Increase robustness of confirm safe tx script (#858)

* some script improvements * add SAFE web URL to networks.json * adds more robustness * Update script/utils/viemScriptHelpers.ts Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * use console.error --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
lifinance · Nov 19, 2024 · df722fb · df722fb
1 parent beb7b1f
commit df722fb
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 26 deletions.
diff --git a/config/networks.json b/config/networks.json
@@ -14,6 +14,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-mainnet.safe.global/api",
     "safeAddress": "0x37347dD595C49212C5FC2D95EA10d1085896f51E",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=eth:0x37347dD595C49212C5FC2D95EA10d1085896f51E",
     "gasZipChainId": 255
   },
   "arbitrum": {
@@ -31,6 +32,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-arbitrum.safe.global/api",
     "safeAddress": "0x9e606d0d2BbA344b911e2F4Eab95d9235A83fe15",
+    "safeWebUrl": "https://app.safe.global/home?chain=oeth&safe=arb1:0x9e606d0d2BbA344b911e2F4Eab95d9235A83fe15",
     "gasZipChainId": 57
   },
   "aurora": {
@@ -48,6 +50,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-aurora.safe.global/api",
     "safeAddress": "0xC7291F249424A35b17976F057D2C97B30c92b88C",
+    "safeWebUrl": "https://app.safe.global/home?chain=oeth&safe=aurora:0xC7291F249424A35b17976F057D2C97B30c92b88C",
     "gasZipChainId": 62
   },
   "avalanche": {
@@ -65,6 +68,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-avalanche.safe.global/api",
     "safeAddress": "0x27d4eb2854d93a1A7Df8e2aeD1a535b080a6f6e4",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=avax:0x27d4eb2854d93a1A7Df8e2aeD1a535b080a6f6e4",
     "gasZipChainId": 15
   },
   "base": {
@@ -82,6 +86,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-base.safe.global/api",
     "safeAddress": "0x1F6974C11B833Eb52ea07E0B442510165D87d82e",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=base:0x1F6974C11B833Eb52ea07E0B442510165D87d82e",
     "gasZipChainId": 54
   },
   "blast": {
@@ -99,6 +104,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.blast-safe.io/api",
     "safeAddress": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
+    "safeWebUrl": "https://blast-safe.io/transactions/queue?safe=blastmainnet:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "gasZipChainId": 96
   },
   "boba": {
@@ -116,6 +122,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction.mainnet.boba.network/api",
     "safeAddress": "0x05d34Bd70E0CBf8b82423d0C2ee8b2a8f02E4128",
+    "safeWebUrl": "https://multisig.boba.network/home?chain=boba&safe=boba:0x05d34Bd70E0CBf8b82423d0C2ee8b2a8f02E4128",
     "gasZipChainId": 140
   },
   "bsc": {
@@ -133,6 +140,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-bsc.safe.global/api",
     "safeAddress": "0x20B6b31D76E054C3e4de6154fEca385Ca58c7C15",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=bnb:0x20B6b31D76E054C3e4de6154fEca385Ca58c7C15",
     "gasZipChainId": 148
   },
   "celo": {
@@ -150,6 +158,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://safe-transaction-celo.safe.global/api",
     "safeAddress": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=celo:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
     "gasZipChainId": 21
   },
   "cronos": {
@@ -167,6 +176,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.cronos-safe.org/api",
     "safeAddress": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "safeWebUrl": "https://cronos-safe.org/home?safe=cro:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
     "gasZipChainId": 36
   },
   "fantom": {
@@ -184,6 +194,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-txservice.fantom.network/api",
     "safeAddress": "0x9B325B1c43BB3c018FcDB24A64E05EF4B8B8057b",
+    "safeWebUrl": "https://safe.fantom.network/transactions/queue?safe=ftm:0x9B325B1c43BB3c018FcDB24A64E05EF4B8B8057b",
     "gasZipChainId": 20
   },
   "fraxtal": {
@@ -201,6 +212,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://transaction-frax.safe.optimism.io/api",
     "safeAddress": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "safeWebUrl": "https://safe.optimism.io/transactions/queue?safe=fraxtal:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
     "gasZipChainId": 10
   },
   "fuse": {
@@ -218,6 +230,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://transaction-fuse.safe.fuse.io/api",
     "safeAddress": "0x5336e97bA7332FAC20281Bda8B790c8892245Ded",
+    "safeWebUrl": "https://safe.fuse.io/fuse:0x5336e97bA7332FAC20281Bda8B790c8892245Ded/transactions/queue",
     "gasZipChainId": 31
   },
   "gnosis": {
@@ -235,6 +248,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-gnosis-chain.safe.global/api",
     "safeAddress": "0x2bC523875b59A1Ddd03CEB1F1b28c5B0e8e6654A",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=gno:0x2bC523875b59A1Ddd03CEB1F1b28c5B0e8e6654A",
     "gasZipChainId": 16
   },
   "gravity": {
@@ -252,6 +266,7 @@
     "multicallAddress": "0xf8ac4BEB2F75d2cFFb588c63251347fdD629B92c",
     "safeApiUrl": "https://safe.gravity.xyz/txs/api",
     "safeAddress": "0x245B16CaCE8730b009c5352186DcE7d73c3037A1",
+    "safeWebUrl": "https://safe.gravity.xyz/transactions/queue?safe=gravity:0x245B16CaCE8730b009c5352186DcE7d73c3037A1",
     "gasZipChainId": 240
   },
   "immutablezkevm": {
@@ -269,6 +284,7 @@
     "multicallAddress": "0x236bdA4589e44e6850f5aC6a74BfCa398a86c6c0",
     "safeApiUrl": "https://transaction.safe.immutable.com/api",
     "safeAddress": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "safeWebUrl": "https://safe.immutable.com/transactions/queue?safe=imx:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
     "gasZipChainId": 95
   },
   "kaia": {
@@ -286,6 +302,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://docs-safe.kaia.io/txs-cypress/api",
     "safeAddress": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "safeWebUrl": "https://safe.kaia.io/transactions/queue?safe=mainnet:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
     "gasZipChainId": 33
   },
   "linea": {
@@ -303,6 +320,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://safe-transaction-linea.safe.global/api",
     "safeAddress": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=linea:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "gasZipChainId": 59
   },
   "mantle": {
@@ -320,6 +338,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.multisig.mantle.xyz/api",
     "safeAddress": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "safeWebUrl": "https://multisig.mantle.xyz/transactions/queue?safe=mantle:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
     "gasZipChainId": 13
   },
   "metis": {
@@ -337,6 +356,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://metissafe.tech/txs/api",
     "safeAddress": "0x925cD8289Ac2d617F52974da8338867f3bB62d56",
+    "safeWebUrl": "https://metissafe.tech/transactions/queue?safe=metis-andromeda:0x925cD8289Ac2d617F52974da8338867f3bB62d56",
     "gasZipChainId": 30
   },
   "mode": {
@@ -354,6 +374,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://transaction-mode.safe.optimism.io/api",
     "safeAddress": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
+    "safeWebUrl": "https://safe.optimism.io/transactions/queue?safe=mode:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "gasZipChainId": 73
   },
   "moonbeam": {
@@ -371,6 +392,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.multisig.moonbeam.network/api",
     "safeAddress": "0xB51E43CeCAB8A42cD6225e16C9C3a3ba1A76871A",
+    "safeWebUrl": "https://multisig.moonbeam.network/transactions/queue?safe=mbeam:0xB51E43CeCAB8A42cD6225e16C9C3a3ba1A76871A",
     "gasZipChainId": 28
   },
   "moonriver": {
@@ -388,6 +410,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.moonriver.multisig.moonbeam.network/api",
     "safeAddress": "0xfC78B018B4daD77351095f00D92934A9A851DA34",
+    "safeWebUrl": "https://multisig.moonbeam.network/transactions/queue?safe=mriver:0xfC78B018B4daD77351095f00D92934A9A851DA34",
     "gasZipChainId": 29
   },
   "optimism": {
@@ -405,6 +428,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-optimism.safe.global/api",
     "safeAddress": "0xa8892eA3fdDeF2aa8AfB1E3643a3284f978A5114",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=oeth:0xa8892eA3fdDeF2aa8AfB1E3643a3284f978A5114",
     "gasZipChainId": 55
   },
   "opbnb": {
@@ -421,7 +445,8 @@
     "explorerApiUrl": "",
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "",
-    "safeAddress": "",
+    "safeAddress": "0xaAD94196680Edb94B421bb5B1E1A0B27db686C72",
+    "safeWebUrl": "https://multisig.bnbchain.org/transactions/queue?safe=opbnb:0xaAD94196680Edb94B421bb5B1E1A0B27db686C72",
     "gasZipChainId": 58
   },
   "polygon": {
@@ -439,6 +464,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-polygon.safe.global/api",
     "safeAddress": "0x8BCC385948C73736423D38cc567cFEdE0F1826A3",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=matic:0x8BCC385948C73736423D38cc567cFEdE0F1826A3",
     "gasZipChainId": 17
   },
   "polygonzkevm": {
@@ -456,6 +482,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-zkevm.safe.global/api",
     "safeAddress": "0x9575B9fC42dec56D3772B3df5DA047a1f1D55582",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=zkevm:0x9575B9fC42dec56D3772B3df5DA047a1f1D55582",
     "gasZipChainId": 52
   },
   "rootstock": {
@@ -473,6 +500,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.safe.rootstock.io/api",
     "safeAddress": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
+    "safeWebUrl": "https://safe.rootstock.io/transactions/queue?safe=rsk:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "gasZipChainId": 254
   },
   "scroll": {
@@ -490,6 +518,7 @@
     "multicallAddress": "0xca11bde05977b3631167028862be2a173976ca11",
     "safeApiUrl": "https://safe-transaction-scroll.safe.global/api",
     "safeAddress": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
+    "safeWebUrl": "https://app.safe.global/transactions/queue?safe=scr:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "gasZipChainId": 41
   },
   "sei": {
@@ -507,6 +536,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.sei-safe.protofire.io/api",
     "safeAddress": "0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
+    "safeWebUrl": "https://sei-safe.protofire.io/transactions/queue?safe=sei:0xdf61270fDC1A892874Fd3C0143A0A4CBA74F4EF1",
     "gasZipChainId": 246
   },
   "taiko": {
@@ -524,6 +554,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://transaction.safe.taiko.xyz/api",
     "safeAddress": "0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
+    "safeWebUrl": "https://safe.taiko.xyz/transactions/queue?safe=tko-mainnet:0xa89a87986e8ee1Ac8fDaCc5Ac91627010Ec9f772",
     "gasZipChainId": 249
   },
   "xlayer": {
@@ -541,6 +572,7 @@
     "multicallAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
     "safeApiUrl": "https://safe-transaction-xlayer.safe.global/api",
     "safeAddress": "0x3fD21B437b5E0a903A8376D33824F9BA658756C2",
+    "safeWebUrl": "https://app.safe.global/home?chain=oeth&safe=xlayer:0x3fD21B437b5E0a903A8376D33824F9BA658756C2",
     "gasZipChainId": 146
   },
   "zksync": {
@@ -558,6 +590,7 @@
     "multicallAddress": "0xF9cda624FBC7e059355ce98a31693d299FACd963",
     "safeApiUrl": "https://safe-transaction-zksync.safe.global/api",
     "safeAddress": "0x02f1272aEaCaf7BD8b30278bc2AA381Cc623A744",
+    "safeWebUrl": "https://app.safe.global/home?chain=oeth&safe=zksync:0x02f1272aEaCaf7BD8b30278bc2AA381Cc623A744",
     "gasZipChainId": 51
   },
   "localanvil": {
@@ -575,6 +608,7 @@
     "multicallAddress": "",
     "safeApiUrl": "",
     "safeAddress": "",
+    "safeWebUrl": "",
     "gasZipChainId": 0
   }
-}
+}
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
+5 −3		.github/workflows/checks.yml
+2 −6		.github/workflows/release-cycle.yml
+0 −8		CHANGELOG.md
+3 −89		contracts/governance/Governor.sol
+0 −88		contracts/mocks/docs/governance/MyGovernor.sol
+0 −24		contracts/mocks/docs/governance/MyToken.sol
+0 −35		contracts/mocks/docs/governance/MyTokenTimestampBased.sol
+0 −31		contracts/mocks/docs/governance/MyTokenWrapped.sol
+1 −1		contracts/mocks/wizard/MyGovernor3.sol
+1 −1		contracts/package.json
+3 −7		contracts/utils/cryptography/MerkleProof.sol
+1 −1		docs/modules/ROOT/pages/crosschain.adoc
+195 −4		docs/modules/ROOT/pages/governance.adoc
+0 −2		docs/modules/ROOT/pages/index.adoc
+2 −2		package-lock.json
+1 −1		package.json
+5 −8		scripts/prepare-docs.sh
+24 −0		scripts/release/workflow/prepare-release-merge.sh
+0 −55		test/governance/Governor.t.sol
+0 −83		test/governance/Governor.test.js
+4 −24		test/utils/cryptography/MerkleProof.test.js