diff --git a/src/__tests__/assets.test.ts b/src/__tests__/assets.test.ts index 35968e63b..4ca4009c6 100644 --- a/src/__tests__/assets.test.ts +++ b/src/__tests__/assets.test.ts @@ -114,6 +114,40 @@ describe('assets/', () => { expect([network, count]).toEqual([network, files.length]); } }); + + it('the address types for a network should be the same in all files', async () => { + const files = versionFiles(version); + const networkAddressMap: Record = {}; + + for (const file of files) { + const deploymentJson = await readAssetJSON(version, file); + if (!deploymentJson) { + throw new Error(`Failed to read asset ${version}/${file}`); + } + const { networkAddresses } = deploymentJson; + + for (const [network, addressTypes] of Object.entries(networkAddresses)) { + if (!networkAddressMap[network]) { + networkAddressMap[network] = addressTypes; + } else { + // We use try/catch here to make the error message more readable. + // Without it the error message looks like: + // Expected: "canonical" + // Actual: ["canonical", "eip155"] + try { + expect(addressTypes).toEqual(networkAddressMap[network]); + } catch (e) { + console.log(` + Discrepancy in network ${network} + Expected: ${networkAddressMap[network]} + Actual: ${addressTypes} + `); + throw e; + } + } + } + } + }); }); }); } diff --git a/src/assets/v1.3.0/compatibility_fallback_handler.json b/src/assets/v1.3.0/compatibility_fallback_handler.json index 4e6b530b5..0c1c22fd5 100644 --- a/src/assets/v1.3.0/compatibility_fallback_handler.json +++ b/src/assets/v1.3.0/compatibility_fallback_handler.json @@ -47,7 +47,7 @@ "111": "eip155", "122": "canonical", "123": "canonical", - "137": ["canonical", "eip155"], + "137": "canonical", "148": "eip155", "155": "eip155", "169": "canonical", @@ -80,7 +80,7 @@ "787": "eip155", "919": ["canonical", "eip155"], "943": "canonical", - "1001": ["eip155", "canonical"], + "1001": "eip155", "1008": "canonical", "1030": "canonical", "1088": "eip155", @@ -145,7 +145,7 @@ "7700": "eip155", "8192": "eip155", "8194": "eip155", - "8217": ["eip155", "canonical"], + "8217": "eip155", "8329": "canonical", "8453": ["eip155", "canonical"], "8822": "eip155", @@ -179,13 +179,13 @@ "23295": "eip155", "28979": "canonical", "34443": ["canonical", "eip155"], - "42161": ["canonical", "eip155"], + "42161": "canonical", "42170": "canonical", "42220": ["eip155", "canonical"], "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -199,10 +199,10 @@ "71401": "eip155", "71402": "eip155", "73799": "canonical", - "80001": ["canonical", "eip155"], + "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], - "81457": ["canonical", "eip155"], + "81457": "canonical", "83291": "canonical", "84531": "eip155", "84532": ["eip155", "canonical"], @@ -217,7 +217,7 @@ "333999": "canonical", "421611": "canonical", "421613": "canonical", - "421614": ["canonical", "eip155"], + "421614": "canonical", "534351": ["canonical", "eip155"], "534352": "canonical", "534353": "eip155", @@ -231,15 +231,15 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": ["eip155", "canonical"], + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", "245022926": "eip155", - "245022934": ["eip155", "canonical"], + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"], diff --git a/src/assets/v1.3.0/create_call.json b/src/assets/v1.3.0/create_call.json index 7faf81cb3..e4bedcbbc 100644 --- a/src/assets/v1.3.0/create_call.json +++ b/src/assets/v1.3.0/create_call.json @@ -80,7 +80,7 @@ "787": "eip155", "919": ["canonical", "eip155"], "943": "canonical", - "1001": ["eip155", "canonical"], + "1001": "eip155", "1008": "canonical", "1030": "canonical", "1088": "eip155", @@ -185,7 +185,7 @@ "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -202,7 +202,7 @@ "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], - "81457": ["canonical", "eip155"], + "81457": "canonical", "83291": "canonical", "84531": "eip155", "84532": ["eip155", "canonical"], @@ -231,15 +231,15 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": "canonical", + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", "245022926": "eip155", - "245022934": ["eip155", "canonical"], + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"], diff --git a/src/assets/v1.3.0/gnosis_safe.json b/src/assets/v1.3.0/gnosis_safe.json index 1f70cecd7..888ae4a3a 100644 --- a/src/assets/v1.3.0/gnosis_safe.json +++ b/src/assets/v1.3.0/gnosis_safe.json @@ -80,7 +80,7 @@ "787": "eip155", "919": ["canonical", "eip155"], "943": "canonical", - "1001": ["eip155", "canonical"], + "1001": "eip155", "1008": "canonical", "1030": "canonical", "1088": "eip155", @@ -124,7 +124,7 @@ "4002": "canonical", "4078": "canonical", "4157": "eip155", - "4202": ["canonical", "eip155"], + "4202": "canonical", "4337": "canonical", "4460": "canonical", "4653": "eip155", @@ -145,7 +145,7 @@ "7700": "eip155", "8192": "eip155", "8194": "eip155", - "8217": ["eip155", "canonical"], + "8217": "eip155", "8329": "canonical", "8453": ["eip155", "canonical"], "8822": "eip155", @@ -185,7 +185,7 @@ "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -202,7 +202,7 @@ "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], - "81457": ["canonical", "eip155"], + "81457": "canonical", "83291": "canonical", "84531": "eip155", "84532": ["eip155", "canonical"], @@ -231,15 +231,15 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": ["eip155", "canonical"], + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", - "245022926": ["eip155", "canonical"], - "245022934": ["eip155", "canonical"], + "245022926": "eip155", + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"], diff --git a/src/assets/v1.3.0/gnosis_safe_l2.json b/src/assets/v1.3.0/gnosis_safe_l2.json index ead3914b6..ca8446177 100644 --- a/src/assets/v1.3.0/gnosis_safe_l2.json +++ b/src/assets/v1.3.0/gnosis_safe_l2.json @@ -47,7 +47,7 @@ "111": "eip155", "122": "canonical", "123": "canonical", - "137": ["canonical", "eip155"], + "137": "canonical", "148": "eip155", "155": "eip155", "169": "canonical", @@ -67,7 +67,7 @@ "324": "zksync", "336": ["canonical", "eip155"], "338": "eip155", - "369": ["canonical", "eip155"], + "369": "canonical", "420": "eip155", "424": "canonical", "570": "eip155", @@ -79,7 +79,7 @@ "690": ["eip155", "canonical"], "787": "eip155", "919": ["canonical", "eip155"], - "943": ["canonical", "eip155"], + "943": "canonical", "1001": "eip155", "1008": "canonical", "1030": "canonical", @@ -124,7 +124,7 @@ "4002": "canonical", "4078": "canonical", "4157": "eip155", - "4202": ["canonical", "eip155"], + "4202": "canonical", "4337": "canonical", "4460": "canonical", "4653": "eip155", @@ -179,13 +179,13 @@ "23295": "eip155", "28979": "canonical", "34443": ["canonical", "eip155"], - "42161": ["canonical", "eip155"], + "42161": "canonical", "42170": "canonical", "42220": ["eip155", "canonical"], "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -202,7 +202,7 @@ "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], - "81457": ["canonical", "eip155"], + "81457": "canonical", "83291": "canonical", "84531": "eip155", "84532": ["eip155", "canonical"], @@ -217,7 +217,7 @@ "333999": "canonical", "421611": "canonical", "421613": "canonical", - "421614": ["canonical", "eip155"], + "421614": "canonical", "534351": ["canonical", "eip155"], "534352": "canonical", "534353": "eip155", @@ -231,12 +231,12 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": ["eip155", "canonical"], + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", "245022926": "eip155", "245022934": "eip155", diff --git a/src/assets/v1.3.0/multi_send.json b/src/assets/v1.3.0/multi_send.json index 093532cf8..ec001ed26 100644 --- a/src/assets/v1.3.0/multi_send.json +++ b/src/assets/v1.3.0/multi_send.json @@ -80,7 +80,7 @@ "787": "eip155", "919": ["canonical", "eip155"], "943": "canonical", - "1001": ["eip155", "canonical"], + "1001": "eip155", "1008": "canonical", "1030": "canonical", "1088": "eip155", @@ -124,7 +124,7 @@ "4002": "canonical", "4078": "canonical", "4157": "eip155", - "4202": ["canonical", "eip155"], + "4202": "canonical", "4337": "canonical", "4460": "canonical", "4653": "eip155", @@ -185,7 +185,7 @@ "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -202,7 +202,7 @@ "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], - "81457": ["canonical", "eip155"], + "81457": "canonical", "83291": "canonical", "84531": "eip155", "84532": ["eip155", "canonical"], @@ -231,15 +231,15 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": ["eip155", "canonical"], + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", "245022926": "eip155", - "245022934": ["eip155", "canonical"], + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"], diff --git a/src/assets/v1.3.0/multi_send_call_only.json b/src/assets/v1.3.0/multi_send_call_only.json index 204e40fdf..b6136107b 100644 --- a/src/assets/v1.3.0/multi_send_call_only.json +++ b/src/assets/v1.3.0/multi_send_call_only.json @@ -47,7 +47,7 @@ "111": "eip155", "122": "canonical", "123": "canonical", - "137": ["canonical", "eip155"], + "137": "canonical", "148": "eip155", "155": "eip155", "169": "canonical", @@ -80,7 +80,7 @@ "787": "eip155", "919": ["canonical", "eip155"], "943": "canonical", - "1001": ["eip155", "canonical"], + "1001": "eip155", "1008": "canonical", "1030": "canonical", "1088": "eip155", @@ -124,7 +124,7 @@ "4002": "canonical", "4078": "canonical", "4157": "eip155", - "4202": ["canonical", "eip155"], + "4202": "canonical", "4337": "canonical", "4460": "canonical", "4653": "eip155", @@ -179,13 +179,13 @@ "23295": "eip155", "28979": "canonical", "34443": ["canonical", "eip155"], - "42161": ["canonical", "eip155"], + "42161": "canonical", "42170": "canonical", "42220": ["eip155", "canonical"], "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -199,10 +199,10 @@ "71401": "eip155", "71402": "eip155", "73799": "canonical", - "80001": ["canonical", "eip155"], + "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], - "81457": ["canonical", "eip155"], + "81457": "canonical", "83291": "canonical", "84531": "eip155", "84532": ["eip155", "canonical"], @@ -217,7 +217,7 @@ "333999": "canonical", "421611": "canonical", "421613": "canonical", - "421614": ["canonical", "eip155"], + "421614": "canonical", "534351": ["canonical", "eip155"], "534352": "canonical", "534353": "eip155", @@ -231,15 +231,15 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": "canonical", + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", "245022926": "eip155", - "245022934": ["eip155", "canonical"], + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"], diff --git a/src/assets/v1.3.0/proxy_factory.json b/src/assets/v1.3.0/proxy_factory.json index 7d3ce460b..57c12cdc4 100644 --- a/src/assets/v1.3.0/proxy_factory.json +++ b/src/assets/v1.3.0/proxy_factory.json @@ -47,11 +47,11 @@ "111": "eip155", "122": "canonical", "123": "canonical", - "137": ["canonical", "eip155"], + "137": "canonical", "148": "eip155", "155": "eip155", "169": "canonical", - "195": ["eip155", "canonical"], + "195": "eip155", "196": ["eip155", "canonical"], "204": ["eip155", "canonical"], "246": "canonical", @@ -67,7 +67,7 @@ "324": "zksync", "336": ["canonical", "eip155"], "338": "eip155", - "369": ["canonical", "eip155"], + "369": "canonical", "420": "eip155", "424": "canonical", "570": "eip155", @@ -79,8 +79,8 @@ "690": ["eip155", "canonical"], "787": "eip155", "919": ["canonical", "eip155"], - "943": ["canonical", "eip155"], - "1001": ["eip155", "canonical"], + "943": "canonical", + "1001": "eip155", "1008": "canonical", "1030": "canonical", "1088": "eip155", @@ -145,7 +145,7 @@ "7700": "eip155", "8192": "eip155", "8194": "eip155", - "8217": ["eip155", "canonical"], + "8217": "eip155", "8329": "canonical", "8453": ["eip155", "canonical"], "8822": "eip155", @@ -179,13 +179,13 @@ "23295": "eip155", "28979": "canonical", "34443": ["canonical", "eip155"], - "42161": ["canonical", "eip155"], + "42161": "canonical", "42170": "canonical", "42220": ["eip155", "canonical"], "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -202,7 +202,7 @@ "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], - "81457": ["canonical", "eip155"], + "81457": "canonical", "83291": "canonical", "84531": "eip155", "84532": ["eip155", "canonical"], @@ -217,7 +217,7 @@ "333999": "canonical", "421611": "canonical", "421613": "canonical", - "421614": ["canonical", "eip155"], + "421614": "canonical", "534351": ["canonical", "eip155"], "534352": "canonical", "534353": "eip155", @@ -231,15 +231,15 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": "canonical", + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", - "245022926": ["eip155", "canonical"], - "245022934": ["eip155", "canonical"], + "245022926": "eip155", + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"], diff --git a/src/assets/v1.3.0/sign_message_lib.json b/src/assets/v1.3.0/sign_message_lib.json index b46e19b06..d579f040c 100644 --- a/src/assets/v1.3.0/sign_message_lib.json +++ b/src/assets/v1.3.0/sign_message_lib.json @@ -231,7 +231,7 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": "canonical", + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], @@ -239,7 +239,7 @@ "168587773": "canonical", "222000222": "canonical", "245022926": "eip155", - "245022934": ["eip155", "canonical"], + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"], diff --git a/src/assets/v1.3.0/simulate_tx_accessor.json b/src/assets/v1.3.0/simulate_tx_accessor.json index 008b310bd..c0da67c4c 100644 --- a/src/assets/v1.3.0/simulate_tx_accessor.json +++ b/src/assets/v1.3.0/simulate_tx_accessor.json @@ -80,7 +80,7 @@ "787": "eip155", "919": ["canonical", "eip155"], "943": "canonical", - "1001": ["eip155", "canonical"], + "1001": "eip155", "1008": "canonical", "1030": "canonical", "1088": "eip155", @@ -185,7 +185,7 @@ "43113": ["canonical", "eip155"], "43114": ["eip155", "canonical"], "43288": "eip155", - "44787": ["canonical", "eip155"], + "44787": "canonical", "45000": "canonical", "47805": "canonical", "48899": "eip155", @@ -199,7 +199,7 @@ "71401": "eip155", "71402": "eip155", "73799": "canonical", - "80001": ["canonical", "eip155"], + "80001": "canonical", "80002": "canonical", "80085": ["canonical", "eip155"], "81457": "canonical", @@ -231,15 +231,15 @@ "7225878": "eip155", "7777777": ["canonical", "eip155"], "11155111": ["eip155", "canonical"], - "11155420": ["eip155", "canonical"], + "11155420": "eip155", "94204209": ["canonical", "eip155"], "111557560": ["canonical", "eip155"], "123420111": ["canonical", "eip155"], "161221135": "canonical", - "168587773": ["canonical", "eip155"], + "168587773": "canonical", "222000222": "canonical", "245022926": "eip155", - "245022934": ["eip155", "canonical"], + "245022934": "eip155", "333000333": "canonical", "666666666": ["canonical", "eip155"], "999999999": ["canonical", "eip155"],