From ef1c6a75b0ef6011a2fd224c797e20064c53989c Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Fri, 22 Nov 2024 13:06:48 +0100 Subject: [PATCH] Fix tests Signed-off-by: Fabio Di Fabio --- ...SendRawTransactionSimulationCheckTest.java | 2 +- .../resources/moduleLimits_sendRawTx.toml | 75 ++++++++++--------- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/acceptance-tests/src/test/java/linea/plugin/acc/test/rpc/linea/EthSendRawTransactionSimulationCheckTest.java b/acceptance-tests/src/test/java/linea/plugin/acc/test/rpc/linea/EthSendRawTransactionSimulationCheckTest.java index c14f1e16..11257cc1 100644 --- a/acceptance-tests/src/test/java/linea/plugin/acc/test/rpc/linea/EthSendRawTransactionSimulationCheckTest.java +++ b/acceptance-tests/src/test/java/linea/plugin/acc/test/rpc/linea/EthSendRawTransactionSimulationCheckTest.java @@ -80,7 +80,7 @@ public void transactionOverModuleLineCountNotAccepted() throws Exception { assertThat(signedTxContractInteractionResp.hasError()).isTrue(); assertThat(signedTxContractInteractionResp.getError().getMessage()) .isEqualTo( - "Transaction 0xe813560d9a3aedff46be12fc32706d8fe9b6565dd7e2db47457a9c416f2d45d7 line count for module ADD=4818 is above the limit 70"); + "Transaction 0xe813560d9a3aedff46be12fc32706d8fe9b6565dd7e2db47457a9c416f2d45d7 line count for module ADD=4818 is above the limit 114"); assertThat(getTxPoolContent()).isEmpty(); diff --git a/acceptance-tests/src/test/resources/moduleLimits_sendRawTx.toml b/acceptance-tests/src/test/resources/moduleLimits_sendRawTx.toml index c8dec3c8..4a19a37d 100644 --- a/acceptance-tests/src/test/resources/moduleLimits_sendRawTx.toml +++ b/acceptance-tests/src/test/resources/moduleLimits_sendRawTx.toml @@ -3,73 +3,78 @@ # This file specifies prover limit by each EVM module # WARN: The prover/arithmetization team has the owneship of this. # Changing this values may compromise the system. -# issue: https://github.com/Consensys/zkevm-monorepo/issues/525 +# issue: https://github.com/ConsenSys/zkevm-monorepo/issues/525 ## [traces-limits] # # Arithmetization module limits # -ADD = 70 +ADD = 114 BIN = 262144 -BLAKE_MODEXP_DATA = 262144 -BLOCK_DATA = 13 -BLOCK_HASH = 1 +BIN_RT = 262144 EC_DATA = 4096 EUC = 16384 # can probably be lower EXP = 32760 EXT = 20 -GAS = 262144 -HUB = 174 +HUB = 105 +INSTRUCTION_DECODER = 256 # Ugly hack, TODO: @franklin MMIO = 1048576 MMU = 524288 +MMU_ID = 256 MOD = 20 MUL = 20 -MXP = 35 +MXP = 36 PHONEY_RLP = 65536 # can probably get lower +PUB_HASH = 32768 +PUB_HASH_INFO = 8192 +PUB_LOG = 16384 +PUB_LOG_INFO = 16384 +RLP = 128 ROM = 2402 ROM_LEX = 20 -SHF = 63 +SHF = 64 +SHF_RT = 2305 TX_RLP = 131072 TRM = 120 -WCP = 149 +WCP = 164 LOG_DATA = 20 LOG_INFO = 20 -RLP_ADDR = 20 +RLP_ADDR = 25 RLP_TXN = 1300 -RLP_TXN_RCPT = 100 +RLP_TXRCPT = 100 TXN_DATA = 30 -SHAKIRA_DATA = 262144 STP = 20 OOB = 262144 +BLOCKDATA = 13 +BLOCKHASH = 1 # # Block-specific limits # +BLOCK_TX = 200 # max number of tx in an L2 block +BLOCK_L2L1LOGS = 16 BLOCK_KECCAK = 8192 -BLOCK_L1_SIZE = 1000000 -BLOCK_L2_L1_LOGS = 16 -BLOCK_TRANSACTIONS = 200 # max number of tx in an L2 block - -# -# Fixed size, static tables -# -BIN_REFERENCE_TABLE = 262144 # contains 3 * 256^2 + 256 data rows + 1 padding row -SHF_REFERENCE_TABLE = 4096 # contains 9 * 256 data rows + 1 padding row -INSTRUCTION_DECODER = 512 # contains 256 data rows + 1 padding row +BLOCK_L1SIZE = 1000000 # # Precompiles limits # -PRECOMPILE_ECRECOVER_EFFECTIVE_CALLS = 10000 -PRECOMPILE_SHA2_BLOCKS = 10000 -PRECOMPILE_RIPEMD_BLOCKS = 10000 -PRECOMPILE_ECPAIRING_MILLER_LOOPS = 10000 -PRECOMPILE_MODEXP_EFFECTIVE_CALLS = 10000 -PRECOMPILE_ECADD_EFFECTIVE_CALLS = 10000 -PRECOMPILE_ECMUL_EFFECTIVE_CALLS = 10000 -PRECOMPILE_ECPAIRING_FINAL_EXPONENTIATIONS = 10000 -PRECOMPILE_ECPAIRING_G2_MEMBERSHIP_CALLS = 10000 -PRECOMPILE_ECPAIRING_MILLER_LOOPS = 10000 -PRECOMPILE_BLAKE_EFFECTIVE_CALLS = 10000 -PRECOMPILE_BLAKE_ROUNDS = 512 \ No newline at end of file +PRECOMPILE_ECRECOVER_EFFECTIVE_CALL = 10000 +PRECOMPILE_SHA2_BLOCKS = 10000 +PRECOMPILE_RIPEMD_BLOCKS = 10000 +PRECOMPILE_IDENTITY = 10000 +PRECOMPILE_MODEXP_EFFECTIVE_CALL = 10000 +PRECOMPILE_ECADD_EFFECTIVE_CALL = 10000 +PRECOMPILE_ECMUL_EFFECTIVE_CALL = 10000 +PRECOMPILE_ECPAIRING_EFFECTIVE_CALL = 10000 +PRECOMPILE_ECPAIRING_MILLER_LOOP = 10000 +PRECOMPILE_BLAKE2F = 10000 +PRECOMPILE_BLAKE2F_ROUNDS = 512 +PRECOMPILE_ECADD = 10000 +PRECOMPILE_ECMUL = 10 +PRECOMPILE_ECPAIRING = 0 +PRECOMPILE_ECRECOVER = 0 +PRECOMPILE_MODEXP = 0 +PRECOMPILE_RIPEMD = 0 +PRECOMPILE_SHA2 = 0 \ No newline at end of file