JSON Structure Update

safe-global · Jul 5, 2024 · bb2d7a8 · bb2d7a8
1 parent f84b3dd
commit bb2d7a8
Showing 58 changed files with 482 additions and 390 deletions.
diff --git a/src/__tests__/assets.test.ts b/src/__tests__/assets.test.ts
@@ -51,8 +51,8 @@ describe('assets/', () => {
                 throw new Error(`Failed to read asset ${version}/${file}`);
               }
 
-              const { networkAddresses, addresses } = deploymentJson;
-              const canonicalAddressTypes = Object.keys(addresses);
+              const { networkAddresses, deployments } = deploymentJson;
+              const canonicalAddressTypes = Object.keys(deployments);
 
               for (const addressType of Object.values(networkAddresses)) {
                 if (Array.isArray(addressType)) {
@@ -71,9 +71,9 @@ describe('assets/', () => {
             if (!deploymentJson) {
               throw new Error(`Failed to read asset ${version}/${file}`);
             }
-            const { addresses } = deploymentJson;
+            const { deployments } = deploymentJson;
 
-            for (const addressType of Object.keys(addresses)) {
+            for (const addressType of Object.keys(deployments)) {
               expect(KNOWN_ADDRESS_TYPES).toContain(addressType);
             }
           });

diff --git a/src/__tests__/assets/v1/v1.0.0/gnosis_safe.json b/src/__tests__/assets/v1/v1.0.0/gnosis_safe.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "GnosisSafe",
   "version": "1.0.0",
-  "codeHash": {
-    "canonical": "0xe1f1593df76e69abc2d692792c80f329457551d5e83dde597546a1d58764da80"
-  },
-  "addresses": {
-    "canonical": "0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A"
+  "deployments": {
+    "canonical": {
+      "address": "0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A",
+      "codeHash": "0xe1f1593df76e69abc2d692792c80f329457551d5e83dde597546a1d58764da80"
+    }
   },
   "networkAddresses": {
     "1": "0xb6029EA3B2c51D09a50B53CA8012FeEB05bDa35A",

diff --git a/src/__tests__/assets/v1/v1.0.0/proxy_factory.json b/src/__tests__/assets/v1/v1.0.0/proxy_factory.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "ProxyFactory",
   "version": "1.0.0",
-  "codeHash": {
-    "canonical": "0x84a375ad96ab395850d46cd601ed6354d3cf3fb67cec0caf18f34af5c9d1a7f0"
-  },
-  "addresses": {
-    "canonical": "0x12302fE9c02ff50939BaAaaf415fc226C078613C"
+  "deployments": {
+    "canonical": {
+      "address": "0x12302fE9c02ff50939BaAaaf415fc226C078613C",
+      "codeHash": "0x84a375ad96ab395850d46cd601ed6354d3cf3fb67cec0caf18f34af5c9d1a7f0"
+    }
   },
   "networkAddresses": {
     "1": "0x12302fE9c02ff50939BaAaaf415fc226C078613C",

diff --git a/src/__tests__/assets/v1/v1.1.1/create_and_add_modules.json b/src/__tests__/assets/v1/v1.1.1/create_and_add_modules.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "CreateAndAddModules",
   "version": "1.1.1",
-  "codeHash": {
-    "canonical": "0x83941bb48a3e3302a6e502e61513981ad02f3870f2d15e6d9cd301d616a0ba38"
-  },
-  "addresses": {
-    "canonical": "0xF61A721642B0c0C8b334bA3763BA1326F53798C0"
+  "deployments": {
+    "canonical": {
+      "address": "0xF61A721642B0c0C8b334bA3763BA1326F53798C0",
+      "codeHash": "0x83941bb48a3e3302a6e502e61513981ad02f3870f2d15e6d9cd301d616a0ba38"
+    }
   },
   "networkAddresses": {
     "1": "0xF61A721642B0c0C8b334bA3763BA1326F53798C0",

diff --git a/src/__tests__/assets/v1/v1.1.1/create_call.json b/src/__tests__/assets/v1/v1.1.1/create_call.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "CreateCall",
   "version": "1.1.1",
-  "codeHash": {
-    "canonical": "0x9de5afc9afd2bc0e329d9b4fa34955da45bb8e11587c645c5ff5287d7507adeb"
-  },
-  "addresses": {
-    "canonical": "0x8538FcBccba7f5303d2C679Fa5d7A629A8c9bf4A"
+  "deployments": {
+    "canonical": {
+      "address": "0x8538FcBccba7f5303d2C679Fa5d7A629A8c9bf4A",
+      "codeHash": "0x9de5afc9afd2bc0e329d9b4fa34955da45bb8e11587c645c5ff5287d7507adeb"
+    }
   },
   "networkAddresses": {
     "1": "0x8538FcBccba7f5303d2C679Fa5d7A629A8c9bf4A",

diff --git a/src/__tests__/assets/v1/v1.1.1/default_callback_handler.json b/src/__tests__/assets/v1/v1.1.1/default_callback_handler.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "DefaultCallbackHandler",
   "version": "1.1.1",
-  "codeHash": {
-    "canonical": "0x919a9f5dd111a01f7a8e4b1f5c6a972bb2d1441c67bdec71de6a09d0be92f5b9"
-  },
-  "addresses": {
-    "canonical": "0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44"
+  "deployments": {
+    "canonical": {
+      "address": "0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44",
+      "codeHash": "0x919a9f5dd111a01f7a8e4b1f5c6a972bb2d1441c67bdec71de6a09d0be92f5b9"
+    }
   },
   "networkAddresses": {
     "1": "0xd5D82B6aDDc9027B22dCA772Aa68D5d74cdBdF44",

diff --git a/src/__tests__/assets/v1/v1.1.1/gnosis_safe.json b/src/__tests__/assets/v1/v1.1.1/gnosis_safe.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "GnosisSafe",
   "version": "1.1.1",
-  "codeHash": {
-    "canonical": "0x56b8be58b5ad629a621593a2e5e5e8e9a28408dc06e95597497b303902772e45"
-  },
-  "addresses": {
-    "canonical": "0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F"
+  "deployments": {
+    "canonical": {
+      "address": "0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F",
+      "codeHash": "0x56b8be58b5ad629a621593a2e5e5e8e9a28408dc06e95597497b303902772e45"
+    }
   },
   "networkAddresses": {
     "1": "0x34CfAC646f301356fAa8B21e94227e3583Fe3F5F",

diff --git a/src/__tests__/assets/v1/v1.1.1/multi_send.json b/src/__tests__/assets/v1/v1.1.1/multi_send.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "MultiSend",
   "version": "1.1.1",
-  "codeHash": {
-    "canonical": "0xe4e9b4d4c1e3ff06cd51afe0b51eb1b22c0bab51eab38d428ee74540a5ff603e"
-  },
-  "addresses": {
-    "canonical": "0x8D29bE29923b68abfDD21e541b9374737B49cdAD"
+  "deployments": {
+    "canonical": {
+      "address": "0x8D29bE29923b68abfDD21e541b9374737B49cdAD",
+      "codeHash": "0xe4e9b4d4c1e3ff06cd51afe0b51eb1b22c0bab51eab38d428ee74540a5ff603e"
+    }
   },
   "networkAddresses": {
     "1": "0x8D29bE29923b68abfDD21e541b9374737B49cdAD",

diff --git a/src/__tests__/assets/v1/v1.1.1/proxy_factory.json b/src/__tests__/assets/v1/v1.1.1/proxy_factory.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "ProxyFactory",
   "version": "1.1.1",
-  "codeHash": {
-    "canonical": "0x0f0bb9c13be3b595d6f0fde841d5247a96f7e315bd8b97e1363553bee9a7d995"
-  },
-  "addresses": {
-    "canonical": "0x76E2cFc1F5Fa8F6a5b3fC4c8F4788F0116861F9B"
+  "deployments": {
+    "canonical": {
+      "address": "0x76E2cFc1F5Fa8F6a5b3fC4c8F4788F0116861F9B",
+      "codeHash": "0x0f0bb9c13be3b595d6f0fde841d5247a96f7e315bd8b97e1363553bee9a7d995"
+    }
   },
   "networkAddresses": {
     "1": "0x76E2cFc1F5Fa8F6a5b3fC4c8F4788F0116861F9B",

diff --git a/src/__tests__/assets/v1/v1.2.0/gnosis_safe.json b/src/__tests__/assets/v1/v1.2.0/gnosis_safe.json
@@ -3,11 +3,11 @@
   "released": true,
   "contractName": "GnosisSafe",
   "version": "1.2.0",
-  "codeHash": {
-    "canonical": "0x2ae2d1231f0d754a7fa4f5e5d0e5554085e1b500d8e09f95aaaaa3f49c0db922"
-  },
-  "addresses": {
-    "canonical": "0x6851D6fDFAfD08c0295C392436245E5bc78B0185"
+  "deployments": {
+    "canonical": {
+      "address": "0x6851D6fDFAfD08c0295C392436245E5bc78B0185",
+      "codeHash": "0x2ae2d1231f0d754a7fa4f5e5d0e5554085e1b500d8e09f95aaaaa3f49c0db922"
+    }
   },
   "networkAddresses": {
     "1": "0x6851D6fDFAfD08c0295C392436245E5bc78B0185",

diff --git a/src/__tests__/assets/v1/v1.3.0/compatibility_fallback_handler.json b/src/__tests__/assets/v1/v1.3.0/compatibility_fallback_handler.json
@@ -3,15 +3,19 @@
   "released": true,
   "contractName": "CompatibilityFallbackHandler",
   "version": "1.3.0",
-  "codeHash": {
-    "canonical": "0x03e69f7ce809e81687c69b19a7d7cca45b6d551ffdec73d9bb87178476de1abf",
-    "eip155": "0x03e69f7ce809e81687c69b19a7d7cca45b6d551ffdec73d9bb87178476de1abf",
-    "zksync": "0x017e9a83d5513f503fb85274f4d1ad1811040d7caa31772750ffb08638c28fbb"
-  },
-  "addresses": {
-    "canonical": "0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4",
-    "eip155": "0x017062a1dE2FE6b99BE3d9d37841FeD19F573804",
-    "zksync": "0x2f870a80647BbC554F3a0EBD093f11B4d2a7492A"
+  "deployments": {
+    "canonical": {
+      "address": "0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4",
+      "codeHash": "0x03e69f7ce809e81687c69b19a7d7cca45b6d551ffdec73d9bb87178476de1abf"
+    },
+    "eip155": {
+      "address": "0x017062a1dE2FE6b99BE3d9d37841FeD19F573804",
+      "codeHash": "0x03e69f7ce809e81687c69b19a7d7cca45b6d551ffdec73d9bb87178476de1abf"
+    },
+    "zksync": {
+      "address": "0x2f870a80647BbC554F3a0EBD093f11B4d2a7492A",
+      "codeHash": "0x017e9a83d5513f503fb85274f4d1ad1811040d7caa31772750ffb08638c28fbb"
+    }
   },
   "networkAddresses": {
     "1": "0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4",

diff --git a/src/__tests__/assets/v1/v1.3.0/create_call.json b/src/__tests__/assets/v1/v1.3.0/create_call.json
@@ -3,15 +3,19 @@
   "released": true,
   "contractName": "CreateCall",
   "version": "1.3.0",
-  "codeHash": {
-    "canonical": "0x8155d988823a4f6f1bcbc76a64af8e510c4ce68819290d43cf24956bd24dee82",
-    "eip155": "0x8155d988823a4f6f1bcbc76a64af8e510c4ce68819290d43cf24956bd24dee82",
-    "zksync": "0x98095337deb9718f4e5ccb1b25a53be5f5e0093502b29df9e857f5e3e12aa194"
-  },
-  "addresses": {
-    "canonical": "0x7cbB62EaA69F79e6873cD1ecB2392971036cFAa4",
-    "eip155": "0xB19D6FFc2182150F8Eb585b79D4ABcd7C5640A9d",
-    "zksync": "0xcB8e5E438c5c2b45FbE17B02Ca9aF91509a8ad56"
+  "deployments": {
+    "canonical": {
+      "address": "0x7cbB62EaA69F79e6873cD1ecB2392971036cFAa4",
+      "codeHash": "0x8155d988823a4f6f1bcbc76a64af8e510c4ce68819290d43cf24956bd24dee82"
+    },
+    "eip155": {
+      "address": "0xB19D6FFc2182150F8Eb585b79D4ABcd7C5640A9d",
+      "codeHash": "0x8155d988823a4f6f1bcbc76a64af8e510c4ce68819290d43cf24956bd24dee82"
+    },
+    "zksync": {
+      "address": "0xcB8e5E438c5c2b45FbE17B02Ca9aF91509a8ad56",
+      "codeHash": "0x98095337deb9718f4e5ccb1b25a53be5f5e0093502b29df9e857f5e3e12aa194"
+    }
   },
   "networkAddresses": {
     "1": "0x7cbB62EaA69F79e6873cD1ecB2392971036cFAa4",

diff --git a/src/__tests__/assets/v1/v1.3.0/gnosis_safe.json b/src/__tests__/assets/v1/v1.3.0/gnosis_safe.json
@@ -3,15 +3,19 @@
   "released": true,
   "contractName": "GnosisSafe",
   "version": "1.3.0",
-  "codeHash": {
-    "canonical": "0xbba688fbdb21ad2bb58bc320638b43d94e7d100f6f3ebaab0a4e4de6304b1c2e",
-    "eip155": "0xbba688fbdb21ad2bb58bc320638b43d94e7d100f6f3ebaab0a4e4de6304b1c2e",
-    "zksync": "0x551b7fdfd2dbcec4f785059e1ef6e0b40ca2e44d792158c4e825bc0b092f15e9"
-  },
-  "addresses": {
-    "canonical": "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552",
-    "eip155": "0x69f4D1788e39c87893C980c06EdF4b7f686e2938",
-    "zksync": "0xB00ce5CCcdEf57e539ddcEd01DF43a13855d9910"
+  "deployments": {
+    "canonical": {
+      "address": "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552",
+      "codeHash": "0xbba688fbdb21ad2bb58bc320638b43d94e7d100f6f3ebaab0a4e4de6304b1c2e"
+    },
+    "eip155": {
+      "address": "0x69f4D1788e39c87893C980c06EdF4b7f686e2938",
+      "codeHash": "0xbba688fbdb21ad2bb58bc320638b43d94e7d100f6f3ebaab0a4e4de6304b1c2e"
+    },
+    "zksync": {
+      "address": "0xB00ce5CCcdEf57e539ddcEd01DF43a13855d9910",
+      "codeHash": "0x551b7fdfd2dbcec4f785059e1ef6e0b40ca2e44d792158c4e825bc0b092f15e9"
+    }
   },
   "networkAddresses": {
     "1": "0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552",

diff --git a/src/__tests__/assets/v1/v1.3.0/gnosis_safe_l2.json b/src/__tests__/assets/v1/v1.3.0/gnosis_safe_l2.json
@@ -3,15 +3,19 @@
   "released": true,
   "contractName": "GnosisSafeL2",
   "version": "1.3.0",
-  "codeHash": {
-    "canonical": "0x21842597390c4c6e3c1239e434a682b054bd9548eee5e9b1d6a4482731023c0f",
-    "eip155": "0x21842597390c4c6e3c1239e434a682b054bd9548eee5e9b1d6a4482731023c0f",
-    "zksync": "0xe2ca068330339d608367d83a0b25545efe39e619098597699ab8ff828cb1ddd8"
-  },
-  "addresses": {
-    "canonical": "0x3E5c63644E683549055b9Be8653de26E0B4CD36E",
-    "eip155": "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA",
-    "zksync": "0x1727c2c531cf966f902E5927b98490fDFb3b2b70"
+  "deployments": {
+    "canonical": {
+      "address": "0x3E5c63644E683549055b9Be8653de26E0B4CD36E",
+      "codeHash": "0x21842597390c4c6e3c1239e434a682b054bd9548eee5e9b1d6a4482731023c0f"
+    },
+    "eip155": {
+      "address": "0xfb1bffC9d739B8D520DaF37dF666da4C687191EA",
+      "codeHash": "0x21842597390c4c6e3c1239e434a682b054bd9548eee5e9b1d6a4482731023c0f"
+    },
+    "zksync": {
+      "address": "0x1727c2c531cf966f902E5927b98490fDFb3b2b70",
+      "codeHash": "0xe2ca068330339d608367d83a0b25545efe39e619098597699ab8ff828cb1ddd8"
+    }
   },
   "networkAddresses": {
     "1": "0x3E5c63644E683549055b9Be8653de26E0B4CD36E",

diff --git a/src/__tests__/assets/v1/v1.3.0/multi_send.json b/src/__tests__/assets/v1/v1.3.0/multi_send.json
@@ -3,15 +3,19 @@
   "released": true,
   "contractName": "MultiSend",
   "version": "1.3.0",
-  "codeHash": {
-    "canonical": "0x0208282bd262360d0320862c5ac70f375f5ed3b9d89a83a615b4d398415bdc83",
-    "eip155": "0x81db0e4afdf5178583537b58c5ad403bd47a4ac7f9bde2442ef3e341d433126a",
-    "zksync": "0xd9aa004a59b3738a108e747e578ae409b84e9f3ffd689d81b10f4d96000c5f5c"
-  },
-  "addresses": {
-    "canonical": "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761",
-    "eip155": "0x998739BFdAAdde7C933B942a68053933098f9EDa",
-    "zksync": "0x0dFcccB95225ffB03c6FBB2559B530C2B7C8A912"
+  "deployments": {
+    "canonical": {
+      "address": "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761",
+      "codeHash": "0x0208282bd262360d0320862c5ac70f375f5ed3b9d89a83a615b4d398415bdc83"
+    },
+    "eip155": {
+      "address": "0x998739BFdAAdde7C933B942a68053933098f9EDa",
+      "codeHash": "0x81db0e4afdf5178583537b58c5ad403bd47a4ac7f9bde2442ef3e341d433126a"
+    },
+    "zksync": {
+      "address": "0x0dFcccB95225ffB03c6FBB2559B530C2B7C8A912",
+      "codeHash": "0xd9aa004a59b3738a108e747e578ae409b84e9f3ffd689d81b10f4d96000c5f5c"
+    }
   },
   "networkAddresses": {
     "1": "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761",

diff --git a/src/__tests__/assets/v1/v1.3.0/multi_send_call_only.json b/src/__tests__/assets/v1/v1.3.0/multi_send_call_only.json
@@ -3,15 +3,19 @@
   "released": true,
   "contractName": "MultiSendCallOnly",
   "version": "1.3.0",
-  "codeHash": {
-    "canonical": "0xa9865ac2d9c7a1591619b188c4d88167b50df6cc0c5327fcbd1c8c75f7c066ad",
-    "eip155": "0xa9865ac2d9c7a1591619b188c4d88167b50df6cc0c5327fcbd1c8c75f7c066ad",
-    "zksync": "0x064ddbf252714bcd4cb79f679e8c12df96d998ce07bbb13b3118c1dbf4a31942"
-  },
-  "addresses": {
-    "canonical": "0x40A2aCCbd92BCA938b02010E17A5b8929b49130D",
-    "eip155": "0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B",
-    "zksync": "0xf220D3b4DFb23C4ade8C88E526C1353AbAcbC38F"
+  "deployments": {
+    "canonical": {
+      "address": "0x40A2aCCbd92BCA938b02010E17A5b8929b49130D",
+      "codeHash": "0xa9865ac2d9c7a1591619b188c4d88167b50df6cc0c5327fcbd1c8c75f7c066ad"
+    },
+    "eip155": {
+      "address": "0xA1dabEF33b3B82c7814B6D82A79e50F4AC44102B",
+      "codeHash": "0xa9865ac2d9c7a1591619b188c4d88167b50df6cc0c5327fcbd1c8c75f7c066ad"
+    },
+    "zksync": {
+      "address": "0xf220D3b4DFb23C4ade8C88E526C1353AbAcbC38F",
+      "codeHash": "0x064ddbf252714bcd4cb79f679e8c12df96d998ce07bbb13b3118c1dbf4a31942"
+    }
   },
   "networkAddresses": {
     "1": "0x40A2aCCbd92BCA938b02010E17A5b8929b49130D",

diff --git a/src/__tests__/assets/v1/v1.3.0/proxy_factory.json b/src/__tests__/assets/v1/v1.3.0/proxy_factory.json
@@ -3,15 +3,19 @@
   "released": true,
   "contractName": "GnosisSafeProxyFactory",
   "version": "1.3.0",
-  "codeHash": {
-    "canonical": "0x337d7f54be11b6ed55fef7b667ea5488db53db8320a05d1146aa4bd169a39a9b",
-    "eip155": "0x337d7f54be11b6ed55fef7b667ea5488db53db8320a05d1146aa4bd169a39a9b",
-    "zksync": "0x55daa5d390d283edbc5fa835bd53befce45179c758feaac8c149a95850d0a6b6"
-  },
-  "addresses": {
-    "canonical": "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2",
-    "eip155": "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC",
-    "zksync": "0xDAec33641865E4651fB43181C6DB6f7232Ee91c2"
+  "deployments": {
+    "canonical": {
+      "address": "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2",
+      "codeHash": "0x337d7f54be11b6ed55fef7b667ea5488db53db8320a05d1146aa4bd169a39a9b"
+    },
+    "eip155": {
+      "address": "0xC22834581EbC8527d974F8a1c97E1bEA4EF910BC",
+      "codeHash": "0x337d7f54be11b6ed55fef7b667ea5488db53db8320a05d1146aa4bd169a39a9b"
+    },
+    "zksync": {
+      "address": "0xDAec33641865E4651fB43181C6DB6f7232Ee91c2",
+      "codeHash": "0x55daa5d390d283edbc5fa835bd53befce45179c758feaac8c149a95850d0a6b6"
+    }
   },
   "networkAddresses": {
     "1": "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2",