chore: more commands

defi-wonderland · Nov 27, 2023 · 97c31f9 · 97c31f9
1 parent 780dbd0
commit 97c31f9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -18,16 +18,16 @@
     "deploy:mainnet": "bash -c 'source .env && forge script -vv --rpc-url $MAINNET_RPC --slow --broadcast --private-key $DEPLOYER_MAINNNET_PRIVATE_KEY solidity/scripts/DeployMainnet.s.sol:DeployMainnet'",
     "deploy:optimism": "bash -c 'source .env && forge script -vv --rpc-url $OPTIMISM_RPC --slow --broadcast --private-key $DEPLOYER_OPTIMISM_PRIVATE_KEY solidity/scripts/DeployOptimism.s.sol:DeployOptimism'",
     "deploy:optimismGoerli": "bash -c 'source .env && forge script -vv --rpc-url $OPTIMISM_GOERLI_RPC --slow --broadcast --private-key $DEPLOYER_OPTIMISM_GOERLI_PRIVATE_KEY solidity/scripts/DeployOptimismGoerli.s.sol:DeployOptimismGoerli'",
-    "ganache": "ganache --port 8545 --mnemonic 'chapter polar wool ethics pudding undo slide social second put segment chair'",
     "docs:build": "./build-docs.sh",
     "docs:run": "mdbook serve docs",
+    "ganache": "ganache --port 8545 --mnemonic 'chapter polar wool ethics pudding undo slide social second put segment chair'",
     "lint:check": "yarn lint:sol-tests && yarn lint:sol-logic && forge fmt check",
     "lint:fix": "sort-package-json && forge fmt && yarn lint:sol-tests --fix && yarn lint:sol-logic --fix",
     "lint:sol-logic": "solhint -c .solhint.json 'solidity/contracts/**/*.sol' 'solidity/interfaces/**/*.sol'",
     "lint:sol-tests": "solhint 'solidity/test/**/*.sol'",
     "prepare": "husky install",
     "proof": "python3 proofs/generate_proof.py",
-    "test": "forge test --ffi -vvv",
+    "test": "yarn deploy:e2e && forge test --ffi -vvv",
     "test:e2e": "yarn deploy:e2e && forge test --ffi --match-contract E2E -vvv",
     "test:unit": "forge test --match-contract Unit -vvv",
     "test:unit:deep": "FOUNDRY_FUZZ_RUNS=5000 yarn test:unit"

