From 16cefd58159af4c04c6e41ded3077402f3ae8234 Mon Sep 17 00:00:00 2001 From: iain nash Date: Tue, 13 Feb 2024 16:56:08 -0500 Subject: [PATCH 1/3] Fix zora sepolia safe connection --- package.json | 2 +- src/chains.ts | 9 ++++++++- yarn.lock | 14 +++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 1fde4fc..62127f7 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "license": "MIT", "type": "module", "dependencies": { - "@safe-global/protocol-kit": "^2.0.0", "@safe-global/safe-deployments": "^1.33.0", + "@safe-global/protocol-kit": "^3.0.0", "@zoralabs/zorb": "^0.1.0", "ethers": "^6.7.1", "formik": "^2.4.5", diff --git a/src/chains.ts b/src/chains.ts index 3534252..42fda81 100644 --- a/src/chains.ts +++ b/src/chains.ts @@ -3,16 +3,17 @@ import * as chains from "viem/chains"; const defaultL2Addresses = { multiSendAddress: "0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761", - safeMasterCopyAddress: "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", safeProxyFactoryAddress: "0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2", multiSendCallOnlyAddress: "0x40A2aCCbd92BCA938b02010E17A5b8929b49130D", fallbackHandlerAddress: "0x1AC114C2099aFAf5261731655Dc6c306bFcd4Dbd", createCallAddress: "0x7cbB62EaA69F79e6873cD1ecB2392971036cFAa4", signMessageLibAddress: "0xA65387F16B013cf2Af4605Ad8aA5ec25a2cbA3a2", + // renamed from safeMasterCopyAddress safeSingletonAddress: "0x3E5c63644E683549055b9Be8653de26E0B4CD36E", simulateTxAccessorAddress: "0x59AD6735bCd8152B84860Cb256dD9e96b85F69Da", }; +<<<<<<< HEAD const blast = { id: 81457 as const, name: "Blast", @@ -37,6 +38,12 @@ const blast = { }, default: { name: "Explorer", url: "https://blastscan.io" }, }, +======= +// Example how to add new networks before they are merged and released from `safe-global/safe-deployments` package. +export const contractNetworks: ContractNetworksConfig = { + // ZORA sepolia + [`${chains.zoraSepolia.id}`]: defaultL2Addresses, +>>>>>>> 084a40e (Fix zora sepolia safe connection) }; // Example how to add new networks before they are merged and released from `safe-global/safe-deployments` package. diff --git a/yarn.lock b/yarn.lock index e6038f1..3db5581 100644 --- a/yarn.lock +++ b/yarn.lock @@ -526,7 +526,7 @@ resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39" integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ== -"@noble/hashes@1.3.3", "@noble/hashes@^1.3.2": +"@noble/hashes@1.3.3", "@noble/hashes@^1.3.3": version "1.3.3" resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.3.tgz#39908da56a4adc270147bb07968bf3b16cfe1699" integrity sha512-V7/fPHgl+jsVPXqqeOzT8egNj2iBIVt+ECeMMG8TdcnTikP3oaBtUVqpT/gYCR68aEBJSF+XbYUxStjbFMqIIA== @@ -1200,13 +1200,13 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.5.0.tgz#748970e066839e33ed8c935061e370c4ab050517" integrity sha512-8kdW+brNhI/NzJ4fxDufuJUjepzINqJKLGHuxyAtpPG9bMbn8P5mtaCcbOm0EzLJ+atg+kF9dwg8jpclkVqx5w== -"@safe-global/protocol-kit@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@safe-global/protocol-kit/-/protocol-kit-2.0.0.tgz#9d7cd6299dc9728c5c5d229a45b73a3b07ec4af7" - integrity sha512-alnSxNZKC1ssKrFG5ytluu9kNKGwBifb1xhOyCqwMnm72JksbCEo0UWlNvaeCiYMwhYvMyS++mfxcLAsV/8Gfw== +"@safe-global/protocol-kit@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@safe-global/protocol-kit/-/protocol-kit-3.0.0.tgz#9db15a214bf307af81b082eab329b33642d5acd8" + integrity sha512-0x/VqxWQvjUpkK9VeO/llfYMNoUV/Zngq3PKD8mC3H40v/KzOa2jUSgwxkTiRJRxH1cjuwAG+tXcdVluk73Wfw== dependencies: - "@noble/hashes" "^1.3.2" - "@safe-global/safe-deployments" "^1.28.0" + "@noble/hashes" "^1.3.3" + "@safe-global/safe-deployments" "^1.32.0" ethereumjs-util "^7.1.5" ethers "^6.7.1" semver "^7.5.4" From c009f27217aa738a649053cc19c98e3408534ca8 Mon Sep 17 00:00:00 2001 From: iain nash Date: Sun, 21 Apr 2024 22:02:33 +0200 Subject: [PATCH 2/3] latest chains --- package.json | 4 ++-- src/chains.ts | 35 +---------------------------------- yarn.lock | 15 +++++++++++---- 3 files changed, 14 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index 62127f7..88c49a0 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "license": "MIT", "type": "module", "dependencies": { - "@safe-global/safe-deployments": "^1.33.0", "@safe-global/protocol-kit": "^3.0.0", + "@safe-global/safe-deployments": "^1.33.0", "@zoralabs/zorb": "^0.1.0", "ethers": "^6.7.1", "formik": "^2.4.5", @@ -16,7 +16,7 @@ "react-router-dom": "^6.20.0", "reshaped": "^2.6.0", "toastify-js": "^1.12.0", - "viem": "^2.7.16", + "viem": "^2.9.23", "yup": "^1.3.2" }, "scripts": { diff --git a/src/chains.ts b/src/chains.ts index 42fda81..d3de96c 100644 --- a/src/chains.ts +++ b/src/chains.ts @@ -13,45 +13,12 @@ const defaultL2Addresses = { simulateTxAccessorAddress: "0x59AD6735bCd8152B84860Cb256dD9e96b85F69Da", }; -<<<<<<< HEAD -const blast = { - id: 81457 as const, - name: "Blast", - network: "blast", - nativeCurrency: { - decimals: 18, - name: "Ether", - symbol: "ETH", - }, - rpcUrls: { - default: { - http: [], - }, - public: { - http: [], - }, - }, - blockExplorers: { - etherscan: { - name: "Explorer", - url: "https://blastscan.io", - }, - default: { name: "Explorer", url: "https://blastscan.io" }, - }, -======= -// Example how to add new networks before they are merged and released from `safe-global/safe-deployments` package. -export const contractNetworks: ContractNetworksConfig = { - // ZORA sepolia - [`${chains.zoraSepolia.id}`]: defaultL2Addresses, ->>>>>>> 084a40e (Fix zora sepolia safe connection) -}; - // Example how to add new networks before they are merged and released from `safe-global/safe-deployments` package. export const contractNetworks: ContractNetworksConfig = { [`${chains.zoraSepolia.id}`]: defaultL2Addresses, [`${chains.blastSepolia.id}`]: defaultL2Addresses, [`${chains.optimismSepolia.id}`]: defaultL2Addresses, - [`${blast.id}`]: defaultL2Addresses, + [`${chains.blast.id}`]: defaultL2Addresses, }; export const allowedNetworks: { [chainId: number]: chains.Chain } = { diff --git a/yarn.lock b/yarn.lock index 3db5581..780e06f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1231,6 +1231,13 @@ dependencies: semver "^7.3.7" +"@safe-global/safe-deployments@^1.32.0": + version "1.34.0" + resolved "https://registry.yarnpkg.com/@safe-global/safe-deployments/-/safe-deployments-1.34.0.tgz#5eef33012a4af55c4440036b1c0cfdb2245c6e49" + integrity sha512-J55iHhB1tiNoPeVQ5s943zrfeKRYPqBtnz/EM7d878WzUmmDlTGKHN98qPYKBxkRKP1UjEWuQDrZxy80lx1rJw== + dependencies: + semver "^7.3.7" + "@safe-global/safe-deployments@^1.33.0": version "1.33.0" resolved "https://registry.yarnpkg.com/@safe-global/safe-deployments/-/safe-deployments-1.33.0.tgz#5fc33354e752d02fa06b3ab1c1060ba23f484038" @@ -5790,10 +5797,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -viem@^2.7.16: - version "2.7.16" - resolved "https://registry.yarnpkg.com/viem/-/viem-2.7.16.tgz#99e66bbec661b2284bc32061474f20a90381bdcb" - integrity sha512-yOPa9yaoJUm44m0Qe3ugHnkHol3QQlFxN3jT+bq+lQip7X7cWdPfmguyfLWX2viCXcmYZUDiQdeFbkPW9lw11Q== +viem@^2.9.23: + version "2.9.23" + resolved "https://registry.yarnpkg.com/viem/-/viem-2.9.23.tgz#43a286779bc68b974794e3673175734b92d5db3b" + integrity sha512-KolNI8H8tNkOA6xkC5UnlQjoorJxk4F1F9h42pHnH9/CtrWG9Ka4xmAWwhO2xKNPA2sNsAsJLmedBsz2uvaQow== dependencies: "@adraffy/ens-normalize" "1.10.0" "@noble/curves" "1.2.0" From 64089d6aab8e39a9d0b97f03f393f71ab84cb761 Mon Sep 17 00:00:00 2001 From: iain nash Date: Sun, 21 Apr 2024 22:27:59 +0200 Subject: [PATCH 3/3] fix blast --- src/chains.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chains.ts b/src/chains.ts index d3de96c..0e8f16b 100644 --- a/src/chains.ts +++ b/src/chains.ts @@ -35,7 +35,7 @@ export const allowedNetworks: { [chainId: number]: chains.Chain } = { [chains.optimism.id]: chains.optimism, [chains.optimismSepolia.id]: chains.optimismSepolia, [chains.blastSepolia.id]: chains.blastSepolia, - [blast.id]: blast, + [chains.blast.id]: chains.blast, }; Object.keys(contractNetworks).map((network) => {