Merge pull request keepkey#163 from keepkey/relocate-new-tokens

pastaghost · web-flow · commit 0c0dfd80928a · 2023-04-14T13:10:54.000-06:00
relocate bnb, avax, wavax, op token data
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "device-protocol"]
-	path = device-protocol
-	url = https://github.com/keepkey/device-protocol.git
+path = device-protocol
+url = https://github.com/keepkey/device-protocol.git
+branch = master
 [submodule "keepkeylib/eth/ethereum-lists"]
-	path = keepkeylib/eth/ethereum-lists
-	url = https://github.com/keepkey/ethereum-lists.git
+path = keepkeylib/eth/ethereum-lists
+url = https://github.com/keepkey/ethereum-lists.git
+branch = master
diff --git a/device-protocol b/device-protocol
@@ -1 +1 @@
-Subproject commit 82ec74705e5798580b532fac02fbbe5f5740f1e2
+Subproject commit 22ca1d983c3f513f338e2a0ba997427659646523
diff --git a/keepkeylib/eth/ethereum-lists b/keepkeylib/eth/ethereum-lists
@@ -1 +1 @@
-Subproject commit edc1247d136ac89da7386cf9a351d2c1d072ad30
+Subproject commit 89a64f717e1690bb31adb3e4c38e23640357333c
diff --git a/keepkeylib/eth/ethereum_networks.json b/keepkeylib/eth/ethereum_networks.json
@@ -12,7 +12,7 @@
     {
         "chain_id": 5,
         "name": "Ethereum Goerli Testnet",
-        "symbol": "ETH"
+        "symbol": "tETH"
     },
     {
         "chain_id": 8,
@@ -22,7 +22,7 @@
     {
         "chain_id": 10,
         "name": "Optimism",
-        "symbol": "ETH"
+        "symbol": "OP"
     },
     {
         "chain_id": 20,
@@ -47,7 +47,7 @@
     {
         "chain_id": 42,
         "name": "Ethereum Kovan Testnet",
-        "symbol": "ETH"
+        "symbol": "tETH"
     },
     {
         "chain_id": 56,
diff --git a/keepkeylib/eth/uniswap_tokens.json b/keepkeylib/eth/uniswap_tokens.json
@@ -4542,37 +4542,5 @@
     "contractAddress": "0x0Ae055097C6d159879521C384F1D2123D1f195e6",
     "precision": 18,
     "network": "ETH"
-  },
-  {
-    "symbol": "BNB",
-    "identifier": "BSC Smart Chain",
-    "displayName": "BSC Smart Chain",
-    "contractAddress": "0xB8c77482e45F1F44dE1745F52C74426C631bDD52",
-    "precision": 18,
-    "network": "ETH"
-  },
-  {
-    "symbol": "AVAX",
-    "identifier": "Avalanche",
-    "displayName": "Avalanche",
-    "contractAddress": "0x1ce0c2827e2ef14d5c4f29a091d735a204794041",
-    "precision": 18,
-    "network": "ETH"
-  },
-  {
-    "symbol": "WAVAX",
-    "identifier": "Avalanche",
-    "displayName": "Avalanche",
-    "contractAddress": "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
-    "precision": 18,
-    "network": "ETH"
-  },
-  {
-    "symbol": "OP",
-    "identifier": "optimism",
-    "displayName": "Optimism",
-    "contractAddress": "0x4200000000000000000000000000000000000042",
-    "precision": 18,
-    "network": "ETH"
   }
 ]

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`{`
`13`	`13`	`"chain_id": 5,`
`14`	`14`	`"name": "Ethereum Goerli Testnet",`
`15`		`- "symbol": "ETH"`
	`15`	`+ "symbol": "tETH"`
`16`	`16`	`},`
`17`	`17`	`{`
`18`	`18`	`"chain_id": 8,`
`@@ -22,7 +22,7 @@`
`22`	`22`	`{`
`23`	`23`	`"chain_id": 10,`
`24`	`24`	`"name": "Optimism",`
`25`		`- "symbol": "ETH"`
	`25`	`+ "symbol": "OP"`
`26`	`26`	`},`
`27`	`27`	`{`
`28`	`28`	`"chain_id": 20,`
`@@ -47,7 +47,7 @@`
`47`	`47`	`{`
`48`	`48`	`"chain_id": 42,`
`49`	`49`	`"name": "Ethereum Kovan Testnet",`
`50`		`- "symbol": "ETH"`
	`50`	`+ "symbol": "tETH"`
`51`	`51`	`},`
`52`	`52`	`{`
`53`	`53`	`"chain_id": 56,`