diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..a973df08 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,5 @@ +# global owner +* @krlosMata + +# src owners +/src/ @krlosMata @laisolizq @invocamanman @ignasirv diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml new file mode 100644 index 00000000..285626c3 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -0,0 +1,39 @@ +name: Bug Report +description: File a bug report +title: "[Bug]: " +labels: ["bug"] +assignees: + - krlosMata +body: + - type: markdown + attributes: + value: | + Fill in all necessary information to report a bug + - type: input + id: version + attributes: + label: Version + description: What version are you using ? + placeholder: 'ex: v1.0.0' + validations: + required: true + - type: textarea + id: description + attributes: + label: Description + description: Explain the bug found and the expected result + validations: + required: true + - type: textarea + id: steps + attributes: + label: Steps to reproduce + description: Please share detailed information about ho to reproduce the bug + validations: + required: true + - type: textarea + id: logs + attributes: + label: Relevant log + description: Please copy and paste any relevant log output + render: shell \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml new file mode 100644 index 00000000..e1d4c0f9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -0,0 +1,26 @@ +name: Feature Request +description: File a bug report +title: "[Feature]: " +labels: ["feature"] +assignees: + - krlosMata +body: + - type: markdown + attributes: + value: | + Fill in all necessary information to request a feature + - type: input + id: version + attributes: + label: Version + description: What version the features should be added ? + placeholder: 'ex: v1.0.0' + validations: + required: true + - type: textarea + id: description + attributes: + label: Description + description: Explain the feature + validations: + required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml new file mode 100644 index 00000000..406c3703 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.yml @@ -0,0 +1,26 @@ +name: Question +description: Submit a question +title: "[Question]: " +labels: ["question"] +assignees: + - krlosMata +body: + - type: markdown + attributes: + value: | + Fill in all necessary information to submit a question + - type: input + id: version + attributes: + label: Version + description: What version the question is refering to ? + placeholder: 'ex: v1.0.0' + validations: + required: true + - type: textarea + id: question + attributes: + label: Description + description: Explain the question + validations: + required: true \ No newline at end of file diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 63351527..b94c1715 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,12 +12,9 @@ on: branches: - main - develop - repository_dispatch: - types: [ok-to-test-command] jobs: - trusted-build: - if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository + build: runs-on: ubuntu-latest strategy: @@ -29,19 +26,10 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - - name: Set int-bot SSH key - run: | - touch /tmp/ssh-key - echo "${{ secrets.INT_BOT_SSH_KEY }}" > /tmp/ssh-key - chmod 400 /tmp/ssh-key - eval "$(ssh-agent -s)" - ssh-add /tmp/ssh-key - name: Checkout code uses: actions/checkout@v2 - name: setup run: | - eval "$(ssh-agent -s)" - ssh-add /tmp/ssh-key npm install -g npm@7.13.0 npm run setup - name: eslint @@ -49,69 +37,3 @@ jobs: - name: test run: npm run test - from-fork-build: - if: - github.event_name == 'repository_dispatch' && - github.event.client_payload.slash_command.sha != '' && - contains(github.event.client_payload.pull_request.head.sha, github.event.client_payload.slash_command.sha) - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [16.x] - - steps: - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - name: Set int-bot SSH key - run: | - touch /tmp/ssh-key - echo "${{ secrets.INT_BOT_SSH_KEY }}" > /tmp/ssh-key - chmod 400 /tmp/ssh-key - eval "$(ssh-agent -s)" - ssh-add /tmp/ssh-key - - name: Fork based /ok-to-test checkout - uses: actions/checkout@v2 - with: - ref: 'refs/pull/${{ github.event.client_payload.pull_request.number }}/merge' - - name: setup - run: | - eval "$(ssh-agent -s)" - ssh-add /tmp/ssh-key - npm install -g npm@7.13.0 - npm run setup - - name: eslint - run: npm run eslint - - name: test - run: npm run test - # Update check run - - uses: actions/github-script@v5 - id: update-check-run - if: ${{ always() }} - env: - number: ${{ github.event.client_payload.pull_request.number }} - job: ${{ github.job }} - # Conveniently, job.status maps to https://developer.github.com/v3/checks/runs/#update-a-check-run - conclusion: ${{ job.status }} - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const { data: pull } = await github.rest.pulls.get({ - ...context.repo, - pull_number: process.env.number - }); - const ref = pull.head.sha; - const { data: checks } = await github.rest.checks.listForRef({ - ...context.repo, - ref - }); - const check = checks.check_runs.filter(c => c.name === process.env.job); - const { data: result } = await github.rest.checks.update({ - ...context.repo, - check_run_id: check[0].id, - status: 'completed', - conclusion: process.env.conclusion - }); - return result; diff --git a/.github/workflows/ok-to-test.yml b/.github/workflows/ok-to-test.yml deleted file mode 100644 index 734d5a27..00000000 --- a/.github/workflows/ok-to-test.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Ok To Test - -on: - issue_comment: - types: [created] - -jobs: - ok-to-test: - runs-on: ubuntu-latest - if: ${{ github.event.issue.pull_request }} - steps: - - name: Slash Command Dispatch - uses: peter-evans/slash-command-dispatch@v1 - env: - TOKEN: ${{ steps.generate_token.outputs.token }} - with: - token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - reaction-token: ${{ secrets.GITHUB_TOKEN }} - issue-type: pull-request - commands: ok-to-test - named-args: true - permission: write \ No newline at end of file diff --git a/package.json b/package.json index d0e9a865..dd5fcb21 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@0xpolygonhermez/zkevm-commonjs", "description": "Javascript library implementing common utilities for zkevm", - "version": "1.0.0", + "version": "2.0.0", "main": "index.js", "scripts": { "setup": "npm i", @@ -51,7 +51,7 @@ "@ethereumjs/block": "^3.6.2", "@ethereumjs/tx": "^3.4.0", "@polygon-hermez/common": "2.6.4", - "@polygon-hermez/vm": "5.7.30", + "@polygon-hermez/vm": "5.7.36", "ethereumjs-util": "^7.1.4", "ethers": "^5.5.4", "ffjavascript": "^0.2.55", diff --git a/src/constants.js b/src/constants.js index 1c7fa6f4..93c15b8f 100644 --- a/src/constants.js +++ b/src/constants.js @@ -14,6 +14,7 @@ module.exports.DB_STARK_INPUT = ethers.utils.id(('ZKEVM_DB_STARK_INPUT')); // Default values and global constants module.exports.DEFAULT_MAX_TX = 1000; module.exports.SIGNATURE_BYTES = 32 + 32 + 1; +module.exports.EFFECTIVE_PERCENTAGE_BYTES = 1; module.exports.FrSNARK = Scalar.e('21888242871839275222246405745257275088548364400416034343698204186575808495617'); module.exports.FrSTARK = Scalar.e('18446744069414584321'); diff --git a/src/contract-utils.js b/src/contract-utils.js index 0d390c2f..ea80731b 100644 --- a/src/contract-utils.js +++ b/src/contract-utils.js @@ -130,36 +130,32 @@ function generateSolidityInputs( proofJson, ) { const { evaluations, polynomials } = proofJson; - const arrayStrings = Array(24).fill('bytes32'); - const proof = ethers.utils.defaultAbiCoder.encode( - arrayStrings, - [ - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C1[0]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C1[1]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C2[0]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C2[1]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W1[0]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W1[1]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W2[0]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W2[1]).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.ql).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qr).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qm).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qo).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qc).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.s1).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.s2).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.s3).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.a).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.b).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.c).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.z).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.zw).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.t1w).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.t2w).toHexString(), 32), - ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.inv).toHexString(), 32), - ], - ); + const proof = [ + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C1[0]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C1[1]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C2[0]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.C2[1]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W1[0]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W1[1]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W2[0]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(polynomials.W2[1]).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.ql).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qr).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qm).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qo).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.qc).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.s1).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.s2).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.s3).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.a).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.b).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.c).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.z).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.zw).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.t1w).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.t2w).toHexString(), 32), + ethers.utils.hexZeroPad(ethers.BigNumber.from(evaluations.inv).toHexString(), 32), + ]; return proof; } diff --git a/src/processor-utils.js b/src/processor-utils.js index 0d85d5cc..a6a37f50 100644 --- a/src/processor-utils.js +++ b/src/processor-utils.js @@ -1,3 +1,4 @@ +/* eslint-disable max-len */ const { ethers } = require('ethers'); const { Scalar } = require('ffjavascript'); const Constants = require('./constants'); @@ -19,24 +20,32 @@ function unarrayifyInteger(data, offset, length) { } /** - * Convert a custom rawTx [rlp(nonce, gasprice, gaslimit, to, value, data, chainId, 0, 0)|r|s|v] + * Convert a custom rawTx [rlp(nonce, gasprice, gaslimit, to, value, data, chainId, 0, 0)|r|s|v|effectivePercentage] * to a standard raw tx [rlp(nonce, gasprice, gaslimit, to, value, data, r, s, v)] * @param {String} customRawTx - Custom raw transaction * @returns {String} - Standar raw transaction */ function customRawTxToRawTx(customRawTx) { const signatureCharacters = Constants.SIGNATURE_BYTES * 2; - const rlpSignData = customRawTx.slice(0, -signatureCharacters); - const signature = `0x${customRawTx.slice(-signatureCharacters)}`; + const effectivePercentageCharacters = Constants.EFFECTIVE_PERCENTAGE_BYTES * 2; + const rlpSignData = customRawTx.slice(0, -(signatureCharacters + effectivePercentageCharacters)); + const signature = `0x${customRawTx.slice(-(signatureCharacters + effectivePercentageCharacters), -effectivePercentageCharacters)}`; const txFields = ethers.utils.RLP.decode(rlpSignData); const signatureParams = ethers.utils.splitSignature(signature); - - const v = ethers.utils.hexlify(signatureParams.v - 27 + txFields[6] * 2 + 35); - const r = ethers.BigNumber.from(signatureParams.r).toHexString(); // does not have necessary 32 bytes - const s = ethers.BigNumber.from(signatureParams.s).toHexString(); // does not have necessary 32 bytes - const rlpFields = [...txFields.slice(0, -3), v, r, s]; + let rlpFields; + if (txFields[6] === undefined) { + const v = ethers.utils.hexlify(signatureParams.v); + const r = ethers.BigNumber.from(signatureParams.r).toHexString(); // does not have necessary 32 bytes + const s = ethers.BigNumber.from(signatureParams.s).toHexString(); // does not have necessary 32 bytes + rlpFields = [...txFields, v, r, s]; + } else { + const v = ethers.utils.hexlify(signatureParams.v - 27 + txFields[6] * 2 + 35); + const r = ethers.BigNumber.from(signatureParams.r).toHexString(); // does not have necessary 32 bytes + const s = ethers.BigNumber.from(signatureParams.s).toHexString(); // does not have necessary 32 bytes + rlpFields = [...txFields.slice(0, -3), v, r, s]; + } return ethers.utils.RLP.encode(rlpFields); } @@ -97,7 +106,7 @@ function addressToHexStringRlp(address) { * @param {String} rawTx - Standar raw transaction * @returns {String} - Custom raw transaction */ -function rawTxToCustomRawTx(rawTx) { +function rawTxToCustomRawTx(rawTx, effectivePercentage) { const tx = ethers.utils.parseTransaction(rawTx); const signData = ethers.utils.RLP.encode([ toHexStringRlp(tx.nonce), @@ -113,8 +122,11 @@ function rawTxToCustomRawTx(rawTx) { const r = tx.r.slice(2); const s = tx.s.slice(2); const v = (tx.v - tx.chainId * 2 - 35 + 27).toString(16).padStart(2, '0'); // 1 byte + if (typeof effectivePercentage === 'undefined') { + effectivePercentage = 'ff'; + } - return signData.concat(r).concat(s).concat(v); + return signData.concat(r).concat(s).concat(v).concat(effectivePercentage); } /** @@ -140,20 +152,18 @@ function encodedStringToArray(encodedTransactions) { throw new Error('encodedTxBytes long segment too short'); } - decodedRawTx.push(ethers.utils.hexlify( - encodedTxBytes.slice(offset, offset + 1 + lengthLength + length + Constants.SIGNATURE_BYTES), - )); - offset = offset + 1 + lengthLength + length + Constants.SIGNATURE_BYTES; + decodedRawTx.push(ethers.utils.hexlify(encodedTxBytes.slice(offset, offset + 1 + lengthLength + length + Constants.SIGNATURE_BYTES + Constants.EFFECTIVE_PERCENTAGE_BYTES))); + offset = offset + 1 + lengthLength + length + Constants.SIGNATURE_BYTES + Constants.EFFECTIVE_PERCENTAGE_BYTES; } else if (encodedTxBytes[offset] >= 0xc0) { const length = encodedTxBytes[offset] - 0xc0; if (offset + 1 + length > encodedTxBytes.length) { throw new Error('encodedTxBytes array too short'); } - decodedRawTx.push(ethers.utils.hexlify(encodedTxBytes.slice(offset, offset + 1 + length + Constants.SIGNATURE_BYTES))); - offset = offset + 1 + length + Constants.SIGNATURE_BYTES; + decodedRawTx.push(ethers.utils.hexlify(encodedTxBytes.slice(offset, offset + 1 + length + Constants.SIGNATURE_BYTES + Constants.EFFECTIVE_PERCENTAGE_BYTES))); + offset = offset + 1 + length + Constants.SIGNATURE_BYTES + Constants.EFFECTIVE_PERCENTAGE_BYTES; } else { - throw new Error('Error'); + throw new Error('Error encodedStringToArray'); } } @@ -283,6 +293,7 @@ function decodeCustomRawTxProverMethod(encodedTransactions) { const lenR = 32; const lenS = 32; const lenV = 1; + const lenEffectivePercentage = 1; txDecoded.r = ethers.utils.hexlify(encodedTxBytes.slice(offset, offset + lenR)); offset += lenR; @@ -290,10 +301,30 @@ function decodeCustomRawTxProverMethod(encodedTransactions) { offset += lenS; txDecoded.v = ethers.utils.hexlify(encodedTxBytes.slice(offset, offset + lenV)); offset += lenV; + txDecoded.effectivePercentage = ethers.utils.hexlify(encodedTxBytes.slice(offset, offset + lenEffectivePercentage)); + offset += lenEffectivePercentage; + if (txDecoded.effectivePercentage === '0x') { + txDecoded.effectivePercentage = '0xff'; + } return { txDecoded, rlpSignData }; } +/** + * Computes the effective gas price for a transaction + * @param {String | BigInt} gasPrice in hex string or BigInt + * @param {String | BigInt} effectivePercentage in hex string or BigInt + * @returns effectiveGasPrice as BigInt + */ +function computeEffectiveGasPrice(gasPrice, effectivePercentage) { + const effectivegasPrice = Scalar.div( + Scalar.mul(Scalar.e(gasPrice), (Scalar.e(Number(effectivePercentage) + 1))), + 256, + ); + + return effectivegasPrice; +} + module.exports = { decodeCustomRawTxProverMethod, rawTxToCustomRawTx, @@ -302,4 +333,5 @@ module.exports = { arrayToEncodedString, encodedStringToArray, addressToHexStringRlp, + computeEffectiveGasPrice, }; diff --git a/src/processor.js b/src/processor.js index f9c2a0a5..a9054366 100644 --- a/src/processor.js +++ b/src/processor.js @@ -16,7 +16,7 @@ const smtUtils = require('./smt-utils'); const { getCurrentDB } = require('./smt-utils'); const { calculateAccInputHash, calculateSnarkInput, calculateBatchHashData } = require('./contract-utils'); -const { decodeCustomRawTxProverMethod } = require('./processor-utils'); +const { decodeCustomRawTxProverMethod, computeEffectiveGasPrice } = require('./processor-utils'); module.exports = class Processor { /** @@ -308,7 +308,8 @@ module.exports = class Processor { } // B: ENOUGH UPFRONT TX COST - const gasLimitCost = Scalar.mul(Scalar.e(currenTx.gasLimit), Scalar.e(currenTx.gasPrice)); + const effectiveGasPrice = computeEffectiveGasPrice(currenTx.gasPrice, currenTx.effectivePercentage); + const gasLimitCost = Scalar.mul(Scalar.e(currenTx.gasLimit), effectiveGasPrice); const upfronTxCost = Scalar.add(gasLimitCost, Scalar.e(currenTx.value)); if (Scalar.gt(upfronTxCost, Scalar.e(oldStateFrom.balance))) { @@ -349,7 +350,7 @@ module.exports = class Processor { const evmBlock = Block.fromBlockData(blockData, { common: evmTx.common }); try { - const txResult = await this.vm.runTx({ tx: evmTx, block: evmBlock }); + const txResult = await this.vm.runTx({ tx: evmTx, block: evmBlock, effectivePercentage: currenTx.effectivePercentage }); this.evmSteps.push(txResult.execResult.evmSteps); currentDecodedTx.receipt = txResult.receipt; diff --git a/src/zkevm-db.js b/src/zkevm-db.js index 0ac8e552..12230e41 100644 --- a/src/zkevm-db.js +++ b/src/zkevm-db.js @@ -311,7 +311,7 @@ class ZkEVMDB { */ static async newZkEVM(db, poseidon, stateRoot, accHashInput, genesis, vm, smt, chainID, forkID) { const common = Common.custom({ chainId: chainID }, { hardfork: Hardfork.Berlin }); - common.setEIPs([3607, 3541]); + common.setEIPs([3607, 3541, 3855]); const lastBatch = await db.getValue(Constants.DB_LAST_BATCH); // If it is null, instantiate a new evm-db if (lastBatch === null) { diff --git a/test/0-get-poseidon.test.js b/test/0-get-poseidon.test.js index 191c3448..fe04411c 100644 --- a/test/0-get-poseidon.test.js +++ b/test/0-get-poseidon.test.js @@ -1,6 +1,6 @@ /* eslint-disable prefer-arrow-callback */ -const { expect } = require('chai'); const { performance } = require('perf_hooks'); +const { expect } = require('chai'); const { getPoseidon, diff --git a/test/block-info.test.js b/test/block-info.test.js index 733e4814..2b93f8b1 100644 --- a/test/block-info.test.js +++ b/test/block-info.test.js @@ -7,8 +7,9 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable guard-for-in */ -const { Scalar } = require('ffjavascript'); const fs = require('fs'); +const path = require('path'); +const { Scalar } = require('ffjavascript'); const { argv } = require('yargs'); const ethers = require('ethers'); @@ -17,7 +18,6 @@ const { Address, toBuffer, } = require('ethereumjs-util'); const { defaultAbiCoder } = require('@ethersproject/abi'); -const path = require('path'); const lodash = require('lodash'); const artifactsPath = path.join(__dirname, 'artifacts/contracts'); diff --git a/test/contract-utils.test.js b/test/contract-utils.test.js index 5fd853f4..65e20b66 100644 --- a/test/contract-utils.test.js +++ b/test/contract-utils.test.js @@ -1,7 +1,6 @@ -const { expect } = require('chai'); - const fs = require('fs'); const path = require('path'); +const { expect } = require('chai'); const { contractUtils } = require('../index'); @@ -127,9 +126,34 @@ describe('contractUtils', function () { protocol: 'fflonk', }; - const expectedOut = '0x035a6fea6f3dfcb8ebd4db937e0d8dfdc0bbef5f05dd423fa3c41aae263c4f81169d882e7cb494ca843ab8bff6449f0bdabc256bed73659ae2db3ec858336f5407aefec9ee7a52d1909e38c1cd205c6e3e19bcc3ca2b7c5d3cea0861b7bdcbcc17c50fd5edb732be11fee3d4a8d7ebdecebd11b83841e45795971b0d2d090ca41a9780d2cfec264b2c87a25340b972c9ca7e4219da6af97d6ad8f1a01356d68603e342771b5c0197cf3c5dd4076a20354bf12e49758c24f61bc692618523d3462c5fd575cb8b10518cf4b82ac3d19d7e083f2291d762f36e6e74bd6e836fe9d70ba6af2e7081674972f6dd833eb72a83b358a389655f806ba79a8fc0e6a020d00fe290cd881d06f44c4459e6af3c01f550b3620404decbc9d68c4a7965090b010e85b35fe9d27a33bea3430b9c1c4ae949aa3109a1c38db1efb82cd3ab14383f22d067169dd27ede08cc64ce3ae290682e8e9d059484502b04c23b40937e1ce71dc3bd07c56162212dd6e342e6f9226bf7b0f9c51b3d77f14c0ffe59bd7f10fb2c9dd10407bc215dc702b07ee6625f9e5c0a2d9f96cb71a6f413d72aefc87fc5092a426d3176669d76da7e3ad2916ff8623db8f15e90874cccd93e4547e3dfa022e4b6a13e105c3a48b0d90762069a054ca8e519e9505649f99da9850936fdff2b688190af39f4437548662b88b11573378e1c3c64857a1401c60a8b1012ae670b045e157513d29cbc228764227e47836a353b35ea38d135e27b8da33b93c49b257c30444cc7b9fec564fc7a74c3cc184ffe5564707f24a9b587ed69fbbba94c2c036f388c438c3e36f382d5597df9500b18b42af8fbf19d8b57b49f4b133605117ecba8ab5400b5fed3a2aef81c4482f9235aab55549337dc0bbc8f53b7385a0f5b14991f9df5d40dcd1c2cf4cd9378601a07befa54270e57947de1f8d678001be454f9b008d4a19a67fec1e0ddb8bd0a74a6fed270b6f6592eb58aee17c0291884d97006f5be9a999575bc889a3b562c4f73f517f63dd135dd5b10c4240c3a295d4b8f19d85d73ba394c09a67a289b56def34d27a972bde05c3a48ada5d052'; + const expectedOut = [ + '0x035a6fea6f3dfcb8ebd4db937e0d8dfdc0bbef5f05dd423fa3c41aae263c4f81', + '0x169d882e7cb494ca843ab8bff6449f0bdabc256bed73659ae2db3ec858336f54', + '0x07aefec9ee7a52d1909e38c1cd205c6e3e19bcc3ca2b7c5d3cea0861b7bdcbcc', + '0x17c50fd5edb732be11fee3d4a8d7ebdecebd11b83841e45795971b0d2d090ca4', + '0x1a9780d2cfec264b2c87a25340b972c9ca7e4219da6af97d6ad8f1a01356d686', + '0x03e342771b5c0197cf3c5dd4076a20354bf12e49758c24f61bc692618523d346', + '0x2c5fd575cb8b10518cf4b82ac3d19d7e083f2291d762f36e6e74bd6e836fe9d7', + '0x0ba6af2e7081674972f6dd833eb72a83b358a389655f806ba79a8fc0e6a020d0', + '0x0fe290cd881d06f44c4459e6af3c01f550b3620404decbc9d68c4a7965090b01', + '0x0e85b35fe9d27a33bea3430b9c1c4ae949aa3109a1c38db1efb82cd3ab14383f', + '0x22d067169dd27ede08cc64ce3ae290682e8e9d059484502b04c23b40937e1ce7', + '0x1dc3bd07c56162212dd6e342e6f9226bf7b0f9c51b3d77f14c0ffe59bd7f10fb', + '0x2c9dd10407bc215dc702b07ee6625f9e5c0a2d9f96cb71a6f413d72aefc87fc5', + '0x092a426d3176669d76da7e3ad2916ff8623db8f15e90874cccd93e4547e3dfa0', + '0x22e4b6a13e105c3a48b0d90762069a054ca8e519e9505649f99da9850936fdff', + '0x2b688190af39f4437548662b88b11573378e1c3c64857a1401c60a8b1012ae67', + '0x0b045e157513d29cbc228764227e47836a353b35ea38d135e27b8da33b93c49b', + '0x257c30444cc7b9fec564fc7a74c3cc184ffe5564707f24a9b587ed69fbbba94c', + '0x2c036f388c438c3e36f382d5597df9500b18b42af8fbf19d8b57b49f4b133605', + '0x117ecba8ab5400b5fed3a2aef81c4482f9235aab55549337dc0bbc8f53b7385a', + '0x0f5b14991f9df5d40dcd1c2cf4cd9378601a07befa54270e57947de1f8d67800', + '0x1be454f9b008d4a19a67fec1e0ddb8bd0a74a6fed270b6f6592eb58aee17c029', + '0x1884d97006f5be9a999575bc889a3b562c4f73f517f63dd135dd5b10c4240c3a', + '0x295d4b8f19d85d73ba394c09a67a289b56def34d27a972bde05c3a48ada5d052', + ]; const result = await contractUtils.generateSolidityInputs(proof); - expect(result).to.be.equal(expectedOut); + expect(result).to.be.deep.equal(expectedOut); }); }); 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 9a9d9d14..b0909034 100644 --- a/test/helpers/test-vectors/block-info/block-info-batches.json +++ b/test/helpers/test-vectors/block-info/block-info-batches.json @@ -57,7 +57,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x188ec356", - "customRawTx": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61c", + "customRawTx": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61cff", "rawTx": "0xf86a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568207f4a00a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf774319a00a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a6" }, { @@ -73,7 +73,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xd1a82a9d", - "customRawTx": "0xea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81b", + "customRawTx": "0xea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81bff", "rawTx": "0xf86a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8207f3a03c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d4a07971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e8" }, { @@ -89,7 +89,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x6d6516c0", - "customRawTx": "0xea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201c", + "customRawTx": "0xea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201cff", "rawTx": "0xf86a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08207f4a0db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043aa0431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b1720" }, { @@ -105,7 +105,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xb6baffe3", - "customRawTx": "0xea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1b", + "customRawTx": "0xea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1bff", "rawTx": "0xf86a03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38207f3a0e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a61627a07c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a" }, { @@ -121,7 +121,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x1a93d1c3", - "customRawTx": "0xea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1c", + "customRawTx": "0xea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1cff", "rawTx": "0xf86a04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38207f4a057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120cea0565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d" }, { @@ -137,7 +137,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x3408e470", - "customRawTx": "0xea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1c", + "customRawTx": "0xea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1cff", "rawTx": "0xf86a05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708207f4a0e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc6294a00c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d" }, { @@ -155,7 +155,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xe9413d380000000000000000000000000000000000000000000000000000000000000000", - "customRawTx": "0xf84a06843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000008203e8808098f56115cad149a409a86e7610863248799a31d80e87d46582d08a3c0933a40a25455a74fa3ca2ada0bf39dac88a172d032583bfec15061f39184ef9f70126771c", + "customRawTx": "0xf84a06843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000008203e8808098f56115cad149a409a86e7610863248799a31d80e87d46582d08a3c0933a40a25455a74fa3ca2ada0bf39dac88a172d032583bfec15061f39184ef9f70126771cff", "rawTx": "0xf88a06843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000008207f4a098f56115cad149a409a86e7610863248799a31d80e87d46582d08a3c0933a40aa025455a74fa3ca2ada0bf39dac88a172d032583bfec15061f39184ef9f7012677" } ], @@ -210,10 +210,10 @@ } } }, - "batchL2Data": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61cea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81bea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201cea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1bea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1cea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1cf84a06843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000008203e8808098f56115cad149a409a86e7610863248799a31d80e87d46582d08a3c0933a40a25455a74fa3ca2ada0bf39dac88a172d032583bfec15061f39184ef9f70126771c", + "batchL2Data": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61cffea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81bffea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201cffea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1bffea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1cffea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1cfff84a06843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000008203e8808098f56115cad149a409a86e7610863248799a31d80e87d46582d08a3c0933a40a25455a74fa3ca2ada0bf39dac88a172d032583bfec15061f39184ef9f70126771cff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0xc8fe9673e241467d9c9a9b44a81c71d1c1bba7cd9fe265ebc37adff1d3d9262b", + "batchHashData": "0xcee8662e4603581fbfbd6b4c83a665346e7ca335fa052f905d47fed106cf677b", "timestamp": 1944498031 }, { @@ -231,7 +231,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x188ec356", - "customRawTx": "0xea07843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800be264304cfc20c400929c82d1435cfbaa18e9a49c34ce65274633820803c415132ab24e00f892d77ad39c87e897772100e3323f31915a3e5eb261e056d99bc31b", + "customRawTx": "0xea07843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800be264304cfc20c400929c82d1435cfbaa18e9a49c34ce65274633820803c415132ab24e00f892d77ad39c87e897772100e3323f31915a3e5eb261e056d99bc31bff", "rawTx": "0xf86a07843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568207f3a00be264304cfc20c400929c82d1435cfbaa18e9a49c34ce65274633820803c415a0132ab24e00f892d77ad39c87e897772100e3323f31915a3e5eb261e056d99bc3" }, { @@ -247,7 +247,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xd1a82a9d", - "customRawTx": "0xea08843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e88080775e9a77a45dafb120ec840926129c5db8ad3843722de88f2c7f6df4383c92fe0176dcd120e97ff6a1a1d60150aac3fdbca81bbfd1e2e9349ed9da4fa3bd85a81b", + "customRawTx": "0xea08843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e88080775e9a77a45dafb120ec840926129c5db8ad3843722de88f2c7f6df4383c92fe0176dcd120e97ff6a1a1d60150aac3fdbca81bbfd1e2e9349ed9da4fa3bd85a81bff", "rawTx": "0xf86a08843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8207f3a0775e9a77a45dafb120ec840926129c5db8ad3843722de88f2c7f6df4383c92fea00176dcd120e97ff6a1a1d60150aac3fdbca81bbfd1e2e9349ed9da4fa3bd85a8" }, { @@ -263,7 +263,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x6d6516c0", - "customRawTx": "0xea09843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080f969b5ab22f54db86a57efcfa83f3369047d328d2c56044bd49d7f863e69ed2b5a95c2b1b41801a5b4d7bb548829fe5a51c72dd5e5a08bd2a56f49bc3246a3081c", + "customRawTx": "0xea09843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080f969b5ab22f54db86a57efcfa83f3369047d328d2c56044bd49d7f863e69ed2b5a95c2b1b41801a5b4d7bb548829fe5a51c72dd5e5a08bd2a56f49bc3246a3081cff", "rawTx": "0xf86a09843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08207f4a0f969b5ab22f54db86a57efcfa83f3369047d328d2c56044bd49d7f863e69ed2ba05a95c2b1b41801a5b4d7bb548829fe5a51c72dd5e5a08bd2a56f49bc3246a308" }, { @@ -279,7 +279,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xb6baffe3", - "customRawTx": "0xea0a843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080b60beddfce8bf365e93cb4f88f45ed0e5649659de56dbf52332e6c9c16aa10bd576fb90bd967e2495fe8fa09d75d58b82668c54dab54d91f5e4ab0d76d2649ae1b", + "customRawTx": "0xea0a843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080b60beddfce8bf365e93cb4f88f45ed0e5649659de56dbf52332e6c9c16aa10bd576fb90bd967e2495fe8fa09d75d58b82668c54dab54d91f5e4ab0d76d2649ae1bff", "rawTx": "0xf86a0a843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38207f3a0b60beddfce8bf365e93cb4f88f45ed0e5649659de56dbf52332e6c9c16aa10bda0576fb90bd967e2495fe8fa09d75d58b82668c54dab54d91f5e4ab0d76d2649ae" }, { @@ -295,7 +295,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x1a93d1c3", - "customRawTx": "0xea0b843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e88080416d143b11a02e0c28344feb6af0f90ecb5b0bd5eec26047b25c0f775502be751e40d32fefe94aee39ad9b2605afeb2e86f31b56ac82874f841054c6a01331851b", + "customRawTx": "0xea0b843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e88080416d143b11a02e0c28344feb6af0f90ecb5b0bd5eec26047b25c0f775502be751e40d32fefe94aee39ad9b2605afeb2e86f31b56ac82874f841054c6a01331851bff", "rawTx": "0xf86a0b843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38207f3a0416d143b11a02e0c28344feb6af0f90ecb5b0bd5eec26047b25c0f775502be75a01e40d32fefe94aee39ad9b2605afeb2e86f31b56ac82874f841054c6a0133185" }, { @@ -311,7 +311,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x3408e470", - "customRawTx": "0xea0c843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080a1ec9b236321a7d3545cfe1a1baedf65d75e589223d732d424576756adb0396e74470d226d5b61895150d96dbd1b1ba8a8ad69a6bf9311a141ece602b6420d961c", + "customRawTx": "0xea0c843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080a1ec9b236321a7d3545cfe1a1baedf65d75e589223d732d424576756adb0396e74470d226d5b61895150d96dbd1b1ba8a8ad69a6bf9311a141ece602b6420d961cff", "rawTx": "0xf86a0c843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708207f4a0a1ec9b236321a7d3545cfe1a1baedf65d75e589223d732d424576756adb0396ea074470d226d5b61895150d96dbd1b1ba8a8ad69a6bf9311a141ece602b6420d96" }, { @@ -329,7 +329,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xe9413d380000000000000000000000000000000000000000000000000000000000000001", - "customRawTx": "0xf84a0d843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000018203e8808068ad61295298051fac15519066926aad57ed5af83b351e586a0fbe70006c48295695cc59543fd10d4af41a8a266aef5efd2d691abc356fc679c66e2545fd9ef61b", + "customRawTx": "0xf84a0d843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000018203e8808068ad61295298051fac15519066926aad57ed5af83b351e586a0fbe70006c48295695cc59543fd10d4af41a8a266aef5efd2d691abc356fc679c66e2545fd9ef61bff", "rawTx": "0xf88a0d843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000018207f3a068ad61295298051fac15519066926aad57ed5af83b351e586a0fbe70006c4829a05695cc59543fd10d4af41a8a266aef5efd2d691abc356fc679c66e2545fd9ef6" } ], @@ -385,10 +385,10 @@ "nonce": "0" } }, - "batchL2Data": "0xea07843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800be264304cfc20c400929c82d1435cfbaa18e9a49c34ce65274633820803c415132ab24e00f892d77ad39c87e897772100e3323f31915a3e5eb261e056d99bc31bea08843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e88080775e9a77a45dafb120ec840926129c5db8ad3843722de88f2c7f6df4383c92fe0176dcd120e97ff6a1a1d60150aac3fdbca81bbfd1e2e9349ed9da4fa3bd85a81bea09843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080f969b5ab22f54db86a57efcfa83f3369047d328d2c56044bd49d7f863e69ed2b5a95c2b1b41801a5b4d7bb548829fe5a51c72dd5e5a08bd2a56f49bc3246a3081cea0a843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080b60beddfce8bf365e93cb4f88f45ed0e5649659de56dbf52332e6c9c16aa10bd576fb90bd967e2495fe8fa09d75d58b82668c54dab54d91f5e4ab0d76d2649ae1bea0b843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e88080416d143b11a02e0c28344feb6af0f90ecb5b0bd5eec26047b25c0f775502be751e40d32fefe94aee39ad9b2605afeb2e86f31b56ac82874f841054c6a01331851bea0c843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080a1ec9b236321a7d3545cfe1a1baedf65d75e589223d732d424576756adb0396e74470d226d5b61895150d96dbd1b1ba8a8ad69a6bf9311a141ece602b6420d961cf84a0d843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000018203e8808068ad61295298051fac15519066926aad57ed5af83b351e586a0fbe70006c48295695cc59543fd10d4af41a8a266aef5efd2d691abc356fc679c66e2545fd9ef61b", + "batchL2Data": "0xea07843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800be264304cfc20c400929c82d1435cfbaa18e9a49c34ce65274633820803c415132ab24e00f892d77ad39c87e897772100e3323f31915a3e5eb261e056d99bc31bffea08843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e88080775e9a77a45dafb120ec840926129c5db8ad3843722de88f2c7f6df4383c92fe0176dcd120e97ff6a1a1d60150aac3fdbca81bbfd1e2e9349ed9da4fa3bd85a81bffea09843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080f969b5ab22f54db86a57efcfa83f3369047d328d2c56044bd49d7f863e69ed2b5a95c2b1b41801a5b4d7bb548829fe5a51c72dd5e5a08bd2a56f49bc3246a3081cffea0a843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080b60beddfce8bf365e93cb4f88f45ed0e5649659de56dbf52332e6c9c16aa10bd576fb90bd967e2495fe8fa09d75d58b82668c54dab54d91f5e4ab0d76d2649ae1bffea0b843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e88080416d143b11a02e0c28344feb6af0f90ecb5b0bd5eec26047b25c0f775502be751e40d32fefe94aee39ad9b2605afeb2e86f31b56ac82874f841054c6a01331851bffea0c843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080a1ec9b236321a7d3545cfe1a1baedf65d75e589223d732d424576756adb0396e74470d226d5b61895150d96dbd1b1ba8a8ad69a6bf9311a141ece602b6420d961cfff84a0d843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4e9413d3800000000000000000000000000000000000000000000000000000000000000018203e8808068ad61295298051fac15519066926aad57ed5af83b351e586a0fbe70006c48295695cc59543fd10d4af41a8a266aef5efd2d691abc356fc679c66e2545fd9ef61bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x8196946b8a211125e92b0bdbce0c9f9b8b8fbebf2cd5e794cbb4cf8208641b3c", + "batchHashData": "0xa5ec3c8ce15d4f66387e050e99f5b48a5671597bd1db6fb0bd023e14744ff232", "timestamp": 1944498031 }, { diff --git a/test/helpers/test-vectors/block-info/block-info.json b/test/helpers/test-vectors/block-info/block-info.json index 7fa74561..cfbf1929 100644 --- a/test/helpers/test-vectors/block-info/block-info.json +++ b/test/helpers/test-vectors/block-info/block-info.json @@ -53,7 +53,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x188ec356", - "customRawTx": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61c", + "customRawTx": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61cff", "rawTx": "0xf86a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568207f4a00a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf774319a00a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a6" }, { @@ -69,7 +69,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xd1a82a9d", - "customRawTx": "0xea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81b", + "customRawTx": "0xea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81bff", "rawTx": "0xf86a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8207f3a03c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d4a07971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e8" }, { @@ -85,7 +85,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x6d6516c0", - "customRawTx": "0xea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201c", + "customRawTx": "0xea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201cff", "rawTx": "0xf86a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08207f4a0db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043aa0431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b1720" }, { @@ -101,7 +101,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0xb6baffe3", - "customRawTx": "0xea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1b", + "customRawTx": "0xea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1bff", "rawTx": "0xf86a03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38207f3a0e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a61627a07c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a" }, { @@ -117,7 +117,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x1a93d1c3", - "customRawTx": "0xea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1c", + "customRawTx": "0xea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1cff", "rawTx": "0xf86a04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38207f4a057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120cea0565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d" }, { @@ -133,7 +133,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x3408e470", - "customRawTx": "0xea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1c", + "customRawTx": "0xea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1cff", "rawTx": "0xf86a05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708207f4a0e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc6294a00c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d" } ], @@ -205,13 +205,13 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61cea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81bea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201cea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1bea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1cea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1c", + "batchL2Data": "0xea80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084188ec3568203e880800a62ce9876e027f7a954f96c485c63c9bf043bd1fe1012c5634cf959bf7743190a601eedbcfef58146bdda9845fea5d9356b09d667010d557c73f83353a119a61cffea01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084d1a82a9d8203e880803c696d27506eebe00e52cd1c327eefd2ebb8c7a5d5309118ad18381630b2a5d47971958df81d8daa0d393daddb17a250c294452078db34b22d9e5ee85d2482e81bffea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880846d6516c08203e88080db91fc325e867faa9625a5c7c152dfaf207a992b6eea855fcabe264f489b043a431f20ba77bd0269a6aedb6287118d383305d0dd677478209e60f6d3af3b17201cffea03843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae988084b6baffe38203e88080e0c0469634b096c3b190713c8a8faa9c4fccc8b2d83cc8da056a897a28a616277c5bf403ce3a4c77cb0c6ca14cdd24d8fa785b4a0bde1500abba55db7df7483a1bffea04843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880841a93d1c38203e8808057c7bfa7288275d862a91776d6d05c2290058a42840f08108b8b157f139120ce565bc8d0b5291e949c1c87e2f829b76d6a5d15e767e61716d1095dcc7cb5b44d1cffea05843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880843408e4708203e88080e255f868a61169a2330cb539671e1a66ee846bc06cc888ea8fcd7ae51cdc62940c6dec27e6f756dd84923bcebb1f85db125299c0b622eaa8d5722cb3dace239d1cff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0xcc387c562528dcc81765f91d3eb572e96815b20d870a3715e0e83c5153a4c696", + "batchHashData": "0x1a372cc47412fd75aaffa03b1df3c89ebe08c9b6eb87774a13db7c5181c369d4", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x73bc24d2f3638c7f9fe0b46739e4db2413d50360d5b98cd58e65350c0048ac10" + "expectedNewAccInputHash": "0x019dbef0f39c32e255e3a884539aed28902cb5af9a6d379123f714d4a3c0aac5" } ] \ No newline at end of file diff --git a/test/helpers/test-vectors/effective-gas-price/effective-gas-price.json b/test/helpers/test-vectors/effective-gas-price/effective-gas-price.json new file mode 100644 index 00000000..b8ccc2bf --- /dev/null +++ b/test/helpers/test-vectors/effective-gas-price/effective-gas-price.json @@ -0,0 +1,1317 @@ +[ + { + "gasPrice": "0x0", + "effectivePercentage": "0xff", + "expectedOutput": "0x0" + }, + { + "gasPrice": "0x1234", + "effectivePercentage": "0xff", + "expectedOutput": "0x1234" + }, + { + "gasPrice": "0x1234", + "effectivePercentage": "0x0", + "expectedOutput": "0x12" + }, + { + "gasPrice": "0x1234", + "effectivePercentage": "0x7f", + "expectedOutput": "0x91a" + }, + { + "gasPrice": "0x1", + "effectivePercentage": "0xf8", + "expectedOutput": "0x0" + }, + { + "gasPrice": "0x2", + "effectivePercentage": "0xf8", + "expectedOutput": "0x1" + }, + { + "gasPrice": "0x2", + "effectivePercentage": "0x01", + "expectedOutput": "0x0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x0", + "expectedOutput": "0x3b9aca" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x1", + "expectedOutput": "0x773594" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x2", + "expectedOutput": "0xb2d05e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x3", + "expectedOutput": "0xee6b28" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x4", + "expectedOutput": "0x12a05f2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x5", + "expectedOutput": "0x165a0bc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x6", + "expectedOutput": "0x1a13b86" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x7", + "expectedOutput": "0x1dcd650" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x8", + "expectedOutput": "0x218711a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x9", + "expectedOutput": "0x2540be4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa", + "expectedOutput": "0x28fa6ae" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb", + "expectedOutput": "0x2cb4178" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc", + "expectedOutput": "0x306dc42" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd", + "expectedOutput": "0x342770c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe", + "expectedOutput": "0x37e11d6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf", + "expectedOutput": "0x3b9aca0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x10", + "expectedOutput": "0x3f5476a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x11", + "expectedOutput": "0x430e234" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x12", + "expectedOutput": "0x46c7cfe" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x13", + "expectedOutput": "0x4a817c8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x14", + "expectedOutput": "0x4e3b292" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x15", + "expectedOutput": "0x51f4d5c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x16", + "expectedOutput": "0x55ae826" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x17", + "expectedOutput": "0x59682f0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x18", + "expectedOutput": "0x5d21dba" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x19", + "expectedOutput": "0x60db884" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x1a", + "expectedOutput": "0x649534e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x1b", + "expectedOutput": "0x684ee18" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x1c", + "expectedOutput": "0x6c088e2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x1d", + "expectedOutput": "0x6fc23ac" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x1e", + "expectedOutput": "0x737be76" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x1f", + "expectedOutput": "0x7735940" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x20", + "expectedOutput": "0x7aef40a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x21", + "expectedOutput": "0x7ea8ed4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x22", + "expectedOutput": "0x826299e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x23", + "expectedOutput": "0x861c468" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x24", + "expectedOutput": "0x89d5f32" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x25", + "expectedOutput": "0x8d8f9fc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x26", + "expectedOutput": "0x91494c6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x27", + "expectedOutput": "0x9502f90" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x28", + "expectedOutput": "0x98bca5a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x29", + "expectedOutput": "0x9c76524" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x2a", + "expectedOutput": "0xa02ffee" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x2b", + "expectedOutput": "0xa3e9ab8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x2c", + "expectedOutput": "0xa7a3582" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x2d", + "expectedOutput": "0xab5d04c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x2e", + "expectedOutput": "0xaf16b16" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x2f", + "expectedOutput": "0xb2d05e0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x30", + "expectedOutput": "0xb68a0aa" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x31", + "expectedOutput": "0xba43b74" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x32", + "expectedOutput": "0xbdfd63e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x33", + "expectedOutput": "0xc1b7108" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x34", + "expectedOutput": "0xc570bd2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x35", + "expectedOutput": "0xc92a69c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x36", + "expectedOutput": "0xcce4166" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x37", + "expectedOutput": "0xd09dc30" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x38", + "expectedOutput": "0xd4576fa" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x39", + "expectedOutput": "0xd8111c4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x3a", + "expectedOutput": "0xdbcac8e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x3b", + "expectedOutput": "0xdf84758" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x3c", + "expectedOutput": "0xe33e222" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x3d", + "expectedOutput": "0xe6f7cec" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x3e", + "expectedOutput": "0xeab17b6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x3f", + "expectedOutput": "0xee6b280" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x40", + "expectedOutput": "0xf224d4a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x41", + "expectedOutput": "0xf5de814" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x42", + "expectedOutput": "0xf9982de" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x43", + "expectedOutput": "0xfd51da8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x44", + "expectedOutput": "0x1010b872" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x45", + "expectedOutput": "0x104c533c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x46", + "expectedOutput": "0x1087ee06" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x47", + "expectedOutput": "0x10c388d0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x48", + "expectedOutput": "0x10ff239a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x49", + "expectedOutput": "0x113abe64" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x4a", + "expectedOutput": "0x1176592e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x4b", + "expectedOutput": "0x11b1f3f8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x4c", + "expectedOutput": "0x11ed8ec2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x4d", + "expectedOutput": "0x1229298c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x4e", + "expectedOutput": "0x1264c456" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x4f", + "expectedOutput": "0x12a05f20" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x50", + "expectedOutput": "0x12dbf9ea" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x51", + "expectedOutput": "0x131794b4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x52", + "expectedOutput": "0x13532f7e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x53", + "expectedOutput": "0x138eca48" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x54", + "expectedOutput": "0x13ca6512" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x55", + "expectedOutput": "0x1405ffdc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x56", + "expectedOutput": "0x14419aa6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x57", + "expectedOutput": "0x147d3570" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x58", + "expectedOutput": "0x14b8d03a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x59", + "expectedOutput": "0x14f46b04" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x5a", + "expectedOutput": "0x153005ce" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x5b", + "expectedOutput": "0x156ba098" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x5c", + "expectedOutput": "0x15a73b62" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x5d", + "expectedOutput": "0x15e2d62c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x5e", + "expectedOutput": "0x161e70f6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x5f", + "expectedOutput": "0x165a0bc0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x60", + "expectedOutput": "0x1695a68a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x61", + "expectedOutput": "0x16d14154" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x62", + "expectedOutput": "0x170cdc1e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x63", + "expectedOutput": "0x174876e8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x64", + "expectedOutput": "0x178411b2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x65", + "expectedOutput": "0x17bfac7c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x66", + "expectedOutput": "0x17fb4746" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x67", + "expectedOutput": "0x1836e210" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x68", + "expectedOutput": "0x18727cda" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x69", + "expectedOutput": "0x18ae17a4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x6a", + "expectedOutput": "0x18e9b26e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x6b", + "expectedOutput": "0x19254d38" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x6c", + "expectedOutput": "0x1960e802" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x6d", + "expectedOutput": "0x199c82cc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x6e", + "expectedOutput": "0x19d81d96" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x6f", + "expectedOutput": "0x1a13b860" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x70", + "expectedOutput": "0x1a4f532a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x71", + "expectedOutput": "0x1a8aedf4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x72", + "expectedOutput": "0x1ac688be" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x73", + "expectedOutput": "0x1b022388" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x74", + "expectedOutput": "0x1b3dbe52" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x75", + "expectedOutput": "0x1b79591c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x76", + "expectedOutput": "0x1bb4f3e6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x77", + "expectedOutput": "0x1bf08eb0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x78", + "expectedOutput": "0x1c2c297a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x79", + "expectedOutput": "0x1c67c444" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x7a", + "expectedOutput": "0x1ca35f0e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x7b", + "expectedOutput": "0x1cdef9d8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x7c", + "expectedOutput": "0x1d1a94a2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x7d", + "expectedOutput": "0x1d562f6c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x7e", + "expectedOutput": "0x1d91ca36" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x7f", + "expectedOutput": "0x1dcd6500" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x80", + "expectedOutput": "0x1e08ffca" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x81", + "expectedOutput": "0x1e449a94" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x82", + "expectedOutput": "0x1e80355e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x83", + "expectedOutput": "0x1ebbd028" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x84", + "expectedOutput": "0x1ef76af2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x85", + "expectedOutput": "0x1f3305bc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x86", + "expectedOutput": "0x1f6ea086" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x87", + "expectedOutput": "0x1faa3b50" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x88", + "expectedOutput": "0x1fe5d61a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x89", + "expectedOutput": "0x202170e4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x8a", + "expectedOutput": "0x205d0bae" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x8b", + "expectedOutput": "0x2098a678" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x8c", + "expectedOutput": "0x20d44142" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x8d", + "expectedOutput": "0x210fdc0c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x8e", + "expectedOutput": "0x214b76d6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x8f", + "expectedOutput": "0x218711a0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x90", + "expectedOutput": "0x21c2ac6a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x91", + "expectedOutput": "0x21fe4734" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x92", + "expectedOutput": "0x2239e1fe" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x93", + "expectedOutput": "0x22757cc8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x94", + "expectedOutput": "0x22b11792" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x95", + "expectedOutput": "0x22ecb25c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x96", + "expectedOutput": "0x23284d26" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x97", + "expectedOutput": "0x2363e7f0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x98", + "expectedOutput": "0x239f82ba" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x99", + "expectedOutput": "0x23db1d84" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x9a", + "expectedOutput": "0x2416b84e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x9b", + "expectedOutput": "0x24525318" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x9c", + "expectedOutput": "0x248dede2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x9d", + "expectedOutput": "0x24c988ac" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x9e", + "expectedOutput": "0x25052376" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0x9f", + "expectedOutput": "0x2540be40" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa0", + "expectedOutput": "0x257c590a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa1", + "expectedOutput": "0x25b7f3d4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa2", + "expectedOutput": "0x25f38e9e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa3", + "expectedOutput": "0x262f2968" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa4", + "expectedOutput": "0x266ac432" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa5", + "expectedOutput": "0x26a65efc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa6", + "expectedOutput": "0x26e1f9c6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa7", + "expectedOutput": "0x271d9490" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa8", + "expectedOutput": "0x27592f5a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xa9", + "expectedOutput": "0x2794ca24" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xaa", + "expectedOutput": "0x27d064ee" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xab", + "expectedOutput": "0x280bffb8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xac", + "expectedOutput": "0x28479a82" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xad", + "expectedOutput": "0x2883354c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xae", + "expectedOutput": "0x28bed016" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xaf", + "expectedOutput": "0x28fa6ae0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb0", + "expectedOutput": "0x293605aa" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb1", + "expectedOutput": "0x2971a074" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb2", + "expectedOutput": "0x29ad3b3e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb3", + "expectedOutput": "0x29e8d608" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb4", + "expectedOutput": "0x2a2470d2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb5", + "expectedOutput": "0x2a600b9c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb6", + "expectedOutput": "0x2a9ba666" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb7", + "expectedOutput": "0x2ad74130" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb8", + "expectedOutput": "0x2b12dbfa" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xb9", + "expectedOutput": "0x2b4e76c4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xba", + "expectedOutput": "0x2b8a118e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xbb", + "expectedOutput": "0x2bc5ac58" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xbc", + "expectedOutput": "0x2c014722" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xbd", + "expectedOutput": "0x2c3ce1ec" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xbe", + "expectedOutput": "0x2c787cb6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xbf", + "expectedOutput": "0x2cb41780" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc0", + "expectedOutput": "0x2cefb24a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc1", + "expectedOutput": "0x2d2b4d14" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc2", + "expectedOutput": "0x2d66e7de" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc3", + "expectedOutput": "0x2da282a8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc4", + "expectedOutput": "0x2dde1d72" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc5", + "expectedOutput": "0x2e19b83c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc6", + "expectedOutput": "0x2e555306" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc7", + "expectedOutput": "0x2e90edd0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc8", + "expectedOutput": "0x2ecc889a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xc9", + "expectedOutput": "0x2f082364" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xca", + "expectedOutput": "0x2f43be2e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xcb", + "expectedOutput": "0x2f7f58f8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xcc", + "expectedOutput": "0x2fbaf3c2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xcd", + "expectedOutput": "0x2ff68e8c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xce", + "expectedOutput": "0x30322956" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xcf", + "expectedOutput": "0x306dc420" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd0", + "expectedOutput": "0x30a95eea" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd1", + "expectedOutput": "0x30e4f9b4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd2", + "expectedOutput": "0x3120947e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd3", + "expectedOutput": "0x315c2f48" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd4", + "expectedOutput": "0x3197ca12" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd5", + "expectedOutput": "0x31d364dc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd6", + "expectedOutput": "0x320effa6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd7", + "expectedOutput": "0x324a9a70" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd8", + "expectedOutput": "0x3286353a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xd9", + "expectedOutput": "0x32c1d004" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xda", + "expectedOutput": "0x32fd6ace" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xdb", + "expectedOutput": "0x33390598" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xdc", + "expectedOutput": "0x3374a062" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xdd", + "expectedOutput": "0x33b03b2c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xde", + "expectedOutput": "0x33ebd5f6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xdf", + "expectedOutput": "0x342770c0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe0", + "expectedOutput": "0x34630b8a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe1", + "expectedOutput": "0x349ea654" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe2", + "expectedOutput": "0x34da411e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe3", + "expectedOutput": "0x3515dbe8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe4", + "expectedOutput": "0x355176b2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe5", + "expectedOutput": "0x358d117c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe6", + "expectedOutput": "0x35c8ac46" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe7", + "expectedOutput": "0x36044710" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe8", + "expectedOutput": "0x363fe1da" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xe9", + "expectedOutput": "0x367b7ca4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xea", + "expectedOutput": "0x36b7176e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xeb", + "expectedOutput": "0x36f2b238" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xec", + "expectedOutput": "0x372e4d02" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xed", + "expectedOutput": "0x3769e7cc" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xee", + "expectedOutput": "0x37a58296" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xef", + "expectedOutput": "0x37e11d60" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf0", + "expectedOutput": "0x381cb82a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf1", + "expectedOutput": "0x385852f4" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf2", + "expectedOutput": "0x3893edbe" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf3", + "expectedOutput": "0x38cf8888" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf4", + "expectedOutput": "0x390b2352" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf5", + "expectedOutput": "0x3946be1c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf6", + "expectedOutput": "0x398258e6" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf7", + "expectedOutput": "0x39bdf3b0" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf8", + "expectedOutput": "0x39f98e7a" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xf9", + "expectedOutput": "0x3a352944" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xfa", + "expectedOutput": "0x3a70c40e" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xfb", + "expectedOutput": "0x3aac5ed8" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xfc", + "expectedOutput": "0x3ae7f9a2" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xfd", + "expectedOutput": "0x3b23946c" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xfe", + "expectedOutput": "0x3b5f2f36" + }, + { + "gasPrice": "0x3b9aca00", + "effectivePercentage": "0xff", + "expectedOutput": "0x3b9aca00" + } +] \ No newline at end of file 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 eb856b73..06225c5c 100644 --- a/test/helpers/test-vectors/end-to-end/state-transition.json +++ b/test/helpers/test-vectors/end-to-end/state-transition.json @@ -164,7 +164,7 @@ "data": "0x2cffd02e0000000000000000000000000000000000000000000000000000000000000000ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5b4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d3021ddb9a356815c3fac1026b6dec5df3124afbadb485c9ba5a3e3398a04b7ba85e58769b32a1beaf1ea27375a44095a0d1fb664ce2dd358e7fcbfb78c26a193440eb01ebfc9ed27500cd4dfc979272d1f0913cc9f66540d7e8005811109e1cf2d887c22bd8750d34016ac3c66b5ff102dacdd73f6b014e710b51e8022af9a1968ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f839867cc5f7f196b93bae1e27e6320742445d290f2263827498b54fec539f756afcefad4e508c098b9a7e1d8feb19955fb02ba9675585078710969d3440f5054e0f9dc3e7fe016e050eff260334f18a5d4fe391d82092319f5964f2e2eb7c1c3a5f8b13a49e282f609c317a833fb8d976d11517c571d1221a265d25af778ecf8923490c6ceeb450aecdc82e28293031d10c7d73bf85e57bf041a97360aa2c5d99cc1df82d9c4b87413eae2ef048f94b4d3554cea73d92b0f7af96e0271c691e2bb5c67add7c6caf302256adedf7ab114da0acfe870d449a3a489f781d659e8beccda7bce9f4e8618b6bd2f4132ce798cdc7a60e7e1460a7299e3c6342a579626d22733e50f526ec2fa19a22b31e8ed50f23cd1fdf94c9154ed3a7609a2f1ff981fe1d3b5c807b281e4683cc6d6315cf95b9ade8641defcb32372f1c126e398ef7a5a2dce0a8a7f68bb74560f8f71837c2c2ebbcbf7fffb42ae1896f13f7c7479a0b46a28b6f55540f89444f63de0378e3d121be09e06cc9ded1c20e65876d36aa0c65e9645644786b620e2dd2ad648ddfcbf4a7e5b1a3a4ecfe7f64667a3f0b7e2f4418588ed35a2458cffeb39b93d26f18d2ab13bdce6aee58e7b99359ec2dfd95a9c16dc00d6ef18b7933a6f8dc65ccb55667138776f7dea101070dc8796e3774df84f40ae0c8229d0d6069e5c8f39a7c299677a09d367fc7b05e3bc380ee652cdc72595f74c7b1043d0e1ffbab734648c838dfb0527d971b602bc216c9619ef0abf5ac974a1ed57f4050aa510dd9c74f508277b39d7973bb2dfccc5eeb0618db8cd74046ff337f0a7bf2c8e03e10f642c1886798d71806ab1e888d9e5ee87d0838c5655cb21c6cb83313b5a631175dff4963772cce9108188b34ac87c81c41e662ee4dd2dd7b2bc707961b1e646c4047669dcb6584f0d8d770daf5d7e7deb2e388ab20e2573d171a88108e79d820e98f26c0b84aa8b2f4aa4968dbb818ea32293237c50ba75ee485f4c22adf2f741400bdf8d6a9cc7df7ecae576221665d7358448818bb4ae4562849e949e17ac16e0be16688e156b5cf15e098c627c0056a900000000000000000000000000000000000000000000000000000000000000005ba002329b53c11a2f1dfe90b11e031771842056cf2125b43da8103c199dcd7f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000008ac7230489e8000000000000000000000000000000000000000000000000000000000000000005200000000000000000000000000000000000000000000000000000000000000000", "chainId": 1000, "reason": "", - "customRawTx": "0xf905680380831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b280b905442cffd02e0000000000000000000000000000000000000000000000000000000000000000ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5b4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d3021ddb9a356815c3fac1026b6dec5df3124afbadb485c9ba5a3e3398a04b7ba85e58769b32a1beaf1ea27375a44095a0d1fb664ce2dd358e7fcbfb78c26a193440eb01ebfc9ed27500cd4dfc979272d1f0913cc9f66540d7e8005811109e1cf2d887c22bd8750d34016ac3c66b5ff102dacdd73f6b014e710b51e8022af9a1968ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f839867cc5f7f196b93bae1e27e6320742445d290f2263827498b54fec539f756afcefad4e508c098b9a7e1d8feb19955fb02ba9675585078710969d3440f5054e0f9dc3e7fe016e050eff260334f18a5d4fe391d82092319f5964f2e2eb7c1c3a5f8b13a49e282f609c317a833fb8d976d11517c571d1221a265d25af778ecf8923490c6ceeb450aecdc82e28293031d10c7d73bf85e57bf041a97360aa2c5d99cc1df82d9c4b87413eae2ef048f94b4d3554cea73d92b0f7af96e0271c691e2bb5c67add7c6caf302256adedf7ab114da0acfe870d449a3a489f781d659e8beccda7bce9f4e8618b6bd2f4132ce798cdc7a60e7e1460a7299e3c6342a579626d22733e50f526ec2fa19a22b31e8ed50f23cd1fdf94c9154ed3a7609a2f1ff981fe1d3b5c807b281e4683cc6d6315cf95b9ade8641defcb32372f1c126e398ef7a5a2dce0a8a7f68bb74560f8f71837c2c2ebbcbf7fffb42ae1896f13f7c7479a0b46a28b6f55540f89444f63de0378e3d121be09e06cc9ded1c20e65876d36aa0c65e9645644786b620e2dd2ad648ddfcbf4a7e5b1a3a4ecfe7f64667a3f0b7e2f4418588ed35a2458cffeb39b93d26f18d2ab13bdce6aee58e7b99359ec2dfd95a9c16dc00d6ef18b7933a6f8dc65ccb55667138776f7dea101070dc8796e3774df84f40ae0c8229d0d6069e5c8f39a7c299677a09d367fc7b05e3bc380ee652cdc72595f74c7b1043d0e1ffbab734648c838dfb0527d971b602bc216c9619ef0abf5ac974a1ed57f4050aa510dd9c74f508277b39d7973bb2dfccc5eeb0618db8cd74046ff337f0a7bf2c8e03e10f642c1886798d71806ab1e888d9e5ee87d0838c5655cb21c6cb83313b5a631175dff4963772cce9108188b34ac87c81c41e662ee4dd2dd7b2bc707961b1e646c4047669dcb6584f0d8d770daf5d7e7deb2e388ab20e2573d171a88108e79d820e98f26c0b84aa8b2f4aa4968dbb818ea32293237c50ba75ee485f4c22adf2f741400bdf8d6a9cc7df7ecae576221665d7358448818bb4ae4562849e949e17ac16e0be16688e156b5cf15e098c627c0056a900000000000000000000000000000000000000000000000000000000000000005ba002329b53c11a2f1dfe90b11e031771842056cf2125b43da8103c199dcd7f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000052000000000000000000000000000000000000000000000000000000000000000008203e880804711b6aa6bb700e690f49d06fe27b204dfae172996bcc61fcede55ac78b994842e153505ce7cb5b060e7bb2383d023fb59ad2952c5cacc3c527f924f457d75dd1c", + "customRawTx": "0xf905680380831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b280b905442cffd02e0000000000000000000000000000000000000000000000000000000000000000ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5b4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d3021ddb9a356815c3fac1026b6dec5df3124afbadb485c9ba5a3e3398a04b7ba85e58769b32a1beaf1ea27375a44095a0d1fb664ce2dd358e7fcbfb78c26a193440eb01ebfc9ed27500cd4dfc979272d1f0913cc9f66540d7e8005811109e1cf2d887c22bd8750d34016ac3c66b5ff102dacdd73f6b014e710b51e8022af9a1968ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f839867cc5f7f196b93bae1e27e6320742445d290f2263827498b54fec539f756afcefad4e508c098b9a7e1d8feb19955fb02ba9675585078710969d3440f5054e0f9dc3e7fe016e050eff260334f18a5d4fe391d82092319f5964f2e2eb7c1c3a5f8b13a49e282f609c317a833fb8d976d11517c571d1221a265d25af778ecf8923490c6ceeb450aecdc82e28293031d10c7d73bf85e57bf041a97360aa2c5d99cc1df82d9c4b87413eae2ef048f94b4d3554cea73d92b0f7af96e0271c691e2bb5c67add7c6caf302256adedf7ab114da0acfe870d449a3a489f781d659e8beccda7bce9f4e8618b6bd2f4132ce798cdc7a60e7e1460a7299e3c6342a579626d22733e50f526ec2fa19a22b31e8ed50f23cd1fdf94c9154ed3a7609a2f1ff981fe1d3b5c807b281e4683cc6d6315cf95b9ade8641defcb32372f1c126e398ef7a5a2dce0a8a7f68bb74560f8f71837c2c2ebbcbf7fffb42ae1896f13f7c7479a0b46a28b6f55540f89444f63de0378e3d121be09e06cc9ded1c20e65876d36aa0c65e9645644786b620e2dd2ad648ddfcbf4a7e5b1a3a4ecfe7f64667a3f0b7e2f4418588ed35a2458cffeb39b93d26f18d2ab13bdce6aee58e7b99359ec2dfd95a9c16dc00d6ef18b7933a6f8dc65ccb55667138776f7dea101070dc8796e3774df84f40ae0c8229d0d6069e5c8f39a7c299677a09d367fc7b05e3bc380ee652cdc72595f74c7b1043d0e1ffbab734648c838dfb0527d971b602bc216c9619ef0abf5ac974a1ed57f4050aa510dd9c74f508277b39d7973bb2dfccc5eeb0618db8cd74046ff337f0a7bf2c8e03e10f642c1886798d71806ab1e888d9e5ee87d0838c5655cb21c6cb83313b5a631175dff4963772cce9108188b34ac87c81c41e662ee4dd2dd7b2bc707961b1e646c4047669dcb6584f0d8d770daf5d7e7deb2e388ab20e2573d171a88108e79d820e98f26c0b84aa8b2f4aa4968dbb818ea32293237c50ba75ee485f4c22adf2f741400bdf8d6a9cc7df7ecae576221665d7358448818bb4ae4562849e949e17ac16e0be16688e156b5cf15e098c627c0056a900000000000000000000000000000000000000000000000000000000000000005ba002329b53c11a2f1dfe90b11e031771842056cf2125b43da8103c199dcd7f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000052000000000000000000000000000000000000000000000000000000000000000008203e880804711b6aa6bb700e690f49d06fe27b204dfae172996bcc61fcede55ac78b994842e153505ce7cb5b060e7bb2383d023fb59ad2952c5cacc3c527f924f457d75dd1cff", "rawTx": "0xf905a80380831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b280b905442cffd02e0000000000000000000000000000000000000000000000000000000000000000ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5b4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d3021ddb9a356815c3fac1026b6dec5df3124afbadb485c9ba5a3e3398a04b7ba85e58769b32a1beaf1ea27375a44095a0d1fb664ce2dd358e7fcbfb78c26a193440eb01ebfc9ed27500cd4dfc979272d1f0913cc9f66540d7e8005811109e1cf2d887c22bd8750d34016ac3c66b5ff102dacdd73f6b014e710b51e8022af9a1968ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f839867cc5f7f196b93bae1e27e6320742445d290f2263827498b54fec539f756afcefad4e508c098b9a7e1d8feb19955fb02ba9675585078710969d3440f5054e0f9dc3e7fe016e050eff260334f18a5d4fe391d82092319f5964f2e2eb7c1c3a5f8b13a49e282f609c317a833fb8d976d11517c571d1221a265d25af778ecf8923490c6ceeb450aecdc82e28293031d10c7d73bf85e57bf041a97360aa2c5d99cc1df82d9c4b87413eae2ef048f94b4d3554cea73d92b0f7af96e0271c691e2bb5c67add7c6caf302256adedf7ab114da0acfe870d449a3a489f781d659e8beccda7bce9f4e8618b6bd2f4132ce798cdc7a60e7e1460a7299e3c6342a579626d22733e50f526ec2fa19a22b31e8ed50f23cd1fdf94c9154ed3a7609a2f1ff981fe1d3b5c807b281e4683cc6d6315cf95b9ade8641defcb32372f1c126e398ef7a5a2dce0a8a7f68bb74560f8f71837c2c2ebbcbf7fffb42ae1896f13f7c7479a0b46a28b6f55540f89444f63de0378e3d121be09e06cc9ded1c20e65876d36aa0c65e9645644786b620e2dd2ad648ddfcbf4a7e5b1a3a4ecfe7f64667a3f0b7e2f4418588ed35a2458cffeb39b93d26f18d2ab13bdce6aee58e7b99359ec2dfd95a9c16dc00d6ef18b7933a6f8dc65ccb55667138776f7dea101070dc8796e3774df84f40ae0c8229d0d6069e5c8f39a7c299677a09d367fc7b05e3bc380ee652cdc72595f74c7b1043d0e1ffbab734648c838dfb0527d971b602bc216c9619ef0abf5ac974a1ed57f4050aa510dd9c74f508277b39d7973bb2dfccc5eeb0618db8cd74046ff337f0a7bf2c8e03e10f642c1886798d71806ab1e888d9e5ee87d0838c5655cb21c6cb83313b5a631175dff4963772cce9108188b34ac87c81c41e662ee4dd2dd7b2bc707961b1e646c4047669dcb6584f0d8d770daf5d7e7deb2e388ab20e2573d171a88108e79d820e98f26c0b84aa8b2f4aa4968dbb818ea32293237c50ba75ee485f4c22adf2f741400bdf8d6a9cc7df7ecae576221665d7358448818bb4ae4562849e949e17ac16e0be16688e156b5cf15e098c627c0056a900000000000000000000000000000000000000000000000000000000000000005ba002329b53c11a2f1dfe90b11e031771842056cf2125b43da8103c199dcd7f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000052000000000000000000000000000000000000000000000000000000000000000008207f4a04711b6aa6bb700e690f49d06fe27b204dfae172996bcc61fcede55ac78b99484a02e153505ce7cb5b060e7bb2383d023fb59ad2952c5cacc3c527f924f457d75dd" }, { @@ -187,7 +187,7 @@ "data": "0xcd5865790000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000", "chainId": 1000, "reason": "", - "customRawTx": "0xf9010f0480831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b2880de0b6b3a7640000b8e4cd5865790000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000008203e8808022849420ce892ab01b2aab19a51c3fac9169b5a26c9789d9ee43041b1214048d5962de13a880e2b38309e41e7255e43bb5c5937dbb8270a7f6d990344b61a84e1b", + "customRawTx": "0xf9010f0480831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b2880de0b6b3a7640000b8e4cd5865790000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000008203e8808022849420ce892ab01b2aab19a51c3fac9169b5a26c9789d9ee43041b1214048d5962de13a880e2b38309e41e7255e43bb5c5937dbb8270a7f6d990344b61a84e1bff", "rawTx": "0xf9014f0480831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b2880de0b6b3a7640000b8e4cd5865790000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000008207f3a022849420ce892ab01b2aab19a51c3fac9169b5a26c9789d9ee43041b1214048da05962de13a880e2b38309e41e7255e43bb5c5937dbb8270a7f6d990344b61a84e" } ], @@ -311,13 +311,13 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xf905680380831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b280b905442cffd02e0000000000000000000000000000000000000000000000000000000000000000ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5b4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d3021ddb9a356815c3fac1026b6dec5df3124afbadb485c9ba5a3e3398a04b7ba85e58769b32a1beaf1ea27375a44095a0d1fb664ce2dd358e7fcbfb78c26a193440eb01ebfc9ed27500cd4dfc979272d1f0913cc9f66540d7e8005811109e1cf2d887c22bd8750d34016ac3c66b5ff102dacdd73f6b014e710b51e8022af9a1968ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f839867cc5f7f196b93bae1e27e6320742445d290f2263827498b54fec539f756afcefad4e508c098b9a7e1d8feb19955fb02ba9675585078710969d3440f5054e0f9dc3e7fe016e050eff260334f18a5d4fe391d82092319f5964f2e2eb7c1c3a5f8b13a49e282f609c317a833fb8d976d11517c571d1221a265d25af778ecf8923490c6ceeb450aecdc82e28293031d10c7d73bf85e57bf041a97360aa2c5d99cc1df82d9c4b87413eae2ef048f94b4d3554cea73d92b0f7af96e0271c691e2bb5c67add7c6caf302256adedf7ab114da0acfe870d449a3a489f781d659e8beccda7bce9f4e8618b6bd2f4132ce798cdc7a60e7e1460a7299e3c6342a579626d22733e50f526ec2fa19a22b31e8ed50f23cd1fdf94c9154ed3a7609a2f1ff981fe1d3b5c807b281e4683cc6d6315cf95b9ade8641defcb32372f1c126e398ef7a5a2dce0a8a7f68bb74560f8f71837c2c2ebbcbf7fffb42ae1896f13f7c7479a0b46a28b6f55540f89444f63de0378e3d121be09e06cc9ded1c20e65876d36aa0c65e9645644786b620e2dd2ad648ddfcbf4a7e5b1a3a4ecfe7f64667a3f0b7e2f4418588ed35a2458cffeb39b93d26f18d2ab13bdce6aee58e7b99359ec2dfd95a9c16dc00d6ef18b7933a6f8dc65ccb55667138776f7dea101070dc8796e3774df84f40ae0c8229d0d6069e5c8f39a7c299677a09d367fc7b05e3bc380ee652cdc72595f74c7b1043d0e1ffbab734648c838dfb0527d971b602bc216c9619ef0abf5ac974a1ed57f4050aa510dd9c74f508277b39d7973bb2dfccc5eeb0618db8cd74046ff337f0a7bf2c8e03e10f642c1886798d71806ab1e888d9e5ee87d0838c5655cb21c6cb83313b5a631175dff4963772cce9108188b34ac87c81c41e662ee4dd2dd7b2bc707961b1e646c4047669dcb6584f0d8d770daf5d7e7deb2e388ab20e2573d171a88108e79d820e98f26c0b84aa8b2f4aa4968dbb818ea32293237c50ba75ee485f4c22adf2f741400bdf8d6a9cc7df7ecae576221665d7358448818bb4ae4562849e949e17ac16e0be16688e156b5cf15e098c627c0056a900000000000000000000000000000000000000000000000000000000000000005ba002329b53c11a2f1dfe90b11e031771842056cf2125b43da8103c199dcd7f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000052000000000000000000000000000000000000000000000000000000000000000008203e880804711b6aa6bb700e690f49d06fe27b204dfae172996bcc61fcede55ac78b994842e153505ce7cb5b060e7bb2383d023fb59ad2952c5cacc3c527f924f457d75dd1cf9010f0480831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b2880de0b6b3a7640000b8e4cd5865790000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000008203e8808022849420ce892ab01b2aab19a51c3fac9169b5a26c9789d9ee43041b1214048d5962de13a880e2b38309e41e7255e43bb5c5937dbb8270a7f6d990344b61a84e1b", + "batchL2Data": "0xf905680380831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b280b905442cffd02e0000000000000000000000000000000000000000000000000000000000000000ad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5b4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d3021ddb9a356815c3fac1026b6dec5df3124afbadb485c9ba5a3e3398a04b7ba85e58769b32a1beaf1ea27375a44095a0d1fb664ce2dd358e7fcbfb78c26a193440eb01ebfc9ed27500cd4dfc979272d1f0913cc9f66540d7e8005811109e1cf2d887c22bd8750d34016ac3c66b5ff102dacdd73f6b014e710b51e8022af9a1968ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f839867cc5f7f196b93bae1e27e6320742445d290f2263827498b54fec539f756afcefad4e508c098b9a7e1d8feb19955fb02ba9675585078710969d3440f5054e0f9dc3e7fe016e050eff260334f18a5d4fe391d82092319f5964f2e2eb7c1c3a5f8b13a49e282f609c317a833fb8d976d11517c571d1221a265d25af778ecf8923490c6ceeb450aecdc82e28293031d10c7d73bf85e57bf041a97360aa2c5d99cc1df82d9c4b87413eae2ef048f94b4d3554cea73d92b0f7af96e0271c691e2bb5c67add7c6caf302256adedf7ab114da0acfe870d449a3a489f781d659e8beccda7bce9f4e8618b6bd2f4132ce798cdc7a60e7e1460a7299e3c6342a579626d22733e50f526ec2fa19a22b31e8ed50f23cd1fdf94c9154ed3a7609a2f1ff981fe1d3b5c807b281e4683cc6d6315cf95b9ade8641defcb32372f1c126e398ef7a5a2dce0a8a7f68bb74560f8f71837c2c2ebbcbf7fffb42ae1896f13f7c7479a0b46a28b6f55540f89444f63de0378e3d121be09e06cc9ded1c20e65876d36aa0c65e9645644786b620e2dd2ad648ddfcbf4a7e5b1a3a4ecfe7f64667a3f0b7e2f4418588ed35a2458cffeb39b93d26f18d2ab13bdce6aee58e7b99359ec2dfd95a9c16dc00d6ef18b7933a6f8dc65ccb55667138776f7dea101070dc8796e3774df84f40ae0c8229d0d6069e5c8f39a7c299677a09d367fc7b05e3bc380ee652cdc72595f74c7b1043d0e1ffbab734648c838dfb0527d971b602bc216c9619ef0abf5ac974a1ed57f4050aa510dd9c74f508277b39d7973bb2dfccc5eeb0618db8cd74046ff337f0a7bf2c8e03e10f642c1886798d71806ab1e888d9e5ee87d0838c5655cb21c6cb83313b5a631175dff4963772cce9108188b34ac87c81c41e662ee4dd2dd7b2bc707961b1e646c4047669dcb6584f0d8d770daf5d7e7deb2e388ab20e2573d171a88108e79d820e98f26c0b84aa8b2f4aa4968dbb818ea32293237c50ba75ee485f4c22adf2f741400bdf8d6a9cc7df7ecae576221665d7358448818bb4ae4562849e949e17ac16e0be16688e156b5cf15e098c627c0056a900000000000000000000000000000000000000000000000000000000000000005ba002329b53c11a2f1dfe90b11e031771842056cf2125b43da8103c199dcd7f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000052000000000000000000000000000000000000000000000000000000000000000008203e880804711b6aa6bb700e690f49d06fe27b204dfae172996bcc61fcede55ac78b994842e153505ce7cb5b060e7bb2383d023fb59ad2952c5cacc3c527f924f457d75dd1cfff9010f0480831e848094cfa773cc48fbde3ca4d24eecb19d224d697026b2880de0b6b3a7640000b8e4cd5865790000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c949254d682d8c9ad5682521675b8f43b102aec40000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000008203e8808022849420ce892ab01b2aab19a51c3fac9169b5a26c9789d9ee43041b1214048d5962de13a880e2b38309e41e7255e43bb5c5937dbb8270a7f6d990344b61a84e1bff", "globalExitRoot": "0x772a7e7f901e350a1943a7204f9bcc5da04bcb804d3b37c4debda567b05b13c4", "newLocalExitRoot": "0x97c7c68e5f6062b69b69b7395dd8ca484a2266fb86d782bc0f094eb1b73f17ba", - "batchHashData": "0x9c122994ef013761e22b13cc184341c3a82ef79700927b1dfc94be5a290562c0", + "batchHashData": "0x1b3b4e1df21d7fc0115a4145be607d5b629904ebaf458ff1c5ef8da37e33757d", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0xb0f3fcee945f06982ec3180aa322c3e3bf9cde363a5db0d28ab85f5e43ea1442" + "expectedNewAccInputHash": "0xbd47cc0dd16271d449d3f854b27853683f9b9447f83716f1ff9a9d1b83a1c7c8" } ] \ No newline at end of file diff --git a/test/helpers/test-vectors/processor/state-transition.json b/test/helpers/test-vectors/processor/state-transition.json index fb637eab..c49e92a6 100644 --- a/test/helpers/test-vectors/processor/state-transition.json +++ b/test/helpers/test-vectors/processor/state-transition.json @@ -32,7 +32,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a01cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e7a05d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad73", "reason": "", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff" } ], "expectedNewRoot": "0x9f4544f3d6c4e46890a1570c052d2140bcbb7f841a0a7fefe3a7e15819fb40bc", @@ -71,14 +71,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b", + "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x80cc22bc1a205c21f2b8c87e6185e1215fb60e3d83c609fd3bf3cdc586a6244b", + "batchHashData": "0x133b422a9d0d3effa6e457fcacd1397174186639950c5b9b0e5ad1456faa2785", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x704d5cfd3e44b82028f7f8cae31168267a7422c5a447b90a65134116da5a8432" + "expectedNewAccInputHash": "0xe6a509b727a72d02065319e261bcdc27392a24ad9efab2c2274e026d78e42d68" }, { "id": 1, @@ -130,7 +130,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a01cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e7a05d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad73", "reason": "", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff" }, { "id": 1, @@ -143,7 +143,7 @@ "chainId": 1000, "rawTx": "0xf86f80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478893635c9adc5dea00000808207f3a06199f98970ea3e0e9a59e32184ea11ae9158b9b93d70906e11f60eb6ce009602a03c1bbbb437e58ea5f7bebd344d61cccd161c6b8accff11b50ea44300d3ab58bd", "reason": "TX INVALID: Not enough funds to pay total transaction cost", - "customRawTx": "0xef80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478893635c9adc5dea00000808203e880806199f98970ea3e0e9a59e32184ea11ae9158b9b93d70906e11f60eb6ce0096023c1bbbb437e58ea5f7bebd344d61cccd161c6b8accff11b50ea44300d3ab58bd1b" + "customRawTx": "0xef80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478893635c9adc5dea00000808203e880806199f98970ea3e0e9a59e32184ea11ae9158b9b93d70906e11f60eb6ce0096023c1bbbb437e58ea5f7bebd344d61cccd161c6b8accff11b50ea44300d3ab58bd1bff" }, { "id": 2, @@ -156,7 +156,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478880de0b6b3a7640000808207f4a074ecb6abb3d84c322a4905c60199b8f422b79b940e8a853d580869268009ae31a023fb6caa5b3afc410b79d9b68bf851df1fd46fd6923cc481b3e273aeb92ce67d", "reason": "", - "customRawTx": "0xee80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478880de0b6b3a7640000808203e8808074ecb6abb3d84c322a4905c60199b8f422b79b940e8a853d580869268009ae3123fb6caa5b3afc410b79d9b68bf851df1fd46fd6923cc481b3e273aeb92ce67d1c" + "customRawTx": "0xee80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478880de0b6b3a7640000808203e8808074ecb6abb3d84c322a4905c60199b8f422b79b940e8a853d580869268009ae3123fb6caa5b3afc410b79d9b68bf851df1fd46fd6923cc481b3e273aeb92ce67d1cff" }, { "id": 3, @@ -169,7 +169,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a7640000808207f4a0432b1bc18d96dea596edfe17b249a68e42117f738ecfaea4e9f92aa77935fb4da05b9a983a5ba73c27cbaa4de62b1d8ab8b908a941926387927dcd2319d8b4dfb2", "reason": "TX INVALID: Invalid nonce", - "customRawTx": "0xee80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a7640000808203e88080432b1bc18d96dea596edfe17b249a68e42117f738ecfaea4e9f92aa77935fb4d5b9a983a5ba73c27cbaa4de62b1d8ab8b908a941926387927dcd2319d8b4dfb21c" + "customRawTx": "0xee80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a7640000808203e88080432b1bc18d96dea596edfe17b249a68e42117f738ecfaea4e9f92aa77935fb4d5b9a983a5ba73c27cbaa4de62b1d8ab8b908a941926387927dcd2319d8b4dfb21cff" }, { "id": 4, @@ -243,14 +243,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bef80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478893635c9adc5dea00000808203e880806199f98970ea3e0e9a59e32184ea11ae9158b9b93d70906e11f60eb6ce0096023c1bbbb437e58ea5f7bebd344d61cccd161c6b8accff11b50ea44300d3ab58bd1bee80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478880de0b6b3a7640000808203e8808074ecb6abb3d84c322a4905c60199b8f422b79b940e8a853d580869268009ae3123fb6caa5b3afc410b79d9b68bf851df1fd46fd6923cc481b3e273aeb92ce67d1cee80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a7640000808203e88080432b1bc18d96dea596edfe17b249a68e42117f738ecfaea4e9f92aa77935fb4d5b9a983a5ba73c27cbaa4de62b1d8ab8b908a941926387927dcd2319d8b4dfb21cec80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a764000080808080c58f68d4c65a9a131d17a426ab83da163a43e21f8811a70cd4ca79eb5d26f25d169e8e50ee8483669b2aef296e6dc68464e5af0dc582a54751ef50c2c9207b6b1c", + "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bffef80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478893635c9adc5dea00000808203e880806199f98970ea3e0e9a59e32184ea11ae9158b9b93d70906e11f60eb6ce0096023c1bbbb437e58ea5f7bebd344d61cccd161c6b8accff11b50ea44300d3ab58bd1bffee80843b9aca00830186a094187bd40226a7073b49163b1f6c2b73d8f2aa8478880de0b6b3a7640000808203e8808074ecb6abb3d84c322a4905c60199b8f422b79b940e8a853d580869268009ae3123fb6caa5b3afc410b79d9b68bf851df1fd46fd6923cc481b3e273aeb92ce67d1cffee80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a7640000808203e88080432b1bc18d96dea596edfe17b249a68e42117f738ecfaea4e9f92aa77935fb4d5b9a983a5ba73c27cbaa4de62b1d8ab8b908a941926387927dcd2319d8b4dfb21cffec80843b9aca00830186a094abcced19d7f290b84608fec510bee872cc8f5112880de0b6b3a764000080808080c58f68d4c65a9a131d17a426ab83da163a43e21f8811a70cd4ca79eb5d26f25d169e8e50ee8483669b2aef296e6dc68464e5af0dc582a54751ef50c2c9207b6b1c", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x7c029310f044ec61946375d00c12cec221f35d42dc6829a9ff1489cf6bb5624d", + "batchHashData": "0x379fb6c3448fdf3e7499494cc44ed0464fbf038a938dffab364302a7a9c3c126", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x8bc7f90ad21282dd4676c19e7ce8f6b73beb7304fed1f8cae2dc7b53026d359c" + "expectedNewAccInputHash": "0xe95a65a725268f9bb7c5139cd659782fcfa34de25b9f36709cc0fb2dfff1099a" }, { "id": 2, @@ -284,7 +284,7 @@ "chainId": 1000, "rawTx": "0xf87080843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8a021e19e0c9bab2400000808207f4a069d48cb9ade9de851379987aa0f7f677cdaee1152ec785a3d3009f094c889be9a0368c3d198cdfe5b1e0100fe110ea60e77b1eb65e9363d96f7fb9c2b84a37c9b0", "reason": "TX INVALID: Not enough funds to pay total transaction cost", - "customRawTx": "0xf080843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8a021e19e0c9bab2400000808203e8808069d48cb9ade9de851379987aa0f7f677cdaee1152ec785a3d3009f094c889be9368c3d198cdfe5b1e0100fe110ea60e77b1eb65e9363d96f7fb9c2b84a37c9b01c" + "customRawTx": "0xf080843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8a021e19e0c9bab2400000808203e8808069d48cb9ade9de851379987aa0f7f677cdaee1152ec785a3d3009f094c889be9368c3d198cdfe5b1e0100fe110ea60e77b1eb65e9363d96f7fb9c2b84a37c9b01cff" } ], "expectedNewRoot": "0x5ce97f7b959b5dbb207ca525a18a7034a1244f23ec0bd393ec1b3e28786dd164", @@ -309,14 +309,14 @@ "nonce": "0" } }, - "batchL2Data": "0xf080843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8a021e19e0c9bab2400000808203e8808069d48cb9ade9de851379987aa0f7f677cdaee1152ec785a3d3009f094c889be9368c3d198cdfe5b1e0100fe110ea60e77b1eb65e9363d96f7fb9c2b84a37c9b01c", + "batchL2Data": "0xf080843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8a021e19e0c9bab2400000808203e8808069d48cb9ade9de851379987aa0f7f677cdaee1152ec785a3d3009f094c889be9368c3d198cdfe5b1e0100fe110ea60e77b1eb65e9363d96f7fb9c2b84a37c9b01cff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x9e2a4414f78bef13670164fb0eac6d43e50b5f305c8c9e9495e8f204d880b88d", + "batchHashData": "0x6a7430f01b53a40688a73a95b891385780a3673fc9a69536fffe2fd606a425c0", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0xb10056e7bcaf293d31fff9155619f5bb7f8e22d4116e0870db02b1e85c62254f" + "expectedNewAccInputHash": "0xe0584815d125d9029412dc63a8707533d9b554bc2be0428218925c18ef1bf642" }, { "id": 3, @@ -350,7 +350,7 @@ "chainId": 401, "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a000080820346a06e209c61ca92c2b980d6197e7ac9ccc3f547bf13be6455dfe682aa5dda9655efa016819a7edcc3fefec81ca97c7a6f3d10ec774440e409adbba693ce8b698d41f1", "reason": "TX INVALID: Chain ID does not match", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a00008082019180806e209c61ca92c2b980d6197e7ac9ccc3f547bf13be6455dfe682aa5dda9655ef16819a7edcc3fefec81ca97c7a6f3d10ec774440e409adbba693ce8b698d41f11c" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a00008082019180806e209c61ca92c2b980d6197e7ac9ccc3f547bf13be6455dfe682aa5dda9655ef16819a7edcc3fefec81ca97c7a6f3d10ec774440e409adbba693ce8b698d41f11cff" }, { "id": 1, @@ -385,7 +385,7 @@ "chainId": 1000, "rawTx": "0xf86f80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808207f3a06fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e85a05d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a", "reason": "TX INVALID: Not enough funds to pay total transaction cost", - "customRawTx": "0xef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1b" + "customRawTx": "0xef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1bff" } ], "expectedNewRoot": "0x5ce97f7b959b5dbb207ca525a18a7034a1244f23ec0bd393ec1b3e28786dd164", @@ -410,14 +410,14 @@ "nonce": "0" } }, - "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a00008082019180806e209c61ca92c2b980d6197e7ac9ccc3f547bf13be6455dfe682aa5dda9655ef16819a7edcc3fefec81ca97c7a6f3d10ec774440e409adbba693ce8b698d41f11cef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1b", + "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a00008082019180806e209c61ca92c2b980d6197e7ac9ccc3f547bf13be6455dfe682aa5dda9655ef16819a7edcc3fefec81ca97c7a6f3d10ec774440e409adbba693ce8b698d41f11cffef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x63a2f1c975b3481a834dc19e47d51bbebfa95d36a5cd5ef7e1cd8f77dba9f92f", + "batchHashData": "0x160d95d0ed410097fb11532e6ba37432410b9619cb2c4fac4422c8aca0d891a9", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x5096be84d9ffe4b90dadb9e14adf0560d3b026f6c70a657ff8db1d8013912dee" + "expectedNewAccInputHash": "0x7e5a5363ba574624c7baf0c8105d5fa6e5d2002f18cb078261ed7c9f050e22c1" }, { "id": 4, @@ -452,7 +452,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a01cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e7a05d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad73", "reason": "TX INVALID: Failed signature", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff" } ], "expectedNewRoot": "0x5ce97f7b959b5dbb207ca525a18a7034a1244f23ec0bd393ec1b3e28786dd164", @@ -477,14 +477,14 @@ "nonce": "0" } }, - "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484", + "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x990477d9fa852647f7f31a984aa915af0ff3a813ca717728c510b48feaacac66", + "batchHashData": "0x27ee44657f1db0b433fe10c4b46c71928f65dd0ad73fe51116f2ebb9adc6c536", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x65e3db0bc8243f62d1064c526cc067caaeea18611bd9f64bb9076574915255c9" + "expectedNewAccInputHash": "0xcfad1b153cd9e258f6effac0c954342043d000bf1e64add63f1d6864465ee64b" }, { "id": 5, @@ -518,7 +518,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808207f3a0cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6aa019cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c1045", "reason": "", - "customRawTx": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451b" + "customRawTx": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451bff" } ], "expectedNewRoot": "0x20e6f4d827273286577020a18bad3b5d5134b6a5ea57d99e6f51a832f58cae19", @@ -557,14 +557,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451b", + "batchL2Data": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x36e75bc24a19a4f5c6057500ed3d9d0567606eaf31f870f0fe3d2b71de951700", + "batchHashData": "0x85c8f224ce880225339ab9c55f27813e7605749f547ae4f1d76285f8dae9eaf6", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0xaee9fbede25418352d0912d6920684cb4a624d91491a4c1080b096b10ac0c61e" + "expectedNewAccInputHash": "0xa7bac7be076577bc2caafc3d984e58189b80e3b6776662f1612c8df52fc8a674" }, { "id": 6, @@ -598,7 +598,7 @@ "chainId": 1000, "rawTx": "0xf86f80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808207f3a06fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e85a05d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a", "reason": "TX INVALID: Not enough funds to pay total transaction cost", - "customRawTx": "0xef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1b" + "customRawTx": "0xef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1bff" }, { "id": 1, @@ -611,7 +611,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a01cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e7a05d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad73", "reason": "", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff" }, { "id": 2, @@ -624,7 +624,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a7640000808207f4a03317280d96c3ed303a42d9da2638805301351c96cad135380ffa544d3c2bc96aa06a55cef2d3827323f134976dd99a33bebef27b5e99c454fb1f8d4a4861ac4e0f", "reason": "TX INVALID: Invalid nonce", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a7640000808203e880803317280d96c3ed303a42d9da2638805301351c96cad135380ffa544d3c2bc96a6a55cef2d3827323f134976dd99a33bebef27b5e99c454fb1f8d4a4861ac4e0f1c" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a7640000808203e880803317280d96c3ed303a42d9da2638805301351c96cad135380ffa544d3c2bc96a6a55cef2d3827323f134976dd99a33bebef27b5e99c454fb1f8d4a4861ac4e0f1cff" }, { "id": 3, @@ -676,14 +676,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1bee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a7640000808203e880803317280d96c3ed303a42d9da2638805301351c96cad135380ffa544d3c2bc96a6a55cef2d3827323f134976dd99a33bebef27b5e99c454fb1f8d4a4861ac4e0f1cec80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a764000080808080f7e1e6f3cd95d27522592e8796afa8f419a066b7172e0ac3e7826705ad608c672731e14da1b190dab8c14e79e050e31da53fdb4a0e55ca48ee4faff859606d5a1b", + "batchL2Data": "0xef80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff89056bc75e2d63100000808203e880806fac51f437890686cea7fc4d478e01f4650284d8b0c447d3a049ad799a938e855d76085acbdd3af82e205f070fd3f333d3f069ab3936323ac347003f07d9418a1bffee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bffee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a7640000808203e880803317280d96c3ed303a42d9da2638805301351c96cad135380ffa544d3c2bc96a6a55cef2d3827323f134976dd99a33bebef27b5e99c454fb1f8d4a4861ac4e0f1cffec80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff880de0b6b3a764000080808080f7e1e6f3cd95d27522592e8796afa8f419a066b7172e0ac3e7826705ad608c672731e14da1b190dab8c14e79e050e31da53fdb4a0e55ca48ee4faff859606d5a1b", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0xcf2f7e2aa1ba6181e15e1fcd15948b92a5dbe807a46b15726eb6688949b7df26", + "batchHashData": "0x88c37cb63c0f6836b57b5f2b52256a8bec4e7f58c0e1034f44ce3aadcc9a7367", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x46608e2fa1db11c26d2cccfad6bd6f7f3150ad41818808507b08080a14e19ead" + "expectedNewAccInputHash": "0x88150cbed3522a59084b4196048780e368109733536475fc9dac7a99125b37ea" }, { "id": 7, @@ -717,7 +717,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808207f3a0cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6aa019cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c1045", "reason": "", - "customRawTx": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451b" + "customRawTx": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451bff" } ], "expectedNewRoot": "0x5c1dd51e1a08c758b5626485c8e4ddc00719745c2fa9b707bf7988ff5be29403", @@ -756,14 +756,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451b", + "batchL2Data": "0xee80843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d88016345785d8a0000808203e88080cca9bd00c0a9af18cdc17e693951b88b293bae8ed236ff7dcf2684c478bc0b6a19cc9ed09ee5e1e2750abbea7ec8d2ed31df90c7d364d4e2f36c31eb410c10451bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x36e75bc24a19a4f5c6057500ed3d9d0567606eaf31f870f0fe3d2b71de951700", + "batchHashData": "0x85c8f224ce880225339ab9c55f27813e7605749f547ae4f1d76285f8dae9eaf6", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0xa93e53fa4ad349a9ca7d3c10cbf300bcd27dd8b0edd3237ab3b4ae1186f66669" + "expectedNewAccInputHash": "0x31014f8380adb840d4a4870c041be0684d51c3d52bf9afac107421c040a935d1" }, { "id": 8, @@ -797,7 +797,7 @@ "chainId": 1000, "rawTx": "0xf87080862b4f29945e00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f4a02338447c58501088b071192ec4b44c696f2f1cdf4ff8182ecb8d0cd4ea83c428a0034c91620ac27f2870e1568e30e1db2ce9c0a05f2b03b20d017b3a0410edc657", "reason": "", - "customRawTx": "0xf080862b4f29945e00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880802338447c58501088b071192ec4b44c696f2f1cdf4ff8182ecb8d0cd4ea83c428034c91620ac27f2870e1568e30e1db2ce9c0a05f2b03b20d017b3a0410edc6571c" + "customRawTx": "0xf080862b4f29945e00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880802338447c58501088b071192ec4b44c696f2f1cdf4ff8182ecb8d0cd4ea83c428034c91620ac27f2870e1568e30e1db2ce9c0a05f2b03b20d017b3a0410edc6571cff" }, { "id": 1, @@ -810,7 +810,7 @@ "chainId": 1000, "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8806f05b59d3b20000808207f4a09990717b4c80d955cacf4a765d3bfefd707511d66e0a482510906d119fa285c7a0232ccd442c5b618558b62175f01d9f45ff655d480f36394ea50a0b7dc52bc333", "reason": "", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8806f05b59d3b20000808203e880809990717b4c80d955cacf4a765d3bfefd707511d66e0a482510906d119fa285c7232ccd442c5b618558b62175f01d9f45ff655d480f36394ea50a0b7dc52bc3331c" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8806f05b59d3b20000808203e880809990717b4c80d955cacf4a765d3bfefd707511d66e0a482510906d119fa285c7232ccd442c5b618558b62175f01d9f45ff655d480f36394ea50a0b7dc52bc3331cff" } ], "expectedNewRoot": "0x7bcce969daceed3b0dffa90dc19987b55f44e7f15ebb84ea407f994c63e7f756", @@ -850,14 +850,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xf080862b4f29945e00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880802338447c58501088b071192ec4b44c696f2f1cdf4ff8182ecb8d0cd4ea83c428034c91620ac27f2870e1568e30e1db2ce9c0a05f2b03b20d017b3a0410edc6571cee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8806f05b59d3b20000808203e880809990717b4c80d955cacf4a765d3bfefd707511d66e0a482510906d119fa285c7232ccd442c5b618558b62175f01d9f45ff655d480f36394ea50a0b7dc52bc3331c", + "batchL2Data": "0xf080862b4f29945e00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880802338447c58501088b071192ec4b44c696f2f1cdf4ff8182ecb8d0cd4ea83c428034c91620ac27f2870e1568e30e1db2ce9c0a05f2b03b20d017b3a0410edc6571cffee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8806f05b59d3b20000808203e880809990717b4c80d955cacf4a765d3bfefd707511d66e0a482510906d119fa285c7232ccd442c5b618558b62175f01d9f45ff655d480f36394ea50a0b7dc52bc3331cff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x165cea5fa8d1f2c85665d22bfff8a45b2b7183e9627840dd04f618c1aec2464f", + "batchHashData": "0x7f670b8f5ef71411fec7a89914638d654960018f242323bc4d3879f315560101", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x34dd638b5422dba4ea61dac77930bcede32dd758fa9d16e2ca7df7b9fecfd406" + "expectedNewAccInputHash": "0x855ab1f0391c5112287fc49dea91704a62f3bd6f789e4e457dd416278881446b" }, { "id": 9, @@ -889,7 +889,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "chainId": 1000, - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b", + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff", "reason": "", "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a01cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e7a05d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad73" }, @@ -902,7 +902,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "chainId": 1000, - "customRawTx": "0xee01843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e88080c15e7f0afea365929bff2dea9b1c219ce7d656e9829c30c5736bfa499fee328132ee39a354417f726d717e68b6b019214721808753aba88a68eea6c57ca136521c", + "customRawTx": "0xee01843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e88080c15e7f0afea365929bff2dea9b1c219ce7d656e9829c30c5736bfa499fee328132ee39a354417f726d717e68b6b019214721808753aba88a68eea6c57ca136521cff", "reason": "", "rawTx": "0xf86e01843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808207f4a0c15e7f0afea365929bff2dea9b1c219ce7d656e9829c30c5736bfa499fee3281a032ee39a354417f726d717e68b6b019214721808753aba88a68eea6c57ca13652" }, @@ -915,7 +915,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "chainId": 1000, - "customRawTx": "0xee02843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e88080bff0e780ba7db409339fd3f71969fa2cbf1b8535f6c725a1499d3318d3ef9c2b6340ddfab84add2c188f9efddb99771db1fe621c981846394ea4f035c85bcdd51b", + "customRawTx": "0xee02843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e88080bff0e780ba7db409339fd3f71969fa2cbf1b8535f6c725a1499d3318d3ef9c2b6340ddfab84add2c188f9efddb99771db1fe621c981846394ea4f035c85bcdd51bff", "reason": "", "rawTx": "0xf86e02843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a0bff0e780ba7db409339fd3f71969fa2cbf1b8535f6c725a1499d3318d3ef9c2ba06340ddfab84add2c188f9efddb99771db1fe621c981846394ea4f035c85bcdd5" }, @@ -928,7 +928,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "chainId": 1000, - "customRawTx": "0xee03843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e8808047b4f7d735dfadefc585bf24d9bd2267438f9bc92d1ab4f65fa9a6d90cc338580720a7da26cad22c05bf1358011c95caec969b8b9177af91c0e90dac3d02f6b31b", + "customRawTx": "0xee03843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e8808047b4f7d735dfadefc585bf24d9bd2267438f9bc92d1ab4f65fa9a6d90cc338580720a7da26cad22c05bf1358011c95caec969b8b9177af91c0e90dac3d02f6b31bff", "reason": "", "rawTx": "0xf86e03843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808207f3a047b4f7d735dfadefc585bf24d9bd2267438f9bc92d1ab4f65fa9a6d90cc33858a00720a7da26cad22c05bf1358011c95caec969b8b9177af91c0e90dac3d02f6b3" } @@ -972,14 +972,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bee01843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e88080c15e7f0afea365929bff2dea9b1c219ce7d656e9829c30c5736bfa499fee328132ee39a354417f726d717e68b6b019214721808753aba88a68eea6c57ca136521cee02843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e88080bff0e780ba7db409339fd3f71969fa2cbf1b8535f6c725a1499d3318d3ef9c2b6340ddfab84add2c188f9efddb99771db1fe621c981846394ea4f035c85bcdd51bee03843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e8808047b4f7d735dfadefc585bf24d9bd2267438f9bc92d1ab4f65fa9a6d90cc338580720a7da26cad22c05bf1358011c95caec969b8b9177af91c0e90dac3d02f6b31b", + "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bffee01843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e88080c15e7f0afea365929bff2dea9b1c219ce7d656e9829c30c5736bfa499fee328132ee39a354417f726d717e68b6b019214721808753aba88a68eea6c57ca136521cffee02843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e88080bff0e780ba7db409339fd3f71969fa2cbf1b8535f6c725a1499d3318d3ef9c2b6340ddfab84add2c188f9efddb99771db1fe621c981846394ea4f035c85bcdd51bffee03843b9aca00830186a094617b3a3528f9cdd6630fd3301b9c8911f7bf063d8806f05b59d3b20000808203e8808047b4f7d735dfadefc585bf24d9bd2267438f9bc92d1ab4f65fa9a6d90cc338580720a7da26cad22c05bf1358011c95caec969b8b9177af91c0e90dac3d02f6b31bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x797d3bbd5aafb65b31647e20b5b0ca3371702fd5166b16c0f1512cad7dc88f8e", + "batchHashData": "0x3bfd89e0987c874f3c965133e682aeef8acdfad11234b2886ce992bd519edb99", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x244fb1f80db37280624da30acf8647a65a68ef3acecb7ca0fd31692bb87e096f" + "expectedNewAccInputHash": "0xf31701db81a44ae2c3def359f37efb4143c611598f731bfcf7c93e46b8d4a574" }, { "id": 10, @@ -1031,7 +1031,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x5ef3d3dd0000000000000000000000000000000000000000000000000000000000000007", - "customRawTx": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a45ef3d3dd00000000000000000000000000000000000000000000000000000000000000078203e880803943e5a952e27d85c91f61610159fd8caf0dd68db76a1df7fb52934156d9ec935ceec6b0f908e36ee8b2c70350b3813d72558572ff95deac79069168e68726571c", + "customRawTx": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a45ef3d3dd00000000000000000000000000000000000000000000000000000000000000078203e880803943e5a952e27d85c91f61610159fd8caf0dd68db76a1df7fb52934156d9ec935ceec6b0f908e36ee8b2c70350b3813d72558572ff95deac79069168e68726571cff", "rawTx": "0xf88a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a45ef3d3dd00000000000000000000000000000000000000000000000000000000000000078207f4a03943e5a952e27d85c91f61610159fd8caf0dd68db76a1df7fb52934156d9ec93a05ceec6b0f908e36ee8b2c70350b3813d72558572ff95deac79069168e6872657" }, { @@ -1043,7 +1043,7 @@ "gasPrice": "1000000000", "chainId": 1000, "reason": "", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b", + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff", "rawTx": "0xf86e80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f3a01cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e7a05d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad73" } ], @@ -1094,14 +1094,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a45ef3d3dd00000000000000000000000000000000000000000000000000000000000000078203e880803943e5a952e27d85c91f61610159fd8caf0dd68db76a1df7fb52934156d9ec935ceec6b0f908e36ee8b2c70350b3813d72558572ff95deac79069168e68726571cee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b", + "batchL2Data": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a45ef3d3dd00000000000000000000000000000000000000000000000000000000000000078203e880803943e5a952e27d85c91f61610159fd8caf0dd68db76a1df7fb52934156d9ec935ceec6b0f908e36ee8b2c70350b3813d72558572ff95deac79069168e68726571cffee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x34277e04e6bb366e19b85abe556937435e579d1c2fe2973587b730c73415b94d", + "batchHashData": "0x34a30ce6632f2c215e085e0cdd57cb8b3897c3a1e499f11f3695392285cf8bd5", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0xd9cd7be40516bdb7b3afe0a764f088e1e3c0f574f70769703aa884a11a6026c5" + "expectedNewAccInputHash": "0x68bc91f13fc1a23ffe2fc9350d4aa8a350521cd159978881a3ce9f3dbe974e9e" }, { "id": 11, @@ -1144,7 +1144,7 @@ "gasPrice": "1000000000", "chainId": 1000, "reason": "", - "customRawTx": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901c", + "customRawTx": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901cff", "rawTx": "0xf86d80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808207f4a00aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f9fe81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc537890" }, { @@ -1163,7 +1163,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x494e4bc30000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff00000000000000000000000000000000000000000000000000038d7ea4c68000", - "customRawTx": "0xf86b01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880b844494e4bc30000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff00000000000000000000000000000000000000000000000000038d7ea4c680008203e88080c83069009c51e411569ca78a660bbcb64e4e6709909eb99c28395fb4c787da4c2b846bf51fcf891fb293e36a0cf5f4efd1fe7c19b2c8a1220b8308b195e801561b", + "customRawTx": "0xf86b01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880b844494e4bc30000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff00000000000000000000000000000000000000000000000000038d7ea4c680008203e88080c83069009c51e411569ca78a660bbcb64e4e6709909eb99c28395fb4c787da4c2b846bf51fcf891fb293e36a0cf5f4efd1fe7c19b2c8a1220b8308b195e801561bff", "rawTx": "0xf8ab01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880b844494e4bc30000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff00000000000000000000000000000000000000000000000000038d7ea4c680008207f3a0c83069009c51e411569ca78a660bbcb64e4e6709909eb99c28395fb4c787da4ca02b846bf51fcf891fb293e36a0cf5f4efd1fe7c19b2c8a1220b8308b195e80156" } ], @@ -1211,14 +1211,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901cf86b01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880b844494e4bc30000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff00000000000000000000000000000000000000000000000000038d7ea4c680008203e88080c83069009c51e411569ca78a660bbcb64e4e6709909eb99c28395fb4c787da4c2b846bf51fcf891fb293e36a0cf5f4efd1fe7c19b2c8a1220b8308b195e801561b", + "batchL2Data": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901cfff86b01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880b844494e4bc30000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff00000000000000000000000000000000000000000000000000038d7ea4c680008203e88080c83069009c51e411569ca78a660bbcb64e4e6709909eb99c28395fb4c787da4c2b846bf51fcf891fb293e36a0cf5f4efd1fe7c19b2c8a1220b8308b195e801561bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x405293b4b4015b2e08493a85d2028419422c2a42b173396552bb4db165f24dbc", + "batchHashData": "0x3d9946f87d11d3da02fd90dc0d38d67db71e06dd2df3a8b07910ee9c2f7506b1", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x3b0a2351ed7ce472ffd4b62f8ad7e93aa1243201624d51f653f5efca29555089" + "expectedNewAccInputHash": "0x45d1718cde0f1be8db8c503f5ebc40465a7e02906125f98b00190c5ba9d0b86e" }, { "id": 12, @@ -1271,7 +1271,7 @@ "gasPrice": "1000000000", "chainId": 1000, "reason": "", - "customRawTx": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901c", + "customRawTx": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901cff", "rawTx": "0xf86d80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808207f4a00aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f9fe81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc537890" }, { @@ -1289,7 +1289,7 @@ "data": "0x027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff", "chainId": 1000, "reason": "", - "customRawTx": "0xf84a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e88080a04c0969f64f440a2c91e29bf9ea0b1cc8db9f33bda47c2c6899840ae46d36d70212c0a9f1bb015890ed0830c7fea6c52adaf85b0bf3d64448d3300c12c1bb161b", + "customRawTx": "0xf84a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e88080a04c0969f64f440a2c91e29bf9ea0b1cc8db9f33bda47c2c6899840ae46d36d70212c0a9f1bb015890ed0830c7fea6c52adaf85b0bf3d64448d3300c12c1bb161bff", "rawTx": "0xf88a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8207f3a0a04c0969f64f440a2c91e29bf9ea0b1cc8db9f33bda47c2c6899840ae46d36d7a00212c0a9f1bb015890ed0830c7fea6c52adaf85b0bf3d64448d3300c12c1bb16" } ], @@ -1339,14 +1339,14 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901cf84a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e88080a04c0969f64f440a2c91e29bf9ea0b1cc8db9f33bda47c2c6899840ae46d36d70212c0a9f1bb015890ed0830c7fea6c52adaf85b0bf3d64448d3300c12c1bb161b", + "batchL2Data": "0xee80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e880800aec3714591ea85d38943922d16f5f592f10abd2834c43b06253314a8591107f00e81823e7864ba979b28a6ee5eb660dfce7aa857303691ba6759d9edc5378901cfff84a01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e88080a04c0969f64f440a2c91e29bf9ea0b1cc8db9f33bda47c2c6899840ae46d36d70212c0a9f1bb015890ed0830c7fea6c52adaf85b0bf3d64448d3300c12c1bb161bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x0648c342d6d0c7dfdbc8ebb8ec2273793705faeead957dc4a6b6cd69c5fa4f71", + "batchHashData": "0xc3a45717b6c41a5b2c7f759e5064c05a6377ed7ff55954889cfb6ffc0b3df242", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0xf93a82af6e9f96942ba005f3362379ab21ba868cd7cf555e4be05a97723219eb" + "expectedNewAccInputHash": "0x42113ffe9ad30ca1d2c9f89d5414d45be64ca2722b25914bede13c7f33f78af2" }, { "id": 13, @@ -1388,7 +1388,7 @@ }, "contractName": "Constructor", "reason": "", - "customRawTx": "0xf9032880843b9aca00830f42408080b90314608060405234801561001057600080fd5b506040516102f43803806102f483398181016040528101906100329190610054565b80600081905550506100a7565b60008151905061004e81610090565b92915050565b60006020828403121561006a5761006961008b565b5b60006100788482850161003f565b91505092915050565b6000819050919050565b600080fd5b61009981610081565b81146100a457600080fd5b50565b61023e806100b66000396000f3fe6080604052600436106100385760003560e01c8063027e5d6114610041578063aa8c217c1461006a578063d997ccb3146100955761003f565b3661003f57005b005b34801561004d57600080fd5b5061006860048036038101906100639190610123565b6100b3565b005b34801561007657600080fd5b5061007f6100ff565b60405161008c9190610189565b60405180910390f35b61009d610105565b6040516100aa919061016e565b60405180910390f35b8073ffffffffffffffffffffffffffffffffffffffff166108fc6000549081150290604051600060405180830381858888f193505050501580156100fb573d6000803e3d6000fd5b5050565b60005481565b60006001905090565b60008135905061011d816101f1565b92915050565b600060208284031215610139576101386101ec565b5b60006101478482850161010e565b91505092915050565b610159816101b6565b82525050565b610168816101e2565b82525050565b60006020820190506101836000830184610150565b92915050565b600060208201905061019e600083018461015f565b92915050565b60006101af826101c2565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600080fd5b6101fa816101a4565b811461020557600080fd5b5056fea26469706673582212208cb33f54873dbf0b74ff9c230fc2e7522ca18ea82fcce1f4a1904abe1c1043fe64736f6c6343000807003300000000000000000000000000000000000000000000000000000000000000018203e88080579b8010f25b1f95158686736e9930d4ebd2a3c0ef4e604d0e76684e491f735d30eb46fe9a689148f3559c23bd5566fcaed97f61be389c4fb96f735b464ec5031c", + "customRawTx": "0xf9032880843b9aca00830f42408080b90314608060405234801561001057600080fd5b506040516102f43803806102f483398181016040528101906100329190610054565b80600081905550506100a7565b60008151905061004e81610090565b92915050565b60006020828403121561006a5761006961008b565b5b60006100788482850161003f565b91505092915050565b6000819050919050565b600080fd5b61009981610081565b81146100a457600080fd5b50565b61023e806100b66000396000f3fe6080604052600436106100385760003560e01c8063027e5d6114610041578063aa8c217c1461006a578063d997ccb3146100955761003f565b3661003f57005b005b34801561004d57600080fd5b5061006860048036038101906100639190610123565b6100b3565b005b34801561007657600080fd5b5061007f6100ff565b60405161008c9190610189565b60405180910390f35b61009d610105565b6040516100aa919061016e565b60405180910390f35b8073ffffffffffffffffffffffffffffffffffffffff166108fc6000549081150290604051600060405180830381858888f193505050501580156100fb573d6000803e3d6000fd5b5050565b60005481565b60006001905090565b60008135905061011d816101f1565b92915050565b600060208284031215610139576101386101ec565b5b60006101478482850161010e565b91505092915050565b610159816101b6565b82525050565b610168816101e2565b82525050565b60006020820190506101836000830184610150565b92915050565b600060208201905061019e600083018461015f565b92915050565b60006101af826101c2565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600080fd5b6101fa816101a4565b811461020557600080fd5b5056fea26469706673582212208cb33f54873dbf0b74ff9c230fc2e7522ca18ea82fcce1f4a1904abe1c1043fe64736f6c6343000807003300000000000000000000000000000000000000000000000000000000000000018203e88080579b8010f25b1f95158686736e9930d4ebd2a3c0ef4e604d0e76684e491f735d30eb46fe9a689148f3559c23bd5566fcaed97f61be389c4fb96f735b464ec5031cff", "rawTx": "0xf9036880843b9aca00830f42408080b90314608060405234801561001057600080fd5b506040516102f43803806102f483398181016040528101906100329190610054565b80600081905550506100a7565b60008151905061004e81610090565b92915050565b60006020828403121561006a5761006961008b565b5b60006100788482850161003f565b91505092915050565b6000819050919050565b600080fd5b61009981610081565b81146100a457600080fd5b50565b61023e806100b66000396000f3fe6080604052600436106100385760003560e01c8063027e5d6114610041578063aa8c217c1461006a578063d997ccb3146100955761003f565b3661003f57005b005b34801561004d57600080fd5b5061006860048036038101906100639190610123565b6100b3565b005b34801561007657600080fd5b5061007f6100ff565b60405161008c9190610189565b60405180910390f35b61009d610105565b6040516100aa919061016e565b60405180910390f35b8073ffffffffffffffffffffffffffffffffffffffff166108fc6000549081150290604051600060405180830381858888f193505050501580156100fb573d6000803e3d6000fd5b5050565b60005481565b60006001905090565b60008135905061011d816101f1565b92915050565b600060208284031215610139576101386101ec565b5b60006101478482850161010e565b91505092915050565b610159816101b6565b82525050565b610168816101e2565b82525050565b60006020820190506101836000830184610150565b92915050565b600060208201905061019e600083018461015f565b92915050565b60006101af826101c2565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600080fd5b6101fa816101a4565b811461020557600080fd5b5056fea26469706673582212208cb33f54873dbf0b74ff9c230fc2e7522ca18ea82fcce1f4a1904abe1c1043fe64736f6c6343000807003300000000000000000000000000000000000000000000000000000000000000018207f4a0579b8010f25b1f95158686736e9930d4ebd2a3c0ef4e604d0e76684e491f735da030eb46fe9a689148f3559c23bd5566fcaed97f61be389c4fb96f735b464ec503" }, { @@ -1400,7 +1400,7 @@ "gasPrice": "1000000000", "chainId": 1000, "reason": "", - "customRawTx": "0xee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e88080da8130f8fd64ed97277e306b9aca4f42ece0e2352d74823b0d31172fe0d8be686bbb35fb63de10207ea586da635ff92c0097acf501aef7940b733317ba4e0d751b", + "customRawTx": "0xee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e88080da8130f8fd64ed97277e306b9aca4f42ece0e2352d74823b0d31172fe0d8be686bbb35fb63de10207ea586da635ff92c0097acf501aef7940b733317ba4e0d751bff", "rawTx": "0xf86e01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808207f3a0da8130f8fd64ed97277e306b9aca4f42ece0e2352d74823b0d31172fe0d8be68a06bbb35fb63de10207ea586da635ff92c0097acf501aef7940b733317ba4e0d75" }, { @@ -1417,7 +1417,7 @@ "data": "0x027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff", "chainId": 1000, "reason": "", - "customRawTx": "0xf84a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e8808028e62eb40661fd098322a7211dca25a6b56f60eefb24ede9607d2603a09e4c653be289b7a729a18336e2f9f4a4f52c4fadc4274d1fd42dd8965deeb8634ddddc1b", + "customRawTx": "0xf84a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e8808028e62eb40661fd098322a7211dca25a6b56f60eefb24ede9607d2603a09e4c653be289b7a729a18336e2f9f4a4f52c4fadc4274d1fd42dd8965deeb8634ddddc1bff", "rawTx": "0xf88a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8207f3a028e62eb40661fd098322a7211dca25a6b56f60eefb24ede9607d2603a09e4c65a03be289b7a729a18336e2f9f4a4f52c4fadc4274d1fd42dd8965deeb8634ddddc" } ], @@ -1468,13 +1468,13 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xf9032880843b9aca00830f42408080b90314608060405234801561001057600080fd5b506040516102f43803806102f483398181016040528101906100329190610054565b80600081905550506100a7565b60008151905061004e81610090565b92915050565b60006020828403121561006a5761006961008b565b5b60006100788482850161003f565b91505092915050565b6000819050919050565b600080fd5b61009981610081565b81146100a457600080fd5b50565b61023e806100b66000396000f3fe6080604052600436106100385760003560e01c8063027e5d6114610041578063aa8c217c1461006a578063d997ccb3146100955761003f565b3661003f57005b005b34801561004d57600080fd5b5061006860048036038101906100639190610123565b6100b3565b005b34801561007657600080fd5b5061007f6100ff565b60405161008c9190610189565b60405180910390f35b61009d610105565b6040516100aa919061016e565b60405180910390f35b8073ffffffffffffffffffffffffffffffffffffffff166108fc6000549081150290604051600060405180830381858888f193505050501580156100fb573d6000803e3d6000fd5b5050565b60005481565b60006001905090565b60008135905061011d816101f1565b92915050565b600060208284031215610139576101386101ec565b5b60006101478482850161010e565b91505092915050565b610159816101b6565b82525050565b610168816101e2565b82525050565b60006020820190506101836000830184610150565b92915050565b600060208201905061019e600083018461015f565b92915050565b60006101af826101c2565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600080fd5b6101fa816101a4565b811461020557600080fd5b5056fea26469706673582212208cb33f54873dbf0b74ff9c230fc2e7522ca18ea82fcce1f4a1904abe1c1043fe64736f6c6343000807003300000000000000000000000000000000000000000000000000000000000000018203e88080579b8010f25b1f95158686736e9930d4ebd2a3c0ef4e604d0e76684e491f735d30eb46fe9a689148f3559c23bd5566fcaed97f61be389c4fb96f735b464ec5031cee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e88080da8130f8fd64ed97277e306b9aca4f42ece0e2352d74823b0d31172fe0d8be686bbb35fb63de10207ea586da635ff92c0097acf501aef7940b733317ba4e0d751bf84a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e8808028e62eb40661fd098322a7211dca25a6b56f60eefb24ede9607d2603a09e4c653be289b7a729a18336e2f9f4a4f52c4fadc4274d1fd42dd8965deeb8634ddddc1b", + "batchL2Data": "0xf9032880843b9aca00830f42408080b90314608060405234801561001057600080fd5b506040516102f43803806102f483398181016040528101906100329190610054565b80600081905550506100a7565b60008151905061004e81610090565b92915050565b60006020828403121561006a5761006961008b565b5b60006100788482850161003f565b91505092915050565b6000819050919050565b600080fd5b61009981610081565b81146100a457600080fd5b50565b61023e806100b66000396000f3fe6080604052600436106100385760003560e01c8063027e5d6114610041578063aa8c217c1461006a578063d997ccb3146100955761003f565b3661003f57005b005b34801561004d57600080fd5b5061006860048036038101906100639190610123565b6100b3565b005b34801561007657600080fd5b5061007f6100ff565b60405161008c9190610189565b60405180910390f35b61009d610105565b6040516100aa919061016e565b60405180910390f35b8073ffffffffffffffffffffffffffffffffffffffff166108fc6000549081150290604051600060405180830381858888f193505050501580156100fb573d6000803e3d6000fd5b5050565b60005481565b60006001905090565b60008135905061011d816101f1565b92915050565b600060208284031215610139576101386101ec565b5b60006101478482850161010e565b91505092915050565b610159816101b6565b82525050565b610168816101e2565b82525050565b60006020820190506101836000830184610150565b92915050565b600060208201905061019e600083018461015f565b92915050565b60006101af826101c2565b9050919050565b60008115159050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b600080fd5b6101fa816101a4565b811461020557600080fd5b5056fea26469706673582212208cb33f54873dbf0b74ff9c230fc2e7522ca18ea82fcce1f4a1904abe1c1043fe64736f6c6343000807003300000000000000000000000000000000000000000000000000000000000000018203e88080579b8010f25b1f95158686736e9930d4ebd2a3c0ef4e604d0e76684e491f735d30eb46fe9a689148f3559c23bd5566fcaed97f61be389c4fb96f735b464ec5031cffee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9888016345785d8a0000808203e88080da8130f8fd64ed97277e306b9aca4f42ece0e2352d74823b0d31172fe0d8be686bbb35fb63de10207ea586da635ff92c0097acf501aef7940b733317ba4e0d751bfff84a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4027e5d610000000000000000000000004d5cf5032b2a844602278b01199ed191a86c93ff8203e8808028e62eb40661fd098322a7211dca25a6b56f60eefb24ede9607d2603a09e4c653be289b7a729a18336e2f9f4a4f52c4fadc4274d1fd42dd8965deeb8634ddddc1bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x97e4163ef51abe91b6acd1b35ba01f89753de21a725a9c0566b55c17a6e7237a", + "batchHashData": "0x96c8a10bab271d009632b255cc2d8001185536cfa9b00dd87907e228229f85eb", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0xcaf5359437893ef0b54f14c2b52e6aeb6ee01d56f53cbce37162a9a60f2246fa" + "expectedNewAccInputHash": "0x97e68fa831babb02bbaf30a947e921be02cbc5b352919c934c000566241e2414" } ] \ No newline at end of file diff --git a/test/helpers/test-vectors/selfdestruct/selfdestruct.json b/test/helpers/test-vectors/selfdestruct/selfdestruct.json index 88e3228f..35650278 100644 --- a/test/helpers/test-vectors/selfdestruct/selfdestruct.json +++ b/test/helpers/test-vectors/selfdestruct/selfdestruct.json @@ -55,7 +55,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x718da7ee0000000000000000000000000000000000000000000000000000000000000001", - "customRawTx": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4718da7ee00000000000000000000000000000000000000000000000000000000000000018203e880800f169b9405991a5f4a96f9d1d726e43ab9d42e1d0b4daac7ec9b4797dd39e9b724cf48c46cbc1924dd25adc6536ef259bedcd822979734ae347e01d715303ad01c", + "customRawTx": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4718da7ee00000000000000000000000000000000000000000000000000000000000000018203e880800f169b9405991a5f4a96f9d1d726e43ab9d42e1d0b4daac7ec9b4797dd39e9b724cf48c46cbc1924dd25adc6536ef259bedcd822979734ae347e01d715303ad01cff", "rawTx": "0xf88a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4718da7ee00000000000000000000000000000000000000000000000000000000000000018207f4a00f169b9405991a5f4a96f9d1d726e43ab9d42e1d0b4daac7ec9b4797dd39e9b7a024cf48c46cbc1924dd25adc6536ef259bedcd822979734ae347e01d715303ad0" }, { @@ -71,7 +71,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x5cfb28e7", - "customRawTx": "0xee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9884075bcd15845cfb28e78203e88080b22ac440612ebcd45672cfc7dcbbbe7cde784294e5076827b1812f9ea9eee2736c3c774150514808053972653f74bbeb33918dc74aa9182cee7993283b1faa541b", + "customRawTx": "0xee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9884075bcd15845cfb28e78203e88080b22ac440612ebcd45672cfc7dcbbbe7cde784294e5076827b1812f9ea9eee2736c3c774150514808053972653f74bbeb33918dc74aa9182cee7993283b1faa541bff", "rawTx": "0xf86e01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9884075bcd15845cfb28e78207f3a0b22ac440612ebcd45672cfc7dcbbbe7cde784294e5076827b1812f9ea9eee273a06c3c774150514808053972653f74bbeb33918dc74aa9182cee7993283b1faa54" }, { @@ -87,7 +87,7 @@ "gasLimit": 100000, "gasPrice": "1000000000", "data": "0x2b68b9c6", - "customRawTx": "0xea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880842b68b9c68203e88080f5b684b995dd9549bb5fd2ed23d3b388f75f559b14110277b4ae7de5bd7775ef1be51078330d1ef03f0e4fe0271e8e2502b6e98c1f7664a5e2aeae3ab04156d41c", + "customRawTx": "0xea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880842b68b9c68203e88080f5b684b995dd9549bb5fd2ed23d3b388f75f559b14110277b4ae7de5bd7775ef1be51078330d1ef03f0e4fe0271e8e2502b6e98c1f7664a5e2aeae3ab04156d41cff", "rawTx": "0xf86a02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880842b68b9c68207f4a0f5b684b995dd9549bb5fd2ed23d3b388f75f559b14110277b4ae7de5bd7775efa01be51078330d1ef03f0e4fe0271e8e2502b6e98c1f7664a5e2aeae3ab04156d4" } ], @@ -160,13 +160,13 @@ "bytecodeLength": 0 } }, - "batchL2Data": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4718da7ee00000000000000000000000000000000000000000000000000000000000000018203e880800f169b9405991a5f4a96f9d1d726e43ab9d42e1d0b4daac7ec9b4797dd39e9b724cf48c46cbc1924dd25adc6536ef259bedcd822979734ae347e01d715303ad01cee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9884075bcd15845cfb28e78203e88080b22ac440612ebcd45672cfc7dcbbbe7cde784294e5076827b1812f9ea9eee2736c3c774150514808053972653f74bbeb33918dc74aa9182cee7993283b1faa541bea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880842b68b9c68203e88080f5b684b995dd9549bb5fd2ed23d3b388f75f559b14110277b4ae7de5bd7775ef1be51078330d1ef03f0e4fe0271e8e2502b6e98c1f7664a5e2aeae3ab04156d41c", + "batchL2Data": "0xf84a80843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880a4718da7ee00000000000000000000000000000000000000000000000000000000000000018203e880800f169b9405991a5f4a96f9d1d726e43ab9d42e1d0b4daac7ec9b4797dd39e9b724cf48c46cbc1924dd25adc6536ef259bedcd822979734ae347e01d715303ad01cffee01843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9884075bcd15845cfb28e78203e88080b22ac440612ebcd45672cfc7dcbbbe7cde784294e5076827b1812f9ea9eee2736c3c774150514808053972653f74bbeb33918dc74aa9182cee7993283b1faa541bffea02843b9aca00830186a0941275fbb540c8efc58b812ba83b0d0b8b9917ae9880842b68b9c68203e88080f5b684b995dd9549bb5fd2ed23d3b388f75f559b14110277b4ae7de5bd7775ef1be51078330d1ef03f0e4fe0271e8e2502b6e98c1f7664a5e2aeae3ab04156d41cff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "batchHashData": "0x8861a42093839bba053d104b4fd359fab4bbb4806eb4214401104ace03b3bca9", + "batchHashData": "0x9f0d0e9a9e76ecf6ecb45406d29a6e851dc2bd7ef2d7595804d2160c03383c8e", "oldLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "timestamp": 1944498031, - "expectedNewAccInputHash": "0x3eecc493740cb9dae79ff74a75f407c81e042883c5fba4a78290e16735929972" + "expectedNewAccInputHash": "0x42100e59b19cc9cbe25b2740ae95ba25447a1bbc3948a360ed2e9c46bef6c494" } ] \ No newline at end of file diff --git a/test/helpers/test-vectors/zkevm-db/recursive.json b/test/helpers/test-vectors/zkevm-db/recursive.json index a6f8125c..d8c6ea80 100644 --- a/test/helpers/test-vectors/zkevm-db/recursive.json +++ b/test/helpers/test-vectors/zkevm-db/recursive.json @@ -38,15 +38,15 @@ "chainId": 1000, "rawTx": "0xf86d80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f5a01186622d03b6b8da7cf111d1ccba5bb185c56deae6a322cebc6dda0556f3cb979f910c26408b64b51c5da36ba2f38ef55ba1cee719d5a6c01225968799907432", "reason": "", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff" } ], "expectedNewRoot": "0x9f4544f3d6c4e46890a1570c052d2140bcbb7f841a0a7fefe3a7e15819fb40bc", - "expectedNewAccInputHash": "0x704d5cfd3e44b82028f7f8cae31168267a7422c5a447b90a65134116da5a8432", + "expectedNewAccInputHash": "0xe6a509b727a72d02065319e261bcdc27392a24ad9efab2c2274e026d78e42d68", "expoectNewLocalExitRoot": "", "expectedNewLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "expectedNewNumBatch": 1, - "expectedBatchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" + "expectedBatchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff" }, { "txs": [ @@ -61,15 +61,15 @@ "chainId": 1000, "rawTx": "0xf86d80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f5a01186622d03b6b8da7cf111d1ccba5bb185c56deae6a322cebc6dda0556f3cb979f910c26408b64b51c5da36ba2f38ef55ba1cee719d5a6c01225968799907432", "reason": "", - "customRawTx": "0xee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8802c68af0bb140000808203e88080225fd92907efb068a8bee3f95a26f2c5d67db2750bb9993083e0df217ff3a2666f412c311280066d1717f309c248fdbd853ce738363db08775999b2f2d2a8d5e1c" + "customRawTx": "0xee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8802c68af0bb140000808203e88080225fd92907efb068a8bee3f95a26f2c5d67db2750bb9993083e0df217ff3a2666f412c311280066d1717f309c248fdbd853ce738363db08775999b2f2d2a8d5e1cff" } ], "expectedNewRoot": "0x556d091bd1f661823711b3252b857b51cc0c2336d327776074cb3e6b9ce9897d", - "expectedNewAccInputHash": "0x87f958227c38bcf883025f5fda2dee19460cff48ca3c4d48d3a48f55c1258e60", + "expectedNewAccInputHash": "0x28e3ecb3f9d8dc465f38a72cac12cc579ecbd493b5f80e307ba39a7bb79f5111", "expoectNewLocalExitRoot": "", "expectedNewLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "expectedNewNumBatch": 2, - "expectedBatchL2Data": "0xee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8802c68af0bb140000808203e88080225fd92907efb068a8bee3f95a26f2c5d67db2750bb9993083e0df217ff3a2666f412c311280066d1717f309c248fdbd853ce738363db08775999b2f2d2a8d5e1c" + "expectedBatchL2Data": "0xee01843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff8802c68af0bb140000808203e88080225fd92907efb068a8bee3f95a26f2c5d67db2750bb9993083e0df217ff3a2666f412c311280066d1717f309c248fdbd853ce738363db08775999b2f2d2a8d5e1cff" } ], "finalNewLeafs": { @@ -84,8 +84,8 @@ }, "finalStateRoot": "0x556d091bd1f661823711b3252b857b51cc0c2336d327776074cb3e6b9ce9897d", "finalLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", - "finalAccInputHash": "0x87f958227c38bcf883025f5fda2dee19460cff48ca3c4d48d3a48f55c1258e60", + "finalAccInputHash": "0x28e3ecb3f9d8dc465f38a72cac12cc579ecbd493b5f80e307ba39a7bb79f5111", "finalNumBatch": 2, - "inputSnark": "0x0a23ec7ce3bfeda62afba0235b8a1e9d7b4c1b69d8d45570f73d6308040d2d5e" + "inputSnark": "0x10d2e272243ac37e1c26d746412c87fdc164d8d9cc04fcc0df998dded9e5862e" } ] \ 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 8cf1a50a..f7c03df3 100644 --- a/test/helpers/test-vectors/zkevm-db/state-transition.json +++ b/test/helpers/test-vectors/zkevm-db/state-transition.json @@ -32,7 +32,7 @@ "chainId": 1000, "rawTx": "0xf86d80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808207f5a01186622d03b6b8da7cf111d1ccba5bb185c56deae6a322cebc6dda0556f3cb979f910c26408b64b51c5da36ba2f38ef55ba1cee719d5a6c01225968799907432", "reason": "", - "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b" + "customRawTx": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff" } ], "expectedNewRoot": "0x9f4544f3d6c4e46890a1570c052d2140bcbb7f841a0a7fefe3a7e15819fb40bc", @@ -46,13 +46,13 @@ "nonce": "0" } }, - "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731b", + "batchL2Data": "0xee80843b9aca00830186a0944d5cf5032b2a844602278b01199ed191a86c93ff88016345785d8a0000808203e880801cee7e01dc62f69a12c3510c6d64de04ee6346d84b6a017f3e786c7d87f963e75d8cc91fa983cd6d9cf55fff80d73bd26cd333b0f098acc1e58edb1fd484ad731bff", "globalExitRoot": "0x090bcaf734c4f06c93954a827b45a6e8c67b8e0fd1e0a35a1c5982d6961828f9", "newLocalExitRoot": "0x0000000000000000000000000000000000000000000000000000000000000000", "inputHash": "0x58dc76197a13d9a9f0894e3d5984098339944ad4fa2cff01945b053d39cd1c9e", "batchHashData": "0x3d53e7e5be04b00f66af647512af6d17e4e767a5e41fa1293010b885c9fe06db", "oldAccInputHash": "0x0000000000000000000000000000000000000000000000000000000000000000", - "expectedNewAccInputHash": "0x704d5cfd3e44b82028f7f8cae31168267a7422c5a447b90a65134116da5a8432", + "expectedNewAccInputHash": "0xe6a509b727a72d02065319e261bcdc27392a24ad9efab2c2274e026d78e42d68", "timestamp": 1944498031 } ] \ No newline at end of file diff --git a/test/input.json b/test/input.json deleted file mode 100644 index 27c3fea7..00000000 --- a/test/input.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "batchL2Data": "0xF8C68080833D09008080B8B76080604052348015600F57600080FD5B5060998061001E6000396000F3FE6080604052348015600F57600080FD5B506004361060285760003560E01C80637966B4F614602D575B600080FD5B60336035565B005B6040516001907F977224B24E70D33F3BE87246A29C5636CFC8DD6853E175B54AF01FF493FFAC6290600090A256FEA26469706673582212200AED1B5F98749897F641535D09C3F58975B5E30A8DFED8781F982AE3E31FD16E64736F6C634300080C00338203E8808035647813D454623A678A9AD67456961351E2BE336B552E058657985BBCCBDDB6629E6F9C67443073DF322BE0E1232286526F204823396A195DC9971174ED07711CE50101829C40941275FBB540C8EFC58B812BA83B0D0B8B9917AE9880847966B4F68203E8808078D3E3E1F56076234B450C14CB7B2ABE1B71980C7CA6FFBA5972C7ED7FDC9A102A484AF7B803F2105733591850E83EA2DA20A9D550FBDAD287442D0633CF8C5C1C", - "db": { - "0x2dc4db4293af236cb329700be43f08ace740a05088f8c7654736871709687e90": [ - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000d1f0da5a7b620c8", - "00000000000000000000000000000000000000000000000043fd1e18e59fd724", - "000000000000000000000000000000000000000000000000d428d25da0cb1888", - "000000000000000000000000000000000000000000000000e31f5542ac227c06", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000" - ], - "0x3efad1dd58c2259d339438195426ad0af57d81efba5d4445b69b044f5e694795": [ - "00000000000000000000000000000000000000000000000000000000dea00000", - "0000000000000000000000000000000000000000000000000000000035c9adc5", - "0000000000000000000000000000000000000000000000000000000000000036", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000" - ], - "0xb78193294108478342b2bd6ec2788851b2e639153607b7c5ed22ec7734d89ff2": [ - "00000000000000000000000000000000000000000000000016dde42596b907f0", - "00000000000000000000000000000000000000000000000049015d7e991a1528", - "00000000000000000000000000000000000000000000000094dd9dadd060910b", - "00000000000000000000000000000000000000000000000060b4d5e9af514018", - "000000000000000000000000000000000000000000000000b69b044f5e694795", - "000000000000000000000000000000000000000000000000f57d81efba5d4445", - "000000000000000000000000000000000000000000000000339438195426ad0a", - "0000000000000000000000000000000000000000000000003efad1dd58c2259d", - "0000000000000000000000000000000000000000000000000000000000000001", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000" - ], - "0xe10053d0ebc64602e0dc203d93f4e3e50b3e34316e81aa103e63658ee0db910d": [ - "00000000000000000000000000000000000000000000000066ee2be0687eea76", - "0000000000000000000000000000000000000000000000006926f8ca8796c78a", - "0000000000000000000000000000000000000000000000004c2f3e938869b82d", - "000000000000000000000000000000000000000000000000649e63bfe1247ba4", - "000000000000000000000000000000000000000000000000b69b044f5e694795", - "000000000000000000000000000000000000000000000000f57d81efba5d4445", - "000000000000000000000000000000000000000000000000339438195426ad0a", - "0000000000000000000000000000000000000000000000003efad1dd58c2259d", - "0000000000000000000000000000000000000000000000000000000000000001", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000" - ], - "0xe31f5542ac227c06d428d25da0cb188843fd1e18e59fd7240d1f0da5a7b620c8": [ - "000000000000000000000000000000000000000000000000ed22ec7734d89ff2", - "000000000000000000000000000000000000000000000000b2e639153607b7c5", - "00000000000000000000000000000000000000000000000042b2bd6ec2788851", - "000000000000000000000000000000000000000000000000b781932941084783", - "0000000000000000000000000000000000000000000000003e63658ee0db910d", - "0000000000000000000000000000000000000000000000000b3e34316e81aa10", - "000000000000000000000000000000000000000000000000e0dc203d93f4e3e5", - "000000000000000000000000000000000000000000000000e10053d0ebc64602", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000", - "0000000000000000000000000000000000000000000000000000000000000000" - ] - }, - "defaultChainId": 0, - "globalExitRoot": "0x090BCAF734C4F06C93954A827B45A6E8C67B8E0FD1E0A35A1C5982D6961828F9", - "newLocalExitRoot": "0x0", - "newStateRoot": "0x0", - "numBatch": 1, - "oldLocalExitRoot": "0x17C04C3760510B48C6012742C540A81ABA4BCA2F78B9D14BFD2F123E2E53EA3E", - "oldStateRoot": "0x2DC4DB4293AF236CB329700BE43F08ACE740A05088F8C7654736871709687E90", - "sequencerAddr": "0x617b3a3528F9cDd6630fd3301B9c8911F7Bf063D", - "timestamp": 1944498031 -} \ No newline at end of file diff --git a/test/processor-utils.test.js b/test/processor-utils.test.js index 5fe0a70b..9d2d4129 100644 --- a/test/processor-utils.test.js +++ b/test/processor-utils.test.js @@ -1,19 +1,22 @@ +/* eslint-disable global-require */ /* eslint-disable no-await-in-loop */ /* eslint-disable no-continue */ -const ethers = require('ethers'); -const { expect } = require('chai'); const fs = require('fs'); const path = require('path'); +const ethers = require('ethers'); +const { expect } = require('chai'); const { Scalar } = require('ffjavascript'); const { processorUtils } = require('../index'); const { pathTestVectors } = require('./helpers/test-utils'); describe('Processor utils', () => { let testVectors; + let testVectorsEffGasPrice; before(async () => { testVectors = JSON.parse(fs.readFileSync(path.join(pathTestVectors, 'zkevm-db/state-transition.json'))); + testVectorsEffGasPrice = JSON.parse(fs.readFileSync(path.join(pathTestVectors, 'effective-gas-price/effective-gas-price.json'))); }); it('Check encode and decode transactions', async () => { @@ -77,7 +80,10 @@ describe('Processor utils', () => { const r = signature.r.slice(2).padStart(64, '0'); // 32 bytes const s = signature.s.slice(2).padStart(64, '0'); // 32 bytes const v = (signature.v).toString(16).padStart(2, '0'); // 1 bytes - customRawTx = signData.concat(r).concat(s).concat(v); + if (typeof tx.effectivePercentage === 'undefined') { + tx.effectivePercentage = 'ff'; + } + customRawTx = signData.concat(r).concat(s).concat(v).concat(tx.effectivePercentage); } else { const rawTxEthers = await walletMap[txData.from].signTransaction(tx); customRawTx = processorUtils.rawTxToCustomRawTx(rawTxEthers); @@ -164,4 +170,30 @@ describe('Processor utils', () => { expect(out).to.be.equal(expectedOut); } }); + + it('computeEffectiveGasPrice', async () => { + for (let i = 0; i < testVectorsEffGasPrice.length; i++) { + const { gasPrice, effectivePercentage, expectedOutput } = testVectorsEffGasPrice[i]; + + const computedOutput = `0x${processorUtils.computeEffectiveGasPrice(gasPrice, effectivePercentage).toString(16)}`; + expect(computedOutput).to.be.equal(expectedOutput); + } + }); + + it('encodedStringToArray', async () => { + for (let i = 0; i < testVectors.length; i++) { + const { + batchL2Data, + txs, + } = testVectors[i]; + + const arrayTxs = processorUtils.encodedStringToArray(batchL2Data); + + expect(arrayTxs.length).to.be.equal(txs.length); + + for (let j = 0; j < arrayTxs.length; j++) { + expect(arrayTxs[j]).to.be.equal(txs[j].customRawTx); + } + } + }); }); diff --git a/test/processor.test.js b/test/processor.test.js index b206938d..a51a2123 100644 --- a/test/processor.test.js +++ b/test/processor.test.js @@ -9,8 +9,9 @@ /* eslint-disable no-await-in-loop */ /* eslint-disable guard-for-in */ -const { Scalar } = require('ffjavascript'); const fs = require('fs'); +const path = require('path'); +const { Scalar } = require('ffjavascript'); const { argv } = require('yargs'); const ethers = require('ethers'); @@ -19,7 +20,6 @@ const { Address, toBuffer, } = require('ethereumjs-util'); const { defaultAbiCoder } = require('@ethersproject/abi'); -const path = require('path'); const lodash = require('lodash'); const artifactsPath = path.join(__dirname, 'artifacts/contracts'); diff --git a/test/smt-full-genesis.test.js b/test/smt-full-genesis.test.js index 3f483cb0..cf992c2d 100644 --- a/test/smt-full-genesis.test.js +++ b/test/smt-full-genesis.test.js @@ -1,6 +1,6 @@ -const { expect } = require('chai'); const fs = require('fs'); const path = require('path'); +const { expect } = require('chai'); const { argv } = require('yargs'); const { diff --git a/test/smt-genesis.test.js b/test/smt-genesis.test.js index 330657e0..69102da9 100644 --- a/test/smt-genesis.test.js +++ b/test/smt-genesis.test.js @@ -1,7 +1,7 @@ -const { Scalar } = require('ffjavascript'); -const { expect } = require('chai'); const fs = require('fs'); const path = require('path'); +const { Scalar } = require('ffjavascript'); +const { expect } = require('chai'); const { argv } = require('yargs'); const { diff --git a/test/smt-raw.test.js b/test/smt-raw.test.js index ef2124fd..eada0865 100644 --- a/test/smt-raw.test.js +++ b/test/smt-raw.test.js @@ -1,7 +1,7 @@ -const { Scalar } = require('ffjavascript'); -const { expect } = require('chai'); const fs = require('fs'); const path = require('path'); +const { Scalar } = require('ffjavascript'); +const { expect } = require('chai'); const { argv } = require('yargs'); const { diff --git a/test/zkevm-db.test.js b/test/zkevm-db.test.js index 2af2fa8a..7d70c47c 100644 --- a/test/zkevm-db.test.js +++ b/test/zkevm-db.test.js @@ -1,10 +1,10 @@ /* eslint-disable no-await-in-loop */ +const fs = require('fs'); +const path = require('path'); const { Scalar } = require('ffjavascript'); const ethers = require('ethers'); const { expect } = require('chai'); -const fs = require('fs'); -const path = require('path'); const { argv } = require('yargs'); const { @@ -106,6 +106,7 @@ describe('ZkEVMDB', function () { expectedOldRoot, txs, expectedNewRoot, + batchL2Data, sequencerAddress, globalExitRoot, timestamp, @@ -198,7 +199,10 @@ describe('ZkEVMDB', function () { const r = signature.r.slice(2).padStart(64, '0'); // 32 bytes const s = signature.s.slice(2).padStart(64, '0'); // 32 bytes const v = (signature.v).toString(16).padStart(2, '0'); // 1 bytes - customRawTx = signData.concat(r).concat(s).concat(v); + if (typeof tx.effectivePercentage === 'undefined') { + tx.effectivePercentage = 'ff'; + } + customRawTx = signData.concat(r).concat(s).concat(v).concat(tx.effectivePercentage); } else { const rawTxEthers = await walletMap[txData.from].signTransaction(tx); customRawTx = processorUtils.rawTxToCustomRawTx(rawTxEthers); @@ -238,13 +242,16 @@ describe('ZkEVMDB', function () { const newRoot = batch.currentStateRoot; const { newAccInputHash } = batch; + const computedBatchL2Data = await batch.getBatchL2Data(); if (update) { testVectors[0].expectedNewRoot = smtUtils.h4toString(newRoot); testVectors[0].expectedNewAccInputHash = smtUtils.h4toString(newAccInputHash); + testVectors[0].batchL2Data = computedBatchL2Data; } else { expect(smtUtils.h4toString(newRoot)).to.be.equal(expectedNewRoot); expect(smtUtils.h4toString(newAccInputHash)).to.be.equal(expectedNewAccInputHash); + expect(computedBatchL2Data).to.be.equal(batchL2Data); } // checks previous consolidate zkEVMDB