From a81ee091e1decfc706549b21334a8c1b9a9cc7cc Mon Sep 17 00:00:00 2001 From: Ignasi Date: Wed, 17 Apr 2024 16:00:43 +0200 Subject: [PATCH] Update minTimestamp test --- inputs-executor/calldata/change-l2-block_8.json | 4 ++-- inputs-executor/calldata/feijoa_2.json | 4 ++-- package.json | 2 +- tools-inputs/data/calldata/change-l2-block.json | 4 ++-- tools-inputs/data/calldata/feijoa.json | 4 ++-- .../generate-test-vectors/gen-change-l2-block.json | 4 ++-- .../tools-calldata/generate-test-vectors/gen-feijoa.json | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/inputs-executor/calldata/change-l2-block_8.json b/inputs-executor/calldata/change-l2-block_8.json index c1cc1ea933b..19678bed1f2 100644 --- a/inputs-executor/calldata/change-l2-block_8.json +++ b/inputs-executor/calldata/change-l2-block_8.json @@ -18,8 +18,8 @@ "forcedData": {}, "previousL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", "previousL1InfoTreeIndex": 1, - "currentL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", - "currentL1InfoTreeIndex": 1, + "currentL1InfoTreeRoot": "0x6419336191e222442b83dce4b05ccdb9ea327f043b8a9eaab181b1742252b5bf", + "currentL1InfoTreeIndex": 3, "l1InfoTree": { "3": { "globalExitRoot": "0x16994edfddddb9480667b64174fc00d3b6da7290d37b8db3a16571b4ddf0789f", diff --git a/inputs-executor/calldata/feijoa_2.json b/inputs-executor/calldata/feijoa_2.json index 96d3e9560cb..af989b24ddb 100644 --- a/inputs-executor/calldata/feijoa_2.json +++ b/inputs-executor/calldata/feijoa_2.json @@ -15,8 +15,8 @@ "forcedData": {}, "previousL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", "previousL1InfoTreeIndex": 1, - "currentL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", - "currentL1InfoTreeIndex": 1, + "currentL1InfoTreeRoot": "0x3f6841214dfcb2b6d9e144c8d95108f1cc4787b863e041c586fb392a48beff2d", + "currentL1InfoTreeIndex": 3, "l1InfoTree": { "3": { "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", diff --git a/package.json b/package.json index ff948b54f6d..1164bdb7195 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ ], "license": "pending", "devDependencies": { - "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v7.0.0-rc.1-fork.10", + "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#feature/fix-73", "@0xpolygonhermez/zkevm-contracts": "github:0xPolygonHermez/zkevm-contracts#feature/fork-etrog", "@grpc/grpc-js": "^1.6.10", "@nomiclabs/hardhat-ethers": "^2.0.5", diff --git a/tools-inputs/data/calldata/change-l2-block.json b/tools-inputs/data/calldata/change-l2-block.json index 787e6c59ba6..db9bd6d5d37 100644 --- a/tools-inputs/data/calldata/change-l2-block.json +++ b/tools-inputs/data/calldata/change-l2-block.json @@ -1121,8 +1121,8 @@ "newStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63", "oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "newBatchAccInputHash": "0xe6af54989178f613d7e94a5a6d0ba272304071ec3c2f9a050477bbde27687cfd", - "currentL1InfoTreeIndex": 1, - "currentL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", + "currentL1InfoTreeIndex": 3, + "currentL1InfoTreeRoot": "0x6419336191e222442b83dce4b05ccdb9ea327f043b8a9eaab181b1742252b5bf", "newLastTimestamp": "3", "virtualCounters": { "steps": 41152, diff --git a/tools-inputs/data/calldata/feijoa.json b/tools-inputs/data/calldata/feijoa.json index f9f3a805690..7319335c80c 100644 --- a/tools-inputs/data/calldata/feijoa.json +++ b/tools-inputs/data/calldata/feijoa.json @@ -351,8 +351,8 @@ "newStateRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", "newBatchAccInputHash": "0xd9354029b3dec99f524f6ecc6bd5c027f827bc9115766971cd0088eed87dcb6e", "oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "currentL1InfoTreeIndex": 1, - "currentL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", + "currentL1InfoTreeIndex": 3, + "currentL1InfoTreeRoot": "0x3f6841214dfcb2b6d9e144c8d95108f1cc4787b863e041c586fb392a48beff2d", "newLastTimestamp": "20", "virtualCounters": { "steps": 9167, diff --git a/tools-inputs/tools-calldata/generate-test-vectors/gen-change-l2-block.json b/tools-inputs/tools-calldata/generate-test-vectors/gen-change-l2-block.json index e2707920238..e8de2d7a74a 100644 --- a/tools-inputs/tools-calldata/generate-test-vectors/gen-change-l2-block.json +++ b/tools-inputs/tools-calldata/generate-test-vectors/gen-change-l2-block.json @@ -1059,8 +1059,8 @@ "newStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63", "oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "newBatchAccInputHash": "0xe6af54989178f613d7e94a5a6d0ba272304071ec3c2f9a050477bbde27687cfd", - "currentL1InfoTreeIndex": 1, - "currentL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", + "currentL1InfoTreeIndex": 3, + "currentL1InfoTreeRoot": "0x6419336191e222442b83dce4b05ccdb9ea327f043b8a9eaab181b1742252b5bf", "newLastTimestamp": "3" }, { diff --git a/tools-inputs/tools-calldata/generate-test-vectors/gen-feijoa.json b/tools-inputs/tools-calldata/generate-test-vectors/gen-feijoa.json index 77a22f7db68..bfbee10545e 100644 --- a/tools-inputs/tools-calldata/generate-test-vectors/gen-feijoa.json +++ b/tools-inputs/tools-calldata/generate-test-vectors/gen-feijoa.json @@ -340,8 +340,8 @@ "newStateRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", "newBatchAccInputHash": "0xd9354029b3dec99f524f6ecc6bd5c027f827bc9115766971cd0088eed87dcb6e", "oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "currentL1InfoTreeIndex": 1, - "currentL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d", + "currentL1InfoTreeIndex": 3, + "currentL1InfoTreeRoot": "0x3f6841214dfcb2b6d9e144c8d95108f1cc4787b863e041c586fb392a48beff2d", "newLastTimestamp": "20" }, {