diff --git a/proofs/proof.json b/proofs/proof.json
@@ -1,6 +1,6 @@
 {
-    "blockNumber": 92,
-    "blockHeader": "f901f5a0b4aebda060090758ceed2276bb86b84c7ab42315b2a3ad33d66487e856304aa5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0749ff359eb32cbbacec40ce31326915f40620bc65d4e089a8e0f42ff9a8fc78ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005c8401c9c38000846564ab9f80a09a579a7f9354aca99b72f864ffa4dcabaff3b83c210eeafb21bfcdbb52255755880000000000000000",
-    "accountProof": "f90312f901f1a0b0766a6f781779592ae8ac6b11b53335c22dea1a4c7c6902f8e5981bce1b5390a040a955246ca6bc3fde5fdb6d3b4edde7f866bd17be78b534c0198f6626467b1ba0077f3e7adaf4ce220c9137887e1b7d72efa41d6e39315ec888a06dddfb868f02a07ce8778eff01f1e72ccadadf67002e63e55431e60bc1a8642800ce238e598d38a0de26cb1b4fd99c4d3ed75d4a67931e3c252605c7d68e0148d5327f341bfd5283a0528931bd86b12da8069a906b9d2b6595252be4d0f86ce33cd0d10c6382814618a0ecbc18894c4a2ac4fc995ea1ee7fa49864d2ab7b84c74f1ef9afc7d5687922ba80a04ba2a12c11def3cbb0592f78ddd4b39dae8658918b6a03c8c246a5bef03f6ab5a04e499edc40e2ee5e71df434786cb4480d07ee00b6eb3d7c2164a0267f2f8ecb6a0daf3400af4cc4937c59dcc3a3f6f0040fc45baa78884d0ccfc36d4eb4ad90c50a02cb4f0d1f80029a7b8d09acf5311d165892f450a74233ba9b536b583f72ed152a0ebd4120e1862a4ac1ea3f48e9e21bce5fa57cc52488cdea089fe33a3f5a63372a0a5ac64bb99d260ef6b13a4f2040ed48a4936664ec13d400238b5004841a4d888a0685baaf1a3e6c61a6584e9e293240bdedc68544e28b544946cb4fa2fe64d23eda0dcda8113b4ab597d03483e17c8b0141762ad705d0dfee78f656ff156f6fc0e0b80f8b180a0f1b0bcc1c4cf73155ea623fc46d43f68902048b0d7dacd57da8679aab8fa149e80a0be1227beb5b6b206fa6169ce723ae5a9c9e6ce7b33c54d8fabed21b3936751768080808080a0324d598257e784ce5f41c8f8e259466f424f69e0dbc4f4a07cd1186777d49fd580a034ad5f99b71da649c8447425f4eb99a416970c0560504282caf1599ab8eb098da0173ed634517f21ca528401295a01e0b0f42bb7e67b8cbb58347267671eeb139380808080f869a0208609badd99773f662c5654d38272a4e31b283d910e192f5f559b97dac66764b846f8440180a0bace5ceab0f03b2c4a20ace2725673b4e0a9e91d4ae85777ddfc0cdca52dc6baa0fd79d9f0b0ab6ee2f4166bb9632d934d81e28cd5fdb396e3f3e06ef9580cfd32",
-    "storageProof": "f846f844a1208bb4ba1efbcf4dccb7f4698344e93578b3c7da05a7fe1722210af5f24ed9bc4fa1a0a362927a7b493db164d1728c370827794def1c9f44b655434ab20f05d39e7478"
+    "blockNumber": 111,
+    "blockHeader": "f901f5a0f77fe2cf9dcf5a1e90a8b723b49e176ae95ea93eccd0bf0f3753d61985175f6ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0fea91f0882acd5ea94bfebc91e2cd315d8b2e1dabc72bf381517ae26d3d852d4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006f8401c9c38000846564ac9280a032dcae6b05056366b659ce56769fbe2d61ff0297847a1593a0e0b223f43aed28880000000000000000",
+    "accountProof": "f90332f901f1a0522cc49f3d8845c5060a92dd6b378a5b3f2643d34733b21d4487d82b550f854aa0377776f7d5c280bdfe81f4bb5005b2c62ed61f489b656ae5cad1efd4ddf2ee3aa0557feb000ee9cfb6c6277bf903583244ab1c89c798a87d927e30a7ecd38a627fa07ce8778eff01f1e72ccadadf67002e63e55431e60bc1a8642800ce238e598d38a0e6d870c8574e3635aa353d559a27adcb1fa09caa33f56c549cc2a2ca144c241ea093e0cabbb9abf3a2996618b98ae189cc0fd9b0537abb33ccb74ab2ca3e918915a00a0816d1d27b3f1d0181bf825387c0a97bdd31d5470c72e5bc01601144def0c680a04ba2a12c11def3cbb0592f78ddd4b39dae8658918b6a03c8c246a5bef03f6ab5a0369c7ab0443a9476dfa43a7da48b7071755321a9b131945b8fed5547558281c2a0daf3400af4cc4937c59dcc3a3f6f0040fc45baa78884d0ccfc36d4eb4ad90c50a02cb4f0d1f80029a7b8d09acf5311d165892f450a74233ba9b536b583f72ed152a0ebd4120e1862a4ac1ea3f48e9e21bce5fa57cc52488cdea089fe33a3f5a63372a0a5ac64bb99d260ef6b13a4f2040ed48a4936664ec13d400238b5004841a4d888a0d69a52a7588e8990554259bb9a7bcdbc2d76e6d6a2e9b5ec7c274118bf2d3e0da05ebc178e97abd152ad001552a4b283fb539a4315d26e35a0e40b8730b215307a80f8d180a0b3935677b71f6b2fbdc0326a9c03c90c2978403261b6e33974c0bd2de2ee9095a0a368c77bc9a8539b2a0b499881bfd0409c83c4839651d2b04033843315a3282c80a0998f1a60662f16e1b7d5626752bea5ff7a672769512921d900ebd1758c504b27a0d56a4c6588190598860b6fd9c3be0920ad1cd67f1aa20cda840e4787628df0868080a05dd227abb5173a3e2d6b81f57dabb053ff9cc82c1b8c850de25123a011028a3280a0356a8c90adec47f20e94b48b56a59e0a3a8a966dc1ac2f9c172daee22a015848808080808080f869a020cf1d2c77776a5e41fbb74e20751a7a2111a26633696299468bfaa9d7d81a38b846f8440180a00e30a31ff183648c746a7a14183ac3d3ebaef84ebd2acded1c863eccaa6ff192a0fd79d9f0b0ab6ee2f4166bb9632d934d81e28cd5fdb396e3f3e06ef9580cfd32",
+    "storageProof": "f846f844a120028b464c6506306884133f0db4368ef7d30d348a2f947d46207c5d327653e040a1a0a362927a7b493db164d1728c370827794def1c9f44b655434ab20f05d39e7478"
 }
