Skip to content

Commit

Permalink
Fix change l2 block tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ignasirv committed Mar 26, 2024
1 parent 9aec1f9 commit ffa4cb6
Show file tree
Hide file tree
Showing 9 changed files with 1,171 additions and 182 deletions.
26 changes: 15 additions & 11 deletions inputs-executor/calldata/change-l2-block_4.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
{
"oldStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"newStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"newStateRoot": "0xe36ad70c6b2922eed0efd6a400bdacdfbb58ae902ffdb6194ecb31463d33281a",
"oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newBatchAccInputHash": "0xeefe580b2e6bf50b9b961d21799678609388b9273676eecfc2b8494ab450b428",
"newBatchAccInputHash": "0x26b1348e06a4c8ca4aab4aa4cd60f15d7eb51d746a96868a1853964a66731f06",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newTimestamp": "0",
"newTimestamp": "1944498031",
"chainID": 1000,
"forkID": 10,
"forcedHashData": "0x0000000000000000000000000000000000000000000000000000000000000000",
"forcedHashData": "0x12f51e0ff1959834606004bfb2a833bf991274f363303da5825f822a7aedd83d",
"batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bffee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880803ee20a0764440b016c4a2ee4e7e4eb3a5a97f1e6a6c9f40bf5ecf50f95ff636d63878ddb3e997e519826c7bb26fb7c5950a208e1ec722a9f1c568c4e479b40341cff",
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0x8539195f5c3ab96bd938d9a439b8280d6ee9443c7d0813cf02cec4efb4f04091",
"contractsBytecode": {
"0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a": "0x4660015500",
"0x1000000000000000000000000000000000000000": "0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a"
},
"forcedData": {},
"forcedData": {
"globalExitRoot": "0x16994edfddddb9480667b64174fc00d3b6da7290d37b8db3a16571b4ddf0789f",
"blockHashL1": "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3",
"minTimestamp": "1944498031"
},
"previousL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"previousL1InfoTreeIndex": 1,
"newL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
Expand Down Expand Up @@ -214,13 +218,13 @@
]
},
"virtualCounters": {
"steps": 19242,
"arith": 1147,
"binary": 1324,
"steps": 21372,
"arith": 1161,
"binary": 1431,
"memAlign": 0,
"keccaks": 8,
"padding": 12,
"poseidon": 90,
"keccaks": 45,
"padding": 26,
"poseidon": 2072,
"sha256": 0
}
}
26 changes: 15 additions & 11 deletions inputs-executor/calldata/change-l2-block_5.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
{
"oldStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"newStateRoot": "0x18a36912bdcea30b5a8bc649583be3940b27d759d713eca7be20430bb4ff9605",
"newStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newBatchAccInputHash": "0xa78cd7278eb8b48a40e791486985ad6290af374ca45ad962ed08cc83b2e184ba",
"newBatchAccInputHash": "0x3ae79df9637e00cc2756e2c6de55eaec0efa583c5cfe055e5a59b3047e3d1d75",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newTimestamp": "1944498031",
"newTimestamp": "0",
"chainID": 1000,
"forkID": 10,
"forcedHashData": "0x0000000000000000000000000000000000000000000000000000000000000000",
"forcedHashData": "0x12f51e0ff1959834606004bfb2a833bf991274f363303da5825f822a7aedd83d",
"batchL2Data": "0x0b73e6af6f00000000ee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff",
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0xf5f6d3757e8241324e33c23ecfbbcb1f53a1aaf82532c6fddd38248292f67b44",
"contractsBytecode": {
"0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a": "0x4660015500",
"0x1000000000000000000000000000000000000000": "0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a"
},
"forcedData": {},
"forcedData": {
"globalExitRoot": "0x16994edfddddb9480667b64174fc00d3b6da7290d37b8db3a16571b4ddf0789f",
"blockHashL1": "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3",
"minTimestamp": "1944498031"
},
"previousL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"previousL1InfoTreeIndex": 1,
"newL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
Expand Down Expand Up @@ -214,13 +218,13 @@
]
},
"virtualCounters": {
"steps": 11112,
"arith": 581,
"binary": 728,
"steps": 372,
"arith": 1,
"binary": 8,
"memAlign": 0,
"keccaks": 41,
"padding": 13,
"poseidon": 1263,
"keccaks": 3,
"padding": 0,
"poseidon": 78,
"sha256": 0
}
}
22 changes: 13 additions & 9 deletions inputs-executor/calldata/change-l2-block_6.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
"oldStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"newStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newBatchAccInputHash": "0x087205534df7865d39a6bc7b35a482b347e4e27da66352bca4731f415ed4edd5",
"newBatchAccInputHash": "0xefbd6ee9d694c748387b5284c519300b2825c36edb5912c54fc256700fe2589f",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newTimestamp": "0",
"chainID": 1000,
"forkID": 10,
"forcedHashData": "0x0000000000000000000000000000000000000000000000000000000000000000",
"forcedHashData": "0x12f51e0ff1959834606004bfb2a833bf991274f363303da5825f822a7aedd83d",
"batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bffee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880803ee20a0764440b016c4a2ee4e7e4eb3a5a97f1e6a6c9f40bf5ecf50f95ff636d63878ddb3e997e519826c7bb26fb7c5950a208e1ec722a9f1c568c4e479b40341cff0b73e6af6f00000000ee02843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e88080bff0e780ba7db409339fd3f71969fa2cbf1b8535f6c725a1499d3318d3ef9c2b6340ddfab84add2c188f9efddb99771db1fe621c981846394ea4f035c85bcdd51bff",
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0x0276b84962da0e930d2bbd358799778c72ef4ffbb32d4e6603faef229271707a",
"contractsBytecode": {
"0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a": "0x4660015500",
"0x1000000000000000000000000000000000000000": "0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a"
},
"forcedData": {},
"forcedData": {
"globalExitRoot": "0x16994edfddddb9480667b64174fc00d3b6da7290d37b8db3a16571b4ddf0789f",
"blockHashL1": "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3",
"minTimestamp": "1944498031"
},
"previousL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"previousL1InfoTreeIndex": 1,
"newL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
Expand Down Expand Up @@ -214,13 +218,13 @@
]
},
"virtualCounters": {
"steps": 28727,
"arith": 1720,
"binary": 1982,
"steps": 19242,
"arith": 1147,
"binary": 1324,
"memAlign": 0,
"keccaks": 11,
"padding": 18,
"poseidon": 96,
"keccaks": 9,
"padding": 12,
"poseidon": 90,
"sha256": 0
}
}
226 changes: 226 additions & 0 deletions inputs-executor/calldata/change-l2-block_9.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
{
"oldStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"newStateRoot": "0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63",
"oldBatchAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newBatchAccInputHash": "0xfdc928f491714b60110afc1f3b3e029471255550bbd8fce2032f00a7cfc6b243",
"newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"newTimestamp": "0",
"chainID": 1000,
"forkID": 10,
"forcedHashData": "0x0000000000000000000000000000000000000000000000000000000000000000",
"batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bffee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880803ee20a0764440b016c4a2ee4e7e4eb3a5a97f1e6a6c9f40bf5ecf50f95ff636d63878ddb3e997e519826c7bb26fb7c5950a208e1ec722a9f1c568c4e479b40341cffee02843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e88080bff0e780ba7db409339fd3f71969fa2cbf1b8535f6c725a1499d3318d3ef9c2b6340ddfab84add2c188f9efddb99771db1fe621c981846394ea4f035c85bcdd51bffee03843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880805b346aa02230b22e62f73608de9ff39a162a6c24be9822209c770e3685b92d0756d5316ef954eefc58b068231ccea001fb7ac763ebe03afd009ad71cab36861e1bff",
"sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D",
"batchHashData": "0x9a02cf3deaed968574bae822e8f231f84fbaa276957fd9b219fb54326f67ac6f",
"contractsBytecode": {
"0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a": "0x4660015500",
"0x1000000000000000000000000000000000000000": "0xc365b38cb85dd0f4779ae540c14353866c21a24eeaba2babafe6bd1c3f505d0a"
},
"forcedData": {},
"previousL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"previousL1InfoTreeIndex": 1,
"newL1InfoTreeRoot": "0x4a9bfcb163ec91c5beb22e6aca41592433092c8c7821b01d37fd0de483f9265d",
"newL1InfoTreeIndex": 1,
"l1InfoTree": {},
"db": {
"0x9e88ad623662912afd2dba0c9c407409b4c6a7806de1234ff5000e950a5c2d63": [
"5a62163897199a63",
"6b254567e111b79a",
"733839b8a279f894",
"7b9addf454981ce3",
"66061f74a6a4ff8f",
"f7d0ff96b175a699",
"c16e6b4980269b90",
"dbd82ab1d0852a25",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x7b9addf454981ce3733839b8a279f8946b254567e111b79a5a62163897199a63": [
"7e10f4804541e230",
"43373b6f1c5c3d13",
"a985a81ba100a3d5",
"b570d134ff4e3dc6",
"01d11082086b0e22",
"86892153a0a2c8ea",
"8a1936b05e2f94ee",
"96793971e16b1e08",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x96793971e16b1e088a1936b05e2f94ee86892153a0a2c8ea01d11082086b0e22": [
"0000000000000005",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0xdbd82ab1d0852a25c16e6b4980269b90f7d0ff96b175a69966061f74a6a4ff8f": [
"8b7a4bb2701e63a7",
"f32b742f1bcffc82",
"e3c02ce20d1091e3",
"d12f1f5cf9017b6e",
"ebb05ed2082602b9",
"c538204eb07f3d6c",
"a5ed480ede7b8f0e",
"52621f81fded9c35",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0xd12f1f5cf9017b6ee3c02ce20d1091e3f32b742f1bcffc828b7a4bb2701e63a7": [
"729c377852dae39b",
"5c6813c82e7e00ed",
"ec1f0131e9694875",
"486697bbf6f4a954",
"b09ded7f11a71d80",
"f5e3a8a953b64b74",
"ea273124c67668e1",
"b6eaa58ffa384843",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x486697bbf6f4a954ec1f0131e96948755c6813c82e7e00ed729c377852dae39b": [
"7183a1a495dcd979",
"7a3ac8109851e438",
"1308c100e0c033d8",
"59240f97b81d9719",
"d074b8cee5dcf415",
"2346a1b4c0f390e8",
"47969c1f5a6a25b1",
"da62fdf84a21108e",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0xda62fdf84a21108e47969c1f5a6a25b12346a1b4c0f390e8d074b8cee5dcf415": [
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0xb6eaa58ffa384843ea273124c67668e1f5e3a8a953b64b74b09ded7f11a71d80": [
"a2864e1663b85c3f",
"97459a5c4c062871",
"7714fd7a08838907",
"3066827800eec3bd",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x3066827800eec3bd7714fd7a0883890797459a5c4c062871a2864e1663b85c3f": [
"356d68ec105e113b",
"b8c3ecf7ffd766d9",
"ecaae95d07bded7f",
"25ed1f939564a14f",
"5a808f99ef73954b",
"17f93b88e1b6bfe6",
"47972799163b761c",
"f8ecb74bd0c7fb07",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x25ed1f939564a14fecaae95d07bded7fb8c3ecf7ffd766d9356d68ec105e113b": [
"0b6ef212cb5c83f8",
"49015d7e991a1528",
"4a6eced6e8304885",
"305a6af4d7a8a00c",
"494f9491c8507dc3",
"e92914c00b37a1cd",
"f6b613135380bd5f",
"b487e2e7e1d98168",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0xb487e2e7e1d98168f6b613135380bd5fe92914c00b37a1cd494f9491c8507dc3": [
"00000000c6200000",
"00000000d78ebc5a",
"000000000000000a",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0xf8ecb74bd0c7fb0747972799163b761c17f93b88e1b6bfe65a808f99ef73954b": [
"01fcb01e0c654491",
"4cee8230467ac42e",
"63741e55a2981f04",
"5bde7f82389c2850",
"97bd009ba83794c6",
"f6201d0df8234fec",
"535bbd1bef474d00",
"55997d393828903b",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x55997d393828903b535bbd1bef474d00f6201d0df8234fec97bd009ba83794c6": [
"000000003f505d0a",
"00000000afe6bd1c",
"00000000eaba2bab",
"000000006c21a24e",
"00000000c1435386",
"00000000779ae540",
"00000000b85dd0f4",
"00000000c365b38c"
],
"0x52621f81fded9c35a5ed480ede7b8f0ec538204eb07f3d6cebb05ed2082602b9": [
"66ee2be0687eea76",
"6926f8ca8796c78a",
"4c2f3e938869b82d",
"649e63bfe1247ba4",
"35f28afeae0ff489",
"b6d75a1b213c2f7c",
"521f1ce7fca92f45",
"2afffacb569cf689",
"0000000000000001",
"0000000000000000",
"0000000000000000",
"0000000000000000"
],
"0x2afffacb569cf689521f1ce7fca92f45b6d75a1b213c2f7c35f28afeae0ff489": [
"0000000063100000",
"000000006bc75e2d",
"0000000000000005",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000",
"0000000000000000"
]
},
"virtualCounters": {
"steps": 38112,
"arith": 2293,
"binary": 2640,
"memAlign": 0,
"keccaks": 14,
"padding": 24,
"poseidon": 102,
"sha256": 0
}
}
Loading

0 comments on commit ffa4cb6

Please sign in to comment.