From 5f0af84f40b29f5d064112252e7638a5ac912098 Mon Sep 17 00:00:00 2001 From: krlosMata Date: Tue, 15 Nov 2022 15:52:46 +0100 Subject: [PATCH] globalExirRoot --> timestamp --- package.json | 6 +- src/processor.js | 9 +- test/block-info.test.js | 8 +- .../block-info/block-info-batches.json | 48 ++++----- .../test-vectors/block-info/block-info.json | 16 +-- .../end-to-end/state-transition.json | 8 +- .../processor/state-transition.json | 98 +++++++++---------- .../selfdestruct/selfdestruct.json | 10 +- .../test-vectors/zkevm-db/recursive.json | 8 +- .../zkevm-db/state-transition.json | 2 +- test/processor.test.js | 10 +- 11 files changed, 114 insertions(+), 109 deletions(-) diff --git a/package.json b/package.json index 48d8be16..cf1aa0a6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@0xpolygonhermez/zkevm-commonjs", "description": "Javascript library implementing common utilities for zkevm", - "version": "0.4.0.1", + "version": "0.5.0.0", "main": "index.js", "scripts": { "setup": "npm i", @@ -34,7 +34,7 @@ }, "homepage": "https://github.com/0xPolygonHermez/zkevm-commonjs#readme", "devDependencies": { - "@0xpolygonhermez/contracts-zkevm": "github:0xPolygonHermez/zkevm-contracts#feature/addAribitraryData", + "@0xpolygonhermez/contracts-zkevm": "github:0xPolygonHermez/zkevm-contracts#develop", "@ethersproject/abi": "^5.6.4", "@nomiclabs/hardhat-ethers": "^2.1.0", "@nomiclabs/hardhat-waffle": "^2.0.2", @@ -48,8 +48,8 @@ }, "dependencies": { "@ethereumjs/block": "^3.6.2", - "@polygon-hermez/common": "2.6.3", "@ethereumjs/tx": "^3.4.0", + "@polygon-hermez/common": "2.6.3", "@polygon-hermez/vm": "5.7.27", "ethereumjs-util": "^7.1.4", "ethers": "^5.5.4", diff --git a/src/processor.js b/src/processor.js index 2f71f504..99660592 100644 --- a/src/processor.js +++ b/src/processor.js @@ -184,12 +184,17 @@ module.exports = class Processor { /** * Set the global exit root in a specific storage slot of the globalExitRootManagerL2 for both vm and SMT + * Not store global exit root if it is zero * This will be performed before process the transactions */ async _setGlobalExitRoot() { + if (Scalar.eq(smtUtils.h4toScalar(this.globalExitRoot), Scalar.e(0))) { + return; + } + const newStorageEntry = {}; const globalExitRootPos = ethers.utils.solidityKeccak256(['uint256', 'uint256'], [smtUtils.h4toString(this.globalExitRoot), Constants.GLOBAL_EXIT_ROOT_STORAGE_POS]); - newStorageEntry[globalExitRootPos] = this.newNumBatch; + newStorageEntry[globalExitRootPos] = this.timestamp; this.currentStateRoot = await stateUtils.setContractStorage( Constants.ADDRESS_GLOBAL_EXIT_ROOT_MANAGER_L2, this.smt, @@ -201,7 +206,7 @@ module.exports = class Processor { await this.vm.stateManager.putContractStorage( addressInstance, toBuffer(globalExitRootPos), - toBuffer(this.newNumBatch), + toBuffer(this.timestamp), ); // store data in internal DB diff --git a/test/block-info.test.js b/test/block-info.test.js index 438a4b24..e2ab85d9 100644 --- a/test/block-info.test.js +++ b/test/block-info.test.js @@ -317,19 +317,19 @@ describe('Block info tests', function () { } // Check global exit root - const batchNumVm = await zkEVMDB.vm.stateManager.getContractStorage( + const timestampVm = await zkEVMDB.vm.stateManager.getContractStorage( addressInstanceGlobalExitRoot, globalExitRootPosBuffer, ); - const batchNumSmt = (await stateUtils.getContractStorage( + const timestampSmt = (await stateUtils.getContractStorage( Constants.ADDRESS_GLOBAL_EXIT_ROOT_MANAGER_L2, zkEVMDB.smt, zkEVMDB.stateRoot, [globalExitRootPos], ))[Scalar.e(globalExitRootPos)]; - expect(Scalar.fromString(batchNumVm.toString('hex'), 16)).to.equal(batchNumSmt); - expect(batchNumSmt).to.equal(Scalar.e(batch.newNumBatch)); + expect(Scalar.fromString(timestampVm.toString('hex'), 16)).to.equal(timestampSmt); + expect(timestampSmt).to.equal(Scalar.e(batch.timestamp)); // Check through a call in the EVM if (bridgeDeployed) { diff --git a/test/helpers/test-vectors/block-info/block-info-batches.json b/test/helpers/test-vectors/block-info/block-info-batches.json index 88e55df4..5f982cca 100644 --- a/test/helpers/test-vectors/block-info/block-info-batches.json +++ b/test/helpers/test-vectors/block-info/block-info-batches.json @@ -158,7 +158,7 @@ "rawTx": "0xf88a06843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000008207f4a098f56115cad149a409a86e7610863248799a31d80e87d46582d08a3c0933a40aa025455a74fa3ca2ada0bf39dac88a172d032583bfec15061f39184ef9f7012677" } ], - "expectedNewRoot": "0xd88af05a70520c656807c1c5ff61e74f9e04d6dcf98a3a6eaddb82cf96a27a6f", + "expectedNewRoot": "0x501d72cea44b1406ab46940f722d3c1293b0f2428f46e1e82a5831398165520d", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", @@ -192,13 +192,13 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x07", - "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x47282e4f91ff3f7bcc8a39735d20b86d01488eb8726b2218572088f9c7c195bf", - "0x8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a": "0x53dfc8e68e52b6f9dddfe0b7af8dbbe1d252316114c9ca38c4c4d1504ea9c020", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xf1d5577c752f44551bb85797348646e75d0b8c1039978cdf91107b9c72ab07f0", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x3835218e81c6e3bd9f5afc7631e287268675602cd6ee272fceff360d0c150cf0", - "0xdc686ec4a0ff239c70e7c7c36e8f853eced3bc8618f48d2b816da2a74311237e": "0xe5c7a860c01c6c1d2123c015be325f65eda6659904b5d6f723429d311ea4da55", - "0xe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c": "0x1719a7e74faad3cc4be0653c40f7e1a13ac9bd66e01167fdf1530cec966369e2", - "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0xaabc8126bea2271fab9af9b2f5301054099bb0dcce159fa75c5409fd0df3aa38" + "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0xf77f751aaeef4ba7bd7118b2b7c2fdac700cefe91a2e41d2aefc08f12e4644d0", + "0x8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a": "0x1b60038e083d5ec82468eb90f6f4868a620ad653651db25b959707ded65bf8a4", + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xc18eb9ea7e6dfc3cf833e81797701ec6fcebe074c766c76c10f3c6290b077742", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xe184b4858698c58a98011fce9e154529073769c00c90a454ac6b51cbd195a665", + "0xdc686ec4a0ff239c70e7c7c36e8f853eced3bc8618f48d2b816da2a74311237e": "0x8158981ea08e4add7b0b558fa36033ae77fc2557e3635b58251979b3bb4a4d5c", + "0xe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c": "0x3fa550675342debd80beb0209d66c809e6e34a92a5791ee7422356ba312c7afa", + "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0x247cd6b9c3f9b06df7308f68d72b27f7a6ce5c484d4a8a5dd3fbfbc1e575b4df" } } }, @@ -325,7 +325,7 @@ "rawTx": "0xf88a0d843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000018207f3a068ad61295298051fac15519066926aad57ed5af83b351e586a0fbe70006c4829a05695cc59543fd10d4af41a8a266aef5efd2d691abc356fc679c66e2545fd9ef6" } ], - "expectedNewRoot": "0x06d2f9a844f954c857f7281c0a12163f0919d2def882ecf88d4c0d325be97cef", + "expectedNewRoot": "0x5a62e3d4a89fdae8794ec78ba1fc91db4778bff0286ecb4cee6fbe8f76544ab6", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", @@ -344,7 +344,7 @@ "0x0000000000000000000000000000000000000000000000000000000000000003": "0x0a", "0x0000000000000000000000000000000000000000000000000000000000000005": "0x01c9c380", "0x0000000000000000000000000000000000000000000000000000000000000006": "0x03e8", - "0x0000000000000000000000000000000000000000000000000000000000000001": "0xf1d5577c752f44551bb85797348646e75d0b8c1039978cdf91107b9c72ab07f0" + "0x0000000000000000000000000000000000000000000000000000000000000001": "0xc18eb9ea7e6dfc3cf833e81797701ec6fcebe074c766c76c10f3c6290b077742" } }, "0x617b3a3528f9cdd6630fd3301b9c8911f7bf063d": { @@ -356,20 +356,20 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x0e", - "0x4db623e5c4870b62d3fc9b4e8f893a1a77627d75ab45d9ff7e56ba19564af99b": "0x0ef707d074037c4c7e727750352f7601af73643a648186eb061b5e99977e6bc5", - "0x57aaafa65c4e563d39fff90096a5fa76d42117f53d87ef870784e64d63a8a16b": "0x0b4f179363ed0b512d110b5e5675a0822edcf88ac2803a59da6bcfdc38a6cabf", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xf1d5577c752f44551bb85797348646e75d0b8c1039978cdf91107b9c72ab07f0", - "0xfc80cd5fe514767bc6e66ec558e68a5429ea70b50fa6caa3b53fc9278e918632": "0x9c5bd5f8820b627b85e88569d39a9a190e8829be1b1ddb23f01f74329277b628", - "0x23bf72df16f8335be9a3eddfb5ef1c739b12847d13a384ec83f578699d38eb89": "0x5245244b80a88fcd94494e544a62f3e61e115a3f4a1511f905b980b81cc6a6d0", - "0x2a32391a76c35a36352b711f9152c0d0a340cd686850c8ef25fbb11c71b89e7b": "0x65252bd75475952605e6676cad142690837b66c28ea575ef8c383c6e858dbe27", - "0x74a5fbcb419ab7dbacbb2c92a4e163730f0da5c72b911deecf4f05a6b327d0a4": "0xedbf18deb6c96ad2e8735b2c9a778a4c6349f9092c89cbf4da090f7ce016cf7e", - "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x47282e4f91ff3f7bcc8a39735d20b86d01488eb8726b2218572088f9c7c195bf", - "0x86b3fa87ee245373978e0d2d334dbde866c9b8b039036b87c5eb2fd89bcb6bab": "0x35700e7b8aeaa2e6275fa8e3ff70a435fd91a415255a9ad05e434234f819e4ef", - "0x8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a": "0x53dfc8e68e52b6f9dddfe0b7af8dbbe1d252316114c9ca38c4c4d1504ea9c020", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x3835218e81c6e3bd9f5afc7631e287268675602cd6ee272fceff360d0c150cf0", - "0xdc686ec4a0ff239c70e7c7c36e8f853eced3bc8618f48d2b816da2a74311237e": "0xe5c7a860c01c6c1d2123c015be325f65eda6659904b5d6f723429d311ea4da55", - "0xe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c": "0x1719a7e74faad3cc4be0653c40f7e1a13ac9bd66e01167fdf1530cec966369e2", - "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0xaabc8126bea2271fab9af9b2f5301054099bb0dcce159fa75c5409fd0df3aa38" + "0x4db623e5c4870b62d3fc9b4e8f893a1a77627d75ab45d9ff7e56ba19564af99b": "0x68233a704e51770a8bc073b6089ebd51c77585bc2a487c22e67a042d36583469", + "0x57aaafa65c4e563d39fff90096a5fa76d42117f53d87ef870784e64d63a8a16b": "0x51a1d8b135406a44d476ebb9a36cbad1dd8c1ac8b03aa0ab7fbfedac2cc03df4", + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xc18eb9ea7e6dfc3cf833e81797701ec6fcebe074c766c76c10f3c6290b077742", + "0xfc80cd5fe514767bc6e66ec558e68a5429ea70b50fa6caa3b53fc9278e918632": "0x0f7dcf3ccdf59b48a4c4848d3a5e0031648b10be58cf0385e32b90b3a4db9c66", + "0x23bf72df16f8335be9a3eddfb5ef1c739b12847d13a384ec83f578699d38eb89": "0x24a321b1cb8aef1ab5546255b345440c7233add99ccf82e08628e18c613a3ba6", + "0x2a32391a76c35a36352b711f9152c0d0a340cd686850c8ef25fbb11c71b89e7b": "0x80079f96ba5ca87685ef22e1a3eed898546fe8f5c2da057bc70ebf465616eef7", + "0x74a5fbcb419ab7dbacbb2c92a4e163730f0da5c72b911deecf4f05a6b327d0a4": "0x631e222b8765a1e000ec527e0b6eab805fe71a03e774b06b96596fdea2ad9901", + "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0xf77f751aaeef4ba7bd7118b2b7c2fdac700cefe91a2e41d2aefc08f12e4644d0", + "0x86b3fa87ee245373978e0d2d334dbde866c9b8b039036b87c5eb2fd89bcb6bab": "0xbdd44421182ea92d4d53cab97872dc1d11596bd3f03694b9986fff4493e4fe11", + "0x8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a": "0x1b60038e083d5ec82468eb90f6f4868a620ad653651db25b959707ded65bf8a4", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xe184b4858698c58a98011fce9e154529073769c00c90a454ac6b51cbd195a665", + "0xdc686ec4a0ff239c70e7c7c36e8f853eced3bc8618f48d2b816da2a74311237e": "0x8158981ea08e4add7b0b558fa36033ae77fc2557e3635b58251979b3bb4a4d5c", + "0xe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c": "0x3fa550675342debd80beb0209d66c809e6e34a92a5791ee7422356ba312c7afa", + "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0x247cd6b9c3f9b06df7308f68d72b27f7a6ce5c484d4a8a5dd3fbfbc1e575b4df" } }, "0x0000000000000000000000000000000000000000": { diff --git a/test/helpers/test-vectors/block-info/block-info.json b/test/helpers/test-vectors/block-info/block-info.json index 6b326bf5..feeb995f 100644 --- a/test/helpers/test-vectors/block-info/block-info.json +++ b/test/helpers/test-vectors/block-info/block-info.json @@ -136,13 +136,13 @@ "rawTx": "0xf86a05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708207f4a0e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc6294a00c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d" } ], - "expectedNewRoot": "0x58a941f582fb380452692bc3899ca4c5369cf0ba526184b0dd16153fee8966f4", + "expectedNewRoot": "0x3c0e9fa45b407ee72bde35b1b36d6ba99b10d6d657075683e7a7259b18838ec7", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -186,12 +186,12 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x06", - "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x47282e4f91ff3f7bcc8a39735d20b86d01488eb8726b2218572088f9c7c195bf", - "0x8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a": "0x53dfc8e68e52b6f9dddfe0b7af8dbbe1d252316114c9ca38c4c4d1504ea9c020", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xf1d5577c752f44551bb85797348646e75d0b8c1039978cdf91107b9c72ab07f0", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x3835218e81c6e3bd9f5afc7631e287268675602cd6ee272fceff360d0c150cf0", - "0xe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c": "0x1719a7e74faad3cc4be0653c40f7e1a13ac9bd66e01167fdf1530cec966369e2", - "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0xaabc8126bea2271fab9af9b2f5301054099bb0dcce159fa75c5409fd0df3aa38" + "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0xf77f751aaeef4ba7bd7118b2b7c2fdac700cefe91a2e41d2aefc08f12e4644d0", + "0x8f331abe73332f95a25873e8b430885974c0409691f89d643119a11623a7924a": "0x1b60038e083d5ec82468eb90f6f4868a620ad653651db25b959707ded65bf8a4", + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xc18eb9ea7e6dfc3cf833e81797701ec6fcebe074c766c76c10f3c6290b077742", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xe184b4858698c58a98011fce9e154529073769c00c90a454ac6b51cbd195a665", + "0xe2689cd4a84e23ad2f564004f1c9013e9589d260bde6380aba3ca7e09e4df40c": "0x3fa550675342debd80beb0209d66c809e6e34a92a5791ee7422356ba312c7afa", + "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0x247cd6b9c3f9b06df7308f68d72b27f7a6ce5c484d4a8a5dd3fbfbc1e575b4df" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 diff --git a/test/helpers/test-vectors/end-to-end/state-transition.json b/test/helpers/test-vectors/end-to-end/state-transition.json index 5bf2ba38..f35a239c 100644 --- a/test/helpers/test-vectors/end-to-end/state-transition.json +++ b/test/helpers/test-vectors/end-to-end/state-transition.json @@ -173,13 +173,13 @@ "rawTx": "0xf9012f0480831e8480949d98deabc42dd696deb9e40b4f1cab7ddbf55988880de0b6b3a7640000b8c40871e97100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000008207f4a0f212cb649f835d4f9c788d3a6733911b8aa02c6b63751f3b931fb062bd1942e4a052e73d8704862f4eb55646e7440dcf65f6e7ca424e38340ed8bcf24597c6865d" } ], - "expectedNewRoot": "0x4e1b8957858dd0b62473b1964a3fdd1efa972832c13acde171b771b5473be008", + "expectedNewRoot": "0xe6df887aa885bec60e0f87b88b792ffa22702f18a725f43a9427d727601b4113", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "1", "storage": { - "0xb7b9bfbed410c773a6625940b8d940fbc10059beab3c33131a2bd6f11a2b106c": "0x01", + "0xb7b9bfbed410c773a6625940b8d940fbc10059beab3c33131a2bd6f11a2b106c": "0x73e6af6f", "0x0000000000000000000000000000000000000000000000000000000000000002": "0x9d98deabc42dd696deb9e40b4f1cab7ddbf55988", "0x0000000000000000000000000000000000000000000000000000000000000001": "0x97c7c68e5f6062b69b69b7395dd8ca484a2266fb86d782bc0f094eb1b73f17ba" }, @@ -274,8 +274,8 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x02", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xe25751d467f409bc62bc9a63ebfc69dfc67cc441e5c003a2d7f684fdb446c761", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xd9054846594d062cd439dd84fd0ca70439a67466e727031af1f8b01021346c9e" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x8c2127702da72a56961189c5f8b1097116d1a963c05fb98719394dda1ead2cf0", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x4e2090a3d95b2235a2e549d7439f3c6d216507982fa641d0b5ba8d5e1e81bec0" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 diff --git a/test/helpers/test-vectors/processor/state-transition.json b/test/helpers/test-vectors/processor/state-transition.json index d92d92ff..e9a5ecc5 100644 --- a/test/helpers/test-vectors/processor/state-transition.json +++ b/test/helpers/test-vectors/processor/state-transition.json @@ -34,13 +34,13 @@ "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" } ], - "expectedNewRoot": "0x67b6e2d00bb7c1f543f1338da760c2f111088ccc13876bbd642b53596e6b18f6", + "expectedNewRoot": "0xea2eb6fb48966077643e7a7dbde44df32d65ca64476c4f9ecb1dc99ba4bc0d72", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -64,7 +64,7 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x01", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x33c9ecd2feb33cb4f6f0d37705566d874c696f6dee3502dba8b0ab54982d64d3" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xff820a2828206984cb9c56603f585beaa62ff9892598c269c3c38d7b53b081bb" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -184,13 +184,13 @@ "rawTx": "0xf86c80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a7640000801ba02c92035bc11227e9e94ba066a6d77a65c43d29dfb4a855c9464e1b60fabd6334a07171c6dc84816ffcf025040cd6193ecef3928a0c4e4964ddba320826b76c725d" } ], - "expectedNewRoot": "0xd5f8959d296f3b67f379bf38ccf592b9dda88bacfaa25f5a3adcc32998ea8345", + "expectedNewRoot": "0xe87e03b34db1bb7f0154f27cd035e73f210078272a5975c0082ce64aeaa304bd", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -235,8 +235,8 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x02", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x8718cc71371ae6772e87ffa77b7e794e821f2f3132ff4d403888d589ce4ba7fa", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x9e346f155ce87cab069e0d649b29afa75c36b2b1d1bf75111823b91f8a1be27e" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x4b77bae453a140e036aa3b62fe334e22597f44d3b1d0c61357b86a997938eb7b", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x525cd380df0da47482e212d1a14eb8b668853d71b55ba173c08ad0224cafd913" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -286,13 +286,13 @@ "customRawTx": "0xf080843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8a021e19e0c9bab2400000808203e8808069d48cb9ade9de851379987aa0f7f677cdaee1152ec785a3d3009f094c889be9368c3d198cdfe5b1e0100fe110ea60e77b1eb65e9363d96f7fb9c2b84a37c9b01c" } ], - "expectedNewRoot": "0xe9271cd6cf6d4178beaf4cf50ef2f7e9474c18d1a0bbc3c3d8061758e9069477", + "expectedNewRoot": "0x0143c4ffec267aba2b44f9c5253c41042af8388b7ac2535c566e70937242a2db", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -387,13 +387,13 @@ "customRawTx": "0xef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1b" } ], - "expectedNewRoot": "0xe9271cd6cf6d4178beaf4cf50ef2f7e9474c18d1a0bbc3c3d8061758e9069477", + "expectedNewRoot": "0x0143c4ffec267aba2b44f9c5253c41042af8388b7ac2535c566e70937242a2db", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -454,13 +454,13 @@ "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" } ], - "expectedNewRoot": "0xe9271cd6cf6d4178beaf4cf50ef2f7e9474c18d1a0bbc3c3d8061758e9069477", + "expectedNewRoot": "0x0143c4ffec267aba2b44f9c5253c41042af8388b7ac2535c566e70937242a2db", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -520,13 +520,13 @@ "customRawTx": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451b" } ], - "expectedNewRoot": "0x2fc2367c234f1e0c6198890fcd8ca608ae2f0b54c97a5af1780fd936e2bb9758", + "expectedNewRoot": "0x49d9e431034c9e29e2bdcb73ce388ac1d973e9001388371539ddaed0c8aece34", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -550,7 +550,7 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x01", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x8ed1df262fbd87519693d26665aac5cac143c2da0d39b655ce67b003305ed524" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x72f06d3422e79efefd698d2c12dd4c667cdfecd27378af2215c578c44f826f60" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -639,13 +639,13 @@ "rawTx": "0xf86c80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a7640000801ba077f76b76aca6161db28545aa742536370e4f57f9a71651688631a423abcbe04aa0131474e130abe8bcc9ef39a44a877eb64b2d43132cb0907abe547aa605b641b8" } ], - "expectedNewRoot": "0xad92e71e73e5f87f9bd396356b5ab981ed2e0f1ade4d701e9e34640263fa9075", + "expectedNewRoot": "0x8fae87d4148f1e3f0646b8218d6768a7e52d494d8a2c81301ebaa873384b2022", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -669,7 +669,7 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x01", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xada698deb2dd6dc157da4a6c438c554b86b2b7a2a097758d014323320aa08e03" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x2399767cba4867599d0c5403a0c6f2d29e5256e259e95afa693b7b9e18524a63" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -719,13 +719,13 @@ "customRawTx": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451b" } ], - "expectedNewRoot": "0x4b28b2ecfa592ad4102a0af8a67190d50727e99f75b4de7c538958463684d768", + "expectedNewRoot": "0xd906285a08c96927daf29c52d1e3c273d43e3cf82df53763c5d5e0f0c2132361", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -749,7 +749,7 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x01", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xe2db8a0725e35f899abfe353a0e1b9bd0d232dab63cd4464c2d18e9494edfb23" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x890c798b995ef75e7ab19292d67c1a4701ba124e84b9732f75400c0479023f45" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -812,13 +812,13 @@ "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8806f05b59d3b20000808203e880809990717b4c80d955cacf4a765d3bfefd707511d66e0a482510906d119fa285c7232ccd442c5b618558b62175f01d9f45ff655d480f36394ea50a0b7dc52bc3331c" } ], - "expectedNewRoot": "0xb30a64d30efd1082832425ac62bae26155123d9548f2e7cf879f1cbe367f1cbd", + "expectedNewRoot": "0x31ea9f5bd5a19fb3c66da5626bf2451e02beaf9449ede180f7392028f37a759b", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -842,8 +842,8 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x02", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xe1fe54937f251deebdd08740d1088d06d982d9c09620fb198986d8c553da87af", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xba7611055c7e026c817fe6270ceb524bb24910bea0e89e35933aa6ed1f09f0f8" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x706491c67b9e5be9d5cbd6e0f5d415e616ad0ea04082c0c4d40206acdb8ddffe", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x7a6952c64e2a91949d53b13da8e219d6695665ba8229689d5f9ff873cf7ef3e2" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -932,13 +932,13 @@ "rawTx": "0xf86e03843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808207f3a047b4f7d735dfadefc585bf24d9bd2267438f9bc92d1ab4f65fa9a6d90cc33858a00720a7da26cad22c05bf1358011c95caec969b8b9177af91c0e90dac3d02f6b3" } ], - "expectedNewRoot": "0x0128a8745cc4abc15a62e33ed3a57eedec45e2858bbbef76894c4e14496bf3d9", + "expectedNewRoot": "0xfe94fc7c1fbeacb3a973bfc31287a69834dab9cd1330ff0412fd15065a5d6c03", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -962,10 +962,10 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x04", - "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x8aaa079a6723e8b30fed8831a360ef34180a2958b2346bbbcac56e4ea4194670", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xada698deb2dd6dc157da4a6c438c554b86b2b7a2a097758d014323320aa08e03", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x664ba440e4e872a23d048bb285e33c9a6e49df7f45bc9c57dfed5036876261c1", - "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0xef3a3f565edf4983d9109a8406554938ee5c761f1758adddd42209f9298907e4" + "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0xa199ba48e4f4850f485c629e71e190db1ef963c46587b1dd8e09cd71a9bd7ee4", + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x2399767cba4867599d0c5403a0c6f2d29e5256e259e95afa693b7b9e18524a63", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x160bd2809e5d7d7ce556ac2c98a6d577a3270fa9d7bb5e625a1b05427e54daaa", + "0xedc95719e9a3b28dd8e80877cb5880a9be7de1a13fc8b05e7999683b6b567643": "0xe10fd7c39745bb4a66b053270387a303e007e313f31d0fba83c9b9b2513a9b02" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1046,13 +1046,13 @@ "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a01cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e7a05d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad73" } ], - "expectedNewRoot": "0x4cf0eae3574ed7c3b3daffaf54f9967aff5f686d6782121dea4e21cc4fa31cc5", + "expectedNewRoot": "0x43b64765591d74099404c3327d3d38beb4731ba1feb8f7a88e935c57973672b2", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1086,8 +1086,8 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x02", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x795dc932e2b6cd74c837e1572123469176c2383209f97117d1ec2548a272be08", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x91eff71c1c6d69dd60b3b943c0afd2bd91f806793587aecfbe41ee9269ca4f5b" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x2125790de337401559f4200e8b3d29f512a806c1ad182127c36661449683b1d5", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xde76464d1d098470fe4439e8ea7261d6bd7bb9396f035026c3e086993b1c535f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1166,13 +1166,13 @@ "rawTx": "0xf8ab01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880b844494e4bc30000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff00000000000000000000000000000000000000000000000000038d7ea4c680008207f3a0c83069009c51e411569ca78a660bbcb64e4e6709909eb99c28395fb4c787da4ca02b846bf51fcf891fb293e36a0cf5f4efd1fe7c19b2c8a1220b8308b195e80156" } ], - "expectedNewRoot": "0x46c20674e771c27de36104f251d3f879e74cde6ae3a543693a79e2326801e760", + "expectedNewRoot": "0x3f5011bc061f6e25c52494442ae4cc8795d720dc9d309469d2bb7c5f37253be7", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1203,8 +1203,8 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x02", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x4c894fd8c77a08e5619a57df2009a4d2197fc666f7abd59517027438de9f7e3e", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x181636fadb326adb245c58a9090333ac8eeea92c67cfaff4a4e45509f059df5f" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xb77669f8c01951ce4caabcf2cdeb5e6a2c87b798e9c19be85c3469e71b32556f", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x579c39e12b0e78d846c660af1c82bd6a26050423ac4da94bc61a9209f34af1f8" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1292,13 +1292,13 @@ "rawTx": "0xf88a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8207f3a0a04c0969f64f440a2c91e29bf9ea0b1cc8db9f33bda47c2c6899840ae46d36d7a00212c0a9f1bb015890ed0830c7fea6c52adaf85b0bf3d64448d3300c12c1bb16" } ], - "expectedNewRoot": "0xbef2f9395a0fd16a2fef83da6fea142cd8f75a387f40351f18aaafc4956ad688", + "expectedNewRoot": "0xd6f87d22b32fd72d65a6317286eb7a201c05c5b28e98ad75febe3cdcf57a0af1", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1331,8 +1331,8 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x02", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xdc05ce49b9a0d80568307b074ce88daa43756ee5843b3c3ee93b211c59e6b9b0", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xca2771de72767e0200ccc42d9bd50c30669f3dd2b422b19aa75f511ea1c7dbcd" + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xab9891d273a3b578625bd00b98718879cd4a8c1f20e8700f5b8c6de9a2dc2894", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x7bea96e161326922da00236594cf6458c425aa581dbef5a63881a95dca02036d" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1420,13 +1420,13 @@ "rawTx": "0xf88a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8207f3a028e62eb40661fd098322a7211dca25a6b56f60eefb24ede9607d2603a09e4c65a03be289b7a729a18336e2f9f4a4f52c4fadc4274d1fd42dd8965deeb8634ddddc" } ], - "expectedNewRoot": "0x9388a935fec9575353c2a8d845d3e97664e3a9cdfcd06c4f06b674551c93aa01", + "expectedNewRoot": "0xa7c4b5953163cabe65894a06213f4757e1c7dd5554d0b4db5a21997f3cf120da", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -1459,9 +1459,9 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x03", - "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x8b1e6712c93a68c58cacaeaba37d94d4e4ec9a2bfff09f7bce9d840dab3b7946", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xb9b6246d363017caccae91bf5899e42014031383d9ea9c74f7b4d7ae8f300883", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0x7dfd753d8b76606dde380c7b8fc6584e1cb33334ac571bc10794b4cf418b222d" + "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x21edb6b1fc6a75e923bec4ec01ba91b0044e4b040a8ebebdeeb43f7a3b784cbc", + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0x614b5f1e8e8cb0bd1986b8b1a548a9c5acda0b6bd866b9cb152f3434345fc61d", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xe0baf1661b7d491a08ef7231710de76e28720cc135b7a95a9e0a1556719b914d" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 diff --git a/test/helpers/test-vectors/selfdestruct/selfdestruct.json b/test/helpers/test-vectors/selfdestruct/selfdestruct.json index 0331d500..0733790a 100644 --- a/test/helpers/test-vectors/selfdestruct/selfdestruct.json +++ b/test/helpers/test-vectors/selfdestruct/selfdestruct.json @@ -90,13 +90,13 @@ "rawTx": "0xf86a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880842b68b9c68207f4a0f5b684b995dd9549bb5fd2ed23d3b388f75f559b14110277b4ae7de5bd7775efa01be51078330d1ef03f0e4fe0271e8e2502b6e98c1f7664a5e2aeae3ab04156d4" } ], - "expectedNewRoot": "0x8d6010008947673cfb51f8116730514ed3a1b357bdf99783e9c53ced4abd4fb4", + "expectedNewRoot": "0x96ddba4a047cb0002f6fcc966c0685040d289946f730b38f7ead4a466d01785a", "expectedNewLeafs": { "0xae4bb80be56b819606589de61d5ec3b522eeb032": { "balance": "0", "nonce": "0", "storage": { - "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x01" + "0x53d3f126103a7f7d6245751d2392e0245bf71479d10a3c27a5b501ace6dde1b7": "0x73e6af6f" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 @@ -137,9 +137,9 @@ "nonce": "0", "storage": { "0x0000000000000000000000000000000000000000000000000000000000000000": "0x03", - "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x049f96e198aba7161f29ca2c324193c9f819fd7a926ca49e3f6de95d1d761080", - "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xce23bd8e92c4670fc0c808be48b0007a0694d39d7dd34a16f744894ce2f64919", - "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xdc8eaac2a6c0d40883b2696fd768259bb6e593719509d9d438b1c4944a25c831" + "0x7dfe757ecd65cbd7922a9c0161e935dd7fdbcc0e999689c7d31633896b1fc60b": "0x874bb1c54bd84db12cfeae234fde18e6eb9fc78fdc740544954665a60194609b", + "0xcc69885fda6bcc1a4ace058b4a62bf5e179ea78fd58a1ccd71c22cc9b688792f": "0xf13d27f15e082ec0d7cd70e9dfe1c3dff946c0a7ef39a0667d1410e13eecf72d", + "0xd9d16d34ffb15ba3a3d852f0d403e2ce1d691fb54de27ac87cd2f993f3ec330f": "0xb189c75e3c56fdca62d57db79a99001a4fc0ee797d46f5f6f9beafa8896d80d4" }, "hashBytecode": "0x0000000000000000000000000000000000000000000000000000000000000000", "bytecodeLength": 0 diff --git a/test/helpers/test-vectors/zkevm-db/recursive.json b/test/helpers/test-vectors/zkevm-db/recursive.json index 77bcc364..92c0b9f8 100644 --- a/test/helpers/test-vectors/zkevm-db/recursive.json +++ b/test/helpers/test-vectors/zkevm-db/recursive.json @@ -40,7 +40,7 @@ "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" } ], - "expectedNewRoot": "0x67b6e2d00bb7c1f543f1338da760c2f111088ccc13876bbd642b53596e6b18f6", + "expectedNewRoot": "0xea2eb6fb48966077643e7a7dbde44df32d65ca64476c4f9ecb1dc99ba4bc0d72", "expectedNewAccInputHash": "0x704d5cfd3e44b82028f7f8cae31168267a7422c5a447b90a65134116da5a8432", "expoectNewLocalExitRoot": "", "expectedNewLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -63,7 +63,7 @@ "customRawTx": "0xee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8802c68af0bb140000808203e88080225fd92907efb068a8bee3f95a26f2c5d67db2750bb9993083e0df217ff3a2666f412c311280066d1717f309c248fdbd853ce738363db08775999b2f2d2a8d5e1c" } ], - "expectedNewRoot": "0xa6e0ab7ee71860e6f8058e28260796ef9ad8cd091a99455d1616c08931cbab66", + "expectedNewRoot": "0x834d6f18362daabea8b103a9a2952d63176b81efbfac20970159a0b36871bac4", "expectedNewAccInputHash": "0x87f958227c38bcf883025f5fda2dee19460cff48ca3c4d48d3a48f55c1258e60", "expoectNewLocalExitRoot": "", "expectedNewLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -81,10 +81,10 @@ "nonce": "0" } }, - "finalStateRoot": "0xa6e0ab7ee71860e6f8058e28260796ef9ad8cd091a99455d1616c08931cbab66", + "finalStateRoot": "0x834d6f18362daabea8b103a9a2952d63176b81efbfac20970159a0b36871bac4", "finalLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "finalAccInputHash": "0x87f958227c38bcf883025f5fda2dee19460cff48ca3c4d48d3a48f55c1258e60", "finalNumBatch": 2, - "inputSnark": "0x00ada7d06625bd48e5d23f8dd1a0aa0a31e84aaa724ed8882f0a2994ceba6a16" + "inputSnark": "0x2cd31ede38a42ee7034bf454c07f843db6b20cc0bbac092f3b6a4df2ff037877" } ] \ No newline at end of file diff --git a/test/helpers/test-vectors/zkevm-db/state-transition.json b/test/helpers/test-vectors/zkevm-db/state-transition.json index fd70ecef..8487b3d1 100644 --- a/test/helpers/test-vectors/zkevm-db/state-transition.json +++ b/test/helpers/test-vectors/zkevm-db/state-transition.json @@ -34,7 +34,7 @@ "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" } ], - "expectedNewRoot": "0x67b6e2d00bb7c1f543f1338da760c2f111088ccc13876bbd642b53596e6b18f6", + "expectedNewRoot": "0xea2eb6fb48966077643e7a7dbde44df32d65ca64476c4f9ecb1dc99ba4bc0d72", "expectedNewLeafs": { "0x617b3a3528f9cdd6630fd3301b9c8911f7bf063d": { "balance": "99900000000000000000", diff --git a/test/processor.test.js b/test/processor.test.js index 16ecf78c..e3e4158c 100644 --- a/test/processor.test.js +++ b/test/processor.test.js @@ -339,19 +339,19 @@ describe('Processor', async function () { } // Check global exit root - const batchNumVm = await zkEVMDB.vm.stateManager.getContractStorage( + const timestampVm = await zkEVMDB.vm.stateManager.getContractStorage( addressInstanceGlobalExitRoot, globalExitRootPosBuffer, ); - const batchNumSmt = (await stateUtils.getContractStorage( + const timestampSmt = (await stateUtils.getContractStorage( Constants.ADDRESS_GLOBAL_EXIT_ROOT_MANAGER_L2, zkEVMDB.smt, zkEVMDB.stateRoot, [globalExitRootPos], ))[Scalar.e(globalExitRootPos)]; - expect(Scalar.fromString(batchNumVm.toString('hex'), 16)).to.equal(batchNumSmt); - expect(batchNumSmt).to.equal(Scalar.e(batch.newNumBatch)); + expect(Scalar.fromString(timestampVm.toString('hex'), 16)).to.equal(timestampSmt); + expect(timestampSmt).to.equal(Scalar.e(batch.timestamp)); // Check through a call in the EVM if (bridgeDeployed) { @@ -362,7 +362,7 @@ describe('Processor', async function () { caller: Address.zero(), data: Buffer.from(encodedData.slice(2), 'hex'), }); - expect(globalExitRootResult.execResult.returnValue.toString('hex')).to.be.equal(ethers.utils.hexZeroPad(batch.newNumBatch, 32).slice(2)); + expect(globalExitRootResult.execResult.returnValue.toString('hex')).to.be.equal(ethers.utils.hexZeroPad(batch.timestamp, 32).slice(2)); } // Check the circuit input