Merge pull request #17 from base-org/jack/fix-prover-tests

Fix broken prover contract tests
base · Nov 18, 2024 · a55acf5 · a55acf5
2 parents 472024b + d714b3d
commit a55acf5
Show file tree

Hide file tree

Showing 10 changed files with 322 additions and 322 deletions.
diff --git a/contracts/Makefile b/contracts/Makefile
@@ -4,11 +4,11 @@
 
 test:
 	forge fmt
-	forge test --fork-url https://sepolia.base.org --fork-block-number 16718855
+	forge test --fork-url https://sepolia.base.org --fork-block-number 18070252
 
 coverage:
 	forge fmt
-	forge coverage --fork-url https://sepolia.base.org --fork-block-number 16718855
+	forge coverage --fork-url https://sepolia.base.org --fork-block-number 18070252
 
 deploy-mock:
 	forge create --rpc-url $(ARBITRUM_SEPOLIA_RPC) --private-key $(PRIVATE_KEY) test/mocks/MockVerifier.sol:MockVerifier
@@ -17,13 +17,13 @@ deploy-mock-opt-sep:
 	forge create --rpc-url $(OPTIMISM_SEPOLIA_RPC) --private-key $(PRIVATE_KEY) test/mocks/MockVerifier.sol:MockVerifier
 
 read-mock:
-	cast call 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874 "getFulfillmentInfo(bytes32)(uint96,address)" 0xd758704a57f68d8454a2e178564de8917b3f5403c103f296ec973c5c0844850c --rpc-url $(ARBITRUM_SEPOLIA_RPC)
+	cast call 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874 "getFulfillmentInfo(bytes32)(uint96,address)" 0x2ac60f23d7c0dea48c6b0383f3f3c4453a0983beb90d45cbee51ba52a4b4b0f9 --rpc-url $(ARBITRUM_SEPOLIA_RPC)
 
 read-mock-storage:
 	cast storage 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874 0xe69a609b2162dcc5af9e0ea127f045c52010347ed0594d871a19290c515ae3cc --rpc-url $(ARBITRUM_SEPOLIA_RPC)
 
 set-mock:
-	cast send 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874 "storeFulfillmentInfo(bytes32,address)" 0xd758704a57f68d8454a2e178564de8917b3f5403c103f296ec973c5c0844850c 0x23214A0864FC0014CAb6030267738F01AFfdd547 --rpc-url $(ARBITRUM_SEPOLIA_RPC) --private-key $(PRIVATE_KEY)
+	cast send 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874 "storeFulfillmentInfo(bytes32,address)" 0x2ac60f23d7c0dea48c6b0383f3f3c4453a0983beb90d45cbee51ba52a4b4b0f9 0x23214A0864FC0014CAb6030267738F01AFfdd547 --rpc-url $(ARBITRUM_SEPOLIA_RPC) --private-key $(PRIVATE_KEY)
 
 read-mock-op:
 	cast call 0x49E2cDC9e81825B6C718ae8244fe0D5b062F4874 "getFulfillmentInfo(bytes32)(uint96,address)" 0xe38ad8c9e84178325f28799eb3aaae72551b2eea7920c43d88854edd350719f5 --rpc-url $(OPTIMISM_SEPOLIA_RPC)

diff --git a/contracts/test/ArbitrumProver.t.sol b/contracts/test/ArbitrumProver.t.sol
@@ -150,7 +150,7 @@ contract ArbitrumProverTest is Test {
             stateProofParams: stateProofParams,
             dstL2StateRootProofParams: dstL2StateRootParams,
             dstL2AccountProofParams: dstL2AccountProofParams,
-            nodeIndex: uint64(uint256(json.readBytes32(".nodeIndex")))
+            nodeIndex: uint64(json.readUint(".nodeIndex"))
         });
         return abi.encode(proofData);
     }
@@ -175,7 +175,7 @@ contract ArbitrumProverTest is Test {
     }
 
     function _initFulfillmentInfo() private view returns (RIP7755Inbox.FulfillmentInfo memory) {
-        return RIP7755Inbox.FulfillmentInfo({timestamp: 1729202968, filler: FILLER});
+        return RIP7755Inbox.FulfillmentInfo({timestamp: 1731849964, filler: FILLER});
     }
 
     function _deriveStorageKey(CrossChainRequest memory request) private pure returns (bytes memory) {

diff --git a/contracts/test/data/ArbitrumSepoliaProof.json b/contracts/test/data/ArbitrumSepoliaProof.json
diff --git a/contracts/test/data/OPSepoliaProof.json b/contracts/test/data/OPSepoliaProof.json
diff --git a/contracts/test/data/invalids/ArbitrumInvalidBlockHeaders.json b/contracts/test/data/invalids/ArbitrumInvalidBlockHeaders.json
diff --git a/contracts/test/data/invalids/ArbitrumInvalidConfirmData.json b/contracts/test/data/invalids/ArbitrumInvalidConfirmData.json
diff --git a/contracts/test/data/invalids/ArbitrumInvalidL1State.json b/contracts/test/data/invalids/ArbitrumInvalidL1State.json
diff --git a/contracts/test/data/invalids/OPInvalidL1Storage.json b/contracts/test/data/invalids/OPInvalidL1Storage.json
diff --git a/contracts/test/data/invalids/OPInvalidL2StateRoot.json b/contracts/test/data/invalids/OPInvalidL2StateRoot.json
diff --git a/contracts/test/data/invalids/OPInvalidL2Storage.json b/contracts/test/data/invalids/OPInvalidL2Storage.json