diff --git a/solidity/scripts/deployments/E2ESafeDeployments.json b/solidity/scripts/deployments/E2ESafeDeployments.json
@@ -1,11 +1,11 @@
 {
-  "BlockHeaderOracle": "0x24C0010BC93e050E5E909Cd18fAdCc4264990Ae0",
-  "GuardCallbackModule": "0x066D328314952c6f33e8FcA84046834FF47190F0",
-  "NeedsUpdateGuard": "0xFEdae71EecAb729b950f735C14F10C3A20dD4c7a",
-  "Safe": "0x4C8a3C4cCf119f6ee521A4E320cf7711f59FE8cB",
-  "SafeOp": "0x4C8a3C4cCf119f6ee521A4E320cf7711f59FE8cB",
-  "StorageMirror": "0xE69026a1eE05CC5C3aC7932bFC560D583657ee31",
-  "StorageMirrorRootRegistry": "0x4B1AE49889086A36EAd8AaBfF4235A6F7DF13318",
-  "UpdateStorageMirrorGuard": "0x456824327A22e75C65C2b855D3602b4b56B4be87",
-  "VerifierModule": "0xB29aEe820B04535DB81fb106d320487A64c5bb48"
+  "BlockHeaderOracle": "0xFC6078eC4Cdc38cCb125F296AcA39965e42B9E1C",
+  "GuardCallbackModule": "0x191f9Ee40128A2e5a20ef205b572fBf0Dd42F47D",
+  "NeedsUpdateGuard": "0xfc9D52ca02873351099AB79F1d8DbD3821197dDb",
+  "Safe": "0x5898A4592c9c19d0B4556f39683666eE2f091235",
+  "SafeOp": "0x5898A4592c9c19d0B4556f39683666eE2f091235",
+  "StorageMirror": "0xF683917d39F5DFD37DE231Fe46f74Eae5C47a08c",
+  "StorageMirrorRootRegistry": "0xE90C19990D2FE7a15c3b8206901d64cfE6049e54",
+  "UpdateStorageMirrorGuard": "0x5bf78f3D633725AEF99132D53F1e5271B017f485",
+  "VerifierModule": "0x4E9AE1E17C1819EC18B535FF1894D00FA8E76185"
 }
diff --git a/solidity/scripts/deployments/HomeChainDeployments.json b/solidity/scripts/deployments/HomeChainDeployments.json
@@ -1,5 +1,5 @@
 {
-  "GuardCallbackModule": "0x066D328314952c6f33e8FcA84046834FF47190F0",
-  "StorageMirror": "0xE69026a1eE05CC5C3aC7932bFC560D583657ee31",
-  "UpdateStorageMirrorGuard": "0x456824327A22e75C65C2b855D3602b4b56B4be87"
+  "GuardCallbackModule": "0x191f9Ee40128A2e5a20ef205b572fBf0Dd42F47D",
+  "StorageMirror": "0xF683917d39F5DFD37DE231Fe46f74Eae5C47a08c",
+  "UpdateStorageMirrorGuard": "0x5bf78f3D633725AEF99132D53F1e5271B017f485"
 }
diff --git a/solidity/scripts/deployments/NonHomeChainDeployments.json b/solidity/scripts/deployments/NonHomeChainDeployments.json
@@ -1,9 +1,9 @@
 {
-  "BlockHeaderOracle": "0x24C0010BC93e050E5E909Cd18fAdCc4264990Ae0",
-  "GuardCallbackModule": "0x066D328314952c6f33e8FcA84046834FF47190F0",
-  "NeedsUpdateGuard": "0xFEdae71EecAb729b950f735C14F10C3A20dD4c7a",
-  "StorageMirror": "0xE69026a1eE05CC5C3aC7932bFC560D583657ee31",
-  "StorageMirrorRootRegistry": "0x4B1AE49889086A36EAd8AaBfF4235A6F7DF13318",
-  "UpdateStorageMirrorGuard": "0x456824327A22e75C65C2b855D3602b4b56B4be87",
-  "VerifierModule": "0xB29aEe820B04535DB81fb106d320487A64c5bb48"
+  "BlockHeaderOracle": "0xFC6078eC4Cdc38cCb125F296AcA39965e42B9E1C",
+  "GuardCallbackModule": "0x191f9Ee40128A2e5a20ef205b572fBf0Dd42F47D",
+  "NeedsUpdateGuard": "0xfc9D52ca02873351099AB79F1d8DbD3821197dDb",
+  "StorageMirror": "0xF683917d39F5DFD37DE231Fe46f74Eae5C47a08c",
+  "StorageMirrorRootRegistry": "0xE90C19990D2FE7a15c3b8206901d64cfE6049e54",
+  "UpdateStorageMirrorGuard": "0x5bf78f3D633725AEF99132D53F1e5271B017f485",
+  "VerifierModule": "0x4E9AE1E17C1819EC18B535FF1894D00FA8E76185"
 }