From 22b324e96dbb0b68dcbf21e3611b47151f393046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Chodo=C5=82a?= <43241881+kamilchodola@users.noreply.github.com> Date: Thu, 5 Mar 2026 08:08:12 +0100 Subject: [PATCH 01/37] refactor(test-benchmark): Remove repricing marker from `unchunkified` and add to `test_mod` (#2405) --- tests/benchmark/compute/instruction/test_arithmetic.py | 4 ++++ .../benchmark/compute/scenario/test_unchunkified_bytecode.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/benchmark/compute/instruction/test_arithmetic.py b/tests/benchmark/compute/instruction/test_arithmetic.py index 1bb5a45c486..f980107b882 100644 --- a/tests/benchmark/compute/instruction/test_arithmetic.py +++ b/tests/benchmark/compute/instruction/test_arithmetic.py @@ -187,8 +187,10 @@ def test_arithmetic( @pytest.mark.parametrize("mod_bits", [255, 191, 127, 63]) @pytest.mark.parametrize("opcode", [Op.MOD, Op.SMOD]) +@pytest.mark.repricing def test_mod( benchmark_test: BenchmarkTestFiller, + fixed_opcode_count: int, mod_bits: int, opcode: Op, ) -> None: @@ -211,6 +213,8 @@ def test_mod( # just the SMOD implementation will have to additionally handle the # sign bits. # The result stays negative. + if fixed_opcode_count is not None: + pytest.skip("fixed-opcode-count not supported in test_mode") should_negate = opcode == Op.SMOD num_numerators = 15 diff --git a/tests/benchmark/compute/scenario/test_unchunkified_bytecode.py b/tests/benchmark/compute/scenario/test_unchunkified_bytecode.py index 8b9420e1429..45be1a5413c 100644 --- a/tests/benchmark/compute/scenario/test_unchunkified_bytecode.py +++ b/tests/benchmark/compute/scenario/test_unchunkified_bytecode.py @@ -24,7 +24,6 @@ from ..helpers import ContractDeploymentTransaction, CustomSizedContractFactory -@pytest.mark.repricing @pytest.mark.parametrize( "opcode", [ From dbe5c3a19992bb9e697da6b0e8a2077fe2c62060 Mon Sep 17 00:00:00 2001 From: Edgar Date: Thu, 5 Mar 2026 08:13:36 +0100 Subject: [PATCH 02/37] fix(ethrex): update exception mapper for BAL validation errors (#2414) --- .../client_clis/clis/ethrex.py | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/testing/src/execution_testing/client_clis/clis/ethrex.py b/packages/testing/src/execution_testing/client_clis/clis/ethrex.py index 1a65a5830cd..39df9286885 100644 --- a/packages/testing/src/execution_testing/client_clis/clis/ethrex.py +++ b/packages/testing/src/execution_testing/client_clis/clis/ethrex.py @@ -50,7 +50,7 @@ class EthrexExceptionMapper(ExceptionMapper): "the header after executing" ), BlockException.INCORRECT_BLOCK_FORMAT: ( - "not in strictly ascending order" + "not in strictly ascending order for" ), BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED: ( "Block access list exceeds gas limit" @@ -119,7 +119,9 @@ class EthrexExceptionMapper(ExceptionMapper): r"gas floor exceeds the gas limit|" r"call gas cost exceeds the gas limit|" r"Transaction gas limit lower than the minimum gas cost " - r"to execute the transaction" + r"to execute the transaction|" + r"Transaction gas limit lower than the gas cost floor " + r"for calldata tokens" ), TransactionException.INTRINSIC_GAS_BELOW_FLOOR_GAS_COST: ( r"Transaction gas limit lower than the gas cost floor " @@ -170,17 +172,27 @@ class EthrexExceptionMapper(ExceptionMapper): BlockException.RLP_BLOCK_LIMIT_EXCEEDED: ( r"Maximum block size exceeded.*" ), + BlockException.INVALID_BAL_EXTRA_ACCOUNT: ( + r"Block access list accounts not in strictly ascending order.*|" + r"BAL validation failed: account .* was never accessed.*" + ), + BlockException.INVALID_BAL_MISSING_ACCOUNT: (r"absent from BAL"), BlockException.INVALID_BLOCK_ACCESS_LIST: ( r"Block access list contains index \d+ " r"exceeding max valid index \d+|" r"Failed to RLP decode BAL|" - r"Block access list .+ not in strictly ascending order.*" + r"Block access list .+ not in strictly ascending order.*|" + r"BAL validation failed for (tx \d+|system_tx|withdrawal): .*|" + r"BAL validation failed: .*|" + r"Block access list slot .+ is in both " + r"storage_changes and storage_reads.*" ), BlockException.INCORRECT_BLOCK_FORMAT: ( r"Block access list hash does not match " r"the one in the header after executing|" r"Block access list contains index \d+ " r"exceeding max valid index \d+|" - r"Failed to RLP decode BAL" + r"Failed to RLP decode BAL|" + r"Block access list accounts not in strictly ascending order.*" ), } From 16657e80dbc102a8571544b93b7c1ccfb800954c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 5 Mar 2026 08:12:14 +0000 Subject: [PATCH 03/37] feat(tests): port EXTCODEHASH call to selfdestruct test (#2412) --- .../eip1052_extcodehash/test_extcodehash.py | 62 ++++++++ .../callToSuicideThenExtcodehashFiller.json | 150 ------------------ 2 files changed, 62 insertions(+), 150 deletions(-) delete mode 100644 tests/static/state_tests/stExtCodeHash/callToSuicideThenExtcodehashFiller.json diff --git a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py index 24d948e7f01..7b02b4fa3eb 100644 --- a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py +++ b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py @@ -1245,3 +1245,65 @@ def test_extcodehash_call_to_nonexistent( post={code_address: Account(storage=storage)}, tx=tx, ) + + +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/callToSuicideThenExtcodehashFiller.json", # noqa: E501 + ], + pr=["https://github.com/ethereum/execution-specs/pull/2412"], +) +@pytest.mark.with_all_call_opcodes +def test_extcodehash_call_to_selfdestruct( + state_test: StateTestFiller, + pre: Alloc, + fork: Fork, + call_opcode: Opcodes, +) -> None: + """ + Test EXTCODEHASH after calling a contract that selfdestructs. + + Call a contract containing SELFDESTRUCT using each call type, then + check EXTCODEHASH. The hash is always returned because the check + happens within the same transaction. STATICCALL fails because + SELFDESTRUCT modifies state. Pre-Cancun, CALLCODE/DELEGATECALL + execute SELFDESTRUCT in the caller's context, destroying the test + contract at end of transaction. + """ + storage = Storage() + beneficiary = pre.empty_account() + target_code = Op.SELFDESTRUCT(beneficiary) + target = pre.deploy_contract(target_code, balance=5_555_555_555) + + call_succeeds = call_opcode != Op.STATICCALL + + code = Op.SSTORE( + storage.store_next(int(call_succeeds)), + call_opcode(address=target, gas=165_000), + ) + Op.SSTORE( + storage.store_next(target_code.keccak256()), + Op.EXTCODEHASH(target), + ) + + code_address = pre.deploy_contract(code, storage=storage.canary()) + + tx = Transaction( + sender=pre.fund_eoa(), + to=code_address, + gas_limit=400_000, + ) + + # Pre-Cancun, CALLCODE/DELEGATECALL execute SELFDESTRUCT in the + # caller's context, destroying the test contract at end of tx. + caller_destroyed = fork < Cancun and call_opcode in ( + Op.CALLCODE, + Op.DELEGATECALL, + ) + + post: dict[Address, Account | None] = {} + if caller_destroyed: + post[code_address] = Account.NONEXISTENT + else: + post[code_address] = Account(storage=storage) + + state_test(pre=pre, post=post, tx=tx) diff --git a/tests/static/state_tests/stExtCodeHash/callToSuicideThenExtcodehashFiller.json b/tests/static/state_tests/stExtCodeHash/callToSuicideThenExtcodehashFiller.json deleted file mode 100644 index 30d95f7f649..00000000000 --- a/tests/static/state_tests/stExtCodeHash/callToSuicideThenExtcodehashFiller.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "callToSuicideThenExtcodehash" : { - "_info" : { - "comment" : "https://github.com/ethereum/tests/issues/652" - }, - "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty" : "0x20000", - "currentGasLimit" : "3000000000", - "currentNumber" : "1", - "currentTimestamp" : "1000" - }, - "expect" : [ - { - "//comment" : "Call[0] Callcode[1] delegatecall[2] staticcall[3] to suicider, then extcodehash of it", - "indexes" : { "data" : [0], "gas" : -1, "value" : -1 }, - "network" : [ ">=Cancun"], - "result" : { - "" : { - "balance" : "1", - "storage" : { - "0x00" : "1", - "0x01" : "0x2f715723d7cde71586406b2995d4fc62acc9ce1adb8df087cc8d4502d047d3ca" - } - }, - "0000000000000000000000000000000000000025" : { - "balance" : "5555555555" - }, - "" : { - "balance" : "0", - "nonce" : "0", - "code" : "0x6025ff00", - "storage" : {} - } - } - }, - { - "//comment" : "Call[0] Callcode[1] delegatecall[2] staticcall[3] to suicider, then extcodehash of it", - "indexes" : { "data" : [1,2], "gas" : -1, "value" : -1 }, - "network" : [ ">=Cancun"], - "result" : { - "0000000000000000000000000000000000000025" : { - "balance" : "1" - }, - "" : { - "balance" : "0", - "nonce" : "0", - "code" : "0x604060006040600060006000355af200", - "storage" : { - "0x00" : "0x01", - "0x01" : "0x2f715723d7cde71586406b2995d4fc62acc9ce1adb8df087cc8d4502d047d3ca" - } - }, - "" : { - "balance" : "5555555555" - } - } - }, - { - "//comment" : "Call[0] Callcode[1] delegatecall[2] staticcall[3] to suicider, then extcodehash of it", - "indexes" : { "data" : [3], "gas" : -1, "value" : -1 }, - "network" : [ ">=Cancun"], - "result" : { - "0000000000000000000000000000000000000025" : { - "shouldnotexist" : "1" - }, - "" : { - "balance" : "1", - "storage" : { - "0x00" : "0", - "0x01" : "0x2f715723d7cde71586406b2995d4fc62acc9ce1adb8df087cc8d4502d047d3ca" - } - }, - "" : { - "balance" : "5555555555" - } - } - } - ], - "pre" : { - "" : { - "balance" : "0", - "nonce" : "0", - "//comment" : "Redirect call to calldataload", - "code" : "{ (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 64 0 64 ) }", - "storage": { - "0x01" : "0x1122" - } - }, - "" : { - "balance" : "", - "code" : "{ [[0]] (CALL 165000 0 0 0 0 0) [[1]] (EXTCODEHASH ) }", - "nonce" : "0", - "storage" : { - } - }, - "" : { - "balance" : "", - "code" : "{ [[0]] (CALLCODE 165000 0 0 0 0 0) [[1]] (EXTCODEHASH ) }", - "nonce" : "0", - "storage" : { - } - }, - "" : { - "balance" : "", - "code" : "{ [[0]] (DELEGATECALL 165000 0 0 0 0) [[1]] (EXTCODEHASH ) }", - "nonce" : "0", - "storage" : { - } - }, - "" : { - "balance" : "", - "code" : "{ [[0]] (STATICCALL 165000 0 0 0 0) [[1]] (EXTCODEHASH ) }", - "nonce" : "0", - "storage" : { - } - }, - "" : { - "balance" : "5555555555", - "nonce" : "0", - "code" : "{(SELFDESTRUCT 0x0000000000000000000000000000000000000025)}", - "storage": {} - }, - "" : { - "balance" : "1000000000000000000", - "nonce" : "0", - "code" : "", - "storage": {} - } - }, - "transaction" : { - "data" : [ - ":raw 0x000000000000000000000000", - ":raw 0x000000000000000000000000", - ":raw 0x000000000000000000000000", - ":raw 0x000000000000000000000000" - ], - "gasLimit" : [ - "300000" - ], - "gasPrice" : "10", - "nonce" : "0", - "secretKey" : "", - "to" : "", - "value" : [ - "1" - ] - } - } -} From 000fc1b0fdb4000e7284d48b1a82107f962e8049 Mon Sep 17 00:00:00 2001 From: felix Date: Thu, 5 Mar 2026 11:20:35 +0100 Subject: [PATCH 04/37] refactor(test-execute): split function + add unit test for nonce comparison (#2407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: split code for easier testing + add unit test * test(test-execute): add JSONRPCError fallback path test for nonce sync. (#2) - Cover the try/except branch in sync_worker_key_nonce() where get_account with block_number="latest" raises JSONRPCError and the function falls back to "pending". - The existing parametrized tests only exercise the happy path; this completes branch coverage for the extracted function. - Not parametrized because the nonce-sync logic is already proven by the existing cases — this test's concern is the recovery path. --------- Co-authored-by: danceratopz --- .../pytest_commands/plugins/execute/sender.py | 28 ++++-- .../plugins/execute/tests/test_sender.py | 97 +++++++++++++++++++ 2 files changed, 118 insertions(+), 7 deletions(-) create mode 100644 packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_sender.py diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/sender.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/sender.py index 9434d89aa87..d59342918ad 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/sender.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/sender.py @@ -9,7 +9,7 @@ from filelock import FileLock from pytest_metadata.plugin import metadata_key -from execution_testing.base_types import Address, Number, Wei +from execution_testing.base_types import Account, Address, Number, Wei from execution_testing.logging import get_logger from execution_testing.rpc import EthRPC from execution_testing.rpc.rpc_types import JSONRPCError @@ -406,12 +406,16 @@ def session_worker_key( logger.info(f"Refund transaction confirmed: {refund_tx.hash}") -@pytest.fixture(scope="function") -def worker_key( - eth_rpc: EthRPC, session_worker_key: EOA -) -> Generator[EOA, None, None]: - """Prepare the worker key for the current test.""" - logger.debug(f"Preparing worker key {session_worker_key} for test") +def sync_worker_key_nonce(eth_rpc: EthRPC, session_worker_key: EOA) -> Account: + """ + Synchronize the worker key nonce with the on-chain nonce. + + Fetch the account state and update the local nonce if it differs + from the RPC nonce. This handles both nonce increases (normal + progression) and decreases (chain reverts). + + Return the fetched account for further use. + """ try: session_worker_account = eth_rpc.get_account( session_worker_key, block_number="latest", skip_code=True @@ -427,6 +431,16 @@ def worker_key( logger.info(f"Worker key nonce mismatch: {wk_nonce} != {rpc_nonce}") logger.info(f"Updating worker key nonce to {rpc_nonce}") session_worker_key.nonce = rpc_nonce + return session_worker_account + + +@pytest.fixture(scope="function") +def worker_key( + eth_rpc: EthRPC, session_worker_key: EOA +) -> Generator[EOA, None, None]: + """Prepare the worker key for the current test.""" + logger.debug(f"Preparing worker key {session_worker_key} for test") + session_worker_account = sync_worker_key_nonce(eth_rpc, session_worker_key) # Record the start balance of the worker key worker_key_start_balance = session_worker_account.balance diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_sender.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_sender.py new file mode 100644 index 00000000000..f59aaeba806 --- /dev/null +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/tests/test_sender.py @@ -0,0 +1,97 @@ +"""Test the sender plugin's worker key nonce synchronization.""" + +from unittest.mock import MagicMock + +import pytest + +from execution_testing.base_types import Account, Number +from execution_testing.rpc.rpc_types import JSONRPCError +from execution_testing.test_types import EOA + +from ..sender import sync_worker_key_nonce + + +@pytest.fixture +def mock_eth_rpc() -> MagicMock: + """Create a mock EthRPC instance.""" + return MagicMock() + + +@pytest.fixture +def mock_eoa() -> EOA: + """Create a mock EOA with a known nonce.""" + return EOA( + key=b"\x01" * 32, + nonce=0, + ) + + +@pytest.mark.parametrize( + "initial_nonce,rpc_nonce", + [ + pytest.param( + 5, + 10, + id="rpc_nonce_higher_than_local", + ), + pytest.param( + 10, + 5, + id="rpc_nonce_lower_than_local_chain_revert", + ), + pytest.param( + 7, + 0, + id="rpc_nonce_reset_to_zero_full_revert", + ), + ], +) +def test_worker_key_nonce_sync( + mock_eth_rpc: MagicMock, + mock_eoa: EOA, + initial_nonce: int, + rpc_nonce: int, +) -> None: + """Test worker key nonce is updated whenever it differs from RPC.""" + mock_eoa.nonce = Number(initial_nonce) + mock_eth_rpc.get_account.return_value = Account( + nonce=rpc_nonce, balance=10**18 + ) + + sync_worker_key_nonce(mock_eth_rpc, mock_eoa) + + assert mock_eoa.nonce == Number(rpc_nonce), ( + f"Expected nonce to be synced to {rpc_nonce}, got {mock_eoa.nonce}" + ) + + +def test_worker_key_nonce_unchanged_when_matching( + mock_eth_rpc: MagicMock, + mock_eoa: EOA, +) -> None: + """Test worker key nonce is not modified when it matches RPC.""" + mock_eoa.nonce = Number(5) + mock_eth_rpc.get_account.return_value = Account(nonce=5, balance=10**18) + + sync_worker_key_nonce(mock_eth_rpc, mock_eoa) + + assert mock_eoa.nonce == Number(5) + + +def test_sync_falls_back_to_pending_on_jsonrpc_error( + mock_eth_rpc: MagicMock, + mock_eoa: EOA, +) -> None: + """Test fallback to pending block when latest is unavailable.""" + mock_eoa.nonce = Number(3) + pending_account = Account(nonce=5, balance=10**18) + mock_eth_rpc.get_account.side_effect = [ + JSONRPCError(code=-32000, message="not available"), + pending_account, + ] + + result = sync_worker_key_nonce(mock_eth_rpc, mock_eoa) + + assert mock_eoa.nonce == Number(5) + assert result is pending_account + assert mock_eth_rpc.get_account.call_count == 2 From 53fe6fe73c448d7ec9c925adea74ec3f0bc8f129 Mon Sep 17 00:00:00 2001 From: Edgar Date: Thu, 5 Mar 2026 11:33:40 +0100 Subject: [PATCH 05/37] chore(test-client-clis): map ethrex BAL validation errors to INVALID_DEPOSIT_EVENT_LAYOUT (#2419) In Amsterdam, blocks with invalid deposit event layouts may trigger BAL validation errors before reaching deposit validation, since the deposit contract is modified but absent from the BAL. Map "BAL validation failed" to INVALID_DEPOSIT_EVENT_LAYOUT alongside the existing direct match. --- .../testing/src/execution_testing/client_clis/clis/ethrex.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/testing/src/execution_testing/client_clis/clis/ethrex.py b/packages/testing/src/execution_testing/client_clis/clis/ethrex.py index 39df9286885..8a7d03f26f8 100644 --- a/packages/testing/src/execution_testing/client_clis/clis/ethrex.py +++ b/packages/testing/src/execution_testing/client_clis/clis/ethrex.py @@ -153,6 +153,9 @@ class EthrexExceptionMapper(ExceptionMapper): r"Invalid transaction: " r"Transaction gas limit exceeds maximum.*" ), + BlockException.INVALID_DEPOSIT_EVENT_LAYOUT: ( + r"Invalid deposit request layout|BAL validation failed.*" + ), BlockException.SYSTEM_CONTRACT_CALL_FAILED: (r"System call failed.*"), BlockException.SYSTEM_CONTRACT_EMPTY: ( r"System contract:.* has no code after deployment" From 452e5f5418215140b8debf2b4535d3fb9672427e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 5 Mar 2026 11:17:22 +0000 Subject: [PATCH 06/37] feat(tests): add basic ecmul precompile tests (#2403) Add test_ecmul.py with valid and invalid input test cases for the BN254 ecmul (0x07) precompile, following the same pattern as test_ecadd.py. Remove 6 ported static ecmul tests. Valid cases: generator/inf/P1 with various scalars, empty input, truncated input, extra trailing data. Invalid cases: not-on-curve points, coordinates >= field modulus. --- .../byzantium/eip196_ec_add_mul/test_ecmul.py | 180 ++++++++ .../ecmul_1-2_2_28000_128Filler.json | 419 ------------------ .../ecmul_1-3_0_21000_128Filler.json | 283 ------------ .../ecmul_1-3_1_28000_128Filler.json | 287 ------------ .../ecmul_1-3_2_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_0_21000_128Filler.json | 415 ----------------- .../ecmul_7827-6598_1_21000_128Filler.json | 415 ----------------- 7 files changed, 180 insertions(+), 2106 deletions(-) create mode 100644 tests/byzantium/eip196_ec_add_mul/test_ecmul.py delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json diff --git a/tests/byzantium/eip196_ec_add_mul/test_ecmul.py b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py new file mode 100644 index 00000000000..faf2c33bd3d --- /dev/null +++ b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py @@ -0,0 +1,180 @@ +"""Tests the ecmul precompiled contract.""" + +import pytest +from execution_testing import ( + Alloc, + Environment, + StateTestFiller, + Transaction, +) + +from .spec import FP, PointG1, Spec, ref_spec_196 + +REFERENCE_SPEC_GIT_PATH = ref_spec_196.git_path +REFERENCE_SPEC_VERSION = ref_spec_196.version + +pytestmark = [ + pytest.mark.valid_from("Byzantium"), + pytest.mark.parametrize("precompile_address", [Spec.ECMUL], ids=["ecmul"]), +] + + +@pytest.mark.parametrize( + "input_data, expected_output", + [ + pytest.param( + Spec.G1 + FP(0), + Spec.INF_G1, + id="generator_times_zero", + ), + pytest.param( + Spec.G1 + FP(1), + Spec.G1, + id="generator_times_one", + ), + pytest.param( + Spec.G1 + FP(2), + Spec.G1x2, + id="generator_times_two", + ), + pytest.param( + Spec.P1 + FP(0), + Spec.INF_G1, + id="p1_times_zero", + ), + pytest.param( + Spec.P1 + FP(1), + Spec.P1, + id="p1_times_one", + ), + pytest.param( + Spec.INF_G1 + FP(0), + Spec.INF_G1, + id="inf_times_zero", + ), + pytest.param( + Spec.INF_G1 + FP(1), + Spec.INF_G1, + id="inf_times_one", + ), + pytest.param( + Spec.INF_G1 + FP(2), + Spec.INF_G1, + id="inf_times_two", + ), + pytest.param( + b"", + Spec.INF_G1, + id="empty", + ), + pytest.param( + Spec.G1, + Spec.INF_G1, + id="no_scalar", + ), + pytest.param( + Spec.G1 + FP(1) + b"\0" * 32, + Spec.G1, + id="generator_times_one_extra_data", + ), + ], +) +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json", + ], + pr=["https://github.com/ethereum/execution-specs/pull/2403"], +) +def test_valid( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test the valid inputs to the ECMUL precompile.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) + + +@pytest.mark.parametrize( + "input_data, expected_output", + [ + pytest.param( + PointG1(1, 3) + FP(0), + b"", + id="not_on_curve_1_3_times_zero", + ), + pytest.param( + PointG1(1, 3) + FP(1), + b"", + id="not_on_curve_1_3_times_one", + ), + pytest.param( + PointG1(1, 3) + FP(2), + b"", + id="not_on_curve_1_3_times_two", + ), + pytest.param( + PointG1(7827, 6598) + FP(0), + b"", + id="not_on_curve_7827_6598_times_zero", + ), + pytest.param( + PointG1(7827, 6598) + FP(1), + b"", + id="not_on_curve_7827_6598_times_one", + ), + pytest.param( + PointG1(0, 3) + FP(1), + b"", + id="not_on_curve_0_3", + ), + pytest.param( + PointG1(Spec.P, 0) + FP(1), + b"", + id="x_eq_P", + ), + pytest.param( + PointG1(0, Spec.P) + FP(1), + b"", + id="y_eq_P", + ), + pytest.param( + PointG1(Spec.G1.x + Spec.P, Spec.G1.y) + FP(1), + b"", + id="x_plus_P", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.G1.y + Spec.P) + FP(1), + b"", + id="y_plus_P", + ), + ], +) +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_2_28000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json", + ], + pr=["https://github.com/ethereum/execution-specs/pull/2403"], +) +def test_invalid( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test the invalid inputs to the ECMUL precompile.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json deleted file mode 100644 index 73dfdc2968f..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_1-2_2_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "balance": "100000000", - "nonce": "133", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "balance": "100000000", - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x85", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "134", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "134", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json deleted file mode 100644 index c49b0129c4b..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_0_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "16", - "balance": "999999999999206642", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "793358", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa920", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x10", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "17", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json deleted file mode 100644 index c15c381a046..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_1_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "127", - "balance": "999999999994435633", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5564367", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "128", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_128Filler.json deleted file mode 100644 index 78c64ff8f76..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_2_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "137", - "balance": "999999999994039858", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5960142", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x89", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "138", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json deleted file mode 100644 index 5830abb2612..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_0_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "12", - "balance": "999999999999391026", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "608974", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xc", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "13", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "13", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json deleted file mode 100644 index fd95739da6a..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_1_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "28", - "balance": "999999999998684658", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1315342", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "29", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "29", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} From d95c86eed8225216fad18c1a66a96e06d416d2a4 Mon Sep 17 00:00:00 2001 From: CPerezz <37264926+CPerezz@users.noreply.github.com> Date: Thu, 5 Mar 2026 13:50:31 +0100 Subject: [PATCH 07/37] feat(bench): add bloatnet ERC20 stubs for 50GB, 9.39GB, 1GB, 4.23MB (#2392) --- .../stateful/bloatnet/stubs_bloatnet.json | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/benchmark/stateful/bloatnet/stubs_bloatnet.json b/tests/benchmark/stateful/bloatnet/stubs_bloatnet.json index 74567363241..f11b4aa8b61 100644 --- a/tests/benchmark/stateful/bloatnet/stubs_bloatnet.json +++ b/tests/benchmark/stateful/bloatnet/stubs_bloatnet.json @@ -1,19 +1,35 @@ { + "test_sload_empty_erc20_balanceof_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc", "test_sload_empty_erc20_balanceof_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C", + "test_sload_empty_erc20_balanceof_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb", + "test_sload_empty_erc20_balanceof_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D", + "test_sload_empty_erc20_balanceof_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE", "test_sload_empty_erc20_balanceof_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8", "test_sload_empty_erc20_balanceof_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48", "test_sload_empty_erc20_balanceof_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7", + "test_sload_empty_erc20_balanceof_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500", + "test_sstore_erc20_mint_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc", "test_sstore_erc20_mint_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C", + "test_sstore_erc20_mint_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb", + "test_sstore_erc20_mint_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D", + "test_sstore_erc20_mint_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE", + "test_sstore_erc20_approve_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc", "test_sstore_erc20_approve_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C", + "test_sstore_erc20_approve_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb", + "test_sstore_erc20_approve_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D", + "test_sstore_erc20_approve_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE", "test_sstore_erc20_approve_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8", "test_sstore_erc20_approve_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48", "test_sstore_erc20_approve_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7", + "test_sstore_erc20_approve_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500", + "test_mixed_sload_sstore_50GB_ERC20": "0x398324972FcE0e89E048c2104f1298031d1931fc", "test_mixed_sload_sstore_30GB_ERC20": "0x19fc17d87D946BBA47ca276f7b06Ee5737c4679C", + "test_mixed_sload_sstore_9_39GB_ERC20": "0xf7EfF64A1b7f3dB550A05fF2635Bb9744B8E21eb", + "test_mixed_sload_sstore_1GB_ERC20": "0x365cF1A2532919e1adf8650670B9e01e163a441D", + "test_mixed_sload_sstore_4_23MB_ERC20": "0xFdC419f77993E0E2E9Fed06299E367F6aEe909bE", "test_mixed_sload_sstore_XEN": "0x06450dEe7FD2Fb8E39061434BAbCFC05599a6Fb8", "test_mixed_sload_sstore_USDC": "0xA0b86991C6218B36c1d19D4a2E9Eb0CE3606EB48", "test_mixed_sload_sstore_ARB": "0xad0c361ef902a7d9851ca7dcc85535da2d3c6fc7", - "test_sload_empty_erc20_balanceof_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500", - "test_sstore_erc20_approve_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500", "test_mixed_sload_sstore_HST": "0x2e2a539285ce690e4c6bddd42deb7e37bdde9500", "bloatnet_factory_0_5kb": "0xDf9da7E8660d38654C8aA267635222c9f5Ac0530", "bloatnet_factory_1kb": "0xA52178573dc859741499946148CA1Fc3822Af600", From a5179536cd0aaacc39efae00be0c2166f412a17a Mon Sep 17 00:00:00 2001 From: spencer Date: Thu, 5 Mar 2026 16:32:10 +0000 Subject: [PATCH 08/37] refactor(spec-specs): use kwargs for message call output collision returns (#2238) --- src/ethereum/forks/arrow_glacier/vm/interpreter.py | 7 ++++++- src/ethereum/forks/berlin/vm/interpreter.py | 7 ++++++- src/ethereum/forks/bpo1/vm/interpreter.py | 12 ++++++------ src/ethereum/forks/bpo2/vm/interpreter.py | 12 ++++++------ src/ethereum/forks/bpo3/vm/interpreter.py | 12 ++++++------ src/ethereum/forks/bpo4/vm/interpreter.py | 12 ++++++------ src/ethereum/forks/bpo5/vm/interpreter.py | 12 ++++++------ src/ethereum/forks/byzantium/vm/interpreter.py | 7 ++++++- src/ethereum/forks/cancun/vm/interpreter.py | 6 +++++- src/ethereum/forks/constantinople/vm/interpreter.py | 7 ++++++- src/ethereum/forks/dao_fork/vm/interpreter.py | 6 +++++- src/ethereum/forks/frontier/vm/interpreter.py | 6 +++++- src/ethereum/forks/gray_glacier/vm/interpreter.py | 7 ++++++- src/ethereum/forks/homestead/vm/interpreter.py | 6 +++++- src/ethereum/forks/istanbul/vm/interpreter.py | 7 ++++++- src/ethereum/forks/london/vm/interpreter.py | 7 ++++++- src/ethereum/forks/muir_glacier/vm/interpreter.py | 7 ++++++- src/ethereum/forks/osaka/vm/interpreter.py | 12 ++++++------ src/ethereum/forks/paris/vm/interpreter.py | 6 +++++- src/ethereum/forks/prague/vm/interpreter.py | 12 ++++++------ src/ethereum/forks/shanghai/vm/interpreter.py | 6 +++++- src/ethereum/forks/spurious_dragon/vm/interpreter.py | 7 ++++++- .../forks/tangerine_whistle/vm/interpreter.py | 6 +++++- 23 files changed, 131 insertions(+), 58 deletions(-) diff --git a/src/ethereum/forks/arrow_glacier/vm/interpreter.py b/src/ethereum/forks/arrow_glacier/vm/interpreter.py index 1c08af0d250..6d78aefcd62 100644 --- a/src/ethereum/forks/arrow_glacier/vm/interpreter.py +++ b/src/ethereum/forks/arrow_glacier/vm/interpreter.py @@ -112,7 +112,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/berlin/vm/interpreter.py b/src/ethereum/forks/berlin/vm/interpreter.py index 20fce4fe76f..ff0a10c622c 100644 --- a/src/ethereum/forks/berlin/vm/interpreter.py +++ b/src/ethereum/forks/berlin/vm/interpreter.py @@ -111,7 +111,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/bpo1/vm/interpreter.py b/src/ethereum/forks/bpo1/vm/interpreter.py index 75b38b8565d..0cf6d8c0ecd 100644 --- a/src/ethereum/forks/bpo1/vm/interpreter.py +++ b/src/ethereum/forks/bpo1/vm/interpreter.py @@ -114,12 +114,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), - U256(0), - tuple(), - set(), - AddressCollision(), - Bytes(b""), + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), + return_data=Bytes(b""), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/bpo2/vm/interpreter.py b/src/ethereum/forks/bpo2/vm/interpreter.py index ad6faa90229..65996142fed 100644 --- a/src/ethereum/forks/bpo2/vm/interpreter.py +++ b/src/ethereum/forks/bpo2/vm/interpreter.py @@ -114,12 +114,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), - U256(0), - tuple(), - set(), - AddressCollision(), - Bytes(b""), + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), + return_data=Bytes(b""), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/bpo3/vm/interpreter.py b/src/ethereum/forks/bpo3/vm/interpreter.py index 1509ac3d452..3057a554555 100644 --- a/src/ethereum/forks/bpo3/vm/interpreter.py +++ b/src/ethereum/forks/bpo3/vm/interpreter.py @@ -114,12 +114,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), - U256(0), - tuple(), - set(), - AddressCollision(), - Bytes(b""), + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), + return_data=Bytes(b""), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/bpo4/vm/interpreter.py b/src/ethereum/forks/bpo4/vm/interpreter.py index e2e060a2613..7727899f20f 100644 --- a/src/ethereum/forks/bpo4/vm/interpreter.py +++ b/src/ethereum/forks/bpo4/vm/interpreter.py @@ -114,12 +114,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), - U256(0), - tuple(), - set(), - AddressCollision(), - Bytes(b""), + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), + return_data=Bytes(b""), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/bpo5/vm/interpreter.py b/src/ethereum/forks/bpo5/vm/interpreter.py index 0ba1d4d7684..ca3aadc90e5 100644 --- a/src/ethereum/forks/bpo5/vm/interpreter.py +++ b/src/ethereum/forks/bpo5/vm/interpreter.py @@ -114,12 +114,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), - U256(0), - tuple(), - set(), - AddressCollision(), - Bytes(b""), + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), + return_data=Bytes(b""), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/byzantium/vm/interpreter.py b/src/ethereum/forks/byzantium/vm/interpreter.py index 39b2cb84f5a..ad6d8167304 100644 --- a/src/ethereum/forks/byzantium/vm/interpreter.py +++ b/src/ethereum/forks/byzantium/vm/interpreter.py @@ -110,7 +110,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/cancun/vm/interpreter.py b/src/ethereum/forks/cancun/vm/interpreter.py index 9b17ad6cf47..f75c492ca45 100644 --- a/src/ethereum/forks/cancun/vm/interpreter.py +++ b/src/ethereum/forks/cancun/vm/interpreter.py @@ -109,7 +109,11 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/constantinople/vm/interpreter.py b/src/ethereum/forks/constantinople/vm/interpreter.py index 9c86fb57f2f..a5345649657 100644 --- a/src/ethereum/forks/constantinople/vm/interpreter.py +++ b/src/ethereum/forks/constantinople/vm/interpreter.py @@ -110,7 +110,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/dao_fork/vm/interpreter.py b/src/ethereum/forks/dao_fork/vm/interpreter.py index 517a491174f..3607678d3be 100644 --- a/src/ethereum/forks/dao_fork/vm/interpreter.py +++ b/src/ethereum/forks/dao_fork/vm/interpreter.py @@ -103,7 +103,11 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/frontier/vm/interpreter.py b/src/ethereum/forks/frontier/vm/interpreter.py index fe1921132da..441e571d1a3 100644 --- a/src/ethereum/forks/frontier/vm/interpreter.py +++ b/src/ethereum/forks/frontier/vm/interpreter.py @@ -103,7 +103,11 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/gray_glacier/vm/interpreter.py b/src/ethereum/forks/gray_glacier/vm/interpreter.py index 074a737d46b..ea759f7ad96 100644 --- a/src/ethereum/forks/gray_glacier/vm/interpreter.py +++ b/src/ethereum/forks/gray_glacier/vm/interpreter.py @@ -112,7 +112,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/homestead/vm/interpreter.py b/src/ethereum/forks/homestead/vm/interpreter.py index 45f5da82e70..de5a16be129 100644 --- a/src/ethereum/forks/homestead/vm/interpreter.py +++ b/src/ethereum/forks/homestead/vm/interpreter.py @@ -103,7 +103,11 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/istanbul/vm/interpreter.py b/src/ethereum/forks/istanbul/vm/interpreter.py index 4fad76662c3..3e667112984 100644 --- a/src/ethereum/forks/istanbul/vm/interpreter.py +++ b/src/ethereum/forks/istanbul/vm/interpreter.py @@ -111,7 +111,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/london/vm/interpreter.py b/src/ethereum/forks/london/vm/interpreter.py index 9f8207aa598..b7948ace38d 100644 --- a/src/ethereum/forks/london/vm/interpreter.py +++ b/src/ethereum/forks/london/vm/interpreter.py @@ -112,7 +112,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/muir_glacier/vm/interpreter.py b/src/ethereum/forks/muir_glacier/vm/interpreter.py index 1369802f40b..d479dc3cf5f 100644 --- a/src/ethereum/forks/muir_glacier/vm/interpreter.py +++ b/src/ethereum/forks/muir_glacier/vm/interpreter.py @@ -111,7 +111,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/osaka/vm/interpreter.py b/src/ethereum/forks/osaka/vm/interpreter.py index 52f08b7a03d..7597a25f28d 100644 --- a/src/ethereum/forks/osaka/vm/interpreter.py +++ b/src/ethereum/forks/osaka/vm/interpreter.py @@ -114,12 +114,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), - U256(0), - tuple(), - set(), - AddressCollision(), - Bytes(b""), + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), + return_data=Bytes(b""), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/paris/vm/interpreter.py b/src/ethereum/forks/paris/vm/interpreter.py index afc0596d51c..3317fd3bb01 100644 --- a/src/ethereum/forks/paris/vm/interpreter.py +++ b/src/ethereum/forks/paris/vm/interpreter.py @@ -108,7 +108,11 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/prague/vm/interpreter.py b/src/ethereum/forks/prague/vm/interpreter.py index 3d53d261ebf..4a53e7b76d0 100644 --- a/src/ethereum/forks/prague/vm/interpreter.py +++ b/src/ethereum/forks/prague/vm/interpreter.py @@ -114,12 +114,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), - U256(0), - tuple(), - set(), - AddressCollision(), - Bytes(b""), + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), + return_data=Bytes(b""), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/shanghai/vm/interpreter.py b/src/ethereum/forks/shanghai/vm/interpreter.py index 29578950811..ed8f91eeec0 100644 --- a/src/ethereum/forks/shanghai/vm/interpreter.py +++ b/src/ethereum/forks/shanghai/vm/interpreter.py @@ -109,7 +109,11 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/spurious_dragon/vm/interpreter.py b/src/ethereum/forks/spurious_dragon/vm/interpreter.py index 879108d3c90..df7f32e8156 100644 --- a/src/ethereum/forks/spurious_dragon/vm/interpreter.py +++ b/src/ethereum/forks/spurious_dragon/vm/interpreter.py @@ -109,7 +109,12 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + touched_accounts=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) diff --git a/src/ethereum/forks/tangerine_whistle/vm/interpreter.py b/src/ethereum/forks/tangerine_whistle/vm/interpreter.py index 688b599f196..663f6f92542 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/interpreter.py +++ b/src/ethereum/forks/tangerine_whistle/vm/interpreter.py @@ -103,7 +103,11 @@ def process_message_call(message: Message) -> MessageCallOutput: ) or account_has_storage(block_env.state, message.current_target) if is_collision: return MessageCallOutput( - Uint(0), U256(0), tuple(), set(), AddressCollision() + gas_left=Uint(0), + refund_counter=U256(0), + logs=tuple(), + accounts_to_delete=set(), + error=AddressCollision(), ) else: evm = process_create_message(message) From 5aff97479b3b08a4bd67f6dcac61776487a902fa Mon Sep 17 00:00:00 2001 From: Karim Taam Date: Thu, 5 Mar 2026 20:48:41 +0400 Subject: [PATCH 09/37] chore(test-client-clis): fix mapping missing for Block access list tests (#2420) --- .../src/execution_testing/client_clis/clis/besu.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/testing/src/execution_testing/client_clis/clis/besu.py b/packages/testing/src/execution_testing/client_clis/clis/besu.py index 1cda710f896..dbe965c64eb 100644 --- a/packages/testing/src/execution_testing/client_clis/clis/besu.py +++ b/packages/testing/src/execution_testing/client_clis/clis/besu.py @@ -458,7 +458,8 @@ class BesuExceptionMapper(ExceptionMapper): # BAL Exceptions: TODO - review once all clients completed. BlockException.INVALID_BAL_EXTRA_ACCOUNT: ( r"Block access list hash mismatch, " - r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)" + r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)|" + r"Block access list validation failed for block 0x[a-f0-9]+" ), BlockException.INVALID_BAL_HASH: ( r"Block access list hash mismatch, " @@ -468,14 +469,18 @@ class BesuExceptionMapper(ExceptionMapper): r"Block access list hash mismatch, " r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)" ), + BlockException.BLOCK_ACCESS_LIST_GAS_LIMIT_EXCEEDED: ( + r"Block access list validation failed for block 0x[a-f0-9]+" + ), BlockException.INVALID_BLOCK_ACCESS_LIST: ( r"Block access list hash mismatch, " r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)|" - r"Block access list validation failed for block" + r"Block access list validation failed for block 0x[a-f0-9]+" ), BlockException.INCORRECT_BLOCK_FORMAT: ( r"Block access list hash mismatch, " - r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)" + r"calculated:\s*(0x[a-f0-9]+)\s+header:\s*(0x[a-f0-9]+)|" + r"Block access list validation failed for block 0x[a-f0-9]+" ), } From 9baeae26373f102744834acbde971f1c8407781b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 5 Mar 2026 16:54:46 +0000 Subject: [PATCH 10/37] feat(tests): port EXTCODEHASH created and deleted account test (#2416) --- .../eip1052_extcodehash/test_extcodehash.py | 97 +++++++++++++++++++ ...ashCreatedAndDeletedAccountCallFiller.json | 70 ------------- ...odeHashCreatedAndDeletedAccountFiller.json | 67 ------------- ...atedAndDeletedAccountStaticCallFiller.json | 72 -------------- 4 files changed, 97 insertions(+), 209 deletions(-) delete mode 100644 tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json delete mode 100644 tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountFiller.json delete mode 100644 tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json diff --git a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py index 7b02b4fa3eb..102b1c599a2 100644 --- a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py +++ b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py @@ -1307,3 +1307,100 @@ def test_extcodehash_call_to_selfdestruct( post[code_address] = Account(storage=storage) state_test(pre=pre, post=post, tx=tx) + + +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountFiller.json", # noqa: E501 + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json", # noqa: E501 + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json", # noqa: E501 + ], + pr=["https://github.com/ethereum/execution-specs/pull/2416"], +) +@pytest.mark.parametrize( + "trigger", + [ + pytest.param(Op.CALL, id="call"), + pytest.param(Op.STATICCALL, id="staticcall"), + ], +) +def test_extcodehash_created_and_deleted( + state_test: StateTestFiller, + pre: Alloc, + trigger: Opcodes, +) -> None: + """ + Test EXTCODEHASH of an account created and selfdestructed in same tx. + + CREATE2 a contract with SELFDESTRUCT code, check EXTCODEHASH, + EXTCODESIZE, and EXTCODECOPY before and after triggering it. Within + the transaction, the values remain unchanged. With CALL the created + contract is deleted at end of transaction; with STATICCALL the + trigger fails and the contract persists. + """ + storage = Storage() + runtime = Op.SELFDESTRUCT(0) + initcode = Initcode(deploy_code=runtime) + salt = 0x10 + expected_hash = runtime.keccak256() + expected_size = len(runtime) + + created_slot = storage.store_next(0) + code = Bytecode() + + # Store initcode in memory and CREATE2 + code += Op.MSTORE( + 0, + Op.PUSH32(bytes(initcode).ljust(32, b"\0")), + ) + Op.SSTORE( + created_slot, + Op.CREATE2(value=0, offset=0, size=len(initcode), salt=salt), + ) + + target = Op.SLOAD(created_slot) + + def extcode_checks() -> Bytecode: + return ( + Op.SSTORE( + storage.store_next(expected_hash), + Op.EXTCODEHASH(target), + ) + + Op.SSTORE( + storage.store_next(expected_size), + Op.EXTCODESIZE(target), + ) + + Op.EXTCODECOPY(target, 0, 0, 32) + + Op.SSTORE( + storage.store_next(bytes(runtime).ljust(32, b"\0")), + Op.MLOAD(0), + ) + ) + + code += extcode_checks() + code += trigger(address=target, gas=0x10000) + Op.POP + code += extcode_checks() + + code_address = pre.deploy_contract(code, storage=storage.canary()) + + created = compute_create2_address( + address=code_address, + salt=salt, + initcode=initcode, + ) + storage[created_slot] = created + + tx = Transaction( + sender=pre.fund_eoa(), + to=code_address, + gas_limit=400_000, + ) + + post: dict[Address, Account | None] = { + code_address: Account(storage=storage), + } + if trigger == Op.CALL: + post[created] = Account.NONEXISTENT + else: + post[created] = Account(code=runtime) + + state_test(pre=pre, post=post, tx=tx) diff --git a/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json b/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json deleted file mode 100644 index 1b2219070b2..00000000000 --- a/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "extCodeHashCreatedAndDeletedAccountCall": { - "_info": { - "comment": "EXTCODEHASH/EXTCODESIZE of an account created then deleted via CALL in same transaction" - }, - "env": { - "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty": "0x20000", - "currentGasLimit": "1000000", - "currentNumber": "1", - "currentTimestamp": "1000" - }, - "expect": [ - { - "indexes": { - "data": -1, - "gas": -1, - "value": -1 - }, - "network": [ - ">=Cancun" - ], - "result": { - "deadbeef00000000000000000000000000000000": { - "storage": { - "0x00": "0x73c5f15b1290fd9e66722596c2fa1e1c9341f7acb185530dce0bf0e0fec7dfc6", - "0x01": "0x04", - "0x02": "0x73c5f15b1290fd9e66722596c2fa1e1c9341f7acb185530dce0bf0e0fec7dfc6", - "0x03": "0x04" - } - }, - "7be7677a20a298ff0676ab31f91a0a923f8d9471": { - "shouldnotexist": "1" - } - } - } - ], - "pre": { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": { - "balance": "1000000000000000000", - "code": "", - "nonce": "0", - "storage": { - } - }, - "deadbeef00000000000000000000000000000000": { - "balance": "1000000000000000000", - "code": "{ (MSTORE 0 (CREATE2 0 128 (lll { (RETURN 0 (lll { (SELFDESTRUCT 0x0) } 0)) } 128) 0x10)) [[0]] (EXTCODEHASH (MLOAD 0)) [[1]] (EXTCODESIZE (MLOAD 0)) (CALL 0x10000 (MLOAD 0) 0 0 0 0 0) [[2]] (EXTCODEHASH (MLOAD 0)) [[3]] (EXTCODESIZE (MLOAD 0)) (STOP) }", - "nonce": "0", - "storage": { - } - } - }, - "transaction": { - "data": [ - "" - ], - "gasLimit": [ - "400000" - ], - "gasPrice": "10", - "nonce": "0", - "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to": "deadbeef00000000000000000000000000000000", - "value": [ - "1" - ] - } - } -} diff --git a/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountFiller.json b/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountFiller.json deleted file mode 100644 index d6ab0591e27..00000000000 --- a/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountFiller.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "extCodeHashCreatedAndDeletedAccount": { - "_info": { - "comment": "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction" - }, - "env": { - "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty": "0x20000", - "currentGasLimit": "1000000", - "currentNumber": "1", - "currentTimestamp": "1000" - }, - "expect": [ - { - "indexes": { - "data": -1, - "gas": -1, - "value": -1 - }, - "network": [ - ">=Cancun" - ], - "result": { - "": { - "storage": { - "0x00": "0x73c5f15b1290fd9e66722596c2fa1e1c9341f7acb185530dce0bf0e0fec7dfc6", - "0x01": "0x04", - "0x02": "0x73c5f15b1290fd9e66722596c2fa1e1c9341f7acb185530dce0bf0e0fec7dfc6", - "0x03": "0x04" - } - } - } - } - ], - "pre": { - "": { - "balance": "1000000000000000000", - "code": "", - "nonce": "0", - "storage": { - } - }, - "": { - "balance": "1000000000000000000", - "code": "{ (MSTORE 0 (CREATE2 0 128 (lll { (RETURN 0 (lll { (SELFDESTRUCT 0x0) } 0)) } 128) 0x10)) [[0]] (EXTCODEHASH (MLOAD 0)) [[1]] (EXTCODESIZE (MLOAD 0)) (CALL 0x10000 (MLOAD 0) 0 0 0 0 0) [[2]] (EXTCODEHASH (MLOAD 0)) [[3]] (EXTCODESIZE (MLOAD 0)) (STOP) }", - "nonce": "0", - "storage": { - } - } - }, - "transaction": { - "data": [ - "" - ], - "gasLimit": [ - "400000" - ], - "gasPrice": "10", - "nonce": "0", - "secretKey": "", - "to": "", - "value": [ - "1" - ] - } - } -} diff --git a/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json b/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json deleted file mode 100644 index c04bf6b70c5..00000000000 --- a/tests/static/state_tests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "extCodeHashCreatedAndDeletedAccountStaticCall": { - "_info": { - "comment": "EXTCODEHASH/EXTCODESIZE of an account created then deleted via STATICCALL in same transaction" - }, - "env": { - "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", - "currentDifficulty": "0x20000", - "currentGasLimit": "1000000", - "currentNumber": "1", - "currentTimestamp": "1000" - }, - "expect": [ - { - "indexes": { - "data": -1, - "gas": -1, - "value": -1 - }, - "network": [ - ">=Cancun" - ], - "result": { - "deadbeef00000000000000000000000000000000": { - "storage": { - "0x00": "0x73c5f15b1290fd9e66722596c2fa1e1c9341f7acb185530dce0bf0e0fec7dfc6", - "0x01": "0x04", - "0x02": "0x73c5f15b1290fd9e66722596c2fa1e1c9341f7acb185530dce0bf0e0fec7dfc6", - "0x03": "0x04" - } - }, - "0x123f4c415171383dcf6f3ac6c3b70fe321e11b5e": { - "code": "0x6000ff00", - "storage": { - } - } - } - } - ], - "pre": { - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b": { - "balance": "1000000000000000000", - "code": "", - "nonce": "0", - "storage": { - } - }, - "deadbeef00000000000000000000000000000000": { - "balance": "1000000000000000000", - "code": "{ (MSTORE 0 (CREATE2 0 128 (lll { (RETURN 0 (lll { (SELFDESTRUCT 0x0) } 0)) } 128) 0x10)) [[0]] (EXTCODEHASH (MLOAD 0)) [[1]] (EXTCODESIZE (MLOAD 0)) (STATICCALL 0x10000 (MLOAD 0) 0 0 0 0) [[2]] (EXTCODEHASH (MLOAD 0)) [[3]] (EXTCODESIZE (MLOAD 0)) (STOP) }", - "nonce": "0", - "storage": { - } - } - }, - "transaction": { - "data": [ - "" - ], - "gasLimit": [ - "400000" - ], - "gasPrice": "10", - "nonce": "0", - "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to": "deadbeef00000000000000000000000000000000", - "value": [ - "1" - ] - } - } -} From f63449c80a4d44d8e3e2ab2ed2d550b1f8b08eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 5 Mar 2026 23:08:14 +0000 Subject: [PATCH 11/37] feat(tests): add ECMUL scalar coverage for EIP-196 (#2424) Add group order N to Spec and test ECMUL with scalars between the group order and field modulus, and larger than the field modulus, as required by EIP-196 test case list. --- tests/byzantium/eip196_ec_add_mul/spec.py | 14 +++++ .../byzantium/eip196_ec_add_mul/test_ecmul.py | 60 ++++++++++++------- 2 files changed, 54 insertions(+), 20 deletions(-) diff --git a/tests/byzantium/eip196_ec_add_mul/spec.py b/tests/byzantium/eip196_ec_add_mul/spec.py index 88bb558947e..a85fa5ec035 100644 --- a/tests/byzantium/eip196_ec_add_mul/spec.py +++ b/tests/byzantium/eip196_ec_add_mul/spec.py @@ -22,6 +22,17 @@ def __bytes__(self) -> bytes: return self.x.to_bytes(32, byteorder="big") +@dataclass(frozen=True) +class Scalar(BytesConcatenation): + """Dataclass that defines a scalar for EC multiplication.""" + + x: int = 0 + + def __bytes__(self) -> bytes: + """Convert scalar to bytes.""" + return self.x.to_bytes(32, byteorder="big") + + @dataclass(frozen=True) class PointG1(BytesConcatenation): """Dataclass that defines an affine point in the BN254 E(Fp) group (G1).""" @@ -48,6 +59,9 @@ class Spec: # The prime modulus of the BN254 prime field Fp P = 0x30644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD47 + # The order of the BN254 G1 group + N = 0x30644E72E131A029B85045B68181585D2833E84879B9709143E1F593F0000001 + # G1 generator point G1 = PointG1(1, 2) diff --git a/tests/byzantium/eip196_ec_add_mul/test_ecmul.py b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py index faf2c33bd3d..98c765921df 100644 --- a/tests/byzantium/eip196_ec_add_mul/test_ecmul.py +++ b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py @@ -8,7 +8,7 @@ Transaction, ) -from .spec import FP, PointG1, Spec, ref_spec_196 +from .spec import PointG1, Scalar, Spec, ref_spec_196 REFERENCE_SPEC_GIT_PATH = ref_spec_196.git_path REFERENCE_SPEC_VERSION = ref_spec_196.version @@ -23,42 +23,42 @@ "input_data, expected_output", [ pytest.param( - Spec.G1 + FP(0), + Spec.G1 + Scalar(0), Spec.INF_G1, id="generator_times_zero", ), pytest.param( - Spec.G1 + FP(1), + Spec.G1 + Scalar(1), Spec.G1, id="generator_times_one", ), pytest.param( - Spec.G1 + FP(2), + Spec.G1 + Scalar(2), Spec.G1x2, id="generator_times_two", ), pytest.param( - Spec.P1 + FP(0), + Spec.P1 + Scalar(0), Spec.INF_G1, id="p1_times_zero", ), pytest.param( - Spec.P1 + FP(1), + Spec.P1 + Scalar(1), Spec.P1, id="p1_times_one", ), pytest.param( - Spec.INF_G1 + FP(0), + Spec.INF_G1 + Scalar(0), Spec.INF_G1, id="inf_times_zero", ), pytest.param( - Spec.INF_G1 + FP(1), + Spec.INF_G1 + Scalar(1), Spec.INF_G1, id="inf_times_one", ), pytest.param( - Spec.INF_G1 + FP(2), + Spec.INF_G1 + Scalar(2), Spec.INF_G1, id="inf_times_two", ), @@ -73,10 +73,30 @@ id="no_scalar", ), pytest.param( - Spec.G1 + FP(1) + b"\0" * 32, + Spec.G1 + Scalar(1) + b"\0" * 32, Spec.G1, id="generator_times_one_extra_data", ), + pytest.param( + Spec.G1 + Scalar(Spec.N), + Spec.INF_G1, + id="generator_times_group_order", + ), + pytest.param( + Spec.G1 + Scalar(Spec.N + 1), + Spec.G1, + id="generator_times_group_order_plus_one", + ), + pytest.param( + Spec.G1 + Scalar(2 * Spec.N), + Spec.INF_G1, + id="generator_times_double_group_order", + ), + pytest.param( + Spec.G1 + Scalar(2 * Spec.N + 1), + Spec.G1, + id="generator_times_double_group_order_plus_one", + ), ], ) @pytest.mark.ported_from( @@ -104,52 +124,52 @@ def test_valid( "input_data, expected_output", [ pytest.param( - PointG1(1, 3) + FP(0), + PointG1(1, 3) + Scalar(0), b"", id="not_on_curve_1_3_times_zero", ), pytest.param( - PointG1(1, 3) + FP(1), + PointG1(1, 3) + Scalar(1), b"", id="not_on_curve_1_3_times_one", ), pytest.param( - PointG1(1, 3) + FP(2), + PointG1(1, 3) + Scalar(2), b"", id="not_on_curve_1_3_times_two", ), pytest.param( - PointG1(7827, 6598) + FP(0), + PointG1(7827, 6598) + Scalar(0), b"", id="not_on_curve_7827_6598_times_zero", ), pytest.param( - PointG1(7827, 6598) + FP(1), + PointG1(7827, 6598) + Scalar(1), b"", id="not_on_curve_7827_6598_times_one", ), pytest.param( - PointG1(0, 3) + FP(1), + PointG1(0, 3) + Scalar(1), b"", id="not_on_curve_0_3", ), pytest.param( - PointG1(Spec.P, 0) + FP(1), + PointG1(Spec.P, 0) + Scalar(1), b"", id="x_eq_P", ), pytest.param( - PointG1(0, Spec.P) + FP(1), + PointG1(0, Spec.P) + Scalar(1), b"", id="y_eq_P", ), pytest.param( - PointG1(Spec.G1.x + Spec.P, Spec.G1.y) + FP(1), + PointG1(Spec.G1.x + Spec.P, Spec.G1.y) + Scalar(1), b"", id="x_plus_P", ), pytest.param( - PointG1(Spec.G1.x, Spec.G1.y + Spec.P) + FP(1), + PointG1(Spec.G1.x, Spec.G1.y + Spec.P) + Scalar(1), b"", id="y_plus_P", ), From a0f6c80f22e27670f1eeb5899bfec3c2d90fe04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 6 Mar 2026 00:49:49 +0000 Subject: [PATCH 12/37] feat(tests): add basic ecpairing precompile tests (#2422) --- tests/byzantium/eip197_ec_pairing/conftest.py | 28 ++ tests/byzantium/eip197_ec_pairing/spec.py | 63 +++ .../eip197_ec_pairing/test_ecpairing.py | 143 ++++++ .../ecpairing_bad_length_191Filler.json | 287 ------------ .../ecpairing_bad_length_193Filler.json | 287 ------------ .../ecpairing_empty_dataFiller.json | 417 ----------------- .../ecpairing_one_point_failFiller.json | 419 ------------------ ...cpairing_one_point_with_g1_zeroFiller.json | 419 ------------------ ...cpairing_one_point_with_g2_zeroFiller.json | 287 ------------ .../ecpairing_two_point_match_1Filler.json | 419 ------------------ 10 files changed, 234 insertions(+), 2535 deletions(-) create mode 100644 tests/byzantium/eip197_ec_pairing/conftest.py create mode 100644 tests/byzantium/eip197_ec_pairing/spec.py create mode 100644 tests/byzantium/eip197_ec_pairing/test_ecpairing.py delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_191Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_193Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_empty_dataFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_failFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_1Filler.json diff --git a/tests/byzantium/eip197_ec_pairing/conftest.py b/tests/byzantium/eip197_ec_pairing/conftest.py new file mode 100644 index 00000000000..01bc4552191 --- /dev/null +++ b/tests/byzantium/eip197_ec_pairing/conftest.py @@ -0,0 +1,28 @@ +"""Shared pytest definitions local to EIP-197 tests.""" + +import pytest +from execution_testing import Fork + +from ...common.precompile_fixtures import ( + call_contract_address, # noqa: F401 + call_contract_code, # noqa: F401 + call_contract_post_storage, # noqa: F401 + call_opcode, # noqa: F401 + call_succeeds, # noqa: F401 + post, # noqa: F401 + precompile_gas_modifier, # noqa: F401 + sender, # noqa: F401 + tx, # noqa: F401 + tx_gas_limit, # noqa: F401 +) + + +@pytest.fixture +def precompile_gas(input_data: bytes, fork: Fork) -> int: + """Gas cost for the ecpairing precompile.""" + gas_costs = fork.gas_costs() + k = len(input_data) // 192 + return ( + gas_costs.GAS_PRECOMPILE_ECPAIRING_BASE + + gas_costs.GAS_PRECOMPILE_ECPAIRING_PER_POINT * k + ) diff --git a/tests/byzantium/eip197_ec_pairing/spec.py b/tests/byzantium/eip197_ec_pairing/spec.py new file mode 100644 index 00000000000..a8254dba5dc --- /dev/null +++ b/tests/byzantium/eip197_ec_pairing/spec.py @@ -0,0 +1,63 @@ +"""Defines EIP-197 specification constants and functions.""" + +from dataclasses import dataclass + +from execution_testing import Address, BytesConcatenation + +from ...constantinople.eip145_bitwise_shift.spec import ReferenceSpec +from ..eip196_ec_add_mul.spec import FP, PointG1 +from ..eip196_ec_add_mul.spec import Spec as Spec196 + +ref_spec_197 = ReferenceSpec( + "EIPS/eip-197.md", "9f9b3d33440e7c122b6c9192facfc380bc009422" +) + + +@dataclass(frozen=True) +class PointG2(BytesConcatenation): + """Affine point in the BN254 E'(Fp2) twist group (G2).""" + + x: tuple[int, int] = (0, 0) + y: tuple[int, int] = (0, 0) + + def __bytes__(self) -> bytes: + """Convert point to bytes.""" + return FP(self.x[0]) + FP(self.x[1]) + FP(self.y[0]) + FP(self.y[1]) + + +@dataclass(frozen=True) +class Spec: + """ + Parameters from the EIP-197 specification + (https://eips.ethereum.org/EIPS/eip-197). + """ + + # Precompile address + ECPAIRING = Address(0x08) + + # G1 points (from EIP-196) + G1 = Spec196.G1 + INF_G1 = Spec196.INF_G1 + NEG_G1 = PointG1(Spec196.G1.x, Spec196.P - Spec196.G1.y) + + # G2 generator + G2 = PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + # Point at infinity in G2 + INF_G2 = PointG2() + + # Pairing precompile results + PAIRING_TRUE = int.to_bytes(1, length=32, byteorder="big") + PAIRING_FALSE = int.to_bytes(0, length=32, byteorder="big") + + # Returned on precompile failure + INVALID = b"" diff --git a/tests/byzantium/eip197_ec_pairing/test_ecpairing.py b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py new file mode 100644 index 00000000000..3f98c639835 --- /dev/null +++ b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py @@ -0,0 +1,143 @@ +"""Test the ecpairing precompiled contract.""" + +import pytest +from execution_testing import ( + Alloc, + Environment, + StateTestFiller, + Transaction, +) + +from .spec import PointG1, Spec, ref_spec_197 + +REFERENCE_SPEC_GIT_PATH = ref_spec_197.git_path +REFERENCE_SPEC_VERSION = ref_spec_197.version + +pytestmark = [ + pytest.mark.valid_from("Byzantium"), + pytest.mark.parametrize( + "precompile_address", [Spec.ECPAIRING], ids=["ecpairing"] + ), +] + + +@pytest.mark.parametrize( + "input_data, expected_output", + [ + pytest.param( + b"", + Spec.PAIRING_TRUE, + id="empty", + ), + pytest.param( + Spec.INF_G1 + Spec.G2, + Spec.PAIRING_TRUE, + id="one_pair_g1_zero", + ), + pytest.param( + Spec.G1 + Spec.INF_G2, + Spec.PAIRING_TRUE, + id="one_pair_g2_zero", + ), + pytest.param( + Spec.G1 + Spec.G2 + Spec.NEG_G1 + Spec.G2, + Spec.PAIRING_TRUE, + id="two_pairs_negated_g1", + ), + ], +) +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_empty_dataFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_1Filler.json", + ], + pr=["https://github.com/ethereum/execution-specs/pull/2422"], +) +def test_valid( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test valid inputs where the pairing check succeeds.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) + + +@pytest.mark.parametrize( + "input_data, expected_output", + [ + pytest.param( + Spec.G1 + Spec.G2, + Spec.PAIRING_FALSE, + id="one_pair", + ), + ], +) +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_failFiller.json", + ], + pr=["https://github.com/ethereum/execution-specs/pull/2422"], +) +def test_fail( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test valid inputs where the pairing check fails.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) + + +@pytest.mark.parametrize( + "input_data, expected_output", + [ + pytest.param( + (Spec.G1 + Spec.G2)[:191], + Spec.INVALID, + id="bad_length_191", + ), + pytest.param( + Spec.G1 + Spec.G2 + b"\x00", + Spec.INVALID, + id="bad_length_193", + ), + pytest.param( + PointG1(1, 3) + Spec.G2, + Spec.INVALID, + id="g1_not_on_curve", + ), + ], +) +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_bad_length_191Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_bad_length_193Filler.json", + ], + pr=["https://github.com/ethereum/execution-specs/pull/2422"], +) +def test_invalid( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test invalid inputs to the ecpairing precompile.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_191Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_191Filler.json deleted file mode 100644 index fecb73adf32..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_191Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_bad_length_191": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "7", - "balance": "999999999998797605", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1202395", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000bf00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7d00" - ], - "gasLimit": [ - "0x3aba8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "8", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_193Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_193Filler.json deleted file mode 100644 index fd5252b240a..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_bad_length_193Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_bad_length_193": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "8", - "balance": "999999999998557053", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1442947", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0x3ac68", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "9", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_empty_dataFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_empty_dataFiller.json deleted file mode 100644 index a22bcf452dc..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_empty_dataFiller.json +++ /dev/null @@ -1,417 +0,0 @@ -{ - "ecpairing_empty_data": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "2", - "balance": "999999999999746703", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "253297", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0x25028", "80000", "85000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "3", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x00" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "3", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_failFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_failFiller.json deleted file mode 100644 index 32311e0d6e6..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_failFiller.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecpairing_one_point_fail": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "4", - "balance": "999999999999442450", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "557550", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3abe8", "90000", "100000" - ], - "gasPrice": "0x0a", - "nonce": "0x4", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "5", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "5", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json deleted file mode 100644 index 235f612a94e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecpairing_one_point_with_g1_zero": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "5", - "balance": "999999999999224771", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "775229", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3ab68", "90000", "100000" - ], - "gasPrice": "0x0a", - "nonce": "0x5", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "6", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "6", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json deleted file mode 100644 index 75b4f83254a..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_one_point_with_g2_zero": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "6", - "balance": "999999999999007220", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "992780", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0x38c68", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "7", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_1Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_1Filler.json deleted file mode 100644 index 40257093b05..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_1Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecpairing_two_point_match_1": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "11", - "balance": "999999999997710931", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2289069", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x50f68", "90000", "110000", "140000" - ], - "gasPrice": "0x0a", - "nonce": "0xb", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "12", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "12", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} From 4baa94f41fe4465c64b8537035f480e84b8818ae Mon Sep 17 00:00:00 2001 From: Jochem Brouwer Date: Fri, 6 Mar 2026 11:02:07 +0000 Subject: [PATCH 13/37] fix(benchmarks): move account_query test from compute to stateful (#2409) --- .../compute/instruction/test_account_query.py | 274 +--------------- .../stateful/bloatnet/test_account_query.py | 304 ++++++++++++++++++ 2 files changed, 305 insertions(+), 273 deletions(-) create mode 100644 tests/benchmark/stateful/bloatnet/test_account_query.py diff --git a/tests/benchmark/compute/instruction/test_account_query.py b/tests/benchmark/compute/instruction/test_account_query.py index 4cf815f7ce1..326097d63d5 100644 --- a/tests/benchmark/compute/instruction/test_account_query.py +++ b/tests/benchmark/compute/instruction/test_account_query.py @@ -13,32 +13,26 @@ """ import math -from typing import Any, Dict, List +from typing import Any import pytest from execution_testing import ( - AccessList, Account, Address, Alloc, BenchmarkTestFiller, Block, Bytecode, - Create2PreimageLayout, ExtCallGenerator, Fork, Hash, - IteratingBytecode, JumpLoopGenerator, Op, - ParameterSet, TestPhaseManager, Transaction, While, ) -from ..helpers import ContractDeploymentTransaction, CustomSizedContractFactory - @pytest.mark.repricing(contract_balance=1) @pytest.mark.parametrize("contract_balance", [0, 1]) @@ -403,269 +397,3 @@ def test_ext_account_query_cold( post=post, blocks=blocks, ) - - -def generate_account_query_params() -> List[ParameterSet]: - """ - Generate valid parameter combinations for test_account_query. - - Returns tuples of: (opcode, access_warm, mem_size, code_size, value_sent) - """ - all_mem_sizes = [0, 32, 256, 1024] - all_code_sizes = [0, 32, 256, 1024] - all_access_warm = [True, False] - all_value_sent = [0, 1] - - params = [] - - # BALANCE, EXTCODESIZE, EXTCODEHASH: - # only mem_size=0, code_size=0, value_sent=0 - for opcode in [Op.BALANCE, Op.EXTCODESIZE, Op.EXTCODEHASH]: - for access_warm in all_access_warm: - params.append(pytest.param(opcode, access_warm, 0, 0, 0)) - - # EXTCODECOPY: all mem_size, all code_size, value_sent=0 - for access_warm in all_access_warm: - for mem_size in all_mem_sizes: - for code_size in all_code_sizes: - params.append( - pytest.param( - Op.EXTCODECOPY, access_warm, mem_size, code_size, 0 - ) - ) - # Add None (max_code_size) separately with custom ID - params.append( - pytest.param( - Op.EXTCODECOPY, - access_warm, - mem_size, - None, - 0, - id=f"EXTCODECOPY-{access_warm}-{mem_size}-max_code_size-0", - ) - ) - - # CALL, CALLCODE: all mem_size, code_size=0, all value_sent - for opcode in [Op.CALL, Op.CALLCODE]: - for access_warm in all_access_warm: - for mem_size in all_mem_sizes: - for value_sent in all_value_sent: - params.append( - pytest.param( - opcode, access_warm, mem_size, 0, value_sent - ) - ) - - # STATICCALL, DELEGATECALL: all mem_size, code_size=0, value_sent=0 - for opcode in [Op.STATICCALL, Op.DELEGATECALL]: - for access_warm in all_access_warm: - for mem_size in all_mem_sizes: - params.append( - pytest.param(opcode, access_warm, mem_size, 0, 0) - ) - - return params - - -@pytest.mark.repricing -@pytest.mark.parametrize( - "opcode,access_warm,mem_size,code_size,value_sent", - generate_account_query_params(), -) -def test_account_query( - benchmark_test: BenchmarkTestFiller, - pre: Alloc, - fork: Fork, - opcode: Op, - access_warm: bool, - mem_size: int, - code_size: int, - value_sent: int, - gas_benchmark_value: int, - fixed_opcode_count: int | None, -) -> None: - """Benchmark scenario of accessing max-code size bytecode.""" - attack_gas_limit = gas_benchmark_value - - # Create the max-sized fork-dependent contract factory. - custom_sized_contract_factory = CustomSizedContractFactory( - pre=pre, fork=fork, contract_size=code_size - ) - factory_address = custom_sized_contract_factory.address() - initcode = custom_sized_contract_factory.initcode - - # Prepare the attack iterating bytecode. - # Setup is just placing the CREATE2 Preimage in memory. - create2_preimage = Create2PreimageLayout( - factory_address=factory_address, - salt=Op.CALLDATALOAD(0), - init_code_hash=initcode.keccak256(), - ) - setup_code: Bytecode = create2_preimage - - if mem_size > 96: - setup_code += Op.MSTORE8( - mem_size - 1, - 0, - # Gas accounting - old_memory_size=96, - new_memory_size=mem_size, - ) - - if opcode == Op.EXTCODECOPY: - attack_call = Op.EXTCODECOPY( - address=create2_preimage.address_op(), - dest_offset=0, - size=mem_size, - # Gas accounting - data_size=mem_size, - address_warm=access_warm, - ) - elif opcode in (Op.CALL, Op.CALLCODE): - # CALL and CALLCODE accept value parameter - attack_call = Op.POP( - opcode( - address=create2_preimage.address_op(), - value=value_sent, - args_size=mem_size, - # Gas accounting - address_warm=access_warm, - new_memory_size=max(mem_size, 96), - ) - ) - elif opcode in (Op.STATICCALL, Op.DELEGATECALL): - # STATICCALL and DELEGATECALL don't have value parameter - attack_call = Op.POP( - opcode( - address=create2_preimage.address_op(), - args_size=mem_size, - # Gas accounting - address_warm=access_warm, - new_memory_size=max(mem_size, 96), - ) - ) - else: - # BALANCE, EXTCODESIZE, EXTCODEHASH - attack_call = Op.POP( - opcode( - address=create2_preimage.address_op(), - # Gas accounting - address_warm=access_warm, - ) - ) - - loop_code = While( - body=attack_call + create2_preimage.increment_salt_op(), - ) - - attack_code = IteratingBytecode( - setup=setup_code, - iterating=loop_code, - # Since the target contract is guaranteed to have a STOP as the first - # instruction, we can use a STOP as the iterating subcall code. - iterating_subcall=Op.STOP, - ) - - # Calldata generator for each transaction of the iterating bytecode. - def calldata(iteration_count: int, start_iteration: int) -> bytes: - del iteration_count - # We only pass the start iteration index as calldata for this bytecode - return Hash(start_iteration) - - # Access list generator for warm access tests. - # When access_warm=True, include all contract addresses that will be - # accessed in each transaction to warm them up via access list. - # Note: This access list generation is very expensive due to the binary - # search, which builds different access lists using the same elements - # over and over. Caching the elements helps a bit. - access_list_cache: Dict[int, AccessList] = {} - - def access_list_generator( - iteration_count: int, start_iteration: int - ) -> list[AccessList] | None: - if not access_warm: - return None - return [ - access_list_cache.setdefault( - i, - AccessList( - address=custom_sized_contract_factory.created_contract_address( - salt=i - ), - storage_keys=[], - ), - ) - for i in range(start_iteration, start_iteration + iteration_count) - ] - - attack_address = pre.deploy_contract(code=attack_code, balance=10**21) - - # Calculate the number of contracts to be targeted. - if fixed_opcode_count is not None: - # Fixed opcode count mode - num_contracts = int(fixed_opcode_count * 1000) - else: - # Gas limit mode - num_contracts = sum( - attack_code.tx_iterations_by_gas_limit( - fork=fork, - gas_limit=attack_gas_limit, - calldata=calldata, - access_list=access_list_generator, - ) - ) - - # Deploy num_contracts via multiple txs (each capped by tx gas limit). - post = {} - with TestPhaseManager.setup(): - setup_sender = pre.fund_eoa() - contracts_deployment_txs: List[ContractDeploymentTransaction] = [] - for contract_creating_tx in ( - custom_sized_contract_factory.transactions_by_total_contract_count( - fork=fork, - sender=setup_sender, - contract_count=num_contracts, - ) - ): - contracts_deployment_txs.append(contract_creating_tx) - if custom_sized_contract_factory.contract_size > 0: - post[contract_creating_tx.deployed_contracts[-1]] = Account( - nonce=1 - ) - - with TestPhaseManager.execution(): - attack_sender = pre.fund_eoa() - if fixed_opcode_count is not None: - attack_txs = list( - attack_code.transactions_by_total_iteration_count( - fork=fork, - total_iterations=int(fixed_opcode_count * 1000), - sender=attack_sender, - to=attack_address, - calldata=calldata, - access_list=access_list_generator, - ) - ) - else: - attack_txs = list( - attack_code.transactions_by_gas_limit( - fork=fork, - gas_limit=attack_gas_limit, - sender=attack_sender, - to=attack_address, - calldata=calldata, - access_list=access_list_generator, - ) - ) - total_gas_cost = sum(tx.gas_cost for tx in attack_txs) - - benchmark_test( - pre=pre, - post=post, - blocks=[ - Block(txs=contracts_deployment_txs), - Block(txs=attack_txs), - ], - target_opcode=opcode, - expected_benchmark_gas_used=total_gas_cost, - ) diff --git a/tests/benchmark/stateful/bloatnet/test_account_query.py b/tests/benchmark/stateful/bloatnet/test_account_query.py new file mode 100644 index 00000000000..ece0cc06d9a --- /dev/null +++ b/tests/benchmark/stateful/bloatnet/test_account_query.py @@ -0,0 +1,304 @@ +""" +Benchmark operations that require querying the account state, either on the +current executing account or on a target account. + +Supported Opcodes: +- SELFBALANCE +- CODESIZE +- CODECOPY +- EXTCODESIZE +- EXTCODEHASH +- EXTCODECOPY +- BALANCE +""" + +from typing import Dict, List + +import pytest +from execution_testing import ( + AccessList, + Account, + Alloc, + BenchmarkTestFiller, + Block, + Bytecode, + Create2PreimageLayout, + Fork, + Hash, + IteratingBytecode, + Op, + ParameterSet, + TestPhaseManager, + While, +) + +from tests.benchmark.compute.helpers import ( + ContractDeploymentTransaction, + CustomSizedContractFactory, +) + + +def generate_account_query_params() -> List[ParameterSet]: + """ + Generate valid parameter combinations for test_account_query. + + Returns tuples of: (opcode, access_warm, mem_size, code_size, value_sent) + """ + all_mem_sizes = [0, 32, 256, 1024] + all_code_sizes = [0, 32, 256, 1024] + all_access_warm = [True, False] + all_value_sent = [0, 1] + + params = [] + + # BALANCE, EXTCODESIZE, EXTCODEHASH: + # only mem_size=0, code_size=0, value_sent=0 + for opcode in [Op.BALANCE, Op.EXTCODESIZE, Op.EXTCODEHASH]: + for access_warm in all_access_warm: + params.append(pytest.param(opcode, access_warm, 0, 0, 0)) + + # EXTCODECOPY: all mem_size, all code_size, value_sent=0 + for access_warm in all_access_warm: + for mem_size in all_mem_sizes: + for code_size in all_code_sizes: + params.append( + pytest.param( + Op.EXTCODECOPY, access_warm, mem_size, code_size, 0 + ) + ) + # Add None (max_code_size) separately with custom ID + params.append( + pytest.param( + Op.EXTCODECOPY, + access_warm, + mem_size, + None, + 0, + id=f"EXTCODECOPY-{access_warm}-{mem_size}-max_code_size-0", + ) + ) + + # CALL, CALLCODE: all mem_size, code_size=0, all value_sent + for opcode in [Op.CALL, Op.CALLCODE]: + for access_warm in all_access_warm: + for mem_size in all_mem_sizes: + for value_sent in all_value_sent: + params.append( + pytest.param( + opcode, access_warm, mem_size, 0, value_sent + ) + ) + + # STATICCALL, DELEGATECALL: all mem_size, code_size=0, value_sent=0 + for opcode in [Op.STATICCALL, Op.DELEGATECALL]: + for access_warm in all_access_warm: + for mem_size in all_mem_sizes: + params.append( + pytest.param(opcode, access_warm, mem_size, 0, 0) + ) + + return params + + +@pytest.mark.repricing +@pytest.mark.parametrize( + "opcode,access_warm,mem_size,code_size,value_sent", + generate_account_query_params(), +) +def test_account_query( + benchmark_test: BenchmarkTestFiller, + pre: Alloc, + fork: Fork, + opcode: Op, + access_warm: bool, + mem_size: int, + code_size: int, + value_sent: int, + gas_benchmark_value: int, + fixed_opcode_count: int | None, +) -> None: + """Benchmark scenario of accessing max-code size bytecode.""" + attack_gas_limit = gas_benchmark_value + + # Create the max-sized fork-dependent contract factory. + custom_sized_contract_factory = CustomSizedContractFactory( + pre=pre, fork=fork, contract_size=code_size + ) + factory_address = custom_sized_contract_factory.address() + initcode = custom_sized_contract_factory.initcode + + # Prepare the attack iterating bytecode. + # Setup is just placing the CREATE2 Preimage in memory. + create2_preimage = Create2PreimageLayout( + factory_address=factory_address, + salt=Op.CALLDATALOAD(0), + init_code_hash=initcode.keccak256(), + ) + setup_code: Bytecode = create2_preimage + + if mem_size > 96: + setup_code += Op.MSTORE8( + mem_size - 1, + 0, + # Gas accounting + old_memory_size=96, + new_memory_size=mem_size, + ) + + if opcode == Op.EXTCODECOPY: + attack_call = Op.EXTCODECOPY( + address=create2_preimage.address_op(), + dest_offset=0, + size=mem_size, + # Gas accounting + data_size=mem_size, + address_warm=access_warm, + ) + elif opcode in (Op.CALL, Op.CALLCODE): + # CALL and CALLCODE accept value parameter + attack_call = Op.POP( + opcode( + address=create2_preimage.address_op(), + value=value_sent, + args_size=mem_size, + # Gas accounting + address_warm=access_warm, + new_memory_size=max(mem_size, 96), + ) + ) + elif opcode in (Op.STATICCALL, Op.DELEGATECALL): + # STATICCALL and DELEGATECALL don't have value parameter + attack_call = Op.POP( + opcode( + address=create2_preimage.address_op(), + args_size=mem_size, + # Gas accounting + address_warm=access_warm, + new_memory_size=max(mem_size, 96), + ) + ) + else: + # BALANCE, EXTCODESIZE, EXTCODEHASH + attack_call = Op.POP( + opcode( + address=create2_preimage.address_op(), + # Gas accounting + address_warm=access_warm, + ) + ) + + loop_code = While( + body=attack_call + create2_preimage.increment_salt_op(), + ) + + attack_code = IteratingBytecode( + setup=setup_code, + iterating=loop_code, + # Since the target contract is guaranteed to have a STOP as the first + # instruction, we can use a STOP as the iterating subcall code. + iterating_subcall=Op.STOP, + ) + + # Calldata generator for each transaction of the iterating bytecode. + def calldata(iteration_count: int, start_iteration: int) -> bytes: + del iteration_count + # We only pass the start iteration index as calldata for this bytecode + return Hash(start_iteration) + + # Access list generator for warm access tests. + # When access_warm=True, include all contract addresses that will be + # accessed in each transaction to warm them up via access list. + # Note: This access list generation is very expensive due to the binary + # search, which builds different access lists using the same elements + # over and over. Caching the elements helps a bit. + access_list_cache: Dict[int, AccessList] = {} + + def access_list_generator( + iteration_count: int, start_iteration: int + ) -> list[AccessList] | None: + if not access_warm: + return None + return [ + access_list_cache.setdefault( + i, + AccessList( + address=custom_sized_contract_factory.created_contract_address( + salt=i + ), + storage_keys=[], + ), + ) + for i in range(start_iteration, start_iteration + iteration_count) + ] + + attack_address = pre.deploy_contract(code=attack_code, balance=10**21) + + # Calculate the number of contracts to be targeted. + if fixed_opcode_count is not None: + # Fixed opcode count mode + num_contracts = int(fixed_opcode_count * 1000) + else: + # Gas limit mode + num_contracts = sum( + attack_code.tx_iterations_by_gas_limit( + fork=fork, + gas_limit=attack_gas_limit, + calldata=calldata, + access_list=access_list_generator, + ) + ) + + # Deploy num_contracts via multiple txs (each capped by tx gas limit). + post = {} + with TestPhaseManager.setup(): + setup_sender = pre.fund_eoa() + contracts_deployment_txs: List[ContractDeploymentTransaction] = [] + for contract_creating_tx in ( + custom_sized_contract_factory.transactions_by_total_contract_count( + fork=fork, + sender=setup_sender, + contract_count=num_contracts, + ) + ): + contracts_deployment_txs.append(contract_creating_tx) + if custom_sized_contract_factory.contract_size > 0: + post[contract_creating_tx.deployed_contracts[-1]] = Account( + nonce=1 + ) + + with TestPhaseManager.execution(): + attack_sender = pre.fund_eoa() + if fixed_opcode_count is not None: + attack_txs = list( + attack_code.transactions_by_total_iteration_count( + fork=fork, + total_iterations=int(fixed_opcode_count * 1000), + sender=attack_sender, + to=attack_address, + calldata=calldata, + access_list=access_list_generator, + ) + ) + else: + attack_txs = list( + attack_code.transactions_by_gas_limit( + fork=fork, + gas_limit=attack_gas_limit, + sender=attack_sender, + to=attack_address, + calldata=calldata, + access_list=access_list_generator, + ) + ) + total_gas_cost = sum(tx.gas_cost for tx in attack_txs) + + benchmark_test( + pre=pre, + post=post, + blocks=[ + Block(txs=contracts_deployment_txs), + Block(txs=attack_txs), + ], + target_opcode=opcode, + expected_benchmark_gas_used=total_gas_cost, + ) From b822879ef5e58201fc06e3450d87a6b706b3bbc3 Mon Sep 17 00:00:00 2001 From: Jochem Brouwer Date: Fri, 6 Mar 2026 12:42:15 +0000 Subject: [PATCH 14/37] fix(benchmarks): fix fill issues with mint/approve erc20 updates (#2413) --- .../stateful/bloatnet/test_single_opcode.py | 56 ++++++++++++++----- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/tests/benchmark/stateful/bloatnet/test_single_opcode.py b/tests/benchmark/stateful/bloatnet/test_single_opcode.py index 66245816e93..b8ee0413e24 100644 --- a/tests/benchmark/stateful/bloatnet/test_single_opcode.py +++ b/tests/benchmark/stateful/bloatnet/test_single_opcode.py @@ -264,8 +264,9 @@ def test_sload_erc20_balanceof( slot_offset += num_calls blocks = build_cache_strategy_blocks(cache_strategy, txs, cache_txs) - - benchmark_test(pre=pre, blocks=blocks) + # FIXME: this should not use gas validation as this one should OOG + # If it does not OOG, the gas calculation is too high, it should be too low + benchmark_test(pre=pre, blocks=blocks, skip_gas_used_validation=True) @pytest.mark.parametrize("cache_strategy", list(CacheStrategy)) @@ -368,6 +369,11 @@ def test_sstore_erc20_approve( ) ) + # This dispatch is something close to the minimal amount + # of code to run for a contract only implementing approve + # It will therefore greatly underestimate the gas of any ERC20 + # contract because all of them have much more overhead in practice + # (also function selector at the entry point of the contract) function_dispatch = ( # Selector dispatch Op.PUSH4(APPROVE_SELECTOR) @@ -425,15 +431,17 @@ def test_sstore_erc20_approve( + Op.CALLDATALOAD(36) + Op.MSTORE(0, Op.CALLDATALOAD(4)) + Op.MSTORE(32, 1) - + Op.SHA3( - 0, - 64, - # gas accounting - data_size=64, - old_memory_size=0, - new_memory_size=64, + + Op.MSTORE( + 32, + Op.SHA3( + 0, + 64, + # gas accounting + data_size=64, + old_memory_size=0, + new_memory_size=64, + ), ) - + Op.MSTORE(32) + Op.MSTORE(0, Op.CALLDATALOAD(36)) + Op.SHA3( 0, @@ -496,8 +504,18 @@ def test_sstore_erc20_approve( slot_offset += num_calls blocks = build_cache_strategy_blocks(cache_strategy, txs, cache_txs) - - benchmark_test(pre=pre, blocks=blocks) + # TODO: this test can currently not estimate the gas used + # It will also overestimate the num_calls it can make to an unknown + # ERC20 contract and will therefore OOG + # (this actually passes the gas check as it consumes all gas and + # thus also the expected gas) + # TODO: find out how to tackle this. We do not want to OOG + # because the state root is part of the calculation + # NOTE: this is not crucial for gas repricing tests + # as the mint variant is used there. + benchmark_test( + pre=pre, blocks=blocks, skip_gas_used_validation=True + ) # FIXME: temp skips def build_call_memory_setup( @@ -570,6 +588,10 @@ def test_sstore_erc20_mint( ) -> None: """ Benchmark SSTORE using ERC20 mint on bloatnet. + This targets very specific code and is meant to be + temporary for the gas repricings effort, to be replaced + by a robust benchmark which does not depend on specific + conditions like in this benchmark. This contract calls mint() on an ERC20 contract which supports the mint() function. It is intended to be used with ERC20 contracts bloated via bloatStorage. @@ -610,14 +632,14 @@ def test_sstore_erc20_mint( mint_mem_setup = build_call_memory_setup( MINT_SELECTOR, Op.SLOAD(slot_offset), mint_amount ) - mint_erc20_call = build_external_call(erc20_address, 32 + 32 + 4) + mint_erc20_call = build_external_call(erc20_address, 2) # MEM[0] = function selector # MEM[32] = target address balance_mem_setup = build_call_memory_setup( BALANCEOF_SELECTOR, Op.SLOAD(slot_offset) ) - balance_erc20_call = build_external_call(erc20_address, 32 + 4) + balance_erc20_call = build_external_call(erc20_address, 1) attack_code = mint_erc20_call if cache_strategy == CacheStrategy.CACHE_TX: @@ -704,6 +726,12 @@ def test_sstore_erc20_mint( benchmark_test( pre=pre, blocks=blocks, + # NOTE: this specifically targets bloatnet code so the + # gas calculation could technically be done by inlining + # the bytecode. This test is temporary and will be removed + # after (or during) gas repricing effort is done. See + # https://github.com/ethereum/execution-specs/issues/2411 + skip_gas_used_validation=True, ) From e275279797a713872c3564886e9f604164a23549 Mon Sep 17 00:00:00 2001 From: Jochem Brouwer Date: Fri, 6 Mar 2026 13:57:53 +0000 Subject: [PATCH 15/37] fix(bench): fix solidity input check on balanceof sload bench (#2432) --- tests/benchmark/stateful/bloatnet/test_single_opcode.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/benchmark/stateful/bloatnet/test_single_opcode.py b/tests/benchmark/stateful/bloatnet/test_single_opcode.py index b8ee0413e24..7e3e0dce9de 100644 --- a/tests/benchmark/stateful/bloatnet/test_single_opcode.py +++ b/tests/benchmark/stateful/bloatnet/test_single_opcode.py @@ -217,7 +217,10 @@ def test_sload_erc20_balanceof( slot_offset = ( 1 if existing_slots - else 0xA4896A3F93BF4BF58378E579F3CF193BB4AF1022AF7D2089F37D8BAE7157B85F + else ( + 0xA4896A3F93BF4BF58378E579F3CF193BB4AF1022AF7D2089F37D8BAE7157B85F + ) + % (2**160) # Mask it as address otherwise Solidity rejects the input ) while gas_remaining > intrinsic_gas_with_access_list: From de5e83d1f4183bd454de8f7bf6e4f08c05cd447d Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Fri, 6 Mar 2026 15:32:46 +0100 Subject: [PATCH 16/37] feat(tests-static): Port rest of ecmul tests (#2425) feat(tests-static): Port rest of ecmul tests in stZeroKnowledge2 feat(tests-static): Refactor # Conflicts: # tests/byzantium/eip196_ec_add_mul/test_ecmul.py Co-authored-by: marioevz --- tests/byzantium/eip196_ec_add_mul/spec.py | 40 ++ .../byzantium/eip196_ec_add_mul/test_ecmul.py | 335 ++++++++++++-- .../ecmul_1-2_2_28000_96Filler.json | 419 ------------------ ...463374607431768211456_21000_128Filler.json | 415 ----------------- ...3463374607431768211456_21000_80Filler.json | 415 ----------------- ...3463374607431768211456_21000_96Filler.json | 415 ----------------- ...463374607431768211456_28000_128Filler.json | 287 ------------ ...3463374607431768211456_28000_80Filler.json | 287 ------------ ...3463374607431768211456_28000_96Filler.json | 419 ------------------ .../ecmul_1-2_5616_21000_128Filler.json | 415 ----------------- .../ecmul_1-2_5616_21000_96Filler.json | 415 ----------------- .../ecmul_1-2_5616_28000_128Filler.json | 287 ------------ .../ecmul_1-2_5617_21000_128Filler.json | 415 ----------------- .../ecmul_1-2_5617_21000_96Filler.json | 415 ----------------- .../ecmul_1-2_5617_28000_128Filler.json | 287 ------------ .../ecmul_1-2_5617_28000_96Filler.json | 287 ------------ .../ecmul_1-2_616_28000_96Filler.json | 419 ------------------ .../ecmul_1-2_9935_21000_128Filler.json | 415 ----------------- .../ecmul_1-2_9935_21000_96Filler.json | 415 ----------------- .../ecmul_1-2_9935_28000_128Filler.json | 287 ------------ .../ecmul_1-2_9935_28000_96Filler.json | 419 ------------------ .../ecmul_1-2_9_21000_128Filler.json | 400 ----------------- .../ecmul_1-2_9_21000_96Filler.json | 415 ----------------- .../ecmul_1-2_9_28000_128Filler.json | 287 ------------ .../ecmul_1-2_9_28000_96Filler.json | 418 ----------------- .../ecmul_1-3_0_21000_64Filler.json | 283 ------------ .../ecmul_1-3_0_21000_80Filler.json | 283 ------------ .../ecmul_1-3_0_21000_96Filler.json | 283 ------------ .../ecmul_1-3_0_28000_128Filler.json | 287 ------------ .../ecmul_1-3_0_28000_64Filler.json | 287 ------------ .../ecmul_1-3_0_28000_80_ParisFiller.json | 282 ------------ .../ecmul_1-3_0_28000_96Filler.json | 287 ------------ .../ecmul_1-3_1_21000_128Filler.json | 283 ------------ .../ecmul_1-3_1_21000_96Filler.json | 283 ------------ .../ecmul_1-3_1_28000_96Filler.json | 287 ------------ .../ecmul_1-3_2_21000_128Filler.json | 283 ------------ .../ecmul_1-3_2_21000_96Filler.json | 283 ------------ .../ecmul_1-3_2_28000_96Filler.json | 287 ------------ ...463374607431768211456_21000_128Filler.json | 283 ------------ ...3463374607431768211456_21000_80Filler.json | 283 ------------ ...3463374607431768211456_21000_96Filler.json | 283 ------------ ...463374607431768211456_28000_128Filler.json | 287 ------------ ...3463374607431768211456_28000_80Filler.json | 287 ------------ ...3463374607431768211456_28000_96Filler.json | 287 ------------ .../ecmul_1-3_5616_21000_128Filler.json | 283 ------------ .../ecmul_1-3_5616_21000_96Filler.json | 283 ------------ .../ecmul_1-3_5616_28000_128Filler.json | 287 ------------ .../ecmul_1-3_5616_28000_96Filler.json | 287 ------------ .../ecmul_1-3_5617_21000_128Filler.json | 283 ------------ .../ecmul_1-3_5617_21000_96Filler.json | 283 ------------ .../ecmul_1-3_5617_28000_128Filler.json | 287 ------------ .../ecmul_1-3_5617_28000_96Filler.json | 287 ------------ .../ecmul_1-3_9935_21000_128Filler.json | 283 ------------ .../ecmul_1-3_9935_21000_96Filler.json | 283 ------------ .../ecmul_1-3_9935_28000_128Filler.json | 287 ------------ .../ecmul_1-3_9935_28000_96Filler.json | 287 ------------ .../ecmul_1-3_9_21000_128Filler.json | 283 ------------ .../ecmul_1-3_9_21000_96Filler.json | 283 ------------ .../ecmul_1-3_9_28000_128Filler.json | 287 ------------ .../ecmul_1-3_9_28000_96Filler.json | 287 ------------ .../ecmul_7827-6598_0_21000_64Filler.json | 415 ----------------- .../ecmul_7827-6598_0_21000_80Filler.json | 415 ----------------- .../ecmul_7827-6598_0_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_0_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_0_28000_64Filler.json | 287 ------------ .../ecmul_7827-6598_0_28000_80Filler.json | 287 ------------ .../ecmul_7827-6598_0_28000_96Filler.json | 282 ------------ .../ecmul_7827-6598_1456_21000_128Filler.json | 415 ----------------- .../ecmul_7827-6598_1456_21000_80Filler.json | 415 ----------------- .../ecmul_7827-6598_1456_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_1456_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_1456_28000_80Filler.json | 287 ------------ .../ecmul_7827-6598_1456_28000_96Filler.json | 419 ------------------ .../ecmul_7827-6598_1_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_1_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_1_28000_96Filler.json | 419 ------------------ .../ecmul_7827-6598_2_21000_128Filler.json | 415 ----------------- .../ecmul_7827-6598_2_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_2_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_2_28000_96Filler.json | 418 ----------------- .../ecmul_7827-6598_5616_21000_128Filler.json | 415 ----------------- .../ecmul_7827-6598_5616_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_5616_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_5616_28000_96Filler.json | 419 ------------------ .../ecmul_7827-6598_5617_21000_128Filler.json | 415 ----------------- .../ecmul_7827-6598_5617_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_5617_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_5617_28000_96Filler.json | 287 ------------ .../ecmul_7827-6598_9935_21000_128Filler.json | 415 ----------------- .../ecmul_7827-6598_9935_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_9935_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_9935_28000_96Filler.json | 419 ------------------ .../ecmul_7827-6598_9_21000_128Filler.json | 417 ----------------- .../ecmul_7827-6598_9_21000_96Filler.json | 415 ----------------- .../ecmul_7827-6598_9_28000_128Filler.json | 287 ------------ .../ecmul_7827-6598_9_28000_96Filler.json | 419 ------------------ .../state_tests/stZeroKnowledge2/__init__.py | 4 - .../ecmul_0-0_0_21000_0Filler.json | 415 ----------------- .../ecmul_0-0_0_21000_128Filler.json | 415 ----------------- .../ecmul_0-0_0_21000_40Filler.json | 415 ----------------- .../ecmul_0-0_0_21000_64Filler.json | 415 ----------------- .../ecmul_0-0_0_21000_80Filler.json | 415 ----------------- .../ecmul_0-0_0_21000_96Filler.json | 415 ----------------- .../ecmul_0-0_0_28000_0Filler.json | 287 ------------ .../ecmul_0-0_0_28000_128Filler.json | 287 ------------ .../ecmul_0-0_0_28000_40Filler.json | 287 ------------ .../ecmul_0-0_0_28000_64Filler.json | 287 ------------ .../ecmul_0-0_0_28000_80Filler.json | 287 ------------ .../ecmul_0-0_0_28000_96Filler.json | 417 ----------------- .../ecmul_0-0_1_21000_128Filler.json | 415 ----------------- .../ecmul_0-0_1_21000_96Filler.json | 415 ----------------- .../ecmul_0-0_1_28000_128Filler.json | 287 ------------ .../ecmul_0-0_1_28000_96Filler.json | 287 ------------ .../ecmul_0-0_2_21000_128Filler.json | 415 ----------------- .../ecmul_0-0_2_21000_96Filler.json | 415 ----------------- .../ecmul_0-0_2_28000_128Filler.json | 287 ------------ .../ecmul_0-0_2_28000_96Filler.json | 419 ------------------ ...463374607431768211456_21000_128Filler.json | 415 ----------------- ...3463374607431768211456_21000_80Filler.json | 415 ----------------- ...3463374607431768211456_21000_96Filler.json | 415 ----------------- ...463374607431768211456_28000_128Filler.json | 287 ------------ ...3463374607431768211456_28000_80Filler.json | 287 ------------ ...3463374607431768211456_28000_96Filler.json | 419 ------------------ .../ecmul_0-0_5616_21000_128Filler.json | 415 ----------------- .../ecmul_0-0_5616_21000_96Filler.json | 415 ----------------- .../ecmul_0-0_5616_28000_128Filler.json | 287 ------------ .../ecmul_0-0_5616_28000_96Filler.json | 419 ------------------ .../ecmul_0-0_5617_21000_128Filler.json | 415 ----------------- .../ecmul_0-0_5617_21000_96Filler.json | 415 ----------------- .../ecmul_0-0_5617_28000_128Filler.json | 287 ------------ .../ecmul_0-0_5617_28000_96Filler.json | 419 ------------------ .../ecmul_0-0_9935_21000_128Filler.json | 415 ----------------- .../ecmul_0-0_9935_21000_96Filler.json | 415 ----------------- .../ecmul_0-0_9935_28000_128Filler.json | 287 ------------ .../ecmul_0-0_9935_28000_96Filler.json | 287 ------------ .../ecmul_0-0_9_21000_128Filler.json | 415 ----------------- .../ecmul_0-0_9_21000_96Filler.json | 415 ----------------- .../ecmul_0-0_9_28000_128Filler.json | 287 ------------ .../ecmul_0-0_9_28000_96Filler.json | 419 ------------------ .../ecmul_0-3_0_21000_128Filler.json | 283 ------------ .../ecmul_0-3_0_21000_64Filler.json | 283 ------------ .../ecmul_0-3_0_21000_80Filler.json | 283 ------------ .../ecmul_0-3_0_21000_96Filler.json | 283 ------------ .../ecmul_0-3_0_28000_128Filler.json | 287 ------------ .../ecmul_0-3_0_28000_64Filler.json | 287 ------------ .../ecmul_0-3_0_28000_80Filler.json | 287 ------------ .../ecmul_0-3_0_28000_96Filler.json | 287 ------------ .../ecmul_0-3_1_21000_128Filler.json | 283 ------------ .../ecmul_0-3_1_21000_96Filler.json | 283 ------------ .../ecmul_0-3_1_28000_128Filler.json | 287 ------------ .../ecmul_0-3_1_28000_96Filler.json | 287 ------------ .../ecmul_0-3_2_21000_128Filler.json | 283 ------------ .../ecmul_0-3_2_21000_96Filler.json | 283 ------------ .../ecmul_0-3_2_28000_128Filler.json | 287 ------------ .../ecmul_0-3_2_28000_96Filler.json | 287 ------------ ...463374607431768211456_21000_128Filler.json | 283 ------------ ...3463374607431768211456_21000_80Filler.json | 283 ------------ ...3463374607431768211456_21000_96Filler.json | 283 ------------ ...463374607431768211456_28000_128Filler.json | 287 ------------ ...3463374607431768211456_28000_80Filler.json | 287 ------------ ...3463374607431768211456_28000_96Filler.json | 287 ------------ .../ecmul_0-3_5616_21000_128Filler.json | 283 ------------ .../ecmul_0-3_5616_21000_96Filler.json | 283 ------------ .../ecmul_0-3_5616_28000_128Filler.json | 287 ------------ .../ecmul_0-3_5616_28000_96_ParisFiller.json | 282 ------------ .../ecmul_0-3_5617_21000_128Filler.json | 283 ------------ .../ecmul_0-3_5617_21000_96Filler.json | 283 ------------ .../ecmul_0-3_5617_28000_128Filler.json | 287 ------------ .../ecmul_0-3_5617_28000_96Filler.json | 287 ------------ .../ecmul_0-3_9935_21000_128Filler.json | 283 ------------ .../ecmul_0-3_9935_21000_96Filler.json | 283 ------------ .../ecmul_0-3_9935_28000_128Filler.json | 287 ------------ .../ecmul_0-3_9935_28000_96Filler.json | 287 ------------ .../ecmul_0-3_9_21000_128Filler.json | 283 ------------ .../ecmul_0-3_9_21000_96Filler.json | 283 ------------ .../ecmul_0-3_9_28000_128Filler.json | 287 ------------ .../ecmul_0-3_9_28000_96Filler.json | 287 ------------ .../ecmul_1-2_0_21000_128Filler.json | 415 ----------------- .../ecmul_1-2_0_21000_64Filler.json | 415 ----------------- .../ecmul_1-2_0_21000_80Filler.json | 415 ----------------- .../ecmul_1-2_0_21000_96Filler.json | 415 ----------------- .../ecmul_1-2_0_28000_128Filler.json | 287 ------------ .../ecmul_1-2_0_28000_64Filler.json | 287 ------------ .../ecmul_1-2_0_28000_80Filler.json | 287 ------------ .../ecmul_1-2_0_28000_96Filler.json | 287 ------------ .../ecmul_1-2_1_21000_128Filler.json | 415 ----------------- .../ecmul_1-2_1_21000_96Filler.json | 416 ----------------- .../ecmul_1-2_1_28000_128Filler.json | 287 ------------ .../ecmul_1-2_1_28000_96Filler.json | 419 ------------------ .../ecmul_1-2_2_21000_128Filler.json | 415 ----------------- .../ecmul_1-2_2_21000_96Filler.json | 415 ----------------- 191 files changed, 343 insertions(+), 63485 deletions(-) delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_616_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_80_ParisFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/__init__.py delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_ParisFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json diff --git a/tests/byzantium/eip196_ec_add_mul/spec.py b/tests/byzantium/eip196_ec_add_mul/spec.py index a85fa5ec035..b0b9e8f9ef6 100644 --- a/tests/byzantium/eip196_ec_add_mul/spec.py +++ b/tests/byzantium/eip196_ec_add_mul/spec.py @@ -74,6 +74,24 @@ class Spec: 0x15ED738C0E0A7C92E7845F96B2AE9C0A68A6A449E3538FC7FF3EBF7A5A18A2C4, ) + # G1 generator point times 2 pow 128: [2**128]G1 + G1x2_128 = PointG1( + 0x13B8FEC4A1EB2C7E3CCC07061AD516277C3BBE57BD4A302012B58A517F6437A4, + 0x224D978B5763831DFF16CE9B2C42222684835FEDFC70FFEC005789BB0C10DE36, + ) + + # G1 generator point times 2 pow 256 minus 1: [2**256-1]G1 + G1x2_256_1 = PointG1( + 0x2F588CFFE99DB877A4434B598AB28F81E0522910EA52B45F0ADAA772B2D5D352, + 0x12F42FA8FD34FB1B33D8C6A718B6590198389B26FC9D8808D971F8B009777A97, + ) + + # G1 generator times nine: [9]G1 + G1x9 = PointG1( + 0x39730EA8DFF1254C0FEE9C0EA777D29A9C710B7E616683F194F18C43B43B869, + 0x73A5FFCC6FC7A28C30723D6E58CE577356982D65B833A5A5C15BF9024B43D98, + ) + # Example point P P1 = PointG1( 0x17C139DF0EFEE0F766BC0204762B774362E4DED88953A39CE849A8A7FA163FA9, @@ -91,3 +109,25 @@ class Spec: 0x15BF2BB17880144B5D1CD2B1F46EFF9D617BFFD1CA57C37FB5A49BD84E53CF66, 0x049C797F9CE0D17083DEB32B5E36F2EA2A212EE036598DD7624C168993D1355F, ) + + # Point taken from legacy Ethereum BN256 ecMul precompile tests + T1 = PointG1( + 0x1A87B0584CE92F4593D161480614F2989035225609F08058CCFA3D0F940FEBE3, + 0x1A2F3C951F6DADCC7EE9007DFF81504B0FCD6D7CF59996EFDC33D92BF7F9F8F6, + ) + T1x2 = PointG1( + 0x3D64E49EBB3C56C99E0769C1833879C9B86EAD23945E1E7477CBD057E961C50, + 0xD6840B39F8C2FEFE0ECED3E7D210B830F50831E756F1CC9039AF65DC292E6D0, + ) + T1x9 = PointG1( + 0x1DBAD7D39DBC56379F78FAC1BCA147DC8E66DE1B9D183C7B167351BFE0AEAB74, + 0x2CD757D51289CD8DBD0ACF9E673AD67D0F0A89F912AF47ED1BE53664F5692575, + ) + T1x2_128 = PointG1( + 0x1051ACB0700EC6D42A88215852D582EFBAEF31529B6FCBC3277B5C1B300F5CF0, + 0x135B2394BB45AB04B8BD7611BD2DFE1DE6A4E6E2CCEA1EA1955F577CD66AF85B, + ) + T1x2_256_1 = PointG1( + 0x2CDE5879BA6F13C0B5AA4EF627F159A3347DF9722EFCE88A9AFBB20B763B4C41, + 0x1AA7E43076F6AEE272755A7F9B84832E71559BA0D2E0B17D5F9F01755E5B0D11, + ) diff --git a/tests/byzantium/eip196_ec_add_mul/test_ecmul.py b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py index 98c765921df..b8fbb1b938e 100644 --- a/tests/byzantium/eip196_ec_add_mul/test_ecmul.py +++ b/tests/byzantium/eip196_ec_add_mul/test_ecmul.py @@ -37,6 +37,91 @@ Spec.G1x2, id="generator_times_two", ), + pytest.param( + Spec.G1 + Scalar(9), + Spec.G1x9, + id="generator_times_nine", + ), + pytest.param( + Spec.G1 + Scalar(2**128), + Spec.G1x2_128, + id="generator_times_2_pow_128", + ), + pytest.param( + Spec.G1 + Scalar(2**256 - 1), + Spec.G1x2_256_1, + id="generator_times_2_pow_256_minus_1", + ), + pytest.param( + Spec.G1 + Scalar(Spec.N - 1), + PointG1(1, Spec.P - 2), + id="generator_times_group_order_minus_one", + ), + pytest.param( + Spec.G1 + Scalar(Spec.N), + Spec.INF_G1, + id="generator_times_group_order", + ), + pytest.param( + Spec.G1 + Scalar(Spec.N + 1), + Spec.G1, + id="generator_times_group_order_plus_one", + ), + pytest.param( + Spec.G1 + Scalar(2 * Spec.N - 1), + PointG1(1, Spec.P - 2), + id="generator_times_double_group_order_minus_one", + ), + pytest.param( + Spec.G1 + Scalar(2 * Spec.N), + Spec.INF_G1, + id="generator_times_double_group_order", + ), + pytest.param( + Spec.G1 + Scalar(2 * Spec.N + 1), + Spec.G1, + id="generator_times_double_group_order_plus_one", + ), + pytest.param( + Spec.T1 + Scalar(0), + Spec.INF_G1, + id="t1_point_times_zero", + ), + pytest.param( + Spec.T1 + Scalar(1), + Spec.T1, + id="t1_point_times_one", + ), + pytest.param( + Spec.T1 + Scalar(2), + Spec.T1x2, + id="t1_point_times_two", + ), + pytest.param( + Spec.T1 + Scalar(9), + Spec.T1x9, + id="t1_point_times_nine", + ), + pytest.param( + Spec.T1 + Scalar(2**128), + Spec.T1x2_128, + id="t1_point_times_2_pow_128", + ), + pytest.param( + Spec.T1 + Scalar(2**256 - 1), + Spec.T1x2_256_1, + id="t1_point_times_2_pow_256_minus_1", + ), + pytest.param( + Spec.T1 + Scalar(Spec.N - 1), + PointG1(Spec.T1.x, Spec.P - Spec.T1.y), + id="t1_point_times_group_order_minus_one", + ), + pytest.param( + Spec.T1 + Scalar(Spec.N), + Spec.INF_G1, + id="t1_point_times_group_order", + ), pytest.param( Spec.P1 + Scalar(0), Spec.INF_G1, @@ -63,45 +148,138 @@ id="inf_times_two", ), pytest.param( - b"", + Spec.INF_G1 + Scalar(9), Spec.INF_G1, - id="empty", + id="inf_times_nine", ), pytest.param( - Spec.G1, + Spec.INF_G1 + Scalar(2**128), + Spec.INF_G1, + id="inf_times_2_pow_128", + ), + pytest.param( + Spec.INF_G1 + Scalar(2**256 - 1), Spec.INF_G1, - id="no_scalar", + id="inf_times_2_pow_256_minus_1", + ), + pytest.param( + Spec.INF_G1 + Scalar(Spec.N - 1), + Spec.INF_G1, + id="inf_times_group_order_minus_one", + ), + pytest.param( + Spec.INF_G1 + Scalar(Spec.N), + Spec.INF_G1, + id="inf_times_group_order", + ), + # Extra data (>96 bytes) + pytest.param( + Spec.G1 + Scalar(1) + b"\0", + Spec.G1, + id="generator_times_one-single_extra_byte_0x00", + ), + pytest.param( + Spec.G1 + Scalar(1) + b"\xff", + Spec.G1, + id="generator_times_one-single_extra_byte_0xff", ), pytest.param( Spec.G1 + Scalar(1) + b"\0" * 32, Spec.G1, - id="generator_times_one_extra_data", + id="generator_times_one-32_extra_byte_0x00", ), pytest.param( - Spec.G1 + Scalar(Spec.N), + Spec.G1 + Scalar(1) + b"\xff" * 32, + Spec.G1, + id="generator_times_one-32_extra_byte_0xff", + ), + pytest.param( + Spec.INF_G1 + Scalar(0) + b"\0" * 32, Spec.INF_G1, - id="generator_times_group_order", + id="generator_times_zero-32_extra_byte_0x00", ), + # Shorter data (<96 bytes) pytest.param( - Spec.G1 + Scalar(Spec.N + 1), - Spec.G1, - id="generator_times_group_order_plus_one", + (Spec.G1 + Scalar(0))[:80], + Spec.INF_G1, + id="generator_times_zero-length_80", ), pytest.param( - Spec.G1 + Scalar(2 * Spec.N), + (Spec.G1 + Scalar(2**128))[:80], + Spec.G1x2_128, + id="generator_times_2_pow_128-length_80", + ), + pytest.param( + (Spec.G1 + Scalar(2**128))[:95], + Spec.G1x2_128, + id="generator_times_2_pow_128-length_95", + ), + pytest.param( + b"", Spec.INF_G1, - id="generator_times_double_group_order", + id="empty", + ), + pytest.param( + Spec.INF_G1, + Spec.INF_G1, + id="inf_no_scalar", + ), + pytest.param( + bytes(Spec.INF_G1)[:40], + Spec.INF_G1, + id="inf-length_40", + ), + pytest.param( + bytes(Spec.INF_G1)[:80], + Spec.INF_G1, + id="inf-length_80", ), pytest.param( - Spec.G1 + Scalar(2 * Spec.N + 1), Spec.G1, - id="generator_times_double_group_order_plus_one", + Spec.INF_G1, + id="generator_no_scalar", ), ], ) @pytest.mark.ported_from( [ - "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_28000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_616_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_9935_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_5617_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_9935_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json", ], pr=["https://github.com/ethereum/execution-specs/pull/2403"], ) @@ -121,67 +299,160 @@ def test_valid( @pytest.mark.parametrize( - "input_data, expected_output", + "input_data", [ pytest.param( PointG1(1, 3) + Scalar(0), - b"", id="not_on_curve_1_3_times_zero", ), + pytest.param( + PointG1(1, 3), + id="not_on_curve_1_3_no_scalar", + ), + pytest.param( + bytes(PointG1(1, 3))[:80], + id="not_on_curve_1_3-length_80", + ), + pytest.param( + PointG1(1, 3) + Scalar(0) + b"\0" * 32, + id="not_on_curve_1_3-32_extra_byte_0x00", + ), pytest.param( PointG1(1, 3) + Scalar(1), - b"", id="not_on_curve_1_3_times_one", ), pytest.param( PointG1(1, 3) + Scalar(2), - b"", id="not_on_curve_1_3_times_two", ), + pytest.param( + PointG1(1, 3) + Scalar(9), + id="not_on_curve_1_3_times_nine", + ), + pytest.param( + PointG1(1, 3) + Scalar(2**128), + id="not_on_curve_1_3_times_2_pow_128", + ), + pytest.param( + bytes(PointG1(1, 3) + Scalar(2**128))[:80], + id="not_on_curve_1_3_times_2_pow_128-length_80", + ), + pytest.param( + PointG1(1, 3) + Scalar(2**256 - 1), + id="not_on_curve_1_3_times_2_pow_256_minus_1", + ), + pytest.param( + PointG1(1, 3) + Scalar(Spec.N - 1), + id="not_on_curve_1_3_times_group_order_minus_one", + ), + pytest.param( + PointG1(1, 3) + Scalar(Spec.N), + id="not_on_curve_1_3_times_group_order", + ), + pytest.param( + PointG1(0, 3) + Scalar(0), + id="not_on_curve_0_3_times_zero", + ), + pytest.param( + PointG1(0, 3), + id="not_on_curve_0_3_no_scalar", + ), + pytest.param( + bytes(PointG1(0, 3))[:80], + id="not_on_curve_0_3-length_80", + ), + pytest.param( + PointG1(0, 3) + Scalar(0) + b"\0" * 32, + id="not_on_curve_0_3-32_extra_byte_0x00", + ), + pytest.param( + PointG1(0, 3) + Scalar(1), + id="not_on_curve_0_3_times_one", + ), + pytest.param( + PointG1(0, 3) + Scalar(2), + id="not_on_curve_0_3_times_two", + ), + pytest.param( + PointG1(0, 3) + Scalar(9), + id="not_on_curve_0_3_times_nine", + ), + pytest.param( + PointG1(0, 3) + Scalar(2**128), + id="not_on_curve_0_3_times_2_pow_128", + ), + pytest.param( + bytes(PointG1(0, 3) + Scalar(2**128))[:80], + id="not_on_curve_0_3_times_2_pow_128-length_80", + ), + pytest.param( + PointG1(0, 3) + Scalar(2**256 - 1), + id="not_on_curve_0_3_times_2_pow_256_minus_1", + ), + pytest.param( + PointG1(0, 3) + Scalar(Spec.N - 1), + id="not_on_curve_0_3_times_group_order_minus_one", + ), + pytest.param( + PointG1(0, 3) + Scalar(Spec.N), + id="not_on_curve_0_3_times_group_order", + ), pytest.param( PointG1(7827, 6598) + Scalar(0), - b"", id="not_on_curve_7827_6598_times_zero", ), pytest.param( PointG1(7827, 6598) + Scalar(1), - b"", id="not_on_curve_7827_6598_times_one", ), - pytest.param( - PointG1(0, 3) + Scalar(1), - b"", - id="not_on_curve_0_3", - ), pytest.param( PointG1(Spec.P, 0) + Scalar(1), - b"", id="x_eq_P", ), pytest.param( PointG1(0, Spec.P) + Scalar(1), - b"", id="y_eq_P", ), pytest.param( PointG1(Spec.G1.x + Spec.P, Spec.G1.y) + Scalar(1), - b"", id="x_plus_P", ), pytest.param( PointG1(Spec.G1.x, Spec.G1.y + Spec.P) + Scalar(1), - b"", id="y_plus_P", ), ], ) +@pytest.mark.parametrize( + "expected_output", [pytest.param(b"", id=pytest.HIDDEN_PARAM)] +) @pytest.mark.ported_from( [ "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_0_21000_128Filler.json", - "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_1_28000_128Filler.json", - "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_2_28000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_1-3_9935_21000_96Filler.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_0_21000_128Filler.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecmul_7827-6598_1_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json", ], pr=["https://github.com/ethereum/execution-specs/pull/2403"], ) diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_96Filler.json deleted file mode 100644 index 1289ffb92d3..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_2_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_1-2_2_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "132", - "balance": "999999999994222676", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5777324", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "30000", "90000", "110000", "200000", "40000" - ], - "gasPrice": "0x0a", - "nonce": "0x84", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "133", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3,4], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "133", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json deleted file mode 100644 index da6775db243..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_340282366920938463463374607431768211456_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "57", - "balance": "999999999997410898", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2589102", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x39", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "58", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "58", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json deleted file mode 100644 index af88fbbdc88..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_80Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_340282366920938463463374607431768211456_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "58", - "balance": "999999999997367538", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2632462", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x3a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "59", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "59", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json deleted file mode 100644 index 83e1c8c5ac5..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_340282366920938463463374607431768211456_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "56", - "balance": "999999999997454130", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2545870", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x38", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "57", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "57", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json deleted file mode 100644 index 9a229130c96..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_340282366920938463463374607431768211456_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "154", - "balance": "999999999993368996", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6631004", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x9a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "155", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_80Filler.json deleted file mode 100644 index 156e002ec96..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_340282366920938463463374607431768211456_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "155", - "balance": "999999999993337736", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6662264", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x9b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "156", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_96Filler.json deleted file mode 100644 index 17a196db6b9..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_340282366920938463463374607431768211456_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_1-2_340282366920938463463374607431768211456_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "153", - "balance": "999999999993400125", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6599875", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x99", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "154", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "154", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json deleted file mode 100644 index 66e7732bbe6..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_5616_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "71", - "balance": "999999999996788370", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3211630", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb060", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x47", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "72", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xac1de87792e425a22b81bdf624dc1b24fee26f16e9a879172aebc261cc51a2fe" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "72", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json deleted file mode 100644 index a0d797dee22..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_5616_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "70", - "balance": "999999999996833394", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3166606", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "0xafe0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x46", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "71", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xac1de87792e425a22b81bdf624dc1b24fee26f16e9a879172aebc261cc51a2fe" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "71", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json deleted file mode 100644 index eba8efb3eb0..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5616_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_5616_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xac1de87792e425a22b81bdf624dc1b24fee26f16e9a879172aebc261cc51a2fe" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "168", - "balance": "999999999992801283", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7198717", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcbb8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa8", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xac1de87792e425a22b81bdf624dc1b24fee26f16e9a879172aebc261cc51a2fe" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "169", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json deleted file mode 100644 index 9349a396f07..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_5617_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "81", - "balance": "999999999996329874", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3670126", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb0a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x51", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "82", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "82", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json deleted file mode 100644 index 0a189eb0d13..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_5617_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "80", - "balance": "999999999996374962", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3625038", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xb020", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x50", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "81", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "81", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json deleted file mode 100644 index 49cc849e559..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_5617_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "178", - "balance": "999999999992387396", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7612604", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcbf8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb2", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "179", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json deleted file mode 100644 index 891ead267f5..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_5617_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_5617_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "177", - "balance": "999999999992420381", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7579619", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xcb78", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb1", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "178", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_616_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_616_28000_96Filler.json deleted file mode 100644 index 51d90d6ef91..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_616_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_1-2_616_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "167", - "balance": "999999999992834204", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7165796", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "30000", "90000", "110000", "200000", "40000" - ], - "gasPrice": "0x0a", - "nonce": "0xa7", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "168", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3,4], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xac1de87792e425a22b81bdf624dc1b24fee26f16e9a879172aebc261cc51a2fe" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "168", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json deleted file mode 100644 index 7f6cd2e4628..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_9935_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "91", - "balance": "999999999995870546", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4129454", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb120", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x5b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "92", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xa34b6e4f9c282ff62c1e6f53fd92ad8efd8346d9866333a95ab4506a8158afc7" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "92", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_96Filler.json deleted file mode 100644 index 07c28a3d170..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_9935_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "90", - "balance": "999999999995915762", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4084238", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xb0a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x5a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "91", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xa34b6e4f9c282ff62c1e6f53fd92ad8efd8346d9866333a95ab4506a8158afc7" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "91", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json deleted file mode 100644 index 2e943702f36..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_9935_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa34b6e4f9c282ff62c1e6f53fd92ad8efd8346d9866333a95ab4506a8158afc7" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "188", - "balance": "999999999991972677", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "8027323", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcc78", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xbc", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa34b6e4f9c282ff62c1e6f53fd92ad8efd8346d9866333a95ab4506a8158afc7" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "189", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json deleted file mode 100644 index 277d562d5e7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9935_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_1-2_9935_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "187", - "balance": "999999999992005790", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7994210", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0x7bf8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xbb", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "188", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa34b6e4f9c282ff62c1e6f53fd92ad8efd8346d9866333a95ab4506a8158afc7" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "188", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json deleted file mode 100644 index bf9c0535078..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_128Filler.json +++ /dev/null @@ -1,400 +0,0 @@ -{ - "ecmul_1-2_9_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "46", - "balance": "999999999997894386", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2105614", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "47", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xc7b29565a7dd9915e6fd86d026aef2fc454506bae7f90e2f2bec5f25f01b2d95" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json deleted file mode 100644 index d47c3978aed..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_9_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "45", - "balance": "999999999997937618", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2062382", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "46", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xc7b29565a7dd9915e6fd86d026aef2fc454506bae7f90e2f2bec5f25f01b2d95" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "46", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_128Filler.json deleted file mode 100644 index 05e9aab429c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_9_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xc7b29565a7dd9915e6fd86d026aef2fc454506bae7f90e2f2bec5f25f01b2d95" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "143", - "balance": "999999999993795772", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6204228", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xc7b29565a7dd9915e6fd86d026aef2fc454506bae7f90e2f2bec5f25f01b2d95" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "144", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json deleted file mode 100644 index 99499b68fee..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-2_9_28000_96Filler.json +++ /dev/null @@ -1,418 +0,0 @@ -{ - "ecmul_1-2_9_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "142", - "balance": "999999999993826901", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6173099", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "143", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xc7b29565a7dd9915e6fd86d026aef2fc454506bae7f90e2f2bec5f25f01b2d95" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "143", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json deleted file mode 100644 index 6e5ee601550..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_64Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_0_21000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "17", - "balance": "999999999999163346", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "836654", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003" - ], - "gasLimit": [ - "0xa820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x11", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "18", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json deleted file mode 100644 index bb29eeb8d39..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_80Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_0_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "18", - "balance": "999999999999120306", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "879694", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x12", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "19", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json deleted file mode 100644 index 4a3ec8cc62d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_0_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "15", - "balance": "999999999999249810", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "750190", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xf", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "16", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_128Filler.json deleted file mode 100644 index 4f86cd225c9..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_0_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "113", - "balance": "999999999995031504", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4968496", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc478", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x71", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "114", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json deleted file mode 100644 index a17f9b3436a..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_64Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_0_28000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "114", - "balance": "999999999994981208", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5018792", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003" - ], - "gasLimit": [ - "0xc378", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x72", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "115", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_80_ParisFiller.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_80_ParisFiller.json deleted file mode 100644 index 0ef588226c4..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_80_ParisFiller.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "ecmul_1-3_0_28000_80_Paris": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "balance" : "100000000", - "storage": {}, - "nonce": "115", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "balance" : "10", - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x73", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "116", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json deleted file mode 100644 index 929f10146c4..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_0_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_0_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "112", - "balance": "999999999995081672", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4918328", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x70", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "113", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json deleted file mode 100644 index 8f5a60d41d6..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_1_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "30", - "balance": "999999999998594162", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1405838", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "31", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json deleted file mode 100644 index c1aa0fedf12..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_1_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "29", - "balance": "999999999998637394", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1362606", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "30", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_96Filler.json deleted file mode 100644 index d0c5f2d5d5c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_1_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_1_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "126", - "balance": "999999999994485865", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5514135", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "127", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json deleted file mode 100644 index 0cb07e27c04..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_2_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "40", - "balance": "999999999998153778", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1846222", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x28", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "41", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json deleted file mode 100644 index 222010b1175..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_2_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "39", - "balance": "999999999998197010", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1802990", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x27", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "40", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json deleted file mode 100644 index 022bfb921e5..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_2_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_2_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "136", - "balance": "999999999994090090", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5909910", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x88", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "137", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json deleted file mode 100644 index 4aebeddcc5d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_340282366920938463463374607431768211456_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "63", - "balance": "999999999997139538", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2860462", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x3f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "64", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json deleted file mode 100644 index 99d2e773d96..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_80Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_340282366920938463463374607431768211456_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "64", - "balance": "999999999997096178", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2903822", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x40", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "65", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json deleted file mode 100644 index a07b445f77d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_340282366920938463463374607431768211456_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "62", - "balance": "999999999997182770", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2817230", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x3e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "63", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json deleted file mode 100644 index 0ea42b2fdc4..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_340282366920938463463374607431768211456_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "160", - "balance": "999999999993151145", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6848855", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa0", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "161", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_80Filler.json deleted file mode 100644 index 0efb9cdcf0f..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_340282366920938463463374607431768211456_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "161", - "balance": "999999999993100785", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6899215", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa1", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "162", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_96Filler.json deleted file mode 100644 index 813ecc179e7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_340282366920938463463374607431768211456_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_340282366920938463463374607431768211456_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "159", - "balance": "999999999993201377", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6798623", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x9f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "160", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json deleted file mode 100644 index ffc780757d6..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_5616_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "75", - "balance": "999999999996600210", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3399790", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb060", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x4b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "76", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json deleted file mode 100644 index e3f6d1a63e8..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_5616_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "74", - "balance": "999999999996645234", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3354766", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "0xafe0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x4a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "75", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_128Filler.json deleted file mode 100644 index a59c5ea01a0..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_5616_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "172", - "balance": "999999999992642426", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7357574", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcbb8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xac", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "173", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json deleted file mode 100644 index 291ec3cc733..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5616_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_5616_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "171", - "balance": "999999999992694450", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7305550", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "0xcb38", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xab", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "172", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json deleted file mode 100644 index 1ef8c3b4f3d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_5617_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "85", - "balance": "999999999996141458", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3858542", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb0a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x55", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "86", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json deleted file mode 100644 index b39de91fb0d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_5617_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "84", - "balance": "999999999996186546", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3813454", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xb020", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x54", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "85", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json deleted file mode 100644 index 68a4511dbcb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_5617_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "182", - "balance": "999999999992228283", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7771717", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcbf8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb6", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "183", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json deleted file mode 100644 index ae5959b2447..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_5617_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_5617_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "181", - "balance": "999999999992280371", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7719629", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xcb78", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb5", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "182", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json deleted file mode 100644 index 4b2753d3dc8..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_9935_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "95", - "balance": "999999999995681618", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4318382", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb120", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x5f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "96", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_96Filler.json deleted file mode 100644 index 3f1601a7a51..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_9935_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "94", - "balance": "999999999995726834", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4273166", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xb0a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x5e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "95", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json deleted file mode 100644 index f48739b1943..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_9935_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "192", - "balance": "999999999991813052", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "8186948", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcc78", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xc0", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "193", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json deleted file mode 100644 index f50d6ac85fc..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9935_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_9935_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "191", - "balance": "999999999991865268", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "8134732", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xcbf8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xbf", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "192", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json deleted file mode 100644 index 051769e4eb4..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_9_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "50", - "balance": "999999999997713394", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2286606", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x32", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "51", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json deleted file mode 100644 index 6247b6247f7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_1-3_9_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "49", - "balance": "999999999997756626", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2243374", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x31", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "50", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json deleted file mode 100644 index 08d0a6d7fdb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_9_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "147", - "balance": "999999999993644083", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6355917", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x93", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "148", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json deleted file mode 100644 index c94a026fefb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_1-3_9_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-3_9_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "146", - "balance": "999999999993694315", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6305685", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x92", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "147", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json deleted file mode 100644 index ae52838cfe7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_64Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_0_21000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "13", - "balance": "999999999999343826", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "656174", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000401a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6" - ], - "gasLimit": [ - "0xb760", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xd", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "14", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "14", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json deleted file mode 100644 index c13dfd7d527..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_80Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_0_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "14", - "balance": "999999999999296882", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "703118", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000501a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb7e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xe", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "15", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "15", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json deleted file mode 100644 index c89af888b21..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_0_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "11", - "balance": "999999999999438098", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "561902", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb7e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "12", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "12", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json deleted file mode 100644 index 15378ffb1a6..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_0_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "109", - "balance": "999999999995186579", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4813421", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xd3b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "110", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_64Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_64Filler.json deleted file mode 100644 index 05636edeba0..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_64Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_0_28000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "110", - "balance": "999999999995151479", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4848521", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000401a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6" - ], - "gasLimit": [ - "0xd2b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "111", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json deleted file mode 100644 index 5fe4d502f9c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_0_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "111", - "balance": "999999999995116641", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4883359", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000501a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xd338", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "112", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json deleted file mode 100644 index 8b77973e5ff..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_0_28000_96Filler.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "ecmul_7827-6598_0_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "108", - "balance": "999999999995221548", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4778452", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xd338", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json deleted file mode 100644 index 1d16cdc7d39..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_1456_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "60", - "balance": "999999999997277170", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2722830", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x3c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "61", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "61", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json deleted file mode 100644 index d9962ffef84..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_80Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_1456_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "61", - "balance": "999999999997229906", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2770094", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000501a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xb820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x3d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "62", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "62", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json deleted file mode 100644 index 818314c30cc..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_1456_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "59", - "balance": "999999999997324306", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2675694", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xb820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x3b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "60", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "60", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_128Filler.json deleted file mode 100644 index 481ef80e16d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_1456_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "157", - "balance": "999999999993271574", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6728426", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xd3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x9d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "158", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json deleted file mode 100644 index ccd3921c36d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_1456_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "158", - "balance": "999999999993236410", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6763590", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000501a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xd378", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x9e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "159", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json deleted file mode 100644 index 12eec3a5a97..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1456_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_7827-6598_1456_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "156", - "balance": "999999999993306607", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6693393", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "34000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x9c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x0467d6413c98fb304cd61014865afdb7b3b81fa53f7ef4046e6a833162c5bb5c" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "157", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "157", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json deleted file mode 100644 index ac848584696..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_1_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "27", - "balance": "999999999998731794", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1268206", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xb820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "28", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "28", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json deleted file mode 100644 index 9a9c167110d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_1_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "125", - "balance": "999999999994521029", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5478971", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xd3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "126", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_96Filler.json deleted file mode 100644 index ed163a50ba0..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_1_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_7827-6598_1_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "124", - "balance": "999999999994556062", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5443938", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "34000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "125", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "125", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json deleted file mode 100644 index ab12420106d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_2_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "38", - "balance": "999999999998244274", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1755726", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x26", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "39", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "39", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json deleted file mode 100644 index c66edf28cef..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_2_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "37", - "balance": "999999999998291410", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1708590", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xb820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x25", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "38", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "38", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_128Filler.json deleted file mode 100644 index 0ff362a0b9f..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_2_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "135", - "balance": "999999999994125254", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5874746", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xd3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x87", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "136", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json deleted file mode 100644 index af2a4842bfb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_2_28000_96Filler.json +++ /dev/null @@ -1,418 +0,0 @@ -{ - "ecmul_7827-6598_2_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "134", - "balance": "999999999994160287", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5839713", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0x8378", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x86", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "135", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "135", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json deleted file mode 100644 index 8d89a15b8a0..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_5616_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "73", - "balance": "999999999996694290", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3305710", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xbfa0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x49", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "74", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "74", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json deleted file mode 100644 index 2dd03494685..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_5616_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "72", - "balance": "999999999996743218", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3256782", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "0xbf20", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x48", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "73", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "73", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json deleted file mode 100644 index 97bb52a0db3..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_5616_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "170", - "balance": "999999999992731406", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7268594", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xdaf8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xaa", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "171", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json deleted file mode 100644 index 88d0c89f01b..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5616_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_7827-6598_5616_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xac1de87792e425a22b81bdf624dc1b24fee26f16e9a879172aebc261cc51a2fe" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "169", - "balance": "999999999992768231", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7231769", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "34000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa9", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xac1de87792e425a22b81bdf624dc1b24fee26f16e9a879172aebc261cc51a2fe" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "170", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "170", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json deleted file mode 100644 index ab55b583d7c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_5617_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "83", - "balance": "999999999996235666", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3764334", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xbfe0", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x53", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "84", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "84", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_96Filler.json deleted file mode 100644 index 43fd7230e90..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_5617_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "82", - "balance": "999999999996284658", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3715342", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xbf60", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x52", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "83", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "83", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json deleted file mode 100644 index 7274db1319f..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_5617_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "180", - "balance": "999999999992317391", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7682609", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xdb38", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb4", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "181", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json deleted file mode 100644 index 61e3b2181ef..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_5617_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_5617_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "179", - "balance": "999999999992354280", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7645720", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f630644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xdab8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb3", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "180", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json deleted file mode 100644 index 18970a408eb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_9935_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "93", - "balance": "999999999995776082", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4223918", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc060", "50000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x5d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0,1], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "94", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "94", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_96Filler.json deleted file mode 100644 index 55be9727a00..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_9935_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "92", - "balance": "999999999995825202", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4174798", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xbfe0", "50000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x5c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0,1], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "93", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "93", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json deleted file mode 100644 index b48411ba983..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_9935_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "190", - "balance": "999999999991902416", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "8097584", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xdbb8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xbe", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "191", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json deleted file mode 100644 index 8e923d839f6..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9935_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_7827-6598_9935_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa34b6e4f9c282ff62c1e6f53fd92ad8efd8346d9866333a95ab4506a8158afc7" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "189", - "balance": "999999999991939433", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "8060567", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xbd", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa34b6e4f9c282ff62c1e6f53fd92ad8efd8346d9866333a95ab4506a8158afc7" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "190", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "190", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json deleted file mode 100644 index 2ad76b165a5..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_128Filler.json +++ /dev/null @@ -1,417 +0,0 @@ -{ - "ecmul_7827-6598_9_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "48", - "balance": "999999999997803890", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2196110", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x30", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "49", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x00" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "49", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json deleted file mode 100644 index c1ab4ea5f2b..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_7827-6598_9_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "47", - "balance": "999999999997851026", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2148974", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0xb820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "48", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "48", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json deleted file mode 100644 index 8114c13920b..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_7827-6598_9_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "145", - "balance": "999999999993729479", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6270521", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000801a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f600000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xd3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x91", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "146", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json deleted file mode 100644 index 93ec3e62394..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecmul_7827-6598_9_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_7827-6598_9_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xc7b29565a7dd9915e6fd86d026aef2fc454506bae7f90e2f2bec5f25f01b2d95" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "144", - "balance": "999999999993764512", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6235488", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000601a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f60000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0x8378", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x90", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xc7b29565a7dd9915e6fd86d026aef2fc454506bae7f90e2f2bec5f25f01b2d95" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "145", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "145", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (11999875504842010600789954262886096740416429265635183817701593963271973497827, 11843594000332171325303933275547366297934113019079887694534126289021216356598) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/__init__.py b/tests/static/state_tests/stZeroKnowledge2/__init__.py deleted file mode 100644 index 9c81318aef8..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -"""Static State Tests Fillers from ethereum/tests repo.""" - -REFERENCE_SPEC_GIT_PATH = "" -REFERENCE_SPEC_VERSION = "" diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json deleted file mode 100644 index fb8ce6fc763..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_0_21000_0": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "5", - "balance": "999999999999696274", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "303726", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa660", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x5", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "6", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "6", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 0 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json deleted file mode 100644 index 7b6927404ee..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_0_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "2", - "balance": "999999999999825394", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "174606", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "3", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "3", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json deleted file mode 100644 index 52b1b96897f..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_0_21000_40": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "6", - "balance": "999999999999653682", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "346318", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa7a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "7", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "7", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 40 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json deleted file mode 100644 index 9669f78ec4c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_0_21000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "3", - "balance": "999999999999782226", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "217774", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa7a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x3", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "4", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "4", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json deleted file mode 100644 index 89865126770..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_0_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "4", - "balance": "999999999999739314", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "260686", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x4", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "5", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "5", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json deleted file mode 100644 index 4c22c7c7221..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_0_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "1", - "balance": "999999999999868434", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "131566", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "2", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "2", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json deleted file mode 100644 index 937103a8bec..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_0_28000_0": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "102", - "balance": "999999999995407094", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4592906", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc1b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x66", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "103", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 0 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json deleted file mode 100644 index e8573e88f54..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_0_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "99", - "balance": "999999999995499905", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4500095", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x63", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "100", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json deleted file mode 100644 index e5ec8609831..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_0_28000_40": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "103", - "balance": "999999999995376614", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4623386", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc2f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x67", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "104", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 40 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json deleted file mode 100644 index cfa950fbe8e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_0_28000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "100", - "balance": "999999999995468837", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4531163", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc2f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x64", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "101", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json deleted file mode 100644 index e99add92678..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_0_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "101", - "balance": "999999999995438031", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4561969", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc378", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x65", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "102", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json deleted file mode 100644 index 869918717d9..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json +++ /dev/null @@ -1,417 +0,0 @@ -{ - "ecmul_0-0_0_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "98", - "balance": "999999999995545842", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4454158", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "35000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x62", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x00" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "99", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "99", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json deleted file mode 100644 index 816446c97c2..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_1_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "24", - "balance": "999999999998861618", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1138382", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x18", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "25", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "25", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json deleted file mode 100644 index 5c3aef2431c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_1_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "23", - "balance": "999999999998904722", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1095278", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xa860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x17", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "24", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "24", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json deleted file mode 100644 index 3b56ed3c54e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_1_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "121", - "balance": "999999999994649583", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5350417", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x79", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "122", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json deleted file mode 100644 index f62d30a89fb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_1_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "120", - "balance": "999999999994680584", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5319416", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xc3b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x78", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "121", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json deleted file mode 100644 index 8d160fdb11c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_2_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "34", - "balance": "999999999998421234", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1578766", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x22", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "35", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "35", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json deleted file mode 100644 index 9dd6afab336..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_2_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "33", - "balance": "999999999998464338", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1535662", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xa860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x21", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "34", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "34", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json deleted file mode 100644 index 3de113ab363..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_2_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "131", - "balance": "999999999994253808", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5746192", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x83", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "132", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json deleted file mode 100644 index e29a74377c9..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_0-0_2_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "130", - "balance": "999999999994284809", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5715191", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x82", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "131", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "131", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json deleted file mode 100644 index 87253bbd587..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_340282366920938463463374607431768211456_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "54", - "balance": "999999999997540466", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2459534", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x36", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "55", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "55", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json deleted file mode 100644 index 1d0280c076b..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_340282366920938463463374607431768211456_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "55", - "balance": "999999999997497234", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2502766", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x37", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "56", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "56", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json deleted file mode 100644 index d2eda709e22..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_340282366920938463463374607431768211456_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "53", - "balance": "999999999997583570", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2416430", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x35", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "54", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "54", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json deleted file mode 100644 index 1e1a2ef37f2..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_340282366920938463463374607431768211456_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "151", - "balance": "999999999993462258", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6537742", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x97", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "152", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json deleted file mode 100644 index 34a41b8fcac..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_340282366920938463463374607431768211456_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "152", - "balance": "999999999993431126", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6568874", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x98", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "153", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json deleted file mode 100644 index 4f009942a40..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_0-0_340282366920938463463374607431768211456_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "150", - "balance": "999999999993493259", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6506741", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x96", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "151", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "151", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json deleted file mode 100644 index 13a0a554999..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_5616_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "69", - "balance": "999999999996878418", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3121582", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xafe0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x45", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "70", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "70", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json deleted file mode 100644 index 6f6c7e10bad..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_5616_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "68", - "balance": "999999999996923314", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3076686", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "0xaf60", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x44", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "69", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "69", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json deleted file mode 100644 index d1e834eb3d1..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_5616_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "166", - "balance": "999999999992867128", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7132872", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcb38", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa6", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "167", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json deleted file mode 100644 index 642747681da..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_0-0_5616_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "165", - "balance": "999999999992899921", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7100079", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa5", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "166", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "166", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json deleted file mode 100644 index 982f2c9d0fe..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_5617_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "79", - "balance": "999999999996420050", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3579950", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb020", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x4f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "80", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "80", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json deleted file mode 100644 index 611c8772c5f..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_5617_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "78", - "balance": "999999999996465010", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3534990", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xafa0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x4e", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "79", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "79", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json deleted file mode 100644 index 40679426c8e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_5617_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "176", - "balance": "999999999992453369", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7546631", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcb78", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb0", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "177", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json deleted file mode 100644 index 0f6e1e31449..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_0-0_5617_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "175", - "balance": "999999999992486226", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7513774", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xaf", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "176", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "176", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json deleted file mode 100644 index 98b838c36de..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_9935_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "89", - "balance": "999999999995960978", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4039022", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb0a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x59", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "90", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "90", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json deleted file mode 100644 index 5e9c55450b7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_9935_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "88", - "balance": "999999999996006066", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3993934", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xb020", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x58", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "89", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "89", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json deleted file mode 100644 index 7383fddeacb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_9935_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "186", - "balance": "999999999992038906", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7961094", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcbf8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xba", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "187", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json deleted file mode 100644 index dd96ffbbeac..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_9935_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "185", - "balance": "999999999992071891", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7928109", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xcb78", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb9", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "186", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json deleted file mode 100644 index 8a655700096..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_9_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "44", - "balance": "999999999997980850", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2019150", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "45", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "45", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json deleted file mode 100644 index 303fb764943..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_0-0_9_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "43", - "balance": "999999999998023954", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1976046", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0xa860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "44", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "44", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json deleted file mode 100644 index dbb05cc5113..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-0_9_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "141", - "balance": "999999999993858033", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6141967", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "142", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json deleted file mode 100644 index ddc7798fa36..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_0-0_9_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "140", - "balance": "999999999993889034", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6110966", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "141", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "141", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 0) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json deleted file mode 100644 index 36a278a8b28..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_0_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "20", - "balance": "999999999999034034", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "965966", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x14", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "21", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json deleted file mode 100644 index f243c0588e7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_0_21000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "21", - "balance": "999999999998990802", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1009198", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003" - ], - "gasLimit": [ - "0xa7e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x15", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "22", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json deleted file mode 100644 index d4573e3379c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_0_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "22", - "balance": "999999999998947826", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1052174", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x16", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "23", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json deleted file mode 100644 index 7e3445f0bab..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_0_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "19", - "balance": "999999999999077138", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "922862", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa860", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x13", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "20", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json deleted file mode 100644 index fd3382fe90b..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_0_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "117", - "balance": "999999999994830896", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5169104", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc438", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x75", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "118", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json deleted file mode 100644 index 832659a1813..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_0_28000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "118", - "balance": "999999999994780664", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5219336", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003" - ], - "gasLimit": [ - "0xc338", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x76", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "119", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json deleted file mode 100644 index f62fff042f4..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_0_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "119", - "balance": "999999999994730688", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5269312", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x77", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "120", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json deleted file mode 100644 index e9e02cdfe7e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_0_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "116", - "balance": "999999999994881000", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5119000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x74", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "117", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json deleted file mode 100644 index b7ff6f71396..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_1_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "32", - "balance": "999999999998507634", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1492366", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa920", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x20", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "33", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json deleted file mode 100644 index acae9897c29..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_1_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "31", - "balance": "999999999998550802", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1449198", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1f", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "32", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json deleted file mode 100644 index 6fe62b7d568..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_1_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "129", - "balance": "999999999994335105", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5664895", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc478", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x81", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "130", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json deleted file mode 100644 index 8dac8242f6e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_1_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "128", - "balance": "999999999994385273", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5614727", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x80", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x556a3c03566b04196c534f5612f50167917d72e6ab9b687e10e72dbe0e0f9279" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "129", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json deleted file mode 100644 index 1dc2db87f0d..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_2_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "42", - "balance": "999999999998067250", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1932750", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa920", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x2a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "43", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json deleted file mode 100644 index c2aeb8bb500..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_2_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "41", - "balance": "999999999998110418", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1889582", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x29", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "42", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json deleted file mode 100644 index 8053fa239b1..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_2_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "139", - "balance": "999999999993939330", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6060670", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc478", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "140", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json deleted file mode 100644 index 0a89d34914e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_2_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "138", - "balance": "999999999993989498", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6010502", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x94b60ed39c6fe45858b5931190d93861a2d2538991194cdf9a39b5e83dec0827" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "139", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json deleted file mode 100644 index 819ec97acb7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_340282366920938463463374607431768211456_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "66", - "balance": "999999999997009778", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2990222", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa920", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x42", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "67", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json deleted file mode 100644 index f00be7395d0..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_340282366920938463463374607431768211456_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "67", - "balance": "999999999996966482", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3033518", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x43", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "68", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json deleted file mode 100644 index b85dac90984..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_340282366920938463463374607431768211456_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "65", - "balance": "999999999997052946", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2947054", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x41", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "66", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json deleted file mode 100644 index 066b3223386..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_340282366920938463463374607431768211456_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "163", - "balance": "999999999993000385", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6999615", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc478", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa3", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "164", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json deleted file mode 100644 index e6204275c61..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_340282366920938463463374607431768211456_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "164", - "balance": "999999999992950089", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7049911", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa4", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "165", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json deleted file mode 100644 index 61ee0801edc..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_340282366920938463463374607431768211456_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "162", - "balance": "999999999993050553", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6949447", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000100000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa2", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xa97df6032909972db52b8144798569bb6169ec8b3e065841da96b3d866aa131e" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "163", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 340282366920938463463374607431768211456 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json deleted file mode 100644 index aeaa6af0721..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_5616_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "77", - "balance": "999999999996510098", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3489902", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb020", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x4d", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "78", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json deleted file mode 100644 index 2ef11071fbd..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_5616_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "76", - "balance": "999999999996555058", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3444942", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "0xafa0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x4c", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "77", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json deleted file mode 100644 index b5d20083e3a..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_5616_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "174", - "balance": "999999999992538314", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7461686", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcb78", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xae", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "175", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_ParisFiller.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_ParisFiller.json deleted file mode 100644 index e542cf90090..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_ParisFiller.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "ecmul_0-3_5616_28000_96_Paris": { - "_info" : { - "comment" : "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - }, - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "balance" : "1500000", - "storage": {}, - "nonce": "173", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "balance" : "10", - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000" - ], - "gasLimit": [ - "0xcaf8", "90000", "110000" - ], - "gasPrice": "0x0a", - "nonce": "0xad", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0,1,2], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x289df36ee06bbcd57a9ce2a88d2bcda09715d42f96f7f23c48cdd54e2002f059" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "174", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ] - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json deleted file mode 100644 index 480f6481d59..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_5617_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "87", - "balance": "999999999996051218", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3948782", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb060", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x57", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "88", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json deleted file mode 100644 index 2243fa37776..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_5617_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "86", - "balance": "999999999996096242", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3903758", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xafe0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x56", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "87", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json deleted file mode 100644 index cf9d6392f24..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_5617_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "184", - "balance": "999999999992124043", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7875957", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcbb8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb8", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "185", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json deleted file mode 100644 index 1a731458b8c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_5617_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "183", - "balance": "999999999992176067", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "7823933", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000330644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001" - ], - "gasLimit": [ - "0xcb38", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xb7", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "184", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495617 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json deleted file mode 100644 index 665913a73b5..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_9935_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "97", - "balance": "999999999995591122", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4408878", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xb0e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x61", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "98", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json deleted file mode 100644 index 56f9a718efa..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_9935_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "96", - "balance": "999999999995636274", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4363726", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xb060", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x60", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "97", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json deleted file mode 100644 index 0fe0626cdeb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_9935_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "194", - "balance": "999999999991708556", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "8291444", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xcc38", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xc2", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "195", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json deleted file mode 100644 index d2b795bca79..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_9935_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "193", - "balance": "999999999991760708", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "8239292", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - "gasLimit": [ - "0xcbb8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xc1", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x40c97882e95e71d48d97c8655188333e16470e807a99282b8795064ca6ca4dcf" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "194", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 115792089237316195423570985008687907853269984665640564039457584007913129639935 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json deleted file mode 100644 index 9b9a6d64c21..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_9_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "52", - "balance": "999999999997626866", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2373134", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa920", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x34", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "53", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json deleted file mode 100644 index 924acedc8a7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "ecmul_0-3_9_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "51", - "balance": "999999999997670034", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2329966", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x33", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "52", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json deleted file mode 100644 index c67920ce517..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_9_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "149", - "balance": "999999999993543555", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6456445", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000090000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc478", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x95", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "150", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json deleted file mode 100644 index c8f5c107201..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_0-3_9_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "148", - "balance": "999999999993593723", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6406277", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000009" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x94", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xf348aa9f55b137fd60af9c782c04ea7c52c0b193972d1c3aa63d78a110fa2e20" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "149", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (0, 3) and the factor 9 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json deleted file mode 100644 index 47e4efcb00b..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_0_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "8", - "balance": "999999999999567602", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "432398", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa920", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x8", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "9", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "9", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json deleted file mode 100644 index 850eeb145de..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_0_21000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "9", - "balance": "999999999999524306", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "475694", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xa820", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x9", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "10", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "10", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json deleted file mode 100644 index b184bcdba74..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_0_21000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "10", - "balance": "999999999999481266", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "518734", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "11", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "11", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json deleted file mode 100644 index d6a37e32bc1..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_0_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "7", - "balance": "999999999999610770", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "389230", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa8a0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "8", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "8", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json deleted file mode 100644 index dc476380cbb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_0_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "105", - "balance": "999999999995314743", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4685257", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc478", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x69", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "106", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json deleted file mode 100644 index 0e34b514e61..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_0_28000_64": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "106", - "balance": "999999999995283547", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4716453", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xc378", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "107", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 64 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json deleted file mode 100644 index b57c9465644..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_0_28000_80": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "107", - "balance": "999999999995252613", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4747387", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "108", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 80 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json deleted file mode 100644 index 14004d354bb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_0_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "104", - "balance": "999999999995345808", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4654192", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc3f8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x68", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "105", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 0 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json deleted file mode 100644 index 323b48e117e..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_1_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "26", - "balance": "999999999998775154", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1224846", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "27", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "27", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json deleted file mode 100644 index 8dcbb355e78..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json +++ /dev/null @@ -1,416 +0,0 @@ - -{ - "ecmul_1-2_1_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "25", - "balance": "999999999998818386", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1181614", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x19", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "26", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "26", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json deleted file mode 100644 index 86d292bdc3c..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecmul_1-2_1_28000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "123", - "balance": "999999999994587322", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5412678", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xc4b8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "124", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json deleted file mode 100644 index f5de8392532..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecmul_1-2_1_28000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "122", - "balance": "999999999994618451", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5381549", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001" - ], - "gasLimit": [ - "33000", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x7a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "123", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "123", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 1 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json deleted file mode 100644 index 35e901369d4..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_2_21000_128": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "36", - "balance": "999999999998334770", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1665230", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0xa960", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x24", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "37", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "37", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 128 bytes. Gives the execution 21000 bytes" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json b/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json deleted file mode 100644 index 4b21c169c78..00000000000 --- a/tests/static/state_tests/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json +++ /dev/null @@ -1,415 +0,0 @@ -{ - "ecmul_1-2_2_21000_96": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "35", - "balance": "999999999998378002", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1621998", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002" - ], - "gasLimit": [ - "0xa8e0", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x23", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "36", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x8a5045bc7a493061be89fdbc32ea8ae69e8d8b55ebe445fa41fa534b1543ab50" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c06004356004013511151558576004356004013560200160043560040161014037604061026061014051610160600060076305f5e0fff11558576040610240526102406060806102c0828460006004601bf15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000000": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "36", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the point (1, 2) and the factor 2 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 21000 bytes" - } - } -} From 5fe181373fd131c71cfcb11eeb7b579214efa996 Mon Sep 17 00:00:00 2001 From: felix Date: Fri, 6 Mar 2026 16:01:05 +0100 Subject: [PATCH 17/37] fix: perform more actions before aborting and prio oldest prs/issues (#2429) --- .github/workflows/stale.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 0ace47d2858..42cae61c120 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -12,6 +12,12 @@ jobs: # --- Stale settings --- days-before-stale: 60 + # raise this from the default 30 + operations-per-run: 200 + + # process oldest first + ascending: true + # --- PR settings --- days-before-pr-close: 0 # PR immediately auto-closes when marked stale stale-pr-label: 'stale' From 20d79d6702bc55a5c76cee236bc150864aad99c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 6 Mar 2026 15:16:32 +0000 Subject: [PATCH 18/37] feat(tests): port EXTCODECOPY bounds test to frontier (#2417) * feat(tests): port EXTCODECOPY bounds test to frontier * refactor(tests): add SHA3 check for full zero range per review Verify the full 5000-byte EXTCODECOPY result is all zeros by hashing it and comparing against the known keccak256 of 5000 zero bytes. --- tests/frontier/opcodes/test_extcodecopy.py | 84 +++++++++++++++++++ .../stExtCodeHash/extCodeCopyBoundsFiller.yml | 75 ----------------- 2 files changed, 84 insertions(+), 75 deletions(-) create mode 100644 tests/frontier/opcodes/test_extcodecopy.py delete mode 100644 tests/static/state_tests/stExtCodeHash/extCodeCopyBoundsFiller.yml diff --git a/tests/frontier/opcodes/test_extcodecopy.py b/tests/frontier/opcodes/test_extcodecopy.py new file mode 100644 index 00000000000..993996e504c --- /dev/null +++ b/tests/frontier/opcodes/test_extcodecopy.py @@ -0,0 +1,84 @@ +"""Test `EXTCODECOPY` opcode.""" + +import pytest +from execution_testing import ( + Account, + Alloc, + Bytes, + Fork, + Op, + StateTestFiller, + Storage, + Transaction, +) + + +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/extCodeCopyBoundsFiller.yml", # noqa: E501 + ], + pr=["https://github.com/ethereum/execution-specs/pull/2417"], +) +def test_extcodecopy_bounds( + state_test: StateTestFiller, + pre: Alloc, + fork: Fork, +) -> None: + """ + Test EXTCODECOPY with out-of-bounds code offset. + + Perform three EXTCODECOPY operations on a 15-byte target contract: + 1. Huge code offset + large size -> all zeros (beyond code) + 2. Huge code offset + small size -> all zeros (beyond code) + 3. Offset 5 + size 12 -> partial code copy + zero padding + + Each result is read via MLOAD(0) and MLOAD(32) and stored. Only the + third operation produces a non-zero result because the dest_offset=1 + shifts the copied bytes into the MLOAD(0) word. + """ + storage = Storage() + + target_code = Op.SSTORE(99, 12) + Op.SSTORE(99, 11) + Op.SSTORE(99, 10) + target = pre.deploy_contract(target_code) + + huge_offset = 0x010000000000000000000000000000000000000000 + large_size = 5000 + + code = ( + # 1. Huge code offset, large size -> all zeros + Op.EXTCODECOPY(target, 1, huge_offset, large_size) + + Op.SSTORE(storage.store_next(0), Op.MLOAD(0)) + + Op.SSTORE(storage.store_next(0), Op.MLOAD(32)) + + Op.SSTORE( + storage.store_next(Bytes(b"\0" * large_size).keccak256()), + Op.SHA3(1, large_size), + ) + # 2. Huge code offset, size 12 -> all zeros + + Op.EXTCODECOPY(target, 1, huge_offset, 12) + + Op.SSTORE(storage.store_next(0), Op.MLOAD(0)) + + Op.SSTORE(storage.store_next(0), Op.MLOAD(32)) + # 3. Offset 5, size 12 -> partial code copy + + Op.EXTCODECOPY(target, 1, 5, 12) + + Op.SSTORE( + storage.store_next( + b"\x00" + bytes(target_code)[5:15] + b"\x00" * 21 + ), + Op.MLOAD(0), + ) + + Op.SSTORE(storage.store_next(0), Op.MLOAD(32)) + ) + + code_address = pre.deploy_contract(code, storage=storage.canary()) + + tx = Transaction( + sender=pre.fund_eoa(), + to=code_address, + gas_limit=400_000, + protected=fork.supports_protected_txs(), + ) + + state_test( + pre=pre, + post={code_address: Account(storage=storage)}, + tx=tx, + ) diff --git a/tests/static/state_tests/stExtCodeHash/extCodeCopyBoundsFiller.yml b/tests/static/state_tests/stExtCodeHash/extCodeCopyBoundsFiller.yml deleted file mode 100644 index 3ed756423c5..00000000000 --- a/tests/static/state_tests/stExtCodeHash/extCodeCopyBoundsFiller.yml +++ /dev/null @@ -1,75 +0,0 @@ -# EXTCODECOPY edge case https://github.com/ethereum/tests/issues/438 ---- -extCodeCopyBounds: - env: - currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba - currentDifficulty: '0x20000' - currentGasLimit: "1000000" - currentNumber: "1" - currentTimestamp: "1000" - _info: - comment: "EXTCODECOPY edge case https://github.com/ethereum/tests/issues/438" - pre: - : - balance: '1000000000000000000' - code: | - { - ;; code position is way too high - (EXTCODECOPY 1 0x010000000000000000000000000000000000000000 5000) - - [[0]] (MLOAD 0) - [[1]] (MLOAD 32) - - (EXTCODECOPY 1 0x010000000000000000000000000000000000000000 12) - - [[2]] (MLOAD 0) - [[3]] (MLOAD 32) - - (EXTCODECOPY 1 5 12) - - [[4]] (MLOAD 0) - [[5]] (MLOAD 32) - } - nonce: '0' - storage: {} - : - balance: '0' - code: | - { - ;; Some code - [[99]] 12 - [[99]] 11 - [[99]] 10 - } - nonce: '0' - storage: { - } - : - balance: '1000000000000000000' - code: '' - nonce: '0' - storage: {} - expect: - - indexes: - data: !!int -1 - gas: !!int -1 - value: !!int -1 - network: - - '>=Cancun' - result: - : - balance: '1000000000000000001' - storage: { - "0x04": '0x600b606355600a606355000000000000000000000000000000000000000000' - } - transaction: - data: - - '' - gasLimit: - - '400000' - gasPrice: '10' - nonce: '0' - secretKey: "" - to: - value: - - '1' From 446eabfb62595a06e5f292751ffe9f082f434d12 Mon Sep 17 00:00:00 2001 From: Jochem Brouwer Date: Fri, 6 Mar 2026 15:54:18 +0000 Subject: [PATCH 19/37] fix(benchmarks): fix mint test (#2435) --- .../stateful/bloatnet/test_single_opcode.py | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/tests/benchmark/stateful/bloatnet/test_single_opcode.py b/tests/benchmark/stateful/bloatnet/test_single_opcode.py index 7e3e0dce9de..0c035e3bc1d 100644 --- a/tests/benchmark/stateful/bloatnet/test_single_opcode.py +++ b/tests/benchmark/stateful/bloatnet/test_single_opcode.py @@ -51,6 +51,13 @@ REFERENCE_SPEC_GIT_PATH = "DUMMY/bloatnet.md" REFERENCE_SPEC_VERSION = "1.0" +# keccak256("random") for non-existing slots, masked as address, +# Solidity does input checks on the size and throws if we input +# something different than an address +START_SLOT = ( + 0xA4896A3F93BF4BF58378E579F3CF193BB4AF1022AF7D2089F37D8BAE7157B85F + % (2**160) +) # SLOAD BENCHMARK ARCHITECTURE: # @@ -212,16 +219,8 @@ def test_sload_erc20_balanceof( txs = [] cache_txs = [] gas_remaining = gas_benchmark_value - # Start at 1 (ERC20 bloater writes the balance of address to the slot) - # or start at keccak256("random") for non-existing slots - slot_offset = ( - 1 - if existing_slots - else ( - 0xA4896A3F93BF4BF58378E579F3CF193BB4AF1022AF7D2089F37D8BAE7157B85F - ) - % (2**160) # Mask it as address otherwise Solidity rejects the input - ) + # Start offset + slot_offset = 1 if existing_slots else START_SLOT while gas_remaining > intrinsic_gas_with_access_list: gas_available = min(gas_remaining, tx_gas_limit) @@ -613,13 +612,8 @@ def test_sstore_erc20_mint( # Storage key to read and write address pointer to slot_offset = 0 - # Start at 1 for existing balance slots, - # or at keccak256("random") for non-existing slots - start_slot = ( - 1 - if existing_slots - else 0xA4896A3F93BF4BF58378E579F3CF193BB4AF1022AF7D2089F37D8BAE7157B85F - ) + # Start slot + start_slot = 1 if existing_slots else START_SLOT # Stub Account erc20_address = pre.deploy_contract( From 0a595241fc6784bc96138c9ff7ff4dcb9aad6871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 6 Mar 2026 16:20:14 +0000 Subject: [PATCH 20/37] feat(tests): port EXTCODEHASH created-and-deleted recheck in outer call (#2428) Port extCodeHashCreatedAndDeletedAccountRecheckInOuterCallFiller.json. Two-level call frame where outer re-checks EXTCODEHASH/EXTCODESIZE of a CREATE2'd-then-selfdestructed contract after inner returns. --- .../eip1052_extcodehash/test_extcodehash.py | 107 ++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py index 102b1c599a2..89ebcca3421 100644 --- a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py +++ b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py @@ -17,6 +17,9 @@ compute_create2_address, compute_create_address, ) +from execution_testing import ( + Macros as Om, +) from execution_testing.forks import Cancun from execution_testing.forks.helpers import Fork @@ -1404,3 +1407,107 @@ def extcode_checks() -> Bytecode: post[created] = Account(code=runtime) state_test(pre=pre, post=post, tx=tx) + + +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCallFiller.json", # noqa: E501 + ], + pr=["https://github.com/ethereum/execution-specs/pull/2428"], +) +def test_extcodehash_created_and_deleted_recheck_outer( + state_test: StateTestFiller, + pre: Alloc, +) -> None: + """ + Test EXTCODEHASH of a created-and-selfdestructed account rechecked + from an outer call frame. + + Outer contract CALLs inner, which CREATE2s a contract with + SELFDESTRUCT code then triggers it. After inner returns, outer + re-checks EXTCODEHASH and EXTCODESIZE of the created address. + Within the transaction all checks return the original code hash + and size. The created contract is deleted at end of transaction. + """ + inner_storage = Storage() + outer_storage = Storage() + + runtime = Op.SELFDESTRUCT(0) + initcode = Initcode(deploy_code=runtime) + salt = 0x10 + expected_hash = runtime.keccak256() + expected_size = len(runtime) + + # Inner contract: CREATE2, check, trigger SELFDESTRUCT, re-check. + created_slot = inner_storage.store_next(0) + inner_code = Bytecode() + inner_code += Om.MSTORE(initcode, 0) + Op.SSTORE( + created_slot, + Op.CREATE2(value=0, offset=0, size=len(initcode), salt=salt), + ) + + target = Op.SLOAD(created_slot) + expected_code = bytes(runtime).ljust(32, b"\0") + + def inner_extcode_checks() -> Bytecode: + return ( + Op.SSTORE( + inner_storage.store_next(expected_hash), + Op.EXTCODEHASH(target), + ) + + Op.SSTORE( + inner_storage.store_next(expected_size), + Op.EXTCODESIZE(target), + ) + + Op.EXTCODECOPY(target, 0, 0, 32) + + Op.SSTORE( + inner_storage.store_next(expected_code), + Op.MLOAD(0), + ) + ) + + inner_code += inner_extcode_checks() + inner_code += Op.CALL(address=target, gas=Op.GAS) + Op.POP + inner_code += inner_extcode_checks() + inner = pre.deploy_contract(inner_code, storage=inner_storage.canary()) + + created = compute_create2_address( + address=inner, + salt=salt, + initcode=initcode, + ) + inner_storage[created_slot] = created + + # Outer contract: CALL inner, then re-check the created address. + outer_code = ( + Op.CALL(address=inner, gas=Op.GAS) + + Op.POP + + Op.SSTORE( + outer_storage.store_next(expected_hash), + Op.EXTCODEHASH(created), + ) + + Op.SSTORE( + outer_storage.store_next(expected_size), + Op.EXTCODESIZE(created), + ) + + Op.EXTCODECOPY(created, 0, 0, 32) + + Op.SSTORE( + outer_storage.store_next(expected_code), + Op.MLOAD(0), + ) + ) + outer = pre.deploy_contract(outer_code, storage=outer_storage.canary()) + + tx = Transaction( + sender=pre.fund_eoa(), + to=outer, + gas_limit=400_000, + ) + + post: dict[Address, Account | None] = { + inner: Account(storage=inner_storage), + outer: Account(storage=outer_storage), + created: Account.NONEXISTENT, + } + + state_test(pre=pre, post=post, tx=tx) From ffb354b902432dab14c483044ed0379238433e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 6 Mar 2026 22:20:50 +0000 Subject: [PATCH 21/37] feat(tests): add ecpairing coordinate validation tests for BN254 (#2438) * feat(tests): add ecpairing coordinate validation tests for BN254 Add test cases for coordinates >= P in ecpairing precompile inputs, covering both G1 (2 coordinates) and G2 (4 coordinates). Each is tested with both exact P and valid-mod-P values. Addresses ecpairing part of #1587. * chore(tests): Remove covered static tests --------- Co-authored-by: marioevz --- tests/byzantium/eip197_ec_pairing/spec.py | 3 + .../eip197_ec_pairing/test_ecpairing.py | 70 ++++- ...ing_perturb_g2_by_field_modulusFiller.json | 287 ------------------ ...rturb_g2_by_field_modulus_againFiller.json | 287 ------------------ 4 files changed, 72 insertions(+), 575 deletions(-) delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json diff --git a/tests/byzantium/eip197_ec_pairing/spec.py b/tests/byzantium/eip197_ec_pairing/spec.py index a8254dba5dc..9744f5be946 100644 --- a/tests/byzantium/eip197_ec_pairing/spec.py +++ b/tests/byzantium/eip197_ec_pairing/spec.py @@ -32,6 +32,9 @@ class Spec: (https://eips.ethereum.org/EIPS/eip-197). """ + # The prime modulus of the BN254 prime field Fp (from EIP-196) + P = Spec196.P + # Precompile address ECPAIRING = Address(0x08) diff --git a/tests/byzantium/eip197_ec_pairing/test_ecpairing.py b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py index 3f98c639835..882bdd437a7 100644 --- a/tests/byzantium/eip197_ec_pairing/test_ecpairing.py +++ b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py @@ -8,7 +8,7 @@ Transaction, ) -from .spec import PointG1, Spec, ref_spec_197 +from .spec import PointG1, PointG2, Spec, ref_spec_197 REFERENCE_SPEC_GIT_PATH = ref_spec_197.git_path REFERENCE_SPEC_VERSION = ref_spec_197.version @@ -119,12 +119,80 @@ def test_fail( Spec.INVALID, id="g1_not_on_curve", ), + # G1 coordinates >= P + pytest.param( + PointG1(Spec.P, 0) + Spec.INF_G2, + Spec.INVALID, + id="g1_x_eq_P", + ), + pytest.param( + PointG1(0, Spec.P) + Spec.INF_G2, + Spec.INVALID, + id="g1_y_eq_P", + ), + pytest.param( + PointG1(Spec.G1.x + Spec.P, Spec.G1.y) + Spec.INF_G2, + Spec.INVALID, + id="g1_x_plus_P", + ), + pytest.param( + PointG1(Spec.G1.x, Spec.G1.y + Spec.P) + Spec.INF_G2, + Spec.INVALID, + id="g1_y_plus_P", + ), + # G2 coordinates >= P + pytest.param( + Spec.INF_G1 + PointG2((Spec.P, 0), (0, 0)), + Spec.INVALID, + id="g2_x0_eq_P", + ), + pytest.param( + Spec.INF_G1 + PointG2((0, Spec.P), (0, 0)), + Spec.INVALID, + id="g2_x1_eq_P", + ), + pytest.param( + Spec.INF_G1 + PointG2((0, 0), (Spec.P, 0)), + Spec.INVALID, + id="g2_y0_eq_P", + ), + pytest.param( + Spec.INF_G1 + PointG2((0, 0), (0, Spec.P)), + Spec.INVALID, + id="g2_y1_eq_P", + ), + pytest.param( + Spec.INF_G1 + + PointG2((Spec.G2.x[0] + Spec.P, Spec.G2.x[1]), Spec.G2.y), + Spec.INVALID, + id="g2_x0_plus_P", + ), + pytest.param( + Spec.INF_G1 + + PointG2((Spec.G2.x[0], Spec.G2.x[1] + Spec.P), Spec.G2.y), + Spec.INVALID, + id="g2_x1_plus_P", + ), + pytest.param( + Spec.INF_G1 + + PointG2(Spec.G2.x, (Spec.G2.y[0] + Spec.P, Spec.G2.y[1])), + Spec.INVALID, + id="g2_y0_plus_P", + ), + pytest.param( + Spec.INF_G1 + + PointG2(Spec.G2.x, (Spec.G2.y[0], Spec.G2.y[1] + Spec.P)), + Spec.INVALID, + id="g2_y1_plus_P", + ), ], ) @pytest.mark.ported_from( [ "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_bad_length_191Filler.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_bad_length_193Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json", ], pr=["https://github.com/ethereum/execution-specs/pull/2422"], ) diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json deleted file mode 100644 index 39b11ab96d2..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_perturb_g2_by_field_modulus": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "26", - "balance": "999999999993378319", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6621681", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed396ad8433991909fa4eedf63ea8d8bf353cc9bc4d925598091cd66f3a99f94a212c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3ab68", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1a", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "27", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json deleted file mode 100644 index 021b310e656..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_perturb_g2_by_field_modulus_again": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "27", - "balance": "999999999993137831", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6862169", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b432cad18bcbe0e1502fbb7370f4c98ed7b5351fa74b59e08890758183f777af1" - ], - "gasLimit": [ - "0x3ab68", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x1b", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "28", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} From ea4b6df7da12655fdfc7756113b8d7a24ff23791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Sat, 7 Mar 2026 18:49:56 +0000 Subject: [PATCH 22/37] feat(tests): add ecrecover tests for combined invalid r and s values (#2440) Add test cases where both r and s are invalid simultaneously: r == 0 with s == N, r == N with s == 0, and r == N with s == N. Also fix duplicate test ID and rename gte_order to eq_N to reflect the actual test values. Closes #1533. --- tests/frontier/precompiles/test_ecrecover.py | 63 ++++++++++++++++++-- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/tests/frontier/precompiles/test_ecrecover.py b/tests/frontier/precompiles/test_ecrecover.py index a6fa669befb..ebcf921c247 100644 --- a/tests/frontier/precompiles/test_ecrecover.py +++ b/tests/frontier/precompiles/test_ecrecover.py @@ -52,7 +52,7 @@ ), id="valid_signature_2", ), - # z >= Order + # z == N (order) pytest.param( bytes.fromhex( "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141" @@ -69,7 +69,7 @@ bytes.fromhex( "000000000000000000000000b32cf3c8616537a28583fc00d29a3e8c9614cd61" ), - id="z_gte_order", + id="z_eq_N", ), pytest.param( bytes.fromhex( @@ -119,7 +119,7 @@ b"", id="invalid_signature_3", ), - # r >= Order + # r == N (order) pytest.param( bytes.fromhex( "18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c" @@ -134,9 +134,9 @@ "eeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549" ), b"", - id="invalid_signature_3", + id="r_eq_N", ), - # s >= Order + # s == N (order) pytest.param( bytes.fromhex( "18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c" @@ -151,7 +151,58 @@ "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141" ), b"", - id="s_gte_order", + id="s_eq_N", + ), + # r == 0 and s == N (order) + pytest.param( + bytes.fromhex( + "18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c" + ), + bytes.fromhex( + "000000000000000000000000000000000000000000000000000000000000001c" + ), + bytes.fromhex( + "0000000000000000000000000000000000000000000000000000000000000000" + ), + bytes.fromhex( + "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141" + ), + b"", + id="r_zero_and_s_eq_N", + ), + # r == N (order) and s == 0 + pytest.param( + bytes.fromhex( + "18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c" + ), + bytes.fromhex( + "000000000000000000000000000000000000000000000000000000000000001c" + ), + bytes.fromhex( + "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141" + ), + bytes.fromhex( + "0000000000000000000000000000000000000000000000000000000000000000" + ), + b"", + id="r_eq_N_and_s_zero", + ), + # r == N (order) and s == N (order) + pytest.param( + bytes.fromhex( + "18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c" + ), + bytes.fromhex( + "000000000000000000000000000000000000000000000000000000000000001c" + ), + bytes.fromhex( + "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141" + ), + bytes.fromhex( + "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141" + ), + b"", + id="r_eq_N_and_s_eq_N", ), # u1 == u2 && R == G pytest.param( From 3e801739a9a7fff37a18f940f4a435ee4cf7f4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 9 Mar 2026 09:41:45 +0000 Subject: [PATCH 23/37] feat(tests): port EXTCODEHASH subcall CALLCODE selfdestruct test (#2418) --- .../eip1052_extcodehash/test_extcodehash.py | 120 ++++++++++++++++++ .../extCodeHashSubcallSuicideCancunFiller.yml | 108 ---------------- .../extCodeHashSubcallSuicideFiller.yml | 90 ------------- 3 files changed, 120 insertions(+), 198 deletions(-) delete mode 100644 tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideCancunFiller.yml delete mode 100644 tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideFiller.yml diff --git a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py index 89ebcca3421..4d18b2caf07 100644 --- a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py +++ b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py @@ -1511,3 +1511,123 @@ def inner_extcode_checks() -> Bytecode: } state_test(pre=pre, post=post, tx=tx) + + +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSubcallSuicideFiller.yml", # noqa: E501 + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashSubcallSuicideCancunFiller.yml", # noqa: E501 + ], + pr=["https://github.com/ethereum/execution-specs/pull/2418"], +) +@pytest.mark.parametrize( + "call_opcode", + [ + pytest.param(Op.CALLCODE, id="callcode"), + pytest.param(Op.DELEGATECALL, id="delegatecall"), + ], +) +@pytest.mark.parametrize( + "dynamic_a", + [ + pytest.param(False, id="pre_existing"), + pytest.param(True, id="dynamic"), + ], +) +def test_extcodehash_subcall_selfdestruct( + state_test: StateTestFiller, + pre: Alloc, + fork: Fork, + call_opcode: Opcodes, + dynamic_a: bool, +) -> None: + """ + Test EXTCODEHASH after subcall with CALLCODE/DELEGATECALL to SELFDESTRUCT. + + B calls A, which uses CALLCODE or DELEGATECALL to invoke a contract C + containing SELFDESTRUCT, executing it in A's context. B checks + EXTCODEHASH, EXTCODESIZE, and EXTCODECOPY of A before and after. + Within the transaction, A's code properties are unchanged. Pre-Cancun, + A is deleted at end of transaction. In Cancun, A survives only if + pre-existing; a dynamically created A is still deleted (EIP-6780). + """ + storage = Storage() + beneficiary = pre.empty_account() + selfdestruct_code = Op.SELFDESTRUCT(beneficiary) + target_c = pre.deploy_contract(selfdestruct_code) + + # A: executes C's code in A's context via CALLCODE/DELEGATECALL + a_code = call_opcode( + gas=350_000, + address=target_c, + ret_size=32, + ) + + if not dynamic_a: + a = pre.deploy_contract(a_code, balance=1) + + a_hash = a_code.keccak256() + a_size = len(a_code) + a_code_word0 = bytes(a_code)[:32].ljust(32, b"\0") + + def extcode_checks(target: Address | Bytecode) -> Bytecode: + """Check EXTCODEHASH, EXTCODESIZE, and EXTCODECOPY of A.""" + return ( + Op.SSTORE(storage.store_next(a_hash), Op.EXTCODEHASH(target)) + + Op.SSTORE(storage.store_next(a_size), Op.EXTCODESIZE(target)) + + Op.EXTCODECOPY(target, 0, 0, 32) + + Op.SSTORE( + storage.store_next(a_code_word0), + Op.MLOAD(0), + ) + ) + + code = Bytecode() + + if dynamic_a: + initcode = Initcode(deploy_code=a_code) + code += Om.MSTORE(initcode) + created_slot = storage.store_next(0) + code += Op.SSTORE( + created_slot, + Op.CREATE(value=0, offset=0, size=len(initcode)), + ) + a_target: Address | Bytecode = Op.SLOAD(created_slot) + else: + a_target = a + + code += extcode_checks(a_target) + code += Op.SSTORE( + storage.store_next(1), + Op.CALL(gas=350_000, address=a_target), + ) + code += extcode_checks(a_target) + code += Op.SSTORE( + storage.store_next(1), + Op.CALL(gas=350_000, address=a_target), + ) + + code_address = pre.deploy_contract(code, storage=storage.canary()) + + if dynamic_a: + a = compute_create_address(address=code_address, nonce=1) + storage[created_slot] = a + + tx = Transaction( + sender=pre.fund_eoa(), + to=code_address, + gas_limit=500_000, + ) + + # Pre-Cancun, CALLCODE/DELEGATECALL executes SELFDESTRUCT in A's + # context, deleting A at end of transaction. + # In Cancun, pre-existing A survives (EIP-6780); dynamic A is deleted. + post: dict[Address, Account | None] = { + code_address: Account(storage=storage), + } + if fork >= Cancun and not dynamic_a: + post[a] = Account(code=a_code, balance=0) + else: + post[a] = Account.NONEXISTENT + + state_test(pre=pre, post=post, tx=tx) diff --git a/tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideCancunFiller.yml b/tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideCancunFiller.yml deleted file mode 100644 index b18a7b93ef2..00000000000 --- a/tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideCancunFiller.yml +++ /dev/null @@ -1,108 +0,0 @@ -# transaction to B -# B call to A -# A delegatecall/callcode to C (C has selfdestruct) -# A selfdestructed. returned to B. now we could check extcodehash of A (in account B code) -# Cancun version with dynamic contract suicide ---- -extCodeHashSubcallSuicideCancun: - _info: - comment: "transaction to B | B call to A | A delegatecall/callcode to C (C has selfdestruct) | A selfdestructed. returned to B. now we could check extcodehash of A (in account B code)" - env: - currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba - currentDifficulty: '0x20000' - currentGasLimit: "10000000" - currentNumber: "1" - currentTimestamp: "1000" - pre: - b000000000000000000000000000000000000000: - balance: '1000000000000000000' - code: | - { - ;; create 0x3e180b1862f9d158abb5e519a6d8605540c23682 (Account A) - (CREATE 1000000000000000000 0 (lll - { - (CALL 100000 0xd000000000000000000000000000000000000000 0 0 0 0 0) - (RETURN 0 (lll - { - (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) - } - 0)) - } - 0)) - - (SSTORE 1 (EXTCODEHASH 0xa000000000000000000000000000000000000000)) - (SSTORE 2 (EXTCODESIZE 0xa000000000000000000000000000000000000000)) - (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32) - (SSTORE 3 (MLOAD 0)) - - (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32) - - (SSTORE 4 (EXTCODEHASH 0xa000000000000000000000000000000000000000)) - (SSTORE 5 (EXTCODESIZE 0xa000000000000000000000000000000000000000)) - (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32) - (SSTORE 6 (MLOAD 0)) - - [[7]] (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32) - } - nonce: '0' - storage: {} - a000000000000000000000000000000000000000: - balance: '1000000000000000000' - code: | - { - (CALLCODE 350000 0x3e180b1862f9d158abb5e519a6d8605540c23682 0 0 0 0 32) - } - nonce: '0' - storage: {} - d000000000000000000000000000000000000000: - balance: '1000000000000000000' - code: | - { - [[1]] 1 - } - nonce: '0' - storage: {} - a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - balance: '1000000000000000000' - code: '' - nonce: '0' - storage: {} - expect: - - indexes: - data: !!int -1 - gas: !!int -1 - value: !!int -1 - network: - - '>=Cancun' - result: - b000000000000000000000000000000000000000: - storage: { - "0x01": '0x807d478bd0d0173122f5531d4c43781631444232a0816dd35578747c7d67af0d', - "0x02": '0x25', - "0x03": '0x60206000600060006000733e180b1862f9d158abb5e519a6d8605540c2368262', - "0x04": '0x807d478bd0d0173122f5531d4c43781631444232a0816dd35578747c7d67af0d', - "0x05": '0x25', - "0x06": '0x60206000600060006000733e180b1862f9d158abb5e519a6d8605540c2368262', - "0x07": '0x01' - } - #CALLCODE to a contract that suicide in Cancun does not delete the caller. even if contract that has suicide is dynamically created - a000000000000000000000000000000000000000: - nonce: '0' - storage: {} - code: '0x60206000600060006000733e180b1862f9d158abb5e519a6d8605540c2368262055730f200' - balance: '0' - d000000000000000000000000000000000000000: - storage: { - "0x01" : "0x01" - } - transaction: - data: - - '' - gasLimit: - - '500000' - gasPrice: '10' - nonce: '0' - secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 - to: 'b000000000000000000000000000000000000000' - value: - - '1' diff --git a/tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideFiller.yml b/tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideFiller.yml deleted file mode 100644 index 1b71f659b83..00000000000 --- a/tests/static/state_tests/stExtCodeHash/extCodeHashSubcallSuicideFiller.yml +++ /dev/null @@ -1,90 +0,0 @@ -# transaction to B -# B call to A -# A delegatecall/callcode to C (C has selfdestruct) -# A selfdestructed. returned to B. now we could check extcodehash of A (in account B code) ---- -extCodeHashSubcallSuicide: - _info: - comment: "transaction to B | B call to A | A delegatecall/callcode to C (C has selfdestruct) | A selfdestructed. returned to B. now we could check extcodehash of A (in account B code)" - env: - currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba - currentDifficulty: '0x20000' - currentGasLimit: "10000000" - currentNumber: "1" - currentTimestamp: "1000" - pre: - b000000000000000000000000000000000000000: - balance: '1000000000000000000' - code: | - { - (SSTORE 1 (EXTCODEHASH 0xa000000000000000000000000000000000000000)) - (SSTORE 2 (EXTCODESIZE 0xa000000000000000000000000000000000000000)) - (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32) - (SSTORE 3 (MLOAD 0)) - - (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32) - - (SSTORE 4 (EXTCODEHASH 0xa000000000000000000000000000000000000000)) - (SSTORE 5 (EXTCODESIZE 0xa000000000000000000000000000000000000000)) - (EXTCODECOPY 0xa000000000000000000000000000000000000000 0 0 32) - (SSTORE 6 (MLOAD 0)) - - [[7]] (CALL 350000 0xa000000000000000000000000000000000000000 0 0 0 0 32) - } - nonce: '0' - storage: {} - a000000000000000000000000000000000000000: - balance: '1000000000000000000' - code: | - { - (CALLCODE 350000 0xc000000000000000000000000000000000000000 0 0 0 0 32) - } - nonce: '0' - storage: {} - c000000000000000000000000000000000000000: - balance: '1000000000000000000' - code: | - { - (SELFDESTRUCT 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) - } - nonce: '0' - storage: {} - a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - balance: '1000000000000000000' - code: '' - nonce: '0' - storage: {} - expect: - - indexes: - data: !!int -1 - gas: !!int -1 - value: !!int -1 - network: - - '>=Cancun' - result: - b000000000000000000000000000000000000000: - storage: { - "0x01": '0x367d3c0e810bbdebc72c25e80dcb9a337c7c87e3a36e6fae87d1d51b3c745d24', - "0x02": '0x25', - "0x03": '0x6020600060006000600073c00000000000000000000000000000000000000062', - "0x04": '0x367d3c0e810bbdebc72c25e80dcb9a337c7c87e3a36e6fae87d1d51b3c745d24', - "0x05": '0x25', - "0x06": '0x6020600060006000600073c00000000000000000000000000000000000000062', - "0x07": '0x01' - } - a000000000000000000000000000000000000000: - balance: 0 - nonce: 0 - code: '0x6020600060006000600073c00000000000000000000000000000000000000062055730f200' - storage: {} - transaction: - data: - - '' - gasLimit: - - '500000' - gasPrice: '10' - nonce: '0' - secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 - to: 'b000000000000000000000000000000000000000' - value: - - '1' From 68fae578e81f518e055a4b55a2229532be00d0d7 Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Mon, 9 Mar 2026 11:25:54 +0100 Subject: [PATCH 24/37] chore(tests-static): Port remaining EC Pairing static tests (#2443) * chore(tests-static): Port more ecpairing tests * chore(tests-static): Port more ecpairing tests * chore(tests-static): Port more ecpairing_inputsFiller.yml --------- Co-authored-by: marioevz --- tests/byzantium/eip197_ec_pairing/spec.py | 3 + .../eip197_ec_pairing/test_ecpairing.py | 312 ++ .../test_ecpairing_fuzzed.py | 4204 +++++++++++++++++ ...ing_empty_data_insufficient_gasFiller.json | 417 -- .../ecpairing_inputsFiller.yml | 231 - ...ring_one_point_insufficient_gasFiller.json | 282 -- ...iring_one_point_not_in_subgroupFiller.json | 287 -- ...int_with_g2_zero_and_g1_invalidFiller.json | 276 -- ...iring_perturb_g2_by_curve_orderFiller.json | 287 -- .../ecpairing_perturb_g2_by_oneFiller.json | 287 -- ...erturb_zeropoint_by_curve_orderFiller.json | 287 -- ...turb_zeropoint_by_field_modulusFiller.json | 287 -- ...airing_perturb_zeropoint_by_oneFiller.json | 287 -- .../ecpairing_three_point_fail_1Filler.json | 419 -- .../ecpairing_three_point_match_1Filler.json | 287 -- .../ecpairing_two_point_fail_1Filler.json | 419 -- .../ecpairing_two_point_fail_2Filler.json | 419 -- .../ecpairing_two_point_match_2Filler.json | 287 -- .../ecpairing_two_point_match_3Filler.json | 287 -- .../ecpairing_two_point_match_4Filler.json | 287 -- .../ecpairing_two_point_match_5Filler.json | 419 -- .../ecpairing_two_point_oogFiller.json | 287 -- ...ing_two_points_with_one_g2_zeroFiller.json | 287 -- 23 files changed, 4519 insertions(+), 6326 deletions(-) create mode 100644 tests/byzantium/eip197_ec_pairing/test_ecpairing_fuzzed.py delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_inputsFiller.yml delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zero_and_g1_invalidFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_match_1Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_2Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_3Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_4Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_5Filler.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_oogFiller.json delete mode 100644 tests/static/state_tests/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json diff --git a/tests/byzantium/eip197_ec_pairing/spec.py b/tests/byzantium/eip197_ec_pairing/spec.py index 9744f5be946..9f5597e8f01 100644 --- a/tests/byzantium/eip197_ec_pairing/spec.py +++ b/tests/byzantium/eip197_ec_pairing/spec.py @@ -35,6 +35,9 @@ class Spec: # The prime modulus of the BN254 prime field Fp (from EIP-196) P = Spec196.P + # The order of the BN254 G1 group + N = Spec196.N + # Precompile address ECPAIRING = Address(0x08) diff --git a/tests/byzantium/eip197_ec_pairing/test_ecpairing.py b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py index 882bdd437a7..6c3aa6510c8 100644 --- a/tests/byzantium/eip197_ec_pairing/test_ecpairing.py +++ b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py @@ -44,6 +44,105 @@ Spec.PAIRING_TRUE, id="two_pairs_negated_g1", ), + pytest.param( + Spec.G1 + + Spec.G2 + + Spec.G1 + + PointG2( + Spec.G2.x, + ( + 0x275DC4A288D1AFB3CBB1AC09187524C7DB36395DF7BE3B99E673B13A075A65EC, + 0x1D9BEFCD05A5323E6DA4D435F3B617CDB3AF83285C2DF711EF39C01571827F9D, + ), + ), + Spec.PAIRING_TRUE, + id="two_point_match_2", + ), + pytest.param( + Spec.G1 + + PointG2( + ( + 0x203E205DB4F19B37B60121B83A7333706DB86431C6D835849957ED8C3928AD79, + 0x27DC7234FD11D3E8C36C59277C3E6F149D5CD3CFA9A62AEE49F8130962B4B3B9, + ), + ( + 0x195E8AA5B7827463722B8C153931579D3505566B4EDF48D498E185F0509DE152, + 0x04BB53B8977E5F92A0BC372742C4830944A59B4FE6B1C0466E2A6DAD122B5D2E, + ), + ) + + PointG1( + 0x030644E72E131A029B85045B68181585D97816A916871CA8D3C208C16D87CFD3, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ) + + Spec.G2, + Spec.PAIRING_TRUE, + id="two_point_match_3", + ), + pytest.param( + PointG1( + 0x105456A333E6D636854F987EA7BB713DFD0AE8371A72AEA313AE0C32C0BF1016, + 0x0CF031D41B41557F3E7E3BA0C51BEBE5DA8E6ECD855EC50FC87EFCDEAC168BCC, + ) + + PointG2( + ( + 0x0476BE093A6D2B4BBF907172049874AF11E1B6267606E00804D3FF0037EC57FD, + 0x3010C68CB50161B7D1D96BB71EDFEC9880171954E56871ABF3D93CC94D745FA1, + ), + ( + 0x14C059D74E5B6C4EC14AE5864EBE23A71781D86C29FB8FB6CCE94F70D3DE7A21, + 0x01B33461F39D9E887DBB100F170A2345DDE3C07E256D1DFA2B657BA5CD030427, + ), + ) + + Spec.G1 + + PointG2( + ( + 0x1A2C3013D2EA92E13C800CDE68EF56A294B883F6AC35D25F587C09B1B3C635F7, + 0x290158A80CD3D66530F74DC94C94ADB88F5CDB481ACCA997B6E60071F08A115F, + ), + ( + 0x2F997F3DBD66A7AFE07FE7862CE239EDBA9E05C5AFFF7F8A1259C9733B2DFBB9, + 0x29D1691530CA701B4A106054688728C9972C8512E9789E9567AAE23E302CCD75, + ), + ), + Spec.PAIRING_TRUE, + id="two_point_match_4", + ), + pytest.param( + Spec.G1 + Spec.INF_G2 + Spec.INF_G1 + Spec.G2, + Spec.PAIRING_TRUE, + id="two_point_match_5", + ), + pytest.param( + PointG1( + 0x105456A333E6D636854F987EA7BB713DFD0AE8371A72AEA313AE0C32C0BF1016, + 0x0CF031D41B41557F3E7E3BA0C51BEBE5DA8E6ECD855EC50FC87EFCDEAC168BCC, + ) + + PointG2( + ( + 0x0476BE093A6D2B4BBF907172049874AF11E1B6267606E00804D3FF0037EC57FD, + 0x3010C68CB50161B7D1D96BB71EDFEC9880171954E56871ABF3D93CC94D745FA1, + ), + ( + 0x14C059D74E5B6C4EC14AE5864EBE23A71781D86C29FB8FB6CCE94F70D3DE7A21, + 0x01B33461F39D9E887DBB100F170A2345DDE3C07E256D1DFA2B657BA5CD030427, + ), + ) + + Spec.G1 + + PointG2( + ( + 0x1A2C3013D2EA92E13C800CDE68EF56A294B883F6AC35D25F587C09B1B3C635F7, + 0x290158A80CD3D66530F74DC94C94ADB88F5CDB481ACCA997B6E60071F08A115F, + ), + ( + 0x2F997F3DBD66A7AFE07FE7862CE239EDBA9E05C5AFFF7F8A1259C9733B2DFBB9, + 0x29D1691530CA701B4A106054688728C9972C8512E9789E9567AAE23E302CCD75, + ), + ) + + Spec.G1 + + Spec.INF_G2, + Spec.PAIRING_TRUE, + id="three_point_match_1", + ), ], ) @pytest.mark.ported_from( @@ -52,6 +151,11 @@ "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_with_g1_zeroFiller.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_with_g2_zeroFiller.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_1Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_2Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_3Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_4Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_match_5Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_three_point_match_1Filler.json", ], pr=["https://github.com/ethereum/execution-specs/pull/2422"], ) @@ -78,11 +182,85 @@ def test_valid( Spec.PAIRING_FALSE, id="one_pair", ), + pytest.param( + Spec.G1 + Spec.G2 + Spec.G1 + Spec.G2, + Spec.PAIRING_FALSE, + id="two_point_fail_1", + ), + pytest.param( + PointG1( + 0x105456A333E6D636854F987EA7BB713DFD0AE8371A72AEA313AE0C32C0BF1016, + 0x0CF031D41B41557F3E7E3BA0C51BEBE5DA8E6ECD855EC50FC87EFCDEAC168BCC, + ) + + PointG2( + ( + 0x0476BE093A6D2B4BBF907172049874AF11E1B6267606E00804D3FF0037EC57FD, + 0x3010C68CB50161B7D1D96BB71EDFEC9880171954E56871ABF3D93CC94D745FA1, + ), + ( + 0x14C059D74E5B6C4EC14AE5864EBE23A71781D86C29FB8FB6CCE94F70D3DE7A21, + 0x01B33461F39D9E887DBB100F170A2345DDE3C07E256D1DFA2B657BA5CD030427, + ), + ) + + Spec.G1 + + PointG2( + ( + 0x105384B6DD6C48634B9FE89CB3E19667C1FE6736C69DF070D674C95A42B3B824, + 0x2C0D8E67F0F2C14C43734B430D8BE4265AF8C4F7A67DEB0B029FD2DFF99CC6B9, + ), + ( + 0x015EAEC465D922580C7DE5D4A5C26DE75EAF2AF6841B7412EF2EEBD1E051076F, + 0x1B4C21849E48DE12D1BAE2BAD3299717AA8664ADE430E19DEC72A6E10A39B0AB, + ), + ), + Spec.PAIRING_FALSE, + id="two_point_fail_2", + ), + pytest.param( + Spec.G1 + Spec.INF_G2 + Spec.G1 + Spec.G2, + Spec.PAIRING_FALSE, + id="two_points_with_one_g2_zero", + ), + pytest.param( + PointG1( + 0x105456A333E6D636854F987EA7BB713DFD0AE8371A72AEA313AE0C32C0BF1016, + 0x0CF031D41B41557F3E7E3BA0C51BEBE5DA8E6ECD855EC50FC87EFCDEAC168BCC, + ) + + PointG2( + ( + 0x0476BE093A6D2B4BBF907172049874AF11E1B6267606E00804D3FF0037EC57FD, + 0x3010C68CB50161B7D1D96BB71EDFEC9880171954E56871ABF3D93CC94D745FA1, + ), + ( + 0x14C059D74E5B6C4EC14AE5864EBE23A71781D86C29FB8FB6CCE94F70D3DE7A21, + 0x01B33461F39D9E887DBB100F170A2345DDE3C07E256D1DFA2B657BA5CD030427, + ), + ) + + Spec.G1 + + PointG2( + ( + 0x1A2C3013D2EA92E13C800CDE68EF56A294B883F6AC35D25F587C09B1B3C635F7, + 0x290158A80CD3D66530F74DC94C94ADB88F5CDB481ACCA997B6E60071F08A115F, + ), + ( + 0x00CACF3523CAF879D7D05E30549F1E6FDCE364CBB8724B0329C6C2A39D4F018E, + 0x0692E55DB067300E6E3FE56218FA2F940054E57E7EF92BF7D475A9D8A8502FD2, + ), + ) + + Spec.G1 + + Spec.G2, + Spec.PAIRING_FALSE, + id="three_point_fail_1", + ), ], ) @pytest.mark.ported_from( [ "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_failFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json", ], pr=["https://github.com/ethereum/execution-specs/pull/2422"], ) @@ -185,6 +363,87 @@ def test_fail( Spec.INVALID, id="g2_y1_plus_P", ), + pytest.param( + Spec.INF_G1 + + PointG2((Spec.G2.x[0] + Spec.N, Spec.G2.x[1]), Spec.G2.y), + Spec.INVALID, + id="g2_x0_plus_N", + ), + pytest.param( + Spec.INF_G1 + + PointG2((Spec.G2.x[0], Spec.G2.x[1] + Spec.N), Spec.G2.y), + Spec.INVALID, + id="g2_x1_plus_N", + ), + pytest.param( + Spec.INF_G1 + + PointG2(Spec.G2.x, (Spec.G2.y[0] + Spec.N, Spec.G2.y[1])), + Spec.INVALID, + id="g2_y0_plus_N", + ), + pytest.param( + Spec.INF_G1 + + PointG2(Spec.G2.x, (Spec.G2.y[0], Spec.G2.y[1] + Spec.N)), + Spec.INVALID, + id="g2_y1_plus_N", + ), + pytest.param( + Spec.INF_G1 + PointG2((Spec.G2.x[0] + 1, Spec.G2.x[1]), Spec.G2.y), + Spec.INVALID, + id="g2_x0_plus_one", + ), + pytest.param( + Spec.INF_G1 + PointG2((Spec.G2.x[0], Spec.G2.x[1] + 1), Spec.G2.y), + Spec.INVALID, + id="g2_x1_plus_one", + ), + pytest.param( + Spec.INF_G1 + PointG2(Spec.G2.x, (Spec.G2.y[0] + 1, Spec.G2.y[1])), + Spec.INVALID, + id="g2_y0_plus_one", + ), + pytest.param( + Spec.INF_G1 + PointG2(Spec.G2.x, (Spec.G2.y[0], Spec.G2.y[1] + 1)), + Spec.INVALID, + id="g2_y1_plus_one", + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0x0, 0x8), + ( + 0x00D3270B7DA683F988D3889ABCDAD9776ECD45ABACA689F1118C3FD33404B439, + 0x2588360D269AF2CD3E0803839EA274C2B8F062A6308E8DA85FD774C26F1BCB87, + ), + ), + Spec.INVALID, + id="one_point_not_in_subgroup", + ), + pytest.param( + PointG1(0x11, 0x2) + Spec.INF_G2, + Spec.INVALID, + id="one_point_with_g2_zero_and_g1_invalid", + ), + pytest.param( + PointG1(Spec.N, 0x0) + Spec.G2, + Spec.INVALID, + id="perturb_x0_by_curve_order", + ), + pytest.param( + PointG1(0x0, Spec.N) + Spec.G2, + Spec.INVALID, + id="perturb_x1_by_curve_order", + ), + pytest.param( + PointG1(Spec.P, 0) + Spec.G2, + Spec.INVALID, + id="perturb_zeropoint_by_field_modulus", + ), + pytest.param( + PointG1(1, 0) + Spec.G2, + Spec.INVALID, + id="perturb_zeropoint_by_one", + ), ], ) @pytest.mark.ported_from( @@ -193,6 +452,13 @@ def test_fail( "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_bad_length_193Filler.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulusFiller.json", "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_g2_by_field_modulus_againFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_with_g2_zero_and_g1_invalidFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json", ], pr=["https://github.com/ethereum/execution-specs/pull/2422"], ) @@ -209,3 +475,49 @@ def test_invalid( tx=tx, post=post, ) + + +@pytest.mark.parametrize( + "input_data, expected_output, precompile_gas_modifier", + [ + pytest.param( + b"", + Spec.INVALID, + -1, + id="empty_data_insufficient_gas", + ), + pytest.param( + Spec.G1 + Spec.G2, + Spec.INVALID, + -1, + id="one_pair_insufficient_gas", + ), + pytest.param( + Spec.G1 + Spec.G2 + PointG1(0x1, Spec.P - 2) + Spec.G2, + Spec.INVALID, + -1, + id="two_point_oog", + ), + ], +) +@pytest.mark.ported_from( + [ + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json", + "https://github.com/ethereum/legacytests/tree/master/Cancun/GeneralStateTests/stZeroKnowledge/ecpairing_two_point_oogFiller.json", + ], + pr=["https://github.com/ethereum/execution-specs/pull/2422"], +) +def test_gas( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test gas combinations to the ecpairing precompile.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) diff --git a/tests/byzantium/eip197_ec_pairing/test_ecpairing_fuzzed.py b/tests/byzantium/eip197_ec_pairing/test_ecpairing_fuzzed.py new file mode 100644 index 00000000000..78e43c1982d --- /dev/null +++ b/tests/byzantium/eip197_ec_pairing/test_ecpairing_fuzzed.py @@ -0,0 +1,4204 @@ +""" +Test the ecpairing precompiled contract using fuzzed inputs from +ecpairing_inputsFiller.yml static test. +""" + +import pytest +from execution_testing import ( + Alloc, + Environment, + StateTestFiller, + Transaction, +) + +from .spec import PointG1, PointG2, Spec, ref_spec_197 + +REFERENCE_SPEC_GIT_PATH = ref_spec_197.git_path +REFERENCE_SPEC_VERSION = ref_spec_197.version + +pytestmark = [ + pytest.mark.valid_from("Byzantium"), + pytest.mark.parametrize( + "precompile_address", [Spec.ECPAIRING], ids=["ecpairing"] + ), + pytest.mark.ported_from( + [ + "https://github.com/ethereum/tests/blob/v13.3/src/GeneralStateTestsFiller/stZeroKnowledge/ecpairing_inputsFiller.yml", + ], + pr=["https://github.com/ethereum/execution-specs/pull/2443"], + ), +] + + +@pytest.mark.parametrize( + "expected_output", [pytest.param(Spec.INVALID, id=pytest.HIDDEN_PARAM)] +) +@pytest.mark.parametrize( + "input_data", + [ + pytest.param( + PointG1( + 0x0, 0xBE00BE00BEBEBEBEBEBE0000000000000000000000000000000000 + ) + + Spec.INF_G2, + ), + pytest.param( + PointG1(0x0, 0xFFFFFFFF << 216) + Spec.INF_G2, + ), + pytest.param( + PointG1(0x0, Spec.P - 0x1B7193500000000002) + Spec.INF_G2, + ), + pytest.param( + PointG1( + 0xFFFF7D7D7D7D7D7D7D7D7D7D7D7D, + 0x30644E72E131A0297D7D7D7DFFFFFFFFFF000000000000000000000000000000, + ) + + PointG2( + ( + 0xFF7D7D7D7D7D817D7D7D7D7DFFFFFFFFFFA100, + 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFF7D7D7D7D7D7D7D7D7D7D7D7D, + ), + ( + 0x30644E72E131A0297D7D7D7DFFFFFFFFFF000000000000000000000000000000, + 0xFF7D7D7D7D7D817D7D7D7D7D827D7D7D7D7D7D, + ), + ), + ), + pytest.param( + PointG1( + 0x2900000000000000000000000000000000000000000000000000, 0x0 + ) + + PointG2( + (0xFFFFFFFFFFFFFFF80000000000000000000000, 0x0), (0x0, 0x0) + ), + ), + pytest.param( + PointG1( + 0xFFFFFFFFFDFFFFFE2E0000000000000000000000000000000000, 0x0 + ) + + Spec.INF_G2, + ), + pytest.param( + PointG1( + 0x0A12D3FB2743836BBBB51414A351E5E70429A5DE70C0FE7CEC084E47D6027709, + 0x006A8C414196ABF21DA0B3F6944846C77A1032B519BAA1ABF125F4F84010C47A, + ) + + PointG2( + ( + 0x250F9CF43675BC1077753C607600F3E51B627A10F3AA68A7E462D89A6BD2A213, + 0x12AE5D695C4F9792CF70228A1BA07E5E0C2CB47D7AECBAE923A84A3734A94FF1, + ), + ( + 0x0BDCD3D0B8E47A925F98BAD0184DFE81967AAFF8DB8F0DFAE31AFCCBCB8C4BD6, + 0x148DFF646F2764243BA9100A930EB7CC8C766B58E0D9953256698DA5DBE66CC3, + ), + ) + + PointG1( + 0x1F372B78747DB898121455853A5672E71977957F134615FD0DD1FAB4938B65E7, + 0x201458C7D8EC49141BD3289F8CC4D19BB52041D51187432579E2E67CAB27C847, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x2110E6D9F2378C1C1CD070A3F1507C3AA924A60F67259ABE487621B0D3C5C38F, + 0x0C26130B8AAA54109A5D82FBB2782B9ED461A4B8FAA69341CCF652D2F73E1887, + ) + + PointG2( + ( + 0x22F1ACBB03C4508760C2430AF35865E7CDF9F3EB1224504FDCC3708DDB954A48, + 0x2A344FAD01C2ED0ED73142AE1752429EAEA515C6F3F6B941103CC21C2308E1CB, + ), + ( + 0x159F15B842BA9C8449AA3268F981010D4C7142E5193473D80B464E964845C3F8, + 0x0EFD30AC7B6F8D0D3CCBC2207587C2ACBAD1532DC0293F0D034CF8258CD428B3, + ), + ) + + PointG1( + 0x00710C68E1B8B73A72A289422D2B6F841CC56FE8C51105021C56AE30C3AE1ACA, + 0x0B2FF392A2FC535427EC9B7E1AE1C35A7961986788CF648349190DD92E182F05, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + ) + + PointG2( + ( + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + ), + ( + 0xBEFDBEBEBEBEABC689BEBEBEBE43BE92BE5FBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + 0xBEBEBEBEBEBEBEBEBE9EBEBEBE2ABEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + ), + ), + ), + pytest.param( + PointG1( + 0x25A78FA05DE3E5F7C69F35AB209D6595697E8664C3572A57EA0C971FE33532ED, + 0x0BC38B0A2D9961CF8D392DE63BE18471FFAAA192111CD8ADCCC98B7D790B6114, + ) + + Spec.INF_G2 + + PointG1( + 0x8013E823575500FFFFFFFFFFFFFFFA00000000000000000000000000, 0x0 + ) + + Spec.INF_G2, + ), + pytest.param( + PointG1( + 0x2DEC711C75595613E8F7E4723C19F6E69BE2EBAFE07E965A001F4FA00A41EECC, + 0x10246180D145035DFE0E334A8E1F4274A189B8DDE0B2CC683CDDFD9CAE9B634B, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1(0x0, 0xFFFFFFFFFFFFFF0F000000000000000000) + + Spec.INF_G2, + ), + pytest.param( + PointG1( + 0x30644E72E131A029B85045AC81EC585DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, + 0xFFFF7D7DFFFF7D817F827D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D, + ) + + PointG2( + ( + 0x7D7D767D7D7D7D7D7D797D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D7F7D7D, + 0x7D7D7D7D7D7D7D7D7D7D7D7D7D7D7D8D7D7D7D7D7D7D7DFFFFFFFFFFFFFFFFFF, + ), + ( + 0xFFFF01FFFFFFFFFFFFFFFFFFFFFF747D7D7D7D7D7D7D7D7DFD7D7D7D7D7D7D7D, + 0x7D7D7D7D7D7D7D7D7D7D7DFFFFFFFFFFFFFFFFFFFFFFFF29FFFFFF0AFFFFFF0A, + ), + ), + ), + pytest.param( + PointG1(Spec.N, 0x0) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1(Spec.P, 0x0) + + PointG2( + ( + 0xFFFFFF000060BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD0C693395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1(Spec.P + 0x10000000000, 0x0) + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2, + ), + ], + ids=lambda _: "invalid_g1_point_", +) +def test_invalid_g1_point( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test invalid g1 point inputs to the ecpairing precompile.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) + + +@pytest.mark.parametrize( + "expected_output", [pytest.param(Spec.INVALID, id=pytest.HIDDEN_PARAM)] +) +@pytest.mark.parametrize( + "input_data", + [ + pytest.param( + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + PointG2( + ( + 0x2D00E9FF0000000000000000FFFFFFFFFFFFFFFFBFB2FFFFFFFFFFFFFFFFA120, + 0xFFFFFFFFFFF7FFFFFFFFFFFF0000000000000000000000000000, + ), + ( + 0x2D0002FF0000000000000000FFFFFFFFFFFF, + 0xFFFFBFFFFFFFFFFFFFFFFFFFA120000000000000FF007D7D7D7D7D7D7D7D7D7D, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0x0, 0x0), + (0x0, 0xFFFFFFFFFFFF0000000000000000FFFFFFFFFFFFFFFFFFFF), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2((0x0, 0x0), (0x8000000, 0x0)) + + PointG1(0xF8FFFFFFFFFFFFFF0000, 0x0) + + PointG2((0x0, 0x0), (0x8000000, 0x0)), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0xFFFFFFFFFFFFFFFFFFA10000000000FFFFFFFFFFFFFFFFFFA100, 0x0), + ( + 0x16C46EBE0077418D002F28E20236919AD92313729F18578BA8547626478EA52C, + 0x2B5B688B4D8078D1E1ACD7ACC7BE7F9E0E30812CE2925B35559213646C93237F, + ), + ) + + Spec.INF_G1 + + Spec.INF_G2, + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0xFFFFFFFF << 184, 0xFFFFFFFF << 184), + ( + 0x00FB55BF7DF894A746FBE20B6F8C54D0DC0D9FD4ED005174A42FC3C45E6E27F9, + 0x12A20D63D446EB175733853B88DD36708EB7A81F5C79E7659C3A6E2B2C470077, + ), + ) + + PointG1( + 0x005ED60BA723A2DD3A5FC35520F982963DE61E3B563636FE6996CC2C30080357, + 0x20AD16F835A46FACA48C6D39AE00A10D3514E93AE3B946EE2F009EA2DCCFF97E, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x09068950585FF0759E99ECAD6903000000000000000000000000000000002C00, + 0x85B7AEF328C21800DEEF5E0000AA426A00665E0000AA, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + 0x0, + ), + ( + 0x0, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ) + + PointG1( + 0x29A0D6D5E7D14A774C3ABFF1435361DA2EE5D8B4F3EE62085CE779F248B41D4A, + 0x2FD37AE5468F6A17B7F9A0BCCA02EE128BDCED61402A566E4EEE2D0FA825F03D, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x2D00E9FF0000000000000000FFFFFFFFFFFFFFFFBFFFFFFFFFFFFFFFFFFFA120, + 0xFFFFFFFFFFF7FFFFFFFFFFFF0000000000000000000000000000, + ), + ( + 0x2D0002FF0000000000000000FFFFFFFFFFFF, + 0xFFFFBFFFFFFFFFFFFFFFFFFFA120000000000000FF007D7D7D7D7D7D7D7D7D7D, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x30644E72E131A0294FAFBA497E1EC6D18C48814A690000000100000000300000, + 0x00CD71EC682D26313681EA8A1A9A410C862CC44A5D0000000000000000000001, + ), + ( + 0x158D600A2D8411F2E9BD1A1B51EAC64E43B0C511F2E9BD1A1B51EAC64E43B0C5, + 0x11FC9BA8B80B727A2C28EE454FC286FD659262C510A3E7F11A4B0E4B74BEBAFC, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (Spec.P, 0x45000000000000000000000000000000000000000000000001), + ( + 0x07B55DE1642362D16B8FC4DCCFEC9E794D24968511CF8E252ED27AFC4D72CA1E, + 0x0301CB4D7E0B7B52A6A8F78613C403EAD1543FEDB0D3F28C77685FDB9EAA2742, + ), + ) + + PointG1( + 0x0CDC335FA81DFF303B71CFFB0256D7097C2B4C6715CA7B1589EA9386A41C2F85, + 0x1223D6BB1F3E68DDFB08F4C95F590F99227FB681A3B0ABDF685CF12BDE37D8EE, + ) + + PointG2( + (0x0, 0x10000000000000000000000000000), + ( + 0x1F1CD7F247F2AE1BA9A1AEB4B32ED4C8C13C70C8861B6AB5340E276C58E1046B, + 0x13D7DE2B557E0AE2B53380AD596BA79F07C037C9D9AA17CF407E9ED86201436E, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + Spec.INF_G2 + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x95BC4B313370B38EF355ACDADCD122975B4B313370B38EF355ACDADCD122975B, + 0x120000C8DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x0F25929BCB43D5A57391564615C9E70A992B10EAFA4DB109709649CF48C50DD2, + 0x16DA2F5CB6BE7A0AA72C440C53C9BBDFEC6C36C7D515536431B3A865468ACBBA, + ) + + PointG2( + ( + 0x2E89718AD33C8BED92E210E81D1853435399A271913A6520736A4729CF0D51EB, + 0x01A9E2FFA2E92599B68E44DE5BCF354FA2642BD4F26B259DAA6F7CE3ED57AEB3, + ), + ( + 0x14A9A87B789A58AF499B314E13C3D65BEDE56C07EA2D418D6874857B70763713, + 0x178FB49A2D6CD347DC58973FF49613A20757D0FCC22079F9ABD10C3BAEE24590, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + Spec.INF_G1 + + PointG2((0x200000000000000000000000000000B4, 0x0), (0x0, 0x0)), + ), + pytest.param( + PointG1( + 0x2A4F1DBC9FE6D2882462FB11AFEAE7B7F2A0CF213B1F19C45CB222336283F380, + 0x1141763C897C9A90E387EA80F68EB88C2D79AAB680196D9538CD2CA632A5E81B, + ) + + PointG2( + ( + 0x0E540F5B5BE91F82ED05349750761224F543068CE30D2D5E838BF66866F34520, + 0x0FA5AC8C46F725E54505019BDA3356EF6E35B0A89B9B4F79BB0C62211235C931, + ), + ( + 0x2E6D97A1F7E0428FC0BE6BE02C811095F5166710DCBE869C36A8EF89CAC63E01, + 0x2657BBAF3BCFD106DD677EEF03172F693A6C919776F441DC0FD47A4BD91D0487, + ), + ) + + PointG1( + 0x225FDAB8FE6CD876363D27075CDF0D01C209DA61B1634B574A5D811CFAE40700, + 0x1216B7C3E2ADC07C3BEF31771C7BB9E1D02F07FF3A5B74953C4FD5BF9A7A6DFF, + ) + + PointG2( + ( + 0x25F63FCC543337B8F6275F97D6479633B921541A96AC1BC2AFF2E0905DB7407C, + 0x206776F9480168741ECA625C06E5526B4664A02CE664BC656F39664D96278B6E, + ), + ( + 0x1E40E8084FD648BA315F691E8367BE1D4C13844421C87223D84829C31A0D7AFE, + 0x24B8042D4CB604AE66C0DC97CA8A9C2D22C743335D92BC401700F6B00D5CDC5B, + ), + ), + ), + pytest.param( + PointG1( + 0x2ECA0C7238BF16E83E7A1E6C5D49540685FF51380F309842A98561558019FC02, + 0x03D3260361BB8451DE5FF5ECD17F010FF22F5C31CDF184E9020B06FA5997DB84, + ) + + PointG2( + ( + 0x1213D2149B006137FCFB23036606F848D638D576A120CA981B5B1A5F9300B3EE, + 0x2276CF730CF493CD95D64677BBB75FC42DB72513A4C1E387B476D056F80AA75F, + ), + ( + 0x21EE6226D31426322AFCDA621464D0611D226783262E21BB3BC86B537E986237, + 0x096DF1F82DFF337DD5972E32A8AD43E28A78A96A823EF1CD4DEBE12B6552EA5F, + ), + ) + + PointG1( + 0x06967A1237EBFECA9AAAE0D6D0BAB8E28C198C5A339EF8A2407E31CDAC516DB9, + 0x22160FA257A5FD5B280642FF47B65ECA77E626CB685C84FA6D3B6882A283DDD1, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0xE8FF2110EDE0E189426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + ], + ids=lambda _: "invalid_g2_point_", +) +def test_invalid_g2_point( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test invalid g2 point inputs to the ecpairing precompile.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) + + +@pytest.mark.parametrize( + "expected_output", [pytest.param(Spec.INVALID, id=pytest.HIDDEN_PARAM)] +) +@pytest.mark.parametrize( + "input_data", + [ + pytest.param( + Spec.INF_G1 + + PointG2( + (0x0, 0x800), + ( + 0x104E75A20B641566A0C71C9069A5256391AA31E22021D36C037C108DFB79C662, + 0x00BF257AE3D66A589214F980A2AE34F9544BE2FCBCC13B21F4C1642F31AA4D20, + ), + ) + + Spec.INF_G1 + + PointG2( + (0x0, 0x800), + ( + 0x104E75A20B641566A0C71C9069A5256391AA31E22021D36C037C108DFB79C662, + 0x00BF257AE3D66A589214F980A2AE34F9544BE2FCBCC13B21F4C1642F31AA4D20, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0x0, 0x80000000000000000000), + ( + 0x12AB9BB0C853FB1D884197CDEFDF654C01A289B677094FE609C835D2B249DCC5, + 0x1460243CC357281001B8B257C6396865C729761AC575A85B2F8F0E58AF439C84, + ), + ) + + Spec.INF_G1 + + Spec.INF_G2, + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x0, + 0x080A77C09A07DFAF666EA36F7879462C0A78EB28F5C70B5ED35D438DC58F0D9D, + ), + ( + 0x058BCABF53CCB1B6F2AD14E6BC531485DBA856600B7941C8C5A4968940FBA978, + 0x210DC371BFD9736EB879D25BE8A799EFF45BEA91130B9B2768689786235ACCD9, + ), + ) + + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2, + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0x800104E75, 0x0), + ( + 0x0A535BC14C0F581A039D0BFB15E730B6BBB3D6E33ECDA8C74EBD901DEEB4EF84, + 0x23E99EADCC72CED9221DF2DB154B36F6931270C3F21F4EC8C4206B9211924BB2, + ), + ) + + PointG1( + 0x03A99966A8DB46602AC05B8F0D7669C3BC066FB7B9A188CC79E5239E27E35805, + 0x17E54F1FFF192038A907711C8123997F785D2C2C9A214355466B60652EE53E4D, + ) + + PointG2( + ( + 0x00C662006274FB346E22EEB59635C82CB4E20E34DA7230644E72E131C82CB4E2, + 0x104E75A20B64000000000000000000150000000000000000006629C731, + ), + ( + 0x270EF2EA6F8C3DAD3832F95F309CB6A1591AD53AF025C6E0809992F15234E5FE, + 0x1B37771CE3BB5A62017C56C496E57673E2617634E900C587724D21F24E603A63, + ), + ) + + PointG1( + 0x03A99966A8DB46602AC05B8F0D7669C3BC066FB7B9A188CC79E5239E27E35805, + 0x187EFF52E2187FF10F48D49A005DBEDE1F243E64CE508737F5B52BB1A997BEFA, + ) + + PointG2( + (0x0, 0xBF000000000000000000), + ( + 0x1284BDD8E69832B232222D3493A6ABB523575BE2A5AF6E88F5501CEF408AA5BB, + 0x0CA4D5B3C58E0BC7BE2C8885E53C673B54F3057CFF97CB1020CB2F5A9F61AFFB, + ), + ) + + Spec.INF_G1 + + PointG2((0x0, 0x0), (0x8000000, 0x0)), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0x4000000000000000000, 0x0), + ( + 0x0FB1B0E8C8B85EC99EBEDAE0880006B0809F5151890CCA524EEA2C0B3AD87F32, + 0x29D3E6BC7F0886B75E186B10564DC990258855E0311E3E2E72F9D9C0DFAB4F0D, + ), + ) + + Spec.INF_G1 + + PointG2( + (0x4000000000000000000, 0x0), + ( + 0x0FB1B0E8C8B85EC99EBEDAE0880006B0809F5151890CCA524EEA2C0B3AD87F32, + 0x29D3E6BC7F0886B75E186B10564DC990258855E0311E3E2E72F9D9C0DFAB4F0D, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0x2000000000000000000000000, 0x0), + ( + 0x114CC34C5044C87540B942287D555CE935499CE155202081CA5CE495C3568960, + 0x09FD9490A6F214B7729F9574D53FCE82A2D46B3CCF7499AB5616B2C4F36582D7, + ), + ) + + Spec.INF_G1 + + PointG2((0x0, 0x0), (0x8000000, 0x0)), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0x310000000000000000000000000CCC36905059, 0x0), + ( + 0x034E16015E4AEADB3C1C93FD54F496A6A75271F9E514B6C51782D145A1771A98, + 0x27910E860D8264C87A784C364D78F117CA598153FC5947C915EB6E2E7E0AD6D5, + ), + ) + + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2, + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x800000000000000000000000000000000000000000, + 0x070A77C19A07DF2E666EA36F7879462C0A78EBBDF5C70B3DD35D438DC58F0D9D, + ), + ( + 0x0A2DD5B476A606A8243E7E879BDDAA8086BA658087AACC4D986A10C74DD9E774, + 0x2D46618F9D516E0F07A59D3C97F5E167A1B49EBE9FB30DD05BDED8185A545420, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x192B7E3A0CA8B63592989FE8B2589465703315272BC7, + 0x30644E72E131A029B85045B68181585D00001B86B77538000000000100000000, + ), + ( + 0x128A694E7017AE1DB6A312C9EF648B1A4910A41E684CB554302044A2065F0468, + 0x0DF2D76A91278279CF401D431C31876EE9C8AD35070694552CCBD36875541383, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x192B7E3A0CA8B63592989FE8B2589465703315272BC7, + 0x30644E72E131A029B85045B68181585D00001B86B77538000000000100000000, + ), + ( + 0x128A694E7017AE1DB6A312C9EF648B1A4910A41E684CB554302044A2065F0468, + 0x0DF2D76A91278279CF401D431C31876EE9C8AD35070694552CCBD36875541383, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x5B000000000045000000002A000000000080000000000000000001, + 0x30644E72E131A029B65045B68181585D2B0D3025C6ABDBAA75EF4D163A7CFD40, + ), + ( + 0x17C66E1806ECE8D631D792F8CBD8BDF7514A9058C183A3B2FCDA7E86C44B7752, + 0x301A6A722CDC812165B619F3CD2B21250D7F7083D0B984FDAF8636202E4AE047, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D2B0D3025C6AB2EB4FBEF4D16D87CFD40, + 0x5B004500000000000000002A000000000000000000000000000001, + ), + ( + 0x109BEDDBAA84026C8F71D34A485AF27FE418028129B55B0A0DF51E3DBA231002, + 0x1AEA54403CE01876467152AA79CA1F227B6B1E0F95B56CB0537583190252556D, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (0xFFFFFFFF << 184, 0xFFFFFFFF << 184), + ( + 0x00FB55BF7DF894A746FBE20B6F8C54D5DC0D9FD4EDA4742FC35100C45E6E27F9, + 0x12A20D63D446EB175733853B88DD36708EB7A81F5C79E7659C3A6E2B2C470077, + ), + ) + + Spec.INF_G1 + + PointG2( + (0xFFFFFFFF << 184, 0xFFFFFFFF << 184), + ( + 0x00FB55BF7DF894A746FBE20B6F8C549FEDDC0DD0D4005174A42FC3C45E6E27F9, + 0x12A20D63D446EB175733853B88DD36708EB7A81F5C79E7659C3A6E2B2C470077, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0xEA1146AF1A0C4DF0000000001000000000000000000000000000000, + 0x0, + ), + ( + 0x15D42E5A1C18703100BEF65A743007BEAD1FC389B7D8F0A8CCDA34B7D30620CB, + 0x1C4156D243211B733AF4F4FFF11B9C0928308BF3C3102415E3105B986166D0CD, + ), + ) + + PointG1(0xF8FFFFFFFFFFFFFF0000, 0x0) + + PointG2((0x0, 0x0), (0x8000000, 0x0)), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x249409822E0000000000000000000000000000000000000001154BAF, + 0x30644E72E131A029B85045B66AC4175696816A916871CA8D3C208C161A46C432, + ), + ( + 0x126F44FAB27034BA2832173059EBF31A96607ADA20F006B4F12D4A8BAD410D8F, + 0x02EEE77897359CFC599B6CA4E8C2A47F641FC0CD6D4146D8ECA263A85C7AA365, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x05908648C919B2BD65122716E5E4AA74FB342E22EEB59635C84BB4E20E34DA72, + 0x30644E72E131A0296427B6542E3A6A00CCFA1D43577C305499096BBD8414F16C, + ), + ( + 0x0DF67CF39CB400A898E9AA727937CA9E07D92185F3FBA6AA42BE45DDAD4FDADB, + 0x145DA376A6EC6D77185DF39EDDE6E9037E58065A054CDA2796F4E669BCDCBF1F, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x05908648C919B2BD65122716E5E4AA74FB342E22EEB59635C84BB4E20E34DA72, + 0x30644E72E131A0296427B6542E3A6A00CCFA1D43577C305499096BBD8414F16C, + ), + ( + 0x0DF67CF39CB400A898E9AA727937CA9E07D92185F3FBA6AA42BE45DDAD4FDADB, + 0x145DA376A6EC6D77185DF39EDDE6E9037E58065A054CDA2796F4E669BCDCBF1F, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x05908648C919B2BD65122716E5E4AA74FB342E22EEB59635C84BB4E20E34DA72, + 0x30644E72E131A0296427B6542E3A6A00CCFA1D43577C305499096BBD8414F16C, + ), + ( + 0x0DF67CF39CB400A898E9AA727937CA9E07D92185F3FBA6AA42BE45DDAD4FDADB, + 0x145DA376A6EC6D77185DF39EDDE6E9037E58065A054CDA2796F4E669BCDCBF1F, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x05908648C919B2BD65122716E5E4AA74FB342E22EEB59635C84BB4E20E34DA72, + 0x30644E72E131A0296427B6542E3A6A00CCFA1D43577C305499096BBD8414F16C, + ), + ( + 0x0DF67CF39CB400A898E9AA727937CA9E07D92185F3FBA6AA42BE45DDAD4FDADB, + 0x145DA376A6EC6D77185DF39EDDE6E9037E58065A054CDA2796F4E669BCDCBF1F, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x05908648C919B2BD65122716E5E4AA74FB342E22EEB59635C84BB4E20E34DA72, + 0x30644E72E131A0296427B6542E3A6A00CCFA1D43577C305499096BBD8414F16C, + ), + ( + 0x0DF67CF39CB400A898E9AA727937CA9E07D92185F3FBA6AA42BE45DDAD4FDADB, + 0x145DA376A6EC6D77185DF39EDDE6E9037E58065A054CDA2796F4E669BCDCBF1F, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x05908648C919B2BD65122716E5E4AA74FB342E22EEB59635C84BB4E20E34DA72, + 0x30644E72E131A0296427B6542E3A6A00CCFA1D43577C305499096BBD8414F16C, + ), + ( + 0x0DF67CF39CB400A898E9AA727937CA9E07D92185F3FBA6AA42BE45DDAD4FDADB, + 0x145DA376A6EC6D77185DF39EDDE6E9037E58065A054CDA2796F4E669BCDCBF1F, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x05908648C919B2BD65122716E5E4AA74FB342E22EEB59635C84BB4E20E34DA72, + 0x30644E72E131A0296427B6542E3A6A00CCFA1D43577C305499096BBD8414F16C, + ), + ( + 0x0DF67CF39CB400A898E9AA727937CA9E07D92185F3FBA6AA42BE45DDAD4FDADB, + 0x145DA376A6EC6D77185DF39EDDE6E9037E58065A054CDA2796F4E669BCDCBF1F, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x1A36C98D1ECE5FD647AFBA497E7EA7A2687E956E978E3572C3DF75E9278302B9, + 0x991B498795, + ), + ( + 0x099A3FAF27255B9542DAF48D9588FC4D6927C7FCD88C5784A4245345474E1E45, + 0x09A44EA53F191DDEF8A32EC03A7E1A24E06588F8DE364BA0024B3B8A062CA91A, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x1A36C98D1ECE5FD647AFBA497E7EA7A2687E956E978E3572C3DF75E9278302B9, + 0x991B498795, + ), + ( + 0x099A3FAF27255B9542DAF48D9588FC4D6927C7FCD88C5784A4245345474E1E45, + 0x09A44EA53F191DDEF8A32EC03A7E1A24E06588F8DE364BA0024B3B8A062CA91A, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x1000000000000000000000000000000000000000017F66B91112534050000, + ), + ( + 0x06F2A18A982E6E9436F171F8BCDB4F60B9EA1DAFAF115F9228E11DDD98CA9680, + 0x304502B9C299712D0CF851E73ADC8CE68C549A5B2AE712A44811DB357D3BDB97, + ), + ) + + PointG1( + 0x17956B549321B92C524D191A62B90C81F08E694AF4DCEB00A80094E53120D39E, + 0x2FD15D78815388959CAA54AFFA2D7B2C8D52C528E6A1F6C0A50FCF0498FAC7EE, + ) + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x0, + ), + ( + 0x016B9E28A32EE61A7AD5BD4BAD29D64FC35A8FB46B510BE2067907069497AE1F, + 0x0C3C07C40F41A731FE27D953F1154B4E9A8ACF3EF44608817150DE0DF916503A, + ), + ) + + PointG1( + 0x17956B549321B92C524D191A62B90C81F08E694AF4DCEB00A80094E53120D39E, + 0x2FD15D78815388959CAA54AFFA2D7B2C8D52C528E6A1F6C0A50FCF0498FAC7EE, + ) + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x0, + ), + ( + 0x016B9E28A32EE61A7AD5BD4BAD29D64FC35A8FB46B510BE2067907069497AE1F, + 0x0C3C07C40F41A731FE27D953F1154B4E9A8ACF3EF44608817150DE0DF916503A, + ), + ) + + PointG1( + 0x17956B549321B92C524D191A62B90C81F08E694AF4DCEB00A80094E53120D39E, + 0x2FD15D78815388959CAA54AFFA2D7B2C8D52C528E6A1F6C0A50FCF0498FAC7EE, + ) + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x0, + ), + ( + 0x016B9E28A32EE61A7AD5BD4BAD29D64FC35A8FB46B510BE2067907069497AE1F, + 0x0C3C07C40F41A731FE27D953F1154B4E9A8ACF3EF44608817150DE0DF916503A, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D977F9597358C206E72C88C16E622B8B2, + 0x4500000000000000000000000107B55DE1642362D16B8FC4DC, + ), + ( + 0x2A314ECA6ADB97BF3A3872A406ECF97BF2BDD210B6CBA667EBA043F71C1FFC20, + 0x0BA9CAA5888AE7C0E6D2B54181905E66769D9ED9BADC43DA3D9F3E56B46CB43B, + ), + ) + + PointG1( + 0x0ACFD59A153BDC736907CC4A640A2FB675CDAA8066A58616537CE4CD7145AA06, + 0x1B1D6BF901BDA3C5E3DF60E3741D6F5D6660F4034E2F99545E0DC71E9B53AF2C, + ) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D977F956E978C3572C8208C166622B8B2, + 0x4500000000000000000000000107B55DE1642362D16B8FC4DC, + ), + ( + 0x2AD9BB009C15BDC11D5ED75A805D5F24BA0E10E5B7953E281E241F72D208CE88, + 0x0D6F072450FD6EF76DD73FF2924238CBEE09EA4C6281B867A897D85D8D091B33, + ), + ) + + PointG1( + 0x0ACFD59A153BDC736907CC4A640A2FB675CDAA8066A58616537CE4CD7145AA06, + 0x1B1D6BF901BDA3C5E3DF60E3741D6F5D6660F4034E2F99545E0DC71E9B53AF2C, + ) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D977F956E978C3572C8208C166622B8B2, + 0x4500000000000000000000000107B55DE1642362D16B8FC4DC, + ), + ( + 0x2AD9BB009C15BDC11D5ED75A805D5F24BA0E10E5B7953E281E241F72D208CE88, + 0x0D6F072450FD6EF76DD73FF2924238CBEE09EA4C6281B867A897D85D8D091B33, + ), + ) + + PointG1( + 0x0ACFD59A153BDC736907CC4A640A2FB675CDAA8066A58616537CE4CD7145AA06, + 0x1546E279DF73FC63D470E4D30D63E9003120768E1A423138DE12C4F83D294E1B, + ) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D977F956E978C3572C8208C166622B8B2, + 0x4500000000000000000000000107B55DE1642362D16B8FC4DC, + ), + ( + 0x2AD9BB009C15BDC11D5ED75A805D5F24BA0E10E5B7953E281E241F72D208CE88, + 0x0D6F072450FD6EF76DD73FF2924238CBEE09EA4C6281B867A897D85D8D091B33, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ) + + PointG1( + 0x1A3CF0C503B2DBC6E1B0F8AEA605DE20D8612FE14627C6F4D3706F8272A1CF84, + 0x2A0BB098018CA4392A1DDC08B9605602AED954308944AC729E2F99BFDD0166DD, + ) + + PointG2( + (0x10000, 0x0), + ( + 0x24B364D16400886C82900AF060FD117CB2F4E0B93590CBF6EC34ED97F4C391EC, + 0x26A10E3233AEFF776D578DE9178A9B7BB919E6EB6CF2CF924EB16EC8DC659AF9, + ), + ), + ), + pytest.param( + Spec.INF_G1 + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ) + + PointG1( + 0x1A5D389CA17607C4B12D7F1C8463B960754DBBB74EE00F645CA559F5EE759AD5, + 0x231FDB414002B25EBEED48FD799214F4DB09A7DAE25AC92C15B7E429E1800A70, + ) + + PointG2( + ( + 0x297861CED3673FA135F178751F203F13D8A4C9F15AD9FDBB4BB7468154AF97F7, + 0x1698710AF2EFBDE1687BC1530E7DA2CA42C8E85BAF594682890D36C8FB8D08F9, + ), + ( + 0x106F1D083223BD63D1630BAF008588AC9C0392C289C68AFEE37B013030A9F7D1, + 0x0128036F1A405F40BCE08BC346F0F83CB8CA2FE81D18FDFFFA984C97CEF37358, + ), + ) + + Spec.INF_G1 + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ) + + PointG1( + 0x1C251D57A884434484D488B3FA5BB0B0D8566A251BFA57CDCFA452EE114A1960, + 0x1BCD6DEC5E0B17FB9BB77B1145793CD6A99534DE85911F41C37934FC6F1F508E, + ) + + PointG2( + ( + 0x203E205DB4F19B37B60121B83A7333706DB86431C6D835849957ED8C3928AD79, + 0x27DC7234FD11D3E8C36C59277C3E6F149D5CD3CFA9A62AEE49F8130962B4B3B9, + ), + ( + 0x195E8AA5B7827463722B8C15393157AD3505566B4EDF48D498E185F0509DE152, + 0x04BB53B8977E5F92A0BC372742C4830944A59B4FE6B1C0466E2A6DAD122B5D2E, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0, + 0x30644E72E131A029B05040FF0000000000000000000000000000000000000000, + ), + ( + 0x2E00D573B028B22B9D347DA8044A53C94B6C3AEE7D9BFB00AB2C0A10EB4775E6, + 0x19E1A75BE1C5D39A105504A0E5D16C949524742DDE6BBB6E831668FEF921A143, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x30644E72E131A029B050FFFFFFFF585D97816A86B77537DAFBEF4D16D87CFD45, + 0x5B00450000F400000000002A00647D903B504C1A02000000000001, + ), + ( + 0x2DB3D49DA56012CF4F73CBF19FDB59EF41356CEBB4F4B6F692F9A38FB282A9FF, + 0x2D96DB5D24DCEA418A44FEAE6052FBC7788E65E521B17232666818386252176A, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + (0x107B55DE1642362D16B8F25DCCF, (Spec.P >> 24) << 24), + ( + 0x09EAE594F627B7CCF496D680F0266E7364F51D2D99CCD69801F29137D889E1E0, + 0x06EA1409D3F9BB38BD40E8DA0701D122E059A02FC3C3C4A99A8CBF6E4290BDC0, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + (0x107B55DE1642362D16B8F25DCCF, (Spec.P >> 24) << 24), + ( + 0x09EAE594F627B7CCF496D680F0266E7364F51D2D99CCD69801F29137D889E1E0, + 0x06EA1409D3F9BB38BD40E8DA0701D122E059A02FC3C3C4A99A8CBF6E4290BDC0, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000008, + Spec.P - 0x65FA7E, + ), + ( + 0x19C023CE224A0C0B121DD4F578B39E0DDF00A55580B03265CB32FCB623BBF778, + 0x240F6BF16B9A25500A02B09FBE8ABFA933F9EE09EFFB104D712BAF573463EF8C, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000008, + Spec.P - 0x65FA7E, + ), + ( + 0x19C023CE224A0C0B121DD4F578B39E0DDF00A55580B03265CB32FCB623BBF778, + 0x240F6BF16B9A25500A02B09FBE8ABFA933F9EE09EFFB104D712BAF573463EF8C, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x5B00450000000000DA76B36B83C728300000000000000000000008, + 0x30644E72E131A029B85045B68181585D97816A916871CA8D104D5B2BAF573463, + ), + ( + 0x1B8765E7F5163862FCD3BC29F751AF42D869A0C8A329F5A53472D3C977038BB7, + 0x068CD6BC298BD1EC695A49E1DB0620332F26E03A4A0ED9076973C1FEA43099F2, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x5B00450000FC00000000002A00647D903B504C1A02000000000001, + 0x30644E72E131A029B85045B68181585D97816A86B77537DAFBEF4D16D87CFD45, + ), + ( + 0x0125B8EDEDE9E4F320E4DBFD7EE46D23A82508C3B44DBB99CB29724DAAA5C560, + 0x2D663CC48C6D7469CC9DF0E861F3A9B93239AF8001F8ECF28B4572F201EF1369, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A86B77538DAFBEF4D16D87CFD45, + 0x5B004500000000000000002A00647D903B504C1A02000000000001, + ), + ( + 0x247F1F6FBF2FE1FFF7E28D816724080774979F57692C2FA8569EA1A3CE52DFC5, + 0x1F5C96F77D84AE24B701A32FF1B8D95B982C76BF5AB02E605C9BA4FA9F45B958, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x012CD187FAAE3648A35E12CC197DDB26D9D3A44A625D97816A86B77537DAFBEF, + 0x30644E72E131A029B050FFFFFFFF5802086325C1129AD4A34EBB48EE96340160, + ), + ( + 0x08AEF33D9388C8F993F0AF340E047C1C9519D222062186F7B025291B6F6F4EF2, + 0x293F1064B0E3345895DC4968BC8BB52FCBE960621C1F15CD7C693C7347078E32, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x012CD187FAAE3648A35E12CC197DDB26D9D3A44A625D97816A86B77537DAFBEF, + 0x30644E72E131A029B050FFFFFFFF5802086325C1129AD4A34EBB48EE96340160, + ), + ( + 0x08AEF33D9388C8F993F0AF340E047C1C9519D222062186F7B025291B6F6F4EF2, + 0x293F1064B0E3345895DC4968BC8BB52FCBE960621C1F15CD7C693C7347078E32, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x30644E72E131A029B05045B68181585D97816A86B77537DAFBEF4D16D87CFD45, + 0x5B00450000FC00000000002A00647D903B504C1A02000000000001, + ), + ( + 0x2C32D7465B0607CFAEBE0B13577B25E42FE6D9E49EEB9D5C0CA78CC17E114CBC, + 0x2CD71C8288EBBD272A784C5B4921128CB68E9E2DDAAEC0595B266126C4E526BD, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B05045B68181585D97816A86B77537DAFBEF4D16D87CFD45, + 0x5B00450000FC00000000002A00647D903B504C1A02000000000001, + ), + ( + 0x2C32D7465B0607CFAEBE0B13577B25E42FE6D9E49EEB9D5C0CA78CC17E114CBC, + 0x2CD71C8288EBBD272A784C5B4921128CB68E9E2DDAAEC0595B266126C4E526BD, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A68917120CA8D3C8C16D87CFD45, + 0x5B0045000000000000000000000000000000000000000040000001, + ), + ( + 0x11EE2BE185FB562C979EEB452DF376F91C7852BFB8A6D5727024444A2FC58C15, + 0x2825D78E66BE7952503E9E1BF2D8AAD4C39F4CE4095349043106508BAB20D6E5, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A86B77538DAFBEF4D16D87CFD45, + 0x5B004500000000000000002A000000000000000000000000000001, + ), + ( + 0x124CA5DC43ED1E22D1C616B50A7D4249A012C1D65330AE8E4CAD70567C8231BB, + 0x23F9415FA570E58E0AC61E4E6E7A6BD02A564F6B206A9D4645401B1D677BF3AB, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A86B77538DAFBEF4D16D87CFD45, + 0x5B004500000000000000002A000000000000000000000000000001, + ), + ( + 0x124CA5DC43ED1E22D1C616B50A7D4249A012C1D65330AE8E4CAD70567C8231BB, + 0x23F9415FA570E58E0AC61E4E6E7A6BD02A564F6B206A9D4645401B1D677BF3AB, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A86B77538DAFBEF4D16D87CFD45, + 0x5B004500000000000000002A00647D903B504C1A02000000000001, + ), + ( + 0x247F1F6FBF2FE1FFF7E28D816724080774979F57692C2FA8569EA1A3CE52DFC5, + 0x1F5C96F77D84AE24B701A32FF1B8D95B982C76BF5AB02E605C9BA4FA9F45B958, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x30644E72E131A029B85045B68181585D97816A86B77538DAFBEF4D16D87CFD45, + 0x5B004500000000000000002A00647D903B504C1A02000000000001, + ), + ( + 0x247F1F6FBF2FE1FFF7E28D816724080774979F57692C2FA8569EA1A3CE52DFC5, + 0x1F5C96F77D84AE24B701A32FF1B8D95B982C76BF5AB02E605C9BA4FA9F45B958, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + Spec.P - 0xC0C80FD98EAC3DB, + 0x5B0045000000000000000000000000000000080000000000000001, + ), + ( + 0x301A8B8043356B83C4341D5E9CFC67071C61C0B053EC979B59AD8C0455B71C98, + 0x15F88E8C709168C1AB898CA5288423B585331497F16B2C074DCBF76C2480E8C9, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + Spec.P - 0xC0C80FD98EAC3DB, + 0x5B0045000000000000000000000000000000080000000000000001, + ), + ( + 0x301A8B8043356B83C4341D5E9CFC67071C61C0B053EC979B59AD8C0455B71C98, + 0x15F88E8C709168C1AB898CA5288423B585331497F16B2C074DCBF76C2480E8C9, + ), + ), + ), + pytest.param( + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + ), + ( + 0x1CC9A9EB823F8D97ADEE0206828C9F19EAF8F536C23207D68AE3D056A1480BB2, + 0x1990DDB90388B94F31089D3B4FF594D5449C04FCDF2A3681017B5D7749367BA1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + ), + ( + 0x1CC9A9EB823F8D97ADEE0206828C9F19EAF8F536C23207D68AE3D056A1480BB2, + 0x1990DDB90388B94F31089D3B4FF594D5449C04FCDF2A3681017B5D7749367BA1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + ), + ( + 0x1CC9A9EB823F8D97ADEE0206828C9F19EAF8F536C23207D68AE3D056A1480BB2, + 0x1990DDB90388B94F31089D3B4FF594D5449C04FCDF2A3681017B5D7749367BA1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + ), + ( + 0x1CC9A9EB823F8D97ADEE0206828C9F19EAF8F536C23207D68AE3D056A1480BB2, + 0x1990DDB90388B94F31089D3B4FF594D5449C04FCDF2A3681017B5D7749367BA1, + ), + ), + ), + pytest.param( + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x2B0D3F819FD0046AEE4D0E54CC759AD714C473BD5F86A0D68DF977F7450390F7, + 0x30644E72E131A029B85045AE0000000000000107B55DE1642362D16B8FC4DCCF, + ), + ( + 0x2A5C3A27C4A417EA34F627B9481B9004E3B0EF59619DAA16E846D8A152D6BF77, + 0x1301A8BB9C71966A4B557A21EEA89447294E8A9CC1308F0C8EECB16DFBF5D53B, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + Spec.P - 2, + 0x45000000000000000000000000000000000000000000000001, + ), + ( + 0x07B55DE1642362D16B8FC4DCCFEC9E794D24968511CF8E252ED27AFC4D72CA1E, + 0x0301CB4D7E0B7B52A6A8F78613C403EAD1543FEDB0D3F28C77685FDB9EAA2742, + ), + ), + ), + pytest.param( + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + (Spec.P >> 8) << 8, + 0x5B0045000000000000000000000000000000000000000000000001, + ), + ( + 0x112006831F3F0E121585C21CDF0AAF63F09728BCFEE141BB4CD407CAAE7715E3, + 0x19DF1E217AD7B1F874726C6683AB87B423C1737F46A54DC5356A9B617C6B9E28, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ), + ), + pytest.param( + PointG1(0x1, Spec.P - 2) + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ), + ), + pytest.param( + PointG1(0x1, Spec.P - 2) + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ) + + Spec.INF_G1 + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ) + + Spec.INF_G1 + + PointG2( + (Spec.P - 2, 0x2), + ( + 0x0833E47A2EAA8BBE12D33B2DA1A4FA8D763F5C567FE0DA6C5C9DA2E246F2096F, + 0x28DC125BF7443BC1826C69FE4C7BF30C26EC60882350E784C4848C822726EB43, + ), + ), + ), + pytest.param( + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + Spec.P - 2, + 0x45000000000000000000000000000000000000000000000001, + ), + ( + 0x07B55DE1642362D16B8FC4DCCFEC9E794D24968511CF8E252ED27AFC4D72CA1E, + 0x0301CB4D7E0B7B52A6A8F78613C403EAD1543FEDB0D3F28C77685FDB9EAA2742, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + Spec.P - 2, + 0x45000000000000000000000000000000000000000000000001, + ), + ( + 0x07B55DE1642362D16B8FC4DCCFEC9E794D24968511CF8E252ED27AFC4D72CA1E, + 0x0301CB4D7E0B7B52A6A8F78613C403EAD1543FEDB0D3F28C77685FDB9EAA2742, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + Spec.P - 2, + 0x45000000000000000000000000000000000000000000000001, + ), + ( + 0x07B55DE1642362D16B8FC4DCCFEC9E794D24968511CF8E252ED27AFC4D72CA1E, + 0x0301CB4D7E0B7B52A6A8F78613C403EAD1543FEDB0D3F28C77685FDB9EAA2742, + ), + ), + ), + pytest.param( + PointG1( + 0x003DB26A0B244FB3FD47F7F5F0F8A289E088FD932D340F0592696503FC621248, + 0x24C9B9423EF04336563ADC35604BA729A4C9E6104BFCB55517E3198B8EDBDF98, + ) + + PointG2( + ( + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADDDE46BD5CD992F6ED, + 0x198E9393920D483A7260BFB731DD5D25F1AA493335A9E71297E485B7AEF312C2, + ), + ( + 0x0B9F1099ECEFA8B45575D349B0A6F04C16D0D58AF9007F2C6D8BD7AA763A3B0E, + 0x0B7C77862FE8D10D489A493A1A5C5D0F282C7D4E8148F340653C4B6297A1088F, + ), + ) + + PointG1( + 0x003DB26A0B244FB3FD47F7F5F0F8A289E088FD932D340F0592696503FC621248, + 0x24C9B9423EF04336563ADC35604BA729A4C9E6104BFCB55517E3198B8EDBDF98, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731DD5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x2BA3E0CAB22EFBFEF96E027F1A29BA7EC11A0F824024A3787D3CB8370B9EED71, + 0x103CE48DAC2E3FF691B61C7E4466ADF35AA183AADE7F15386BF7C789628B1B0E, + ), + ), + ), + pytest.param( + PointG1( + 0x01EA6E2EAE2A2501D6830A3F5EA1353A5F920719AAEEEA537DDE0DF31BEC7A80, + 0x2B40433B22AAAEC8F6D6D21DC04994AB99BA4A4B16545F63430A6ECF01881E09, + ) + + PointG2( + ( + 0x4000000000000000000000000000000000000000000000000000000, + 0x196EC634C6397F591EBEE925F9FA9E89A1FA55BA5E38D5CB0F7DCFA49E0C0AE4, + ), + ( + 0x260377B5B8FED1C2F2A2F848038464FFC8C3BD1D71844FCC85F64B478248B21D, + 0x0990A17D0F06D3BB026B17967CC55B2160D7570FDE6A448502BD28E8192DB67E, + ), + ) + + PointG1( + 0x01EA6E2EAE2A2501D6830A3F5EA1353A5F920719AAEEEA537DDE0DF31BEC7A80, + 0x05240B37BE86F160C1797398C137C3B1FDC72046521D6B29F9161D47D6F4DF3E, + ) + + PointG2( + ( + 0x4000000000000000000000000000000000000000000000000000000, + 0x196EC634C6397F591EBEE925F9FA9E89A1FA55BA5E38D5CB0F7DCFA49E0C0AE4, + ), + ( + 0x260377B5B8FED1C2F2A2F848038464FFC8C3BD1D71844FCC85F64B478248B21D, + 0x0990A17D0F06D3BB026B17967CC55B2160D7570FDE6A448502BD28E8192DB67E, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ) + + PointG1(0x1, 0x2) + + PointG2( + ( + 0x0D7D3BE95C6B1FC7D70F2EDC7B7BF6E7397BC04BC6AAA0584B9E5BBC064DE4FA, + Spec.P - 0x1D8A9F8B4C998A61149D6C, + ), + ( + 0x10FB4E584F10053CBA1117D920DB188F54D1AB64E66E10B6177401A44C71E250, + 0x20F50C6423205B18D96CDF7A832041D89076CF36DCDE6700E62833186ACD60B6, + ), + ), + ), + pytest.param( + PointG1( + 0x0272AF94B7AEB772C1666DB65FF3987FD8EC43B8454AAD395232B5EEF18CA2C5, + 0x1D5FC6B50EF577096EC2489356E8ECCCD5ED5A144928C5338AF5549701DBB40D, + ) + + PointG2( + ( + 0x255495FFBA02A0ED6877A0A6ED658C93A1487A3319AAA05934E35BBB953673AF, + 0x279573FBFE8E6C2300000000000030640472E131A029B85045, + ), + ( + 0x090D17C2EAEDA0D61DD0442997D161E176FB98A27091FE8B6B5746FE2F344A0F, + 0x26F1F16556D24506AF1FD1C8CB4B3B6DFA73E2CE958C50E3B937FD59A1DF623F, + ), + ) + + PointG1( + 0x0272AF94B7AEB772C1666DB65FF3987FD8EC43B8454AAD395232B5EEF18CA2C5, + 0x130487BDD23C2920498DFD232A986B90C194107D1F490559B12B377FD6A1493A, + ) + + PointG2( + ( + 0x255495FFBA02A0ED6877A0A6ED658C93A1487A3319AAA05934E35BBB953673AF, + 0x279573FBFE8E6C2300000000000030640472E131A029B85045, + ), + ( + 0x090D17C2EAEDA0D61DD0442997D161E176FB98A27091FE8B6B5746FE2F344A0F, + 0x26F1F16556D24506AF1FD1C8CB4B3B6DFA73E2CE958C50E3B937FD59A1DF623F, + ), + ) + + PointG1(0x0, Spec.P) + + PointG2( + (0xFCFF0000000000000000000000, 0x0), + ( + 0x212A3B4059E59D125DD17F662945170E1E13024FAE97A401895690ACAC63CF68, + 0x1AECB67409D1D9C142FFD13375BD79FD0457DEB278DFA91B5756378FB837FD60, + ), + ), + ), + pytest.param( + PointG1( + 0x03A99966A8DB46602AC05B8F0D7669C3BC066FB7B9A188CC79E5239E27E35805, + 0x187EFF52E2187FF10F48D49A005DBEDE1F243E64CE508737F5B52BB1A997BEFA, + ) + + PointG2( + (0x0, 0xBF000000000000000000), + ( + 0x1284BDD8E69832B232222D3493A6ABB523575BE2A5AF6E88F5501CEF408AA5BB, + 0x0CA4D5B3C58E0BC7BE2C8885E53C673B54F3057CFF97CB1020CB2F5A9F61AFFB, + ), + ) + + PointG1( + 0x03A99966A8DB46602AC05B8F0D7669C3BC066FB7B9A188CC79E5239E27E35805, + 0x17E54F1FFF192038A907711C8123997F785D2C2C9A214355466B60652EE53E4D, + ) + + PointG2( + ( + 0x00C662006274FB346E22EEB59635C82CB4E20E34DA7230644E72E131C82CB4E2, + 0x104E75A20B64000000000000000000150000000000000000006629C731, + ), + ( + 0x270EF2EA6F8C3DAD3832F95F309CB6A1591AD53AF025C6E0809992F15234E5FE, + 0x1B37771CE3BB5A62017C56C496E57673E2617634E900C587724D21F24E603A63, + ), + ) + + Spec.INF_G1 + + PointG2( + (0x0, 0x800), + ( + 0x104E75A20B641566A0C71C9069A5256391AA31E22021D36C037C108DFB79C662, + 0x00BF257AE3D66A589214F980A2AE34F9544BE2FCBCC13B21F4C1642F31AA4D20, + ), + ) + + Spec.INF_G1 + + PointG2((0x0, 0x0), (0x8000000, 0x0)), + ), + pytest.param( + PointG1( + 0x06E42BC7EB32A979B39A77435202C2A062C8BEF977F46500B040FA35B8A45B23, + 0x15CA114B0522BDD5E928F9629ED2A283D36141F3307071CAD74FB768721CBB0E, + ) + + Spec.INF_G2 + + PointG1( + 0x06E42BC7EB32A979B39A77435202C2A062C8BEF977F46500B040FA35B8A45B23, + 0x1A9A3D27DC0EE253CF274C53E2AEB5D9C420289E380158C264D0D4AE66604239, + ) + + PointG2( + ( + 0x1000000000000000000, + 0x1611179006BEFD3749602129813BD7247045AC58EA0000000100000000000000, + ), + ( + 0x202A170A4A4385BDCEFBE36ADE6CC7C0E9834B78FC6CA233E8DE345A2D5782DC, + 0x1699F57DEAACB74E8B98BD8532C3F152570DB884FC1755FBC0C8CB3EF54A537F, + ), + ) + + PointG1( + 0x26C6E104E6C30ED077379B1762D05AC66A6D8E1BB0699FF4F8E3FA52568F0F77, + 0x09179C965E45C4F28E2EE2AFFB9B86744B8F29DF08357DC80776ECEDE39ADC7F, + ) + + PointG2( + ( + 0x221276DFFF5B3A2B6A46EC6C0E0891AEFD121170D8361187B73B46E1C6B1218F, + 0x29255D7955576BBA25241EC1EDFDFC08C9B8D29379D4213025FA95B0DBDD1646, + ), + ( + 0x0FF9FDFCCCDA82FB0DD8F17931E05823321073A1A4E484699ACDC9D0F14EA6F6, + 0x0C25B531FED0C7E8899296888CC0B27FBB6DBFC2041D482E21D908E240772A23, + ), + ) + + PointG1( + 0x26C6E104E6C30ED077379B1762D05AC66A6D8E1BB0699FF4F8E3FA52568F0F77, + 0x09179C965E45C4F28E2EE2AFFB9B86744B8F29DF08357DC80776ECEDE39ADC7F, + ) + + PointG2( + ( + 0x221276DFFF5B3A2B6A46EC6C0E0891AEFD121170D8361187B73B46E1C6B1218F, + 0x29255D7955576BBA25241EC1EDFDFC08C9B8D29379D4213025FA95B0DBDD1646, + ), + ( + 0x0FF9FDFCCCDA82FB0DD8F17931E05823321073A1A4E484699ACDC9D0F14EA6F6, + 0x0C25B531FED0C7E8899296888CC0B27FBB6DBFC2041D482E21D908E240772A23, + ), + ) + + PointG1( + 0x26C6E104E6C30ED077379B1762D05AC66A6D8E1BB0699FF4F8E3FA52568F0F77, + 0x09179C965E45C4F28E2EE2AFFB9B86744B8F29DF08357DC80776ECEDE39ADC7F, + ) + + PointG2( + ( + 0x221276DFFF5B3A2B6A46EC6C0E0891AEFD121170D8361187B73B46E1C6B1218F, + 0x29255D7955576BBA25241EC1EDFDFC08C9B8D29379D4213025FA95B0DBDD1646, + ), + ( + 0x0FF9FDFCCCDA82FB0DD8F17931E05823321073A1A4E484699ACDC9D0F14EA6F6, + 0x0C25B531FED0C7E8899296888CC0B27FBB6DBFC2041D482E21D908E240772A23, + ), + ) + + PointG1( + 0x26C6E104E6C30ED077379B1762D05AC66A6D8E1BB0699FF4F8E3FA52568F0F77, + 0x09179C965E45C4F28E2EE2AFFB9B86744B8F29DF08357DC80776ECEDE39ADC7F, + ) + + PointG2( + ( + 0x221276DFFF5B3A2B6A46EC6C0E0891AEFD121170D8361187B73B46E1C6B1218F, + 0x29255D7955576BBA25241EC1EDFDFC08C9B8D29379D4213025FA95B0DBDD1646, + ), + ( + 0x0FF9FDFCCCDA82FB0DD8F17931E05823321073A1A4E484699ACDC9D0F14EA6F6, + 0x0C25B531FED0C7E8899296888CC0B27FBB6DBFC2041D482E21D908E240772A23, + ), + ), + ), + pytest.param( + PointG1( + 0x0A96696A78E6818DA746C504A8B83F7A3FAEA0DFEE0A2C52751F3CFAE5FE979B, + 0x017A319DCE2D1976671EDDD5B909781C102E5EED5C40DB00BDBD19A14397B889, + ) + + PointG2( + ( + 0x198E9393920DAEF312C20B9F1099ECEFA8B45575D349B0A6F04C16D0D58AF900, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADDDE46BD5CD992F6ED, + ), + ( + 0x05A7A5759338C23CA603C1C4ADF979E004C2F3E3C5BAD6F07693C59A85D600A9, + 0x22376289C558493C1D6CC413A5F07DCB54526A964E4E687B65A881AA9752FAA2, + ), + ), + ), + pytest.param( + PointG1( + 0x0CDC335FA81DFF303B71CFFB0256D7097C2B4C6715CA7B1589EA9386A41C2F85, + 0x1E4077B7C1F3374BBD4750ED222848C47501B40FC4C11EADD3C39AEAFA452459, + ) + + PointG2( + (0x0, 0x10000000000000000000000000000), + ( + 0x1F1CD7F247F2AE1BA9A1AEB4B32ED4C8C13C70C8861B6AB5340E276C58E1046B, + 0x13D7DE2B557E0AE2B53380AD596BA79F07C037C9D9AA17CF407E9ED86201436E, + ), + ) + + PointG1( + 0x0CDC335FA81DFF303B71CFFB0256D7097C2B4C6715CA7B1589EA9386A41C2F85, + 0x1223D6BB1F3E68DDFB08F4C95F590F99227FB681A3B0ABDF685CF12BDE37D8EE, + ) + + PointG2( + (0x0, 0x10000000000000000000000000000), + ( + 0x1F1CD7F247F2AE1BA9A1AEB4B32ED4C8C13C70C8861B6AB5340E276C58E1046B, + 0x13D7DE2B557E0AE2B53380AD596BA79F07C037C9D9AA17CF407E9ED86201436E, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + Spec.P - 2, + 0x45000000000000000000000000000000000000000000000001, + ), + ( + 0x07B55DE1642362D16B8FC4DCCFEC9E794D24968511CF8E252ED27AFC4D72CA1E, + 0x0301CB4D7E0B7B52A6A8F78613C403EAD1543FEDB0D3F28C77685FDB9EAA2742, + ), + ) + + PointG1( + 0x12EE4836F908E5E39090A4124B75F3EC5B665A729997F55CDEA80F76AB940C59, + 0x02A12BA6400116479DCF5179E4D06471A65E72229FB444B34D8F07458A4A8157, + ) + + PointG2( + (0xFFFFFFFF << 184, 0xFFFFFFFF << 184), + ( + 0x00FB55BF7DF894A746FBE20B6F8C54D5DC0D9FD4EDA4742FC35100C45E6E27F9, + 0x12A20D63D446EB175733853B88DD36708EB7A81F5C79E7659C3A6E2B2C470077, + ), + ), + ), + pytest.param( + PointG1( + 0x0D1E4322F03FA0515F8ED6CB02B15E5A024B5092003DD7792D2AC055F14AC67D, + 0x155C53A1DAA56E3A5E9BD097CEBFCD44038F2C606C8951310AAE0EA01A447253, + ) + + PointG2( + ( + 0x279573FBFE8E6C2300000000000030640472E131A029B85045, + 0x255495FFBA02A0ED6877A0A6ED4684235053C04CC3AAA05934E35BBB953673AF, + ), + ( + 0x0E1CEC4C9D6D3921992E4C5C71523F5D097CDE90F25B3E6C52C9C63E764A6787, + 0x0FE0CFE24E0B2F78D4F909C9131E3794FA911B1109DF4A567B1423475CF409C1, + ), + ) + + PointG1(0x0, Spec.P) + + PointG2( + (0xFCFF0000000000000000000000, 0x0), + ( + 0x212A3B4059E59D125DD17F662945170E1E13024FAE97A401895690ACAC63CF68, + 0x1AECB67409D1D9C142FFD13375BD79FD0457DEB278DFA91B5756378FB837FD60, + ), + ), + ), + pytest.param( + PointG1( + 0x0E474956B0FBC11BA65F3C7632AFB3C66A98340871CEE7C974DB4461D8791B8D, + 0x25410E545457AF7BB0E9D2F1F8126180F11DEC9BFCF69CD2934E6814741C9AA2, + ) + + PointG2( + ( + 0x231E75FDDF7E2FA8B38B7DD6FD13EB4B70460000000000000000000002006500, + 0x2546AC8393E836A297, + ), + ( + 0x0D312FC0AC642C207B5B36E17990B4F7D0EF39CFE6F0D46B9C556A0B7935714B, + 0x1E4CD9FD726048138DCDEA456203D4B7414F3BA5EF7B37817AA98874D71C191F, + ), + ) + + PointG1( + 0x2E5EFCB149C6A4914B8D85BE71E79254F9FDF19F62DE2B2F6CC0822E578A420F, + 0x07FD874051CB395CA999E596047A25FC6BC12CBA97DAB578F9F903612C1C757F, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x102C9AFAA6AC9D2553D0F47E2A945816F56B10014DDCC00EF63F5CDA3D143102, + 0x0DB583622C614B32310911623E2F71F7871413D13DC372ACE97F1813D2622D59, + ) + + PointG2( + ( + 0x0A0E124CD6005B33C8A16492B1B451897B1679F44F3D288585EC8F82B49F6F50, + 0x1579CD1AA3FB1BF108C6B7B5D1F4AE1FAE44099A8BF5FDDC74D87665E29812BA, + ), + ( + 0x0D5DB514CA1C318CC409BCBF9A75055B1A8E7B783127734D902B6118B518EE96, + 0x2F24A2ABDA945E843C6952A5F0632365146CFD4E2034B70E41A78772FC404BEA, + ), + ) + + PointG1( + 0x102C9AFAA6AC9D2553D0F47E2A945816F56B10014DDCC00EF63F5CDA3D143102, + 0x22AECB10B4D054F7874734544351E666106D56C02AAE57E052A17403061ACFEE, + ) + + PointG2( + ( + 0x0A0E124CD6005B33C8A16492B1B451897B1679F44F3D288585EC8F82B49F6F50, + 0x1579CD1AA3FB1BF108C6B7B5D1F4AE1FAE44099A8BF5FDDC74D87665E29812BA, + ), + ( + 0x0D5DB514CA1C318CC409BCBF9A75055B1A8E7B783127734D902B6118B518EE96, + 0x2F24A2ABDA945E843C6952A5F0632365146CFD4E2034B70E41A78772FC404BEA, + ), + ), + ), + pytest.param( + PointG1( + 0x111F95E1632A3624DD29BBC012E6462B7836EB9C80E281B9381E103AEBE63237, + 0x2B38B76D492B3AF692EB99D03CD8DCFD8A8C3A6E4A161037C42F542AF5564C41, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1A76DAE6D3272396D0CBE61FCED2BC532EDAC647851E3AC53CE1CC9C7E645A83, + ), + ( + 0x05B993046905746641A19B500EBBBD30CF0068A845BFBEE9DE55B8FE57D1DEE8, + 0x243EF33537F73EF4ACE4279D86344D93A5DC8C20C69045865C0FA3B924933879, + ), + ), + ), + pytest.param( + PointG1( + 0x11C8F0EA735E099781F852FB93256540C7C7611BA324F67680F3DBFC00BBDDA1, + 0x2D7FB8D83E13AFA4EA8A9D8817CD5B7C5B1804AA1006AF2A8AB7E9C7757B300C, + ) + + PointG2( + ( + 0x040000002DB3759AAFF5357156BC2E8D52EACD11EFB7D108D3B4034162839A93, + 0x300000000000000000000000000000000000000000003100000000, + ), + ( + 0x0649EBC27A3909E089C6023C7ED952098A3E5547CE56E79953929BA4D718F131, + 0x1C2C7E752E7947B506C14A8300A0D15D9022BD6FBA67461CC8A0783DFEBA77FB, + ), + ) + + PointG1( + 0x11C8F0EA735E099781F852FB93256540C7C7611BA324F67680F3DBFC00BBDDA1, + 0x02E4959AA31DF084CDC5A82E69B3FCE13C6965E7586B1B62B168A24F6301CD3B, + ) + + PointG2( + ( + 0x040000002DB3759AAFF5357156BC2E8D52EACD11EFB7D108D3B4034162839A93, + 0x300000000000000000000000000000000000000000003100000000, + ), + ( + 0x0649EBC27A3909E089C6023C7ED952098A3E5547CE56E79953929BA4D718F131, + 0x1C2C7E752E7947B506C14A8300A0D15D9022BD6FBA67461CC8A0783DFEBA77FB, + ), + ), + ), + pytest.param( + PointG1( + 0x12CA97E893996E5BB392C57ABBA4578276654D2856B336B640EAFD84DE31140E, + 0x055370544625EA3C3E85A42831DCAF47353695B158149BC2D5BF4061326F089E, + ) + + PointG2( + ( + 0x0E80426227CE5FD647AFBA497E7EA7A2687E956E978E3572C3DF73E9278302B9, + 0xC451F8749A, + ), + ( + 0x05602FDE384569BE9950C3466D0FB40A66A63F202C3A685856CD21C76CEA2BE7, + 0x0ED4F367E657BC59C785BF6BF6AC33FB4B653E8BD68D1D838E0416E8C47B5F53, + ), + ) + + PointG1( + 0x12CA97E893996E5BB392C57ABBA4578276654D2856B336B640EAFD84DE31140E, + 0x2B10DE1E9B0BB5ED79CAA18E4FA4A916624AD4E0105D2ECA66614BB5A60DF4A9, + ) + + PointG2( + ( + 0x0E80426227CE5FD647AFBA497E7EA7A2687E956E978E3572C3DF73E9278302B9, + 0xC451F8749A, + ), + ( + 0x05602FDE384569BE9950C3466D0FB40A66A63F202C3A685856CD21C76CEA2BE7, + 0x0ED4F367E657BC59C785BF6BF6AC33FB4B653E8BD68D1D838E0416E8C47B5F53, + ), + ), + ), + pytest.param( + PointG1( + 0x1425B11B4FE47A394DBFC0AD3E99DC93C3E1C0980B9BCB68529BA9DE33DBF585, + 0x168B8CDFF7AE7D084FD111608FA03E018B415FD4F0755F7E8F039A2D852BDA0E, + ) + + PointG2( + ( + 0x5B00, + 0x149BB18D1ECE5FD647AFBA497E7EA7A2687E956E978E3072C4FC9EC579B80946, + ), + ( + 0x2061EBAFFAEDC532D8BB542F9D93CAE5DC6C4B431833EE0A7BE4D053E2E0D60D, + 0x03C12E282E4442C88F5235D004E8EDBA3080754CA41C976D03CD332A9B6FA42D, + ), + ) + + PointG1( + 0x1425B11B4FE47A394DBFC0AD3E99DC93C3E1C0980B9BCB68529BA9DE33DBF585, + 0x19D8C192E9832321687F3455F1E11A5C0C400ABC77FC6B0EAD1CF1E953512339, + ) + + PointG2( + ( + 0x149BB18D1ECE5FD647AFBA497E7EA7A2687E956E978E3572C4FC9EC579B80946, + 0x5B00, + ), + ( + 0x29E864B516B661105D0A2708F21BEAAE1BF1636608AC53864C4D8F0EA2E7DC38, + 0x05C3B957CAA8F4C5F248E3E6E754304E9BA7E5B6DD3A4ECE125F47811A525E65, + ), + ), + ), + pytest.param( + PointG1( + 0x1565586940BBB0E082639A1E2C9ECFE96BFF6CBDA25A93C4D462B83602300672, + 0x19767D96DD90432F459BF8F6181C9FEA507BF7BCD4063FD070FE8E72093E8BF9, + ) + + PointG2( + (0xE8, 0x0), + ( + 0x23812D70E97CFD777C5CF0B64B18400F3EA88AFB56146BFC1F34071EEBB05998, + 0x27352C710F0E1711B5D18E672B5CAB3C369CD8D84B70ED159BB712C7D929C8E5, + ), + ) + + PointG1( + 0x1565586940BBB0E082639A1E2C9ECFE96BFF6CBDA25A93C4D462B83602300672, + 0x16EDD0DC03A15CFA72B44CC06964B873470572D4946B8ABCCB21FDA4CF3E714E, + ) + + PointG2( + ( + 0x252B5EC0E7DF7DF26D0CC46DD811ACE847A4174AA634C8D9269CCEBB52845D78, + 0x29A0FE67466554BC0A6C97089DEC1EBAC672344BC3A69B8FC6904F9B83438CBB, + ), + ( + 0x24C159CDA85A7F7E04F7E128101E8FBE502FEE784946FFCE0A9174424F0254B2, + 0x2B0C8AC28082E97EAE5EE175AE2C1A6E466C7DD693238A386EC80F7743FFC517, + ), + ), + ), + pytest.param( + PointG1( + 0x17956B549321B92C524D191A62B90C81F08E694AF4DCEB00A80094E53120D39E, + 0x2FD15D78815388959CAA54AFFA2D7B2C8D52C528E6A1F6C0A50FCF0498FAC7EE, + ) + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x0, + ), + ( + 0x016B9E28A32EE61A7AD5BD4BAD29D64FC35A8FB46B510BE2067907069497AE1F, + 0x0C3C07C40F41A731FE27D953F1154B4E9A8ACF3EF44608817150DE0DF916503A, + ), + ), + ), + pytest.param( + PointG1( + 0x17956B549321B92C524D191A62B90C81F08E694AF4DCEB00A80094E53120D39E, + 0x2FD15D78815388959CAA54AFFA2D7B2C8D52C528E6A1F6C0A50FCF0498FAC7EE, + ) + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x0, + ), + ( + 0x016B9E28A32EE61A7AD5BD4BAD29D64FC35A8FB46B510BE2067907069497AE1F, + 0x0C3C07C40F41A731FE27D953F1154B4E9A8ACF3EF44608817150DE0DF916503A, + ), + ) + + PointG1( + 0x17956B549321B92C524D191A62B90C81F08E694AF4DCEB00A80094E53120D39E, + 0x2FD15D78815388959CAA54AFFA2D7B2C8D52C528E6A1F6C0A50FCF0498FAC7EE, + ) + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x0, + ), + ( + 0x016B9E28A32EE61A7AD5BD4BAD29D64FC35A8FB46B510BE2067907069497AE1F, + 0x0C3C07C40F41A731FE27D953F1154B4E9A8ACF3EF44608817150DE0DF916503A, + ), + ) + + PointG1( + 0x17956B549321B92C524D191A62B90C81F08E694AF4DCEB00A80094E53120D39E, + 0x2FD15D78815388959CAA54AFFA2D7B2C8D52C528E6A1F6C0A50FCF0498FAC7EE, + ) + + PointG2( + ( + 0x30644E72E131A029000000000000000000000000000000004000000000000000, + 0x0, + ), + ( + 0x016B9E28A32EE61A7AD5BD4BAD29D64FC35A8FB46B510BE2067907069497AE1F, + 0x0C3C07C40F41A731FE27D953F1154B4E9A8ACF3EF44608817150DE0DF916503A, + ), + ), + ), + pytest.param( + PointG1( + 0x17AC723D48C98FCE706845B61C254630ACB6DA96A9620FC6CD07276A4EF8936D, + 0x1A515B7E403D2A46BB5387138F17D33C2B12E3D5051F9D22042921F35031035E, + ) + + PointG2( + (0x10000000000000000000000000000000000000000000000000000, 0x0), + ( + 0x2D8AD25DC006EEA79B9C052A6A367B209D5C9215C8A4C325555A7E1E608ABED0, + 0x22DD54ED23382326A8DF674C7BE35D7AC181C9625A10F508DD7FBD109760D762, + ), + ) + + PointG1( + 0x17AC723D48C98FCE706845B61C254630ACB6DA96A9620FC6CD07276A4EF8936D, + 0x1612F2F4A0F475E2FCFCBEA2F26985216C6E86BC63522D6B37F76A23884BF9E9, + ) + + PointG2( + ( + 0x062CA96B10A86BE7BC151A74E01170193F2AD046C2F5EB3A25A95592CC3A1775, + 0x2043C18FE0A47868239575B1C3700BE7308890370EB6982F4E3E36916EBC28F5, + ), + ( + 0x2B7D22180BE2BDCA69028C5BF32181D203B2350781D675098B320766F5DCD9B0, + 0x2A21AA3010F604FEA531E9264671D546CC94D8A0DDAB42B7146573F5C1ED26FB, + ), + ), + ), + pytest.param( + PointG1( + 0x1838CCF8D820349A8C38A57DC0A5495577898E422509E4C9636E9737FE0DCD91, + 0x16F566A30B7D2579FD6109EB09D66C005FDCCDC0D91B28F43BE34C5668F34F81, + ) + + PointG2( + ( + 0x2A9A64F273FA329BC9C98FF2083C627609E2219177B9C5DF7286AF31A3B27E81, + 0x20D85101E1E6AF0126C00A95C645B192B3EA69ED72297DEAC1FBB0E6BD1440C6, + ), + ( + 0x00EC155AB3CD58005B488308578AAEEAEAE9C65939F785BF693FA5763C174DD6, + 0x24D3B2ADB35AD17933D0317A00436D10F2D6908FAF109E7FE3DB77A39D5C1711, + ), + ) + + PointG1( + 0x175BCEC7C4C77C612DF588174DD44362722F7B8E588A0EF599129CF123F63B8D, + 0x2E1FF6C569E5CB0D20FB28504057D4F7ED248900AC99BD0F31A853AF5C10A806, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + ), + ( + 0x1CC9A9EB823F8D97ADEE0206828C9F19EAF8F536C23207D68AE3D056A1480BB2, + 0x1990DDB90388B94F31089D3B4FF594D5449C04FCDF2A3681017B5D7749367BA1, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + ), + ( + 0x1CC9A9EB823F8D97ADEE0206828C9F19EAF8F536C23207D68AE3D056A1480BB2, + 0x1990DDB90388B94F31089D3B4FF594D5449C04FCDF2A3681017B5D7749367BA1, + ), + ), + ), + pytest.param( + PointG1( + 0x1BBEFDB0536C0996D663A908ADC2CAE17180C53D971E73FE234A6927CD10DA33, + 0x2481152785517C274B2DC4AB7B6CACBBDC7D7B8E4DD396FAA05A119761130E5C, + ) + + PointG2( + ( + 0x039A49879C785FD647AFBA497E7EA7A2687E956E978E3572C3DF73E9278302B9, + 0x194B9757129492217D64C4B267E5E935137AE3859EC8B99CF6E6DC61CA90BDFD, + ), + ( + 0x1C67B6B637C528053A25079E25734A67FFC5388209D11839B3FF1F92591C81EE, + 0x09750D9BC6FDB71F16E6A69EEA50E7288AAC1C25A5CD674CA9C57D8AC06FAC69, + ), + ) + + PointG1( + 0x1BBEFDB0536C0996D663A908ADC2CAE17180C53D971E73FE234A6927CD10DA33, + 0x0BE3394B5BE024026D22810B0614ABA1BB03EF031A9E33929BC67A7F7769EEEB, + ) + + PointG2( + ( + 0x039A49879C785FD647AFBA497E7EA7A2687E956E978E3572C3DF73E9278302B9, + 0x194B9757129492217D64C4B267E5E935137AE3859EC8B99CF6E6DC61CA90BDFD, + ), + ( + 0x1C67B6B637C528053A25079E25734A67FFC5388209D11839B3FF1F92591C81EE, + 0x09750D9BC6FDB71F16E6A69EEA50E7288AAC1C25A5CD674CA9C57D8AC06FAC69, + ), + ) + + PointG1( + 0x29A0D6D5E7D14A774C3ABFF1435361DA2EE5D8B4F3EE62085CE779F248B41D4A, + 0x2FD37AE5468F6A17B7F9A0BCCA02EE128BDCED61402A566E4EEE2D0FA825F03D, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x1BBF3321BFDF76E22CA0E95089338A772A4A2982DBEDE2571C14A258BD9874FF, + 0x2B5AA74EFA3429CD77ACC68BD2E487960F34074D3A725444B06A552C1BE0CA44, + ) + + PointG2( + ( + 0x2471FA6C0785556DACBE4D9570FA9E89A2FA55BA5E38D5CB0F7DCFA49E0C0AE4, + 0x181B42BBB36F2BB465708C62B0BD12AE5D6922CF5C4F928A7097F8DB8F0DFAE3, + ), + ( + 0x103E85DDEFBE5900DED1384BADBC32C907C50BAA4282172D02562116005AECDF, + 0x2CCE8D04251B64CED66CC7B66A1C54000E17872B10B4793F5BD81052E5EF3E5C, + ), + ) + + PointG1( + 0x1BBF3321BFDF76E22CA0E95089338A772A4A2982DBEDE2571C14A258BD9874FF, + 0x0509A723E6FD765C40A37F2AAE9CD0C7884D63442DFF76488BB636EABC9C3303, + ) + + PointG2( + ( + 0x2471FA6C0785556DACBE4D9570FA9E89A2FA55BA5E38D5CB0F7DCFA49E0C0AE4, + 0x181B42BBB36F2BB465708C62B0BD12AE5D6922CF5C4F928A7097F8DB8F0DFAE3, + ), + ( + 0x103E85DDEFBE5900DED1384BADBC32C907C50BAA4282172D02562116005AECDF, + 0x2CCE8D04251B64CED66CC7B66A1C54000E17872B10B4793F5BD81052E5EF3E5C, + ), + ) + + PointG1( + 0x00710C68E1B8B73A72A289422D2B6F841CC56FE8C51105021C56AE30C3AE1ACA, + 0x0B2FF392A2FC535427EC9B7E1AE1C35A7961986788CF648349190DD92E182F05, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + ) + + PointG2( + ( + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + 0xBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + ), + ( + 0xBEFDBEBEBEBEABC689BEBEBEBE43BE92BE5FBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + 0xBEBEBEBEBEBEBEBEBE9EBEBEBE2ABEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBEBE, + ), + ), + ), + pytest.param( + PointG1( + 0x1C4189BBFE590521DA71E6834B73A622528FD923E9421F18DF9A48E9123B16AA, + 0x15C8E4948927F2E089ACCB33C8D51B4C83CA69505F4A7801399573273D743991, + ) + + PointG2( + (0x8000, 0x8000), + ( + 0x23AD956E40F22F18BF59310F6D23055F2A3FDC2713F05CF1B099A18041CD4982, + 0x20B15BB64C3C6223098439E4FC7E9B2BD956ED94B2BF1F066C281D41C8560EE5, + ), + ) + + PointG1( + 0x1C4189BBFE590521DA71E6834B73A622528FD923E9421F18DF9A48E9123B16AA, + 0x1A9B69DE5809AD492EA37A82B8AC3D1113B701410927528C028B18EF9B08C3B6, + ) + + PointG2( + (0x8000, 0x8000), + ( + 0x23AD956E40F22F18BF59310F6D23055F2A3FDC2713F05CF1B099A18041CD4982, + 0x20B15BB64C3C6223098439E4FC7E9B2BD956ED94B2BF1F066C281D41C8560EE5, + ), + ), + ), + pytest.param( + PointG1( + 0x1C934D642C245E76EB0C016B17E8ECED3A1CF56EF6D787EACE40BC0CB933DEA9, + 0x02567D6E1141F67673E6F17A705F3D9764C6D5673F1F93E2ED5A21FD38E9A572, + ) + + PointG2( + (0x0, 0x770000000000000000000000), + ( + 0x1F3953D0D836A44E15AEBEF16DD187CCF9493693379FE7D1C5A2CF2DEB87F89C, + 0x0DD737C063475FC587C1574A8FF4E9E4F933118D67BB7BA4A70C79C1CCB0D344, + ), + ) + + PointG1( + 0x1C934D642C245E76EB0C016B17E8ECED3A1CF56EF6D787EACE40BC0CB933DEA9, + 0x2E0DD104CFEFA9B34469543C11221AC632BA952A295236AA4EC66A199F9357D5, + ) + + PointG2( + (0x0, 0x770000000000000000000000), + ( + 0x1F3953D0D836A44E15AEBEF16DD187CCF9493693379FE7D1C5A2CF2DEB87F89C, + 0x0DD737C063475FC587C1574A8FF4E9E4F933118D67BB7BA4A70C79C1CCB0D344, + ), + ), + ), + pytest.param( + PointG1( + 0x1CED814234531C29AA14F95E3A3F59657AACEA69FA4C35DFA5B8E03C87E80757, + 0x25C3327A2C4F61437D53ABBB2BB75DC1DC4F2427C3E9D7714D5D83DAE8069769, + ) + + PointG2( + ( + 0x0EC85B4F8A9224B27145B3757B7BF6E7397BC04C8634404D924689E27BB8A261, + 0xBF89, + ), + ( + 0x0E717255B589C7286F7BDE23FE6AC9D838262D9E7BA5BC603E410ABF27AADA5B, + 0x1760BBDB5183AE4E28F049CFE75FB9600B8FD03E63D9AA1A9BD709D23AFBC12F, + ), + ) + + PointG1( + 0x1CED814234531C29AA14F95E3A3F59657AACEA69FA4C35DFA5B8E03C87E80757, + 0x0AA11BF8B4E23EE63AFC99FB55C9FA9BBB324669A487F31BEEC3083BF07665DE, + ) + + PointG2( + ( + 0x0EC85B4F8A9224B27145B3757B7BF6E7397BC04C8634404D924689E27BB8A261, + 0xBF89, + ), + ( + 0x0E717255B589C7286F7BDE23FE6AC9D838262D9E7BA5BC603E410ABF27AADA5B, + 0x1760BBDB5183AE4E28F049CFE75FB9600B8FD03E63D9AA1A9BD709D23AFBC12F, + ), + ), + ), + pytest.param( + PointG1( + 0x1F9D02FA71D0AE244EDC79709AF68216D99A978A5E8FD92EBE793FFF8317AAD4, + 0x2CD6A493D88A0A87A6F6818C23FA87FF12FD84E5641E1081E849F6E88A488A43, + ) + + PointG2( + ( + 0x04BB53B8977E5F92A0BC372742C48309445CD3CFA9A62AEE49F8130962B4B3B9, + 0x203E205DB4F19B37B60121B83A7333706DB86431C6D835849957EDF0509DE152, + ), + ( + 0x1F544B5E4AB6D13DCB7E89582AAEE12A8410A7C6B2D8A5DE7BD83E8CDB1FB1A8, + 0x2BAEF43E095CAAF7C2ACA272AEE277D1DA98D74656F2CA01B833C67DCC08CA5D, + ), + ) + + PointG1(0x1, Spec.P - 2) + + PointG2( + ( + 0x5B0045000000000000000000000000000000000000000000000001, + Spec.P - 2, + ), + ( + 0x218C0CEF2A606613357BFAA3C880E71FF8490195337FA26205A21CCD9A6949A3, + 0x13FED2C79ADD9D85B9949C5852EF8CCCF02B69EA6FC4DB0D1660AC7B50DF39E1, + ), + ), + ), + pytest.param( + PointG1( + 0x225FDAB8FE6CD876363D27075CDF0D01C209DA61B1634B574A5D811CFAE40700, + 0x1216B7C3E2ADC07C3BEF31771C7BB9E1D02F07FF3A5B74953C4FD5BF9A7A6DFF, + ) + + PointG2( + ( + 0x25F63FCC543337B8F6275F97D6479633B921541A96E0F2ACAF901BC25DB7407C, + 0x206776F9480168741ECA625C06E5526B4664A02CE664BC656F39664D96278B6E, + ), + ( + 0x1E40E8084FD648BA315F691E8367BE1D4C13844421C87223D84829C31A0D7AFE, + 0x24B8042D4CB604AE66C0DC97CA8A9C2D22C743335D92BC401700F6B00D5CDC5B, + ), + ) + + PointG1( + 0x2A4F1DBC9FE6D2882462FB11AFEAE7B7F2A0CF213B1F19C45CB222336283F380, + 0x1141763C897C9A90E387EA80F68EB88C2D79AAB680196D9538CD2CA632A5E81B, + ) + + PointG2( + ( + 0x0E540F5B5BE91F82ED05349750761224F543068CE30D2D5E838BF66866F34520, + 0x0FA5AC8C46F725E54505019BDA3356EF6E35B0A89B9B4F79BB0C62211235C931, + ), + ( + 0x2E6D97A1F7E0428FC0BE6BE02C811095F5166710DCBE869C36A8EF89CAC63E01, + 0x2657BBAF3BCFD106DD677EEF03172F693A6C919776F441DC0FD47A4BD91D0487, + ), + ), + ), + pytest.param( + PointG1( + 0x22847A3CD1CB28B60A51B54991D6DD86D206AA12B3873942C45A120B2E63A492, + 0x26C3889C7B08D9288F13F64E6E3F166C59F57B5C014CBECF815A4ABA4EBABBFB, + ) + + PointG2( + ( + 0x2E91F2B0F4F7A42C870FE8F6236EC1042BDEB2586A641808A5E09019514E83A0, + 0x2B078A1F12CB5426B6BCFEB9548566AFB4BDF7454190EAF97F63E210F3A94CE1, + ), + ( + 0x008A9EDE8DDE2C849793027433D90C626BC326BDC248DC223F537F7152955DAC, + 0x00B319B7060AD49091D9B52015B4AE8085BF6739B7F5A2C098C2F113FF33806A, + ), + ) + + PointG1( + 0x22847A3CD1CB28B60A51B54991D6DD86D206AA12B3873942C45A120B2E63A492, + 0x26C3889C7B08D9288F13F64E6E3F166C59F57B5C014CBECF815A4ABA4EBABBFB, + ) + + PointG2( + ( + 0x2E91F2B0F4F7A42C870FE8F6236EC1042BDEB2586A641808A5E09019514E83A0, + 0x2B078A1F12CB5426B6BCFEB9548566AFB4BDF7454190EAF97F63E210F3A94CE1, + ), + ( + 0x008A9EDE8DDE2C849793027433D90C626BC326BDC248DC223F537F7152955DAC, + 0x00B319B7060AD49091D9B52015B4AE8085BF6739B7F5A2C098C2F113FF33806A, + ), + ), + ), + pytest.param( + PointG1( + 0x26581613E6C802822867D2B3A0867FD7FD8CEA503764AE1A9D01EC0D5364D1BE, + 0x0530AE3D4FE87AC76DA4382835135AC0AEC9B1ECD0705CF84C21B48327EADE54, + ) + + PointG2( + ( + 0x07A13E1BE6F9072893C0E5BB528C5CC22DD6370308DDA1613068E064C6E5D15A, + 0x067239C795D2EA27B85D93E54FC221D81E9DE3EBC8E43C20D63608E7078FAB68, + ), + ( + 0x22FA7EA234E21AEC74F4DB0B365AE1E7CC6E7F4AAC89BC460D0308B83399BE86, + 0x27705B19388EBEDDBD35A5CE72830EC07E3F1BCA3F4E9FDC0AEBAAB5A1FE91B1, + ), + ) + + PointG1( + 0x26581613E6C802822867D2B3A0867FD7FD8CEA503764AE1A9D01EC0D5364D1BE, + 0x2B33A035914925624AAC0D8E4C6DFD9CE8B7B8A498016D94EFFED793B0921EF3, + ) + + PointG2( + ( + 0x07A13E1BE6F9072893C0E5BB528C5CC22DD6370308DDA1613068E064C6E5D15A, + 0x067239C795D2EA27B85D93E54FC221D81E9DE3EBC8E43C20D63608E7078FAB68, + ), + ( + 0x22FA7EA234E21AEC74F4DB0B365AE1E7CC6E7F4AAC89BC460D0308B83399BE86, + 0x27705B19388EBEDDBD35A5CE72830EC07E3F1BCA3F4E9FDC0AEBAAB5A1FE91B1, + ), + ), + ), + pytest.param( + PointG1( + 0x28100E22DF4DC1C6BF8801F63FFDEF2AF6BFB80147994395BE6DC792479CA4F5, + 0x17414E05AC69D56DEC03E0AF314645B463414A7D831AFF54459B6D409351A5A4, + ) + + PointG2( + ( + 0x2851FD14FBAA7FD586E3039A2D9FA136C42685CB2B5904BF0591B95B52FC, + 0x0, + ), + ( + 0x24D852A54E2D52FFC43B2E4F1993FD159AE7EC19AF2F3AD548F6DAA33BD0DE31, + 0x0B0FABBC2F33EA444E5F3C92269F11FC30C048463973A914A6787DBD616E703E, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x299A5917ADB7B45C30CEA045EDAA623F5036280DF176F4A2C751CA728C2C9E3A, + 0x2BEDF30BA7D8BD0814E9D091913EA5BC6A4B60EE993E949507832DF601906519, + ) + + PointG2( + (0x10000000, 0x0), + ( + 0x213D689AF09B7F52AC4A04C34BCDB2F90521B1CD213EDCFE48FA3063520B6BE2, + 0x2EF0F3110EA3051248E907221493E6C2943EBE8D70794188A515EC23DF5D9B2B, + ), + ) + + PointG1( + 0x299A5917ADB7B45C30CEA045EDAA623F5036280DF176F4A2C751CA728C2C9E3A, + 0x04765B673958E321A3667524F042B2A12D3609A2CF3335F8349D5E20D6EC982E, + ) + + PointG2( + (0x10000000, 0x0), + ( + 0x213D689AF09B7F52AC4A04C34BCDB2F90521B1CD213EDCFE48FA3063520B6BE2, + 0x2EF0F3110EA3051248E907221493E6C2943EBE8D70794188A515EC23DF5D9B2B, + ), + ), + ), + pytest.param( + PointG1( + 0x299A5917ADB7B45C30CEA045EDAA623F5036280DF176F4A2C751CA728C2C9E3A, + 0x2BEDF30BA7D8BD0814E9D091913EA5BC6A4B60EE993E949507832DF601906519, + ) + + PointG2( + (0x10000000, 0x0), + ( + 0x213D689AF09B7F52AC4A04C34BCDB2F90521B1CD213EDCFE48FA3063520B6BE2, + 0x2EF0F3110EA3051248E907221493E6C2943EBE8D70794188A515EC23DF5D9B2B, + ), + ) + + PointG1( + 0x299A5917ADB7B45C30CEA045EDAA623F5036280DF176F4A2C751CA728C2C9E3A, + 0x04765B673958E321A3667524F042B2A12D3609A2CF3335F8349D5E20D6EC982E, + ) + + PointG2( + (0x10000000, 0x0), + ( + 0x213D689AF09B7F52AC4A04C34BCDB2F90521B1CD213EDCFE48FA3063520B6BE2, + 0x2EF0F3110EA3051248E907221493E6C2943EBE8D70794188A515EC23DF5D9B2B, + ), + ) + + PointG1( + 0x299A5917ADB7B45C30CEA045EDAA623F5036280DF176F4A2C751CA728C2C9E3A, + 0x2BEDF30BA7D8BD0814E9D091913EA5BC6A4B60EE993E949507832DF601906519, + ) + + PointG2( + (0x10000000, 0x0), + ( + 0x213D689AF09B7F52AC4A04C34BCDB2F90521B1CD213EDCFE48FA3063520B6BE2, + 0x2EF0F3110EA3051248E907221493E6C2943EBE8D70794188A515EC23DF5D9B2B, + ), + ), + ), + pytest.param( + PointG1( + 0x29C19B11665CBEB0FD496542E6115CEEF9B628AB4BC7419802E7016CF1B2C931, + 0x057CDBEC3F7C2AD0F4DA33B3CFD3234EA29F71C6C46B8B90EB2D4A5851ADF74B, + ) + + PointG2( + ( + 0x00BB00B95E1B59FCA2159A5F33F27F36B15FE6BCDA0B1EE0381B0EF7DD804BD6, + 0x25ED3C1A0120B6531E39CCA6F67F35F9A849CFBFE958CC1840D1C20CC6B3E1AD, + ), + ( + 0x08CBBA5815581DCEA62FA0426DBFF39C8F0E9FDC451B1FB127A4E7A4C0587996, + 0x19068E06466A9DD7543AC89D53A17A8BEB6C11C59C3AF32EA0C1BBC55E0FAE7B, + ), + ) + + PointG1( + 0x2C52AB9E7E9296183B9695387E3AE3D06C9D11A98676E4E046914B36B636DDC4, + 0x050ABC3606826F8AEAAC5AA7BE9F44D15A55805037EB2B260C32D43BD32ADEF1, + ) + + PointG2( + ( + 0x0763B017BC2777AC81FF30FFF09F65381C24912BFC9D1490A23765B4830F0AAE, + 0x2B71C998ABC367AD761DA7E9900EB7E579989F82EEE3338C17B8DC17E53E052B, + ), + ( + 0x21E242369877673070A6B8B0307DA6E84E32BDFB3EB09D514B25E8704BD55D43, + 0x1782C07D2D471AF10469A13476A49EC51D1BC538D49BBAF85A63FDB6B412FB4A, + ), + ) + + PointG1( + 0x1BC85B155EEE2E33BF5322810C7C0150158F373E998316EDF821AE9804A2AC19, + 0x1899A5E18C57F4E6B5F736C2F21E95F4147A4235ED2C1F6E6615EB0E00979F09, + ) + + PointG2( + ( + 0x20568D8F3B2F2D0A6A596EA20B3E62191BAF420DE10125557F9A665900A82A59, + 0x25A43A697CEAA9DEBA01A97D8722815E8185973A402E11FDCA62FA908DA409C4, + ), + ( + 0x054081D5B9D0E3AA18A31CC5F9D0FA925205FD50A71EDF4CA157A607587E2457, + 0x1C9CACF3B3D821146083F9E5FE6BE23546643E3AD4540A1F02C02728010A4B9F, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + Spec.P - 0x725A44E7, + 0x4500000000000000000000000107B55DE1642362D16B8FC4DC, + ), + ( + 0x2215436159D2BDB4E084A6C63BD04F6B84D69BFAD793DA72C21B421F3F89B22F, + 0x22B811A1A4FA51DF281657F0B0A1ADD382FAB768AC1ED8886BF979E2BF11402D, + ), + ), + ), + pytest.param( + PointG1( + 0x2DEB529E45720F20BE41088DFD7489C315E9E18FE23DD1C8A8183295DC770DEE, + 0x1090B3FCD1898780C332B7D73A602CADD1B26029124DB9DA19941250EDA890B5, + ) + + PointG2( + (0xFF0A69A42C284614E3D7DE26B3F9B2F3C71FF6, 0x0), + ( + 0x1E2C7F9D6A525B6AF5DAD683C5E6408661DA29780860C3209B2DDDCAD5A88795, + 0x033123665850406FC2428227BBB3509FC71C911CF41623DE1605CD3E0A281B90, + ), + ) + + PointG1( + 0x2DEB529E45720F20BE41088DFD7489C315E9E18FE23DD1C8A8183295DC770DEE, + 0x1090B3FCD1898780C332B7D73A602CADD1B26029124DB9DA19941250EDA890B5, + ) + + PointG2( + (0x275680008DED35BA000000, 0x0), + ( + 0x19367FE97B92D85D7C29090C2313DE1A85F030239CFA71F939A197249CB17B89, + 0x0465A8498153883ACA20E4DE66AC02B1B6957FAB9B4BCE71DF334CD6BEE5FF95, + ), + ), + ), + pytest.param( + PointG1( + 0x2DEB529E45720F20BE41088DFD7489C315E9E18FE23DD1C8A8183295DC770DEE, + 0x1090B3FCD1898780C332B7D73A602CADD1B26029124DB9DA19941250EDA890B5, + ) + + PointG2( + (0xFF0A69A42C284614E3D7DE26B3F9B2F3C71FF6, 0x0), + ( + 0x1E2C7F9D6A525B6AF5DAD683C5E6408661DA29780860C3209B2DDDCAD5A88795, + 0x033123665850406FC2428227BBB3509FC71C911CF41623DE1605CD3E0A281B90, + ), + ) + + PointG1( + 0x2DEB529E45720F20BE41088DFD7489C315E9E18FE23DD1C8A8183295DC770DEE, + 0x1090B3FCD1898780C332B7D73A602CADD1B26029124DB9DA19941250EDA890B5, + ) + + PointG2( + (0x275680008DED35BA000000, 0x0), + ( + 0x19367FE97B92D85D7C29090C2313DE1A85F030239CFA71F939A197249CB17B89, + 0x0465A8498153883ACA20E4DE66AC02B1B6957FAB9B4BCE71DF334CD6BEE5FF95, + ), + ) + + PointG1( + 0x2DEB529E45720F20BE41088DFD7489C315E9E18FE23DD1C8A8183295DC770DEE, + 0x1090B3FCD1898780C332B7D73A602CADD1B26029124DB9DA19941250EDA890B5, + ) + + PointG2( + (0x275680008DED35BA000000, 0x0), + ( + 0x19367FE97B92D85D7C29090C2313DE1A85F030239CFA71F939A197249CB17B89, + 0x0465A8498153883ACA20E4DE66AC02B1B6957FAB9B4BCE71DF334CD6BEE5FF95, + ), + ) + + PointG1( + 0x2DEB529E45720F20BE41088DFD7489C315E9E18FE23DD1C8A8183295DC770DEE, + 0x1090B3FCD1898780C332B7D73A602CADD1B26029124DB9DA19941250EDA890B5, + ) + + PointG2( + (0x275680008DED35BA000000, 0x0), + ( + 0x19367FE97B92D85D7C29090C2313DE1A85F030239CFA71F939A197249CB17B89, + 0x0465A8498153883ACA20E4DE66AC02B1B6957FAB9B4BCE71DF334CD6BEE5FF95, + ), + ), + ), + ], + ids=lambda _: "invalid_g2_subgroup_", +) +def test_invalid_g2_subgroup( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test invalid g2 subgroup inputs to the ecpairing precompile.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) + + +@pytest.mark.parametrize( + "expected_output", + [pytest.param(Spec.PAIRING_FALSE, id=pytest.HIDDEN_PARAM)], +) +@pytest.mark.parametrize( + "input_data", + [ + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x092A62B029973FCD9EC18DB33EB4C7B6B649A2E6196561761789E39BC84F11AC, + 0x0A59F2672462BE814A277F495D53244691C40DA85D39B210ED3E099B397A4CF9, + ), + ( + 0x2AD603022931E8C20C927FA114866CA26B305156336511A9224D6BD88E5BA7FB, + 0x2B44DD02DF7F7A846F546C77F3330CC171ABEEA7747EC03607C4B754A0710142, + ), + ) + + PointG1( + 0x1F4B96B82BD3631447045F1BB66198FA6A904E48092750762EFD419FB5FF52B5, + 0x1FAC61C1A7265D0E1A6433E9767CB51C71E9AC5A119BE9894F509BF92B0FB1B4, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x0624D2C76767981FADC8F74F29C034F7AE0522585E1E0201308109C40D1D5420, + 0x251BA3C545339BBE22DA0FE90692A099384C435EC0902C99BE7E7A84D62BB49C, + ) + + PointG2( + ( + 0x0C0B524584214B17414A25236E4E2B6F4BF398EC62E9ABEB7EA1F158D89DF05B, + 0x0E05F600BF1408AB25C0F3DBB98FF26C4D85A6CE6A63BEBC3B2E360DE77CF606, + ), + ( + 0x2488EB90497D64621124420825ABD353268FE00BD90726991D0CE623E59DA9C6, + 0x2340B1FB006017382CB76606A873F48DE8F31434CC243C8F465CB908D8CC7346, + ), + ) + + PointG1( + 0x18CDE0D7BDE7E1DA88FB8192CE94BEA754F24A53F1F000F15B4C5C151C12DF4F, + 0x0066B16BF4229EDF5375B78A5C7469DDF68F7D5C7577642ED2C90D5D42C231ED, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x2948734DB775BB41A29257214B19A6356E6640894C2A48F201ADDCE62DE7B41E, + 0x1BB87BDDBE46D75809751232405928C3314934082052131A64574FF5A59C7DB7, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x09C91A687E6C44F2917682DC5D0A34BE7C77FFF361AA36610EFFAB6F6D2D87AC, + 0x13849277ED76B58020AB993F1847EBCC0F1BCF711FBA15F4A7A80AB72B4FE964, + ) + + PointG2( + ( + 0x2F0C63D0C53B3DFBCA27B6B43AE7FBF55A38D78A21470996485B03128ACCC208, + 0x00556502356E37ED150DB2E36531B0F275FD6835C0FC1945922E270B48C48A86, + ), + ( + 0x02644C27B5DBD793592A70B735E22C798A5E309FA17A992A7DC2A050E01B298F, + 0x194776B6A53439D7336F389D2A8F6651E40885F5CA2538B0DC9CB534FB23F7FA, + ), + ) + + PointG1( + 0x1E379E19DBFFBA1EDF0A04505F67229E707A4B82F19285D3C186964E83E15536, + 0x08EE58BAA16641B1513F007DA7D3CF58B503B80F73C7D8E792DB63DEF167E0D8, + ) + + PointG2( + ( + 0x2B1F95D6AA6FD6F5E6978D0135C206079770D5C3BA001967C5D94C5902F95FE9, + 0x264AD64952CB1D30A7230BCA35B3907B2457ABDCD6052E14E2A132D768222225, + ), + ( + 0x14F79CE35164ACFDB802551E02A9AEBDB20BF4248C0CCF5C6CF5E57690877841, + 0x0F8DFB99AAA272BBAA49012DA81DFAFA1A3C07EBA89355602143C58F63DF2939, + ), + ) + + PointG1( + 0x117A8203A67AB052AF18032434B61FE6B33E0A6AD5AB70D57AEF4444478B42BA, + 0x123A80E91F77C135F657E2DBF5AF0D07E9A4FB63585B88E5439DDAB7741C0961, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x104F6D8507D6A112E8FD516D70BFE3D2474539948276D36EEE987BE127A9E3AB, + 0x199EEF24146007E80386F391EDC886F5DDBA22B5CF131EFA3B6AE71A673FC88E, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x2642F046AD222F094C9282816131317B8D52FC0FEE64F26898232432D34FDAE6, + 0x05A5F2A2E8F15BA27E90F54FAFF78391B307B402A0AE995D1C12F92C0B574593, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x142C9123C08A0D7F66D95F3AD637A06B95700BC525073B75610884EF45416E16, + 0x10104C796F40BFEEF3588E996C040D2A88C0B4B85AFD2578327B99413C6FE820, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x275DC4A288D1AFB3CBB1AC09187524C7DB36395DF7BE3B99E673B13A075A65EC, + 0x1D9BEFCD05A5323E6DA4D435F3B617CDB3AF83285C2DF711EF39C01571827F9D, + ), + ), + ), + pytest.param( + PointG1( + 0x1F0AB114F50077D71A195869DD8C07E2A031A55A8DAC07C522EE7AC74136C50C, + 0x229C9D498F5CA70A27612A244743773FE22668370A91410B645FE22F2E6EB78C, + ) + + Spec.INF_G2 + + PointG1( + 0x284869D750E478E4B09637F7AE55BCCE23BD622F04E986E1CBA0F64B59B02320, + 0x0A88BC2898A2930AEE2B92055CA2F97360A79C598F5E8998FED7ADD43A692D10, + ) + + PointG2( + ( + 0x21F4F3DDD5250962BAAEFC6EF587F464C8FDAD1BB7812B292DCE48D5462039DF, + 0x14044CA96015F3C6666F98D756FBF7BD0E12C3E884DB4100391DA8A47DEFF16E, + ), + ( + 0x00B30C250F71DB58EB20E14D67CD98EBB47790A7E7D45D30A90CE707175F295B, + 0x1E45ECA08667A7CFE06158FAE4A38CAC01A37853E730EAA28B2F7167FD74C22D, + ), + ), + ), + ], + ids=lambda _: "negative_", +) +def test_negative( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test valid inputs where the pairing check fails.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) + + +@pytest.mark.parametrize( + "expected_output", + [pytest.param(Spec.PAIRING_TRUE, id=pytest.HIDDEN_PARAM)], +) +@pytest.mark.parametrize( + "input_data", + [ + pytest.param( + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2, + ), + pytest.param( + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2 + + Spec.INF_G1 + + Spec.INF_G2, + ), + pytest.param( + Spec.INF_G1 + + Spec.INF_G2 + + PointG1( + 0x103AA4B2AEFF1BC7AFC5CD39952C872C8F29D64188E8D18C1B65E526D6277A33, + 0x209854E0AC153A98EFF0FD08A0C73D46DBBE4209F8A6A4F2AAD914E40686F472, + ) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2, + ), + pytest.param( + Spec.INF_G1 + + PointG2( + ( + 0x0EF4AAC9B7954D5FC6EAFAE7F4F4C2A732AB05B45F8D50D102CEE4973F36EB2C, + 0x23DB7D30C99E0A2A7F3BB5CD1F04635AAEA58732B58887DF93D9239C28230D28, + ), + ( + 0x2BD99D31A5054F2556D226F2E5EF0E075423D8604178B2E2C08006311CAEE54F, + 0x0F11AFB0C6073D12D21B13F4F78210E8CA9A66729206D3FCC2C1B04824C425F2, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + Spec.INF_G1 + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2, + ), + pytest.param( + PointG1(0x1, 0x2) + + PointG2( + ( + 0x203E205DB4F19B37B60121B83A7333706DB86431C6D835849957ED8C3928AD79, + 0x27DC7234FD11D3E8C36C59277C3E6F149D5CD3CFA9A62AEE49F8130962B4B3B9, + ), + ( + 0x195E8AA5B7827463722B8C153931579D3505566B4EDF48D498E185F0509DE152, + 0x04BB53B8977E5F92A0BC372742C4830944A59B4FE6B1C0466E2A6DAD122B5D2E, + ), + ) + + PointG1( + 0x104316C97997C17267A1BB67365523B4388E1306D66EA6E4D8F4A4A4B65F5C7D, + 0x06E286B49C56F6293B2CEA30764F0D5EABE5817905468A41F09B77588F692E8B, + ) + + PointG2( + ( + 0x081070EFE3D4913DDE35BBA2513C426D065DEE815C478700CEF07180FB614618, + 0x2432428B1490A4F25053D4C20C8723A73DE6F0681BD3A8FCA41008A6C3C28825, + ), + ( + 0x2D50F18403272E96C10135F96DB0F8D0AEC25033EBDFFB88D2E7956C9BB198EC, + 0x072462211EBC0A2F042F993D5BD76CAF4ADB5E99610DCF7C1D992595E6976AA3, + ), + ), + ), + pytest.param( + PointG1( + 0x0084C3136563609CE6D7218719AF3024E2163EA8124130CFB61C2521379B0067, + 0x2E775227CCD46BB5BD8B9F9714ECAE9E037F8E91246B2A7E171337CF1332E341, + ) + + PointG2( + ( + 0x1FEE9EEA81AF0F92485CB60CEC6FDD90385B3F390C67D0885520BEA38A07BB08, + 0x1242A8A318BA046CD7F4B87B4EDE31C0C19F823CE0AB3192F36ACC7683A91704, + ), + ( + 0x11D50FA9A8A15815BAF103030117065601AFF6B54F4242D2A5A14E3147E89E25, + 0x133CA084BE363F41CB3886EED01FA8D896A609C22E099C4C9F5BB5A4363A57AD, + ), + ) + + PointG1( + 0x2F9B2CAF0345E3EC3ECCBC16AF5713BBF15EAF2A17CD9F7A02966BD5E7CCD6FE, + 0x185A77DFE45C4C1C9042C67FDB65D25BBD8B6F79DFDDE27458A35792653443F3, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x00898CC97B5A1F95221E7272C6EA8CEB56E702D678AC6C24275A4F6147D2B279, + 0x16F336255E3F8970FD79A12281E6A6BEE510E7D2CE5117214F4DD8C764E00EF3, + ) + + PointG2( + ( + 0x12580B380DDF94A3370E6842E68B260A12012AB02C883678ABF3F0F37606F55C, + 0x268F02E60DFC36A40BB1FA3DBA22BBA44953358031876C21748D5D57DFB39EF4, + ), + ( + 0x07C890D2B747CB1E0456C9C1B30C03BADFFB8CDE540704104B016976D0A37447, + 0x2A3E2918076D66622D7D6014299B77850A74B2691DDA1DADCD0232FBBFE2A9E0, + ), + ) + + PointG1( + 0x2781B3ACE921B11D98193720D1493609C4D47F607A2266D608185C6382B5D235, + 0x19797C215563C8B73CC7F0041D1F5FE1CE017B36AFBEFFE56683E3FFCCB9380B, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x06236320CF783A01E2B8BE7816A84671DE9E8BEBDA0E8F957809EE1253565BAE, + 0x0A4CE1AC405B9974E4EAF9342C2A43BD1FDC4EDC2BD18235249BF51EC4328744, + ) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2 + + PointG1(0x1, 0x2) + + Spec.INF_G2, + ), + pytest.param( + PointG1( + 0x082A5B0EB620C491DC7CFBF269EA3E9DB35FDAF6C7C4BAA25A829127A56F63C4, + 0x1C49E6C57C3C0DDCA035138E5AADB79AC638F67A918E6A4377200EBFA80ED188, + ) + + PointG2( + ( + 0x0BF4734681E3030E126C2A595DE85F80B46BD327BAE8A860A3ED5F5BE7318037, + 0x116C5E07DE19E858EB720604F6E2935BF0F5E40D9194CFBA05BFEA0AB69F1D82, + ), + ( + 0x263EE7293C68743B04034A5B63E1D2B65261F7C6758D8084A50419CC65D02AD2, + 0x14189E61084D61CF2AD9B6140B951CA35AE18A008CB3C1C4904E59F462E66B04, + ), + ) + + PointG1( + 0x28EC2C3D544A901AD85AF62E1EC02AAC643E707A3A45983EF168877B6901A19D, + 0x108E7A47061FD472BD715C35B71B842FC1914A8972E472A2A4FAA4880E0D2787, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x09148BA3625B1D4862ECFED71970E395D22BC4DAFAA4A662546E4FB39141D8BA, + 0x0A8F563782B2B31347C9E7CED5A21D959A38F4AE4BBC7CD37B1180A0D491CAD6, + ) + + PointG2( + ( + 0x17F32B902D2096A48B25F94AD6C692A99C68E937A4BAE3C820F25093CF2786AB, + 0x155C57D2B7F4AEFC0E1A44A78C7D59D2CAC917546717C665DC001FA43CF57753, + ), + ( + 0x17B81FE685DD2E24A14899EF74821D1D147B88FE0C63D0921EB45C191146E7E4, + 0x1C9AE775EBA85EA225258C9BAFDF5CBAD6106CD79194F4B0F8E7814068370DAF, + ), + ) + + PointG1( + 0x302AC8191CD6D55B858891D05B919AD95F5E2F16B78C5B0AD2ECC72C3FE23842, + 0x1A924FA7E779AD503830C25838C2489D9BBC21FD519CEB3F4A10F4DC3E3B72BE, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x0EE7F0252E8210EAA3EE452C8731AD6864D8506BA61836F48C99A16A03D59B0D, + 0x2BA1DDC868F452EF0CFDCAC410E9D38D726557B05EDC84F8D4F62203ACC1F9F0, + ) + + PointG2( + ( + 0x29AA08ECADE2C1D537C14BAF6CF62758C02E6F3C4EEB0B621AD3AB941B1559DE, + 0x11EAC12AAF058F799EE8146F36A0BBBF8E67A0AA0F9E2C192BAFD05FF8DA45D3, + ), + ( + 0x03B7BD661BECFA6FF5092B36F1768C815434F3B7F4254FB4B8ABF68E36086CD3, + 0x196CAA297895D4A1D58A5FE388416FBAC2A74FB9BEB835DBBBAA8F6B63BF9CAB, + ), + ) + + PointG1( + 0x29A00816ED140FC36E515F43FB054C891B4B07F013C9E6D5C3F284C8528C71AE, + 0x2F060699E8F54B1028B78E5F016D8142563947ADCAC5A5857137B6958DDC995E, + ) + + PointG2( + ( + 0x141DD828AF529924148912360FD71EF6A365A707173AA2C06C8290D54FAE458E, + 0x1CF61D5E9CECED0C662C6E2DF96D63ADC7D84E182FA0F62E08B9AFDD5C90545E, + ), + ( + 0x01F3E8049B7934995DEE28FAA0E401289B92CCD1A2F408C85383F5312F528C9E, + 0x2C6AAA06B56E9D6C98A701B4A9CF2F8CFDDBFA93D7104D5EAFBAD9A84B5174E5, + ), + ), + ), + pytest.param( + PointG1( + 0x0F740D88DE760DF099674C96DD2D476B42673D0F2972E6D5D1F9DBA95A29D26A, + 0x04A44D72C2A82088DA663FF162FE2D3DDD4A139E1EF6C0BBB1124D8DE75F7C68, + ) + + PointG2( + ( + 0x196346D9774F017C351DBBDD99960E834B188B3347B92FAC7F83CC6453617FE1, + 0x1E3BA24A0848096A0D6484133AF97B7487CA9A4309CB5574D8BB96CFD7F22678, + ), + ( + 0x235603772D0E9CF9503D05742962B07CD0AF71A7C7B757960CED6FCFA74D3DED, + 0x1CEED193F30FBBE5E9A9438E82BAC927A0977B49F6E476AEE20923E1A230F2C4, + ), + ) + + PointG1( + 0x201AF9371C7CEA66800F961D6A7219DA9C27FBE61B5DF43FCCB275D8C034BF8E, + 0x1F0E7C5A1143B0F8E850D9516EA2C836B0331521829DC2B71DBF775078C770F4, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x107B8A2CB6318AABD95763C0CAFC3B24D8A9ACDF8DD967176F05C400951B3E06, + 0x13A1C9847BF87C8CC79EF1120ED6E3E98412F0DD4E9C8C8C421057A2353279E6, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x2FB5B7E464A0A76D9ACA8698E73802782DA01FCE50384F459BE1427855C0EB50, + 0x2E6C7AF07418CD0203FAD6A1ABDE95E745C41A78C6AD1AE7B1B2ADA2E643FD37, + ) + + PointG2( + ( + 0x260E01B251F6F1C7E7FF4E580791DEE8EA51D87A358E038B4EFE30FAC09383C1, + 0x0118C4D5B837BCC2BC89B5B398B5974E9F5944073B32078B7E231FEC938883B0, + ), + ( + 0x04FC6369F7110FE3D25156C1BB9A72859CF2A04641F99BA4EE413C80DA6A5FE4, + 0x22FEBDA3C0C0632A56475B4214E5615E11E6DD3F96E6CEA2854A87D4DACC5E55, + ), + ), + ), + pytest.param( + PointG1( + 0x1147057B17237DF94A3186435ACF66924E1D382B8C935FDD493CEB38C38DEF73, + 0x03CD046286139915160357CE5B29B9EA28BFB781B71734455D20EF1A64BE76CA, + ) + + PointG2( + ( + 0x0DAA7CC4983CF74C94607519DF747F61E317307C449BAFB6923F6D6A65299A7E, + 0x1D48DB8F275830859FD61370ADDBC5D5EF3F0CE7491D16918E065F7E3727439D, + ), + ( + 0x1CA8AC2F4A0F540E5505EDBE1D15D13899A2A0DFCCB012D068134AC66EDEC625, + 0x2162C315417D1D12C9D7028C5619015391003A9006D4D8979784C7AF2C4537A3, + ), + ) + + PointG1( + 0x0D221A19CA86DAFA8CB804DAFF78FD3D1BED30AA32E7D4029B1AA69AFDA2D750, + 0x018628C766A98DE1D0CCA887A6D90303E68A7729490F25F937B76B57624BA0BE, + ) + + PointG2( + ( + 0x14550CCF7139312DA6FA9EB1259C6365B0BD688A27473CCB42BC5CD6F14C8ABD, + 0x165F8721EE9F614382C8C7EDB103C941D3A55C1849C9787F34317777D5D9365B, + ), + ( + 0x0D19DA7439EDB573A1B3E357FAADE63D5D68B6031771FD911459B7AB0BDA9D3F, + 0x25A50A44D10C99C5F107E3B3874F717873CB2D4674699A468204DF27C0C50A9A, + ), + ) + + PointG1( + 0x0D7136C59B907615E1B45CF730FBFD6CF38B7E126E85E52BE804620A23ACE4FB, + 0x03E80C29D24ED5CC407329AE093BB1BE00F9E3C9332F532BC3658937110D7607, + ) + + PointG2( + ( + 0x2129813BD7247065AC58EAC42C81E874044E199F48C12AA749A9FE6BB6E4BDDC, + 0x1B72B9AB4579283E62445555D5B2921424213D09A776152361C46988B82BE8A7, + ), + ( + 0x111BC8198F932E379B8F9825F01AF0F5E5CACBF8BFE274BF674F6EAA6E338E04, + 0x259F58D438FD6391E158C991E155966218E6A432703A84068A32543965749857, + ), + ) + + PointG1( + 0x1BA47A91D487CCE77AA78390A295DF54D9351637D67810C400415FB374278E3F, + 0x24318BBC05A4E4D779B9498075841C360C6973C1C51DEA254281829BBC9AEF33, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x1E219772C16EEE72450BBF43E9CADAE7BF6B2E6AE6637CFEB1D1E8965287ACFB, + 0x0347E7BF4245DEBD3D00B6F51D2D50FD718E6769352F4FE1DB0EFE492FED2FC3, + ) + + PointG2( + ( + 0x24FDCC7D4ED0953E3DAD500C7EF9836FC61DED44BA454EC76F0A6D0687F4C1B4, + 0x282B18F7E59C1DB4852E622919B2CE9AA5980CA883EAC312049C19A3DEB79F6D, + ), + ( + 0x0C9D6CE303B7811DD7EA506C8FA124837405BD209B8731BDA79A66EB7206277B, + 0x1AC5DAC62D2332FAA8069FACA3B0D27FCDF95D8C8BAFC9074EE72B5C1F33AA70, + ), + ), + ), + pytest.param( + PointG1( + 0x117196C7EA11E6362BCA58533A55DE3DEADC441B18B0A7CA68557F374DFED6A6, + 0x29B1B63F1D649480AA9655406C454B55CBBF8D29F3AEDC30DE3B0745BED3BE52, + ) + + PointG2( + ( + 0x226AD93C0A164E73D8D9161F9D0206AB232FA5A08CB349F7DF3633096CD04E92, + 0x0DE4A56223EE43AA3C4A18BF4C84BE1879DD9182FD4A03318A4BEBD642627D1E, + ), + ( + 0x142A0ED74BA11936E27101A43DB8E16F6A603953C3EA4B14EAEBBE117970268A, + 0x2ABCED69FFBCE2E34440530111050A4D72282DD5F4FAA7703D5762D043271756, + ), + ) + + PointG1( + 0x19EEDB06C5D1F53510F7F7464B39730659ECCF0E9DFEEC2CC131FD0D27C4F8E3, + 0x043AAEA131D0E69B79A816B675AC0DD21B4796046C149CA16DF5884D615025C5, + ) + + PointG2( + ( + 0x238F967690E26443E6F5207B5C2AF7FEDB837D534282C7DB1CA926A9BC06A739, + 0x0EC4C043A606711A021205EF7D97785D9AE246BA06B2912E24FF9E669FB700B4, + ), + ( + 0x2714A2E42C4BD73A79CD7B2243D1B784CADB22A58E6360BE1AF873424EFD420C, + 0x12F54BDCF07FF30854629A0531065973197E685193051F2FA11A7761B0CC39F6, + ), + ), + ), + pytest.param( + PointG1( + 0x13B076F9E2DDF66BD1E9EC7509945EC37289D9AD65F210ED35E78BA2B02E7E3D, + 0x2C6D9689097E79C4227B7B8519E4850BE2D795F9496A70AE8607A3172208371A, + ) + + PointG2( + ( + 0x0774089B1BE2375B269AC0CD913803AF1E8E967C7A12DED9E38BBFE816CB6B2B, + 0x25E481BF589A76E531E3CBAEE9B47A07FB832B052A71029665A5CA89F1EB6D6B, + ), + ( + 0x0F10223646F0D0F8F79189C456F40295FA02708A2629B8A88D7AE36CAAB47055, + 0x2B4BF562F83ED28EDF524EDC1646B4C4CD538BEC5D544D8071F0C73406339B2E, + ), + ) + + PointG1( + 0x2043A8194E50B9FF3B93D13873035FEE0CCC3B4A0FDA33D34AC7A4771C9B884D, + 0x291B24054553ECAB7EB9A6807281A895BDCF29E95D8D3A2552749B7FC0932637, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x15D6EAAA18C5737E7BD229C2900F8DEDDF6DA9C0E20E7E905E7B7491D041EABA, + 0x2AB7D1B2A259B85054253DA8947C2FD38B04A4EDE3BFA6E258E22F668DCB5A63, + ) + + PointG2( + ( + 0x092A62B029973FCD9EC18DB33EB4C7B6B649A2E6196561761789E39BC84F11AC, + 0x0A59F2672462BE814A277F495D53244691C40DA85D39B210ED3E099B397A4CF9, + ), + ( + 0x2AD603022931E8C20C927FA114866CA26B305156336511A9224D6BD88E5BA7FB, + 0x2B44DD02DF7F7A846F546C77F3330CC171ABEEA7747EC03607C4B754A0710142, + ), + ) + + PointG1( + 0x1F4B96B82BD3631447045F1BB66198FA6A904E48092750762EFD419FB5FF52B5, + 0x1FAC61C1A7265D0E1A6433E9767CB51C71E9AC5A119BE9894F509BF92B0FB1B4, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x16F5D1473D8A9012DF4EFC624AE3B5FC3B1C1742BB73B9B62AA50C0DEC9848AD, + 0x1B2381A593F0A661DB10B659329907FB62B4F5FD196092EF235F0775463B11F3, + ) + + PointG2( + ( + 0x054F9C54B1560A307E173C70FCE534A2E4C7B248EC342F968A9DB905FB31BA36, + 0x2513859B9C3A196E357D5D4F34E17F5CB2D78F4160103ECAE86CB57A3E48EF77, + ), + ( + 0x15E96B3AD7BFBCCC491029F30BE0CED0654C6C2600B49BFAFC70AF802B305A09, + 0x154BB828C71576E1809723E3BBB5D459ECE5BDCCB9BCDFF733761FE908E1E1D5, + ), + ) + + PointG1( + 0x2F91CEC7B5D03D4C5930875239F825C55849B352FA27B4E20581FC4A68950C75, + 0x2EE478820A0DC3F22866E7C5111D6FD1F057C18B7C9C1568173916CE67555C47, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x18DD52DAAA11FF5DBB97C8776924D95B1BB86BF16481BA52519674873E0279EA, + 0x0B32F4758CC18142794358E62B9C29951D3CB7E705D97E4CEFD8422FA340ED58, + ) + + PointG2( + ( + 0x04CBAC0707B92F59B87024017AAE6941A3D8F42C6B93C619FA85CD54A3F05963, + 0x25EF128BD051C44F95F7AA6122A390666691C2EC8A328F5302605F0AAAE670DB, + ), + ( + 0x14A3194DB0C978125B0212D2DBCF3639650E40F8ACAEFF5A5C20BA700DE3966F, + 0x004D3F0A629EB1456685DB5A1B94D4B2F8DC0A9CDC5D29CCCC5B596D88BA29FE, + ), + ) + + PointG1( + 0x0BCF53D38A1B0732FD90B73149559E0EE767F525875EBDB26F7F123136282AFA, + 0x28E440620EA4064D1F0190C75E2A36003F18643507A927926130EB54ECC1004D, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x1B6E4577CC71DF5E856ED88D2D14A464343F140B07693E3B08308570B28FD55B, + 0x24198AA6EE0F5BFEC020AD2FF15729434439E4AF7554FA0F7395EE20CB926346, + ) + + PointG2( + ( + 0x246B8E8C771C3DB7226A8066537632923D7D5A542F8E0D600E7F0195240F1EC5, + 0x13CBE706F9BA436DD4A781FAB85FA2E9D82854446CF91182DCFA66EB68C4B7E7, + ), + ( + 0x2533A60B837F9CF4838C4C38F4F9C8988FEE10C9895753E7925A86330E925DB7, + 0x02F47F10F7DA957CFCC613361AB6AAEB67F14D22C06EEC14E47E36988C4EE067, + ), + ) + + PointG1( + 0x05A596BD22BBB13DC898ACFDD420C88893DD09F7FD4875E8B3FB65B54AD9643F, + 0x2847AB3C7D853E89CFDF520DE28E1092C1955B7E17D9CBA5808F047A3D6898FD, + ) + + PointG2( + ( + 0x2F64F057DEDA8BBB646D5B9864D9789A696ABF2A42218F7AF28BAAE517F5E457, + 0x23BD3952D332068086B2079260B285896CB84C73ECE3647094FAC90D8B1374C2, + ), + ( + 0x1EEBB3F8EA3C3D9147FA09E4506BCFF1C222A02EA8B4904FC6DF3BCA1CC0505E, + 0x133D9A4794EB099E9BDF82A6FECDB2E2E29B0867BF0FE557475DC758D796714E, + ), + ), + ), + pytest.param( + PointG1( + 0x1EE2AF29808BC7BAAD8EB3E87BF55588EF59763AE59585453AA57222A6040914, + 0x1756D11B0679F2E3C44A95592D270F55F76670C2D248FE2C0B391A11AA90D0EC, + ) + + PointG2( + ( + 0x0EA16E33157B6D0F197ED197CE3AD5B93AC91458632464DD5E4AA23EC628E6CB, + 0x03C160EB0D2AB47566D495F1A53B7B1CDB659CB64E26C848C74267BC74FFEEC8, + ), + ( + 0x1D5EE181514337F685E60BA02DACCDED24EA3122FB04D9DA37790F3DCE545878, + 0x03087C55D223005FF8AD78F6F417B19CAFF564E8B8CB820D0EADB6BEC43F0CF9, + ), + ) + + PointG1( + 0x02B88F6E24920BD60DBBF082DF1CD200ABF141B6C01E7FCB262525364C14C205, + 0x02958D26F4E6AD2D9B1DB8A6B23E7FA5DC4D0E4C6673B0F840C000EEAC001988, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x1F357DB2CD961C374F81A4AE374F5306787361C3AEA270815962003C0915B5D2, + 0x044C12E4C6321F0A73B09480C1D7A84CE30EE9219B3B649FF36EC7553150428F, + ) + + PointG2( + ( + 0x1B789C458E1E033DB933F65230C01F173DC581494D23407494818CBC70C5E4EB, + 0x05685001B0F48E5191BC50797F1330BEB69D7DABE58B9B7D0C9C86C61C8D2A33, + ), + ( + 0x01C8DC500074BC4207038E94F028D954405D8B6FF8B3F1B52A7CE67C97382C0B, + 0x0A9C7D7844CA3F0A571B04211C021DC96A29628119B067364A06FEA760698A06, + ), + ) + + PointG1( + 0x0452283EEFD9B336E591F37119AA473F03932C9C6D7CB0256C93E2BB7EBC2140, + 0x24A87B7AFBB4143434A5AECBEC2C38E02C7E01E8B056B812C80DEAB761BD9429, + ) + + PointG2( + ( + 0x06B4A2CADF0C0D14E9015F1DD1833E1A71BDECFCC8D400F0C96C309DD8F3F30E, + 0x243FDDB630078AF3593C50273C6FBC2C33F2FC6E208AD1E6DD537079F569CD5F, + ), + ( + 0x25E6C61EB8D52BFE15205FB66A6E90DA703A7CB8B441023F90AE987E35C72F80, + 0x0E8E708E896B7BA90163F4DD87BB6660359CA5558473831DEA4AAC4D222FE443, + ), + ), + ), + pytest.param( + PointG1( + 0x21B1479BE2A88D421D6AA893A59FE4966322436BCD047E610F90929A5823188A, + 0x2FEB0BAED066808BE65012E37E364243877A4D47B75CD9FFE4A5DF3011A68F90, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ) + + PointG1( + 0x1AA2BA0E64E80047D931DF5931420DE2D4DC0B7B6FC83121A9F155DDF9D65775, + 0x20108E265338E3F2BDCC276BF69D955D60C73419D7BA24C25A40E9EFD4CB24B8, + ) + + PointG2( + ( + 0x0DBBD035AB913DC40917C815E66941EEF6529D94ECBAAEE8F77EFE9AAC45AAB2, + 0x2FF4691BD3AA5F5BBB6067C1A4392DC87BB7A9997F7A660DD960DF462203C18F, + ), + ( + 0x2D4E9EE9F56967D24826884A2473B374D24B5AFEF1CB8D11555A2A62249B44A9, + 0x07A93F02C17DA88BBEF2E8B41A34EE1137AA7EDB0459E06BE0BD88EF68A876B0, + ), + ), + ), + pytest.param( + PointG1( + 0x2371E7D92E9FC444D0E11526F0752B520318C80BE68BF0131704B36B7976572E, + 0x2DCA8F05ED5D58E0F2E13C49AE40480C0F99DFCD9268521EEA6C81C6387B66C4, + ) + + PointG2( + ( + 0x051A93D697DB02AFD3DCF8414ECB906A114A2BFDB6B06C95D41798D1801B3CBD, + 0x2E275FEF7A0BDB0A2AEA77D8EC5817E66E199B3D55BC0FA308DCDDA74E85060B, + ), + ( + 0x1C7E33C2A72D6E12A31EABABAD3DBC388525135628102BB64742D9E325F43410, + 0x115DC41FA10B2DBF99036F252AD6F00E8876B22F02CB4738DC4413B22EA9B2DF, + ), + ) + + PointG1( + 0x09A760EA8F9BD87DC258A949395A03F7D2500C6E72C61F570986328A096B610A, + 0x148027063C072345298117EB2CB980AD79601DB31CC69BBA6BCBE4937ADA6720, + ) + + PointG2( + ( + 0x198E9393920D483A7260BFB731FB5D25F1AA493335A9E71297E485B7AEF312C2, + 0x1800DEEF121F1E76426A00665E5C4479674322D4F75EDADD46DEBD5CD992F6ED, + ), + ( + 0x090689D0585FF075EC9E99AD690C3395BC4B313370B38EF355ACDADCD122975B, + 0x12C85EA5DB8C6DEB4AAB71808DCB408FE3D1E7690C43D37B4CE6CC0166FA7DAA, + ), + ), + ), + pytest.param( + PointG1( + 0x23E6648726D779A5E9943A9CB2C3D89CC966F0CA965BBE7BBDC1BD93DF642930, + 0x2A1E299A0D2C7FB74AF9E086C19B07B357C55E76D2C65FBA3B122C8158EE2B76, + ) + + PointG2( + ( + 0x071A0694C6A785AE2FF2553F4C06E2D24D031B86A4023A0D41A095B9D35EC8D3, + 0x0C1AB42B9A9D852E0901C708A5A0DFA9920E0BA08828620A5EBBDF1FFB8F9D85, + ), + ( + 0x1741332DCD8798B695EDF6BE41E0E58803AB926516D0D600514C4572575B2924, + 0x1A64993DDD9BE2BAB46A7190024DE9E051862F46AC3130DB54EDE8C322E604A2, + ), + ) + + PointG1( + 0x2E198A9651F4D48DC87F0EBC9FBA1061D49962668790EDC37948681DA728A79F, + 0x1649DC12A9101AD7E6C1631C1290BEC29720BF5617EE6B5AFA720733748BC3FE, + ) + + PointG2( + ( + 0x2AE647DA926E44CC8E5476A15FFC62F11EAFC89CB7D1D9EA1107403E1773C49A, + 0x2408EAAABD36AA0A8DC6DB3FB091F3C8B4DF202714F74AE8D8CCA11A216A3017, + ), + ( + 0x25EF6BF83C607781E9C1696E31CB5BAA60B9E2DEB0856479B342737592C09612, + 0x11D363F2F2FC286D903A1E94C6673714464530BDB734DED5608B4654466D3F35, + ), + ), + ), + pytest.param( + PointG1( + 0x24AB69F46F3E3333027D67D51AF71571141BD5652B9829157A3C5D1268461984, + 0x0F0E1495665BCCF97D627B714E8A49E9C77C21E8D5B383AD7DDE7E50040D0F62, + ) + + PointG2( + ( + 0x2CAB595B9D579F8B82E433249B83AE1D7B62D7073A4F67CB3AEB9B316988907F, + 0x1326D1905FFDE0C77E8EBD98257AA239B05AE76C8EC7723EC19BBC8282B0DEBE, + ), + ( + 0x130502106676B537E01CC356765E91C005D6C4BD1A75F5F6D41D2556C73E56AC, + 0x2DC4CB08068B4AA5F14B7F1096AB35D5C13D78319EC7E66E9F67A1FF20CBBF03, + ), + ) + + PointG1( + 0x1459F4140B271CBC8746DE9DFCB477D5B72D50EF95BEC5FEF4A68DD69DDFDB2E, + 0x2C589584551D16A9723B5D356D1EE2066D10381555CDC739E39EFCA2612FC544, + ) + + PointG2( + ( + 0x229AB0ABDB0A7D1A5F0D93FB36CE41E12A31BA52FD9E3C27BEBCE524AB6C4E9B, + 0x00F8756832B244377D06E2D00EEB95EC8096DCFD81F4E4931B50FEA23C04A2FE, + ), + ( + 0x29605352CE973EC48D1AB2C8355643C999B70FF771946078B519C556058C3D56, + 0x059A65AE6E0189D4E04A966140AA40F781A1345824A90A91BB035E12AD29AF1D, + ), + ), + ), + pytest.param( + PointG1( + 0x24AB69F46F3E3333027D67D51AF71571141BD5652B9829157A3C5D1268461984, + 0x0F0E1495665BCCF97D627B714E8A49E9C77C21E8D5B383AD7DDE7E50040D0F62, + ) + + PointG2( + ( + 0x2CAB595B9D579F8B82E433249B83AE1D7B62D7073A4F67CB3AEB9B316988907F, + 0x1326D1905FFDE0C77E8EBD98257AA239B05AE76C8EC7723EC19BBC8282B0DEBE, + ), + ( + 0x130502106676B537E01CC356765E91C005D6C4BD1A75F5F6D41D2556C73E56AC, + 0x2DC4CB08068B4AA5F14B7F1096AB35D5C13D78319EC7E66E9F67A1FF20CBBF03, + ), + ) + + PointG1( + 0x1459F4140B271CBC8746DE9DFCB477D5B72D50EF95BEC5FEF4A68DD69DDFDB2E, + 0x2C589584551D16A9723B5D356D1EE2066D10381555CDC739E39EFCA2612FC544, + ) + + PointG2( + ( + 0x229AB0ABDB0A7D1A5F0D93FB36CE41E12A31BA52FD9E3C27BEBCE524AB6C4E9B, + 0x00F8756832B244377D06E2D00EEB95EC8096DCFD81F4E4931B50FEA23C04A2FE, + ), + ( + 0x29605352CE973EC48D1AB2C8355643C999B70FF771946078B519C556058C3D56, + 0x059A65AE6E0189D4E04A966140AA40F781A1345824A90A91BB035E12AD29AF1D, + ), + ) + + PointG1( + 0x1459F4140B271CBC8746DE9DFCB477D5B72D50EF95BEC5FEF4A68DD69DDFDB2E, + 0x2C589584551D16A9723B5D356D1EE2066D10381555CDC739E39EFCA2612FC544, + ) + + PointG2( + ( + 0x229AB0ABDB0A7D1A5F0D93FB36CE41E12A31BA52FD9E3C27BEBCE524AB6C4E9B, + 0x00F8756832B244377D06E2D00EEB95EC8096DCFD81F4E4931B50FEA23C04A2FE, + ), + ( + 0x29605352CE973EC48D1AB2C8355643C999B70FF771946078B519C556058C3D56, + 0x059A65AE6E0189D4E04A966140AA40F781A1345824A90A91BB035E12AD29AF1D, + ), + ) + + PointG1( + 0x24AB69F46F3E3333027D67D51AF71571141BD5652B9829157A3C5D1268461984, + 0x0F0E1495665BCCF97D627B714E8A49E9C77C21E8D5B383AD7DDE7E50040D0F62, + ) + + PointG2( + ( + 0x2CAB595B9D579F8B82E433249B83AE1D7B62D7073A4F67CB3AEB9B316988907F, + 0x1326D1905FFDE0C77E8EBD98257AA239B05AE76C8EC7723EC19BBC8282B0DEBE, + ), + ( + 0x130502106676B537E01CC356765E91C005D6C4BD1A75F5F6D41D2556C73E56AC, + 0x2DC4CB08068B4AA5F14B7F1096AB35D5C13D78319EC7E66E9F67A1FF20CBBF03, + ), + ), + ), + pytest.param( + PointG1( + 0x2B5154892605B4B57C6F309A1F39D91A89D985264F9DC47342470B5605532939, + 0x153954F4AC012E3D5860731081C59B0B5D9DF76EEECA47C1EDE99D0A73A8D135, + ) + + PointG2( + ( + 0x1B7962C4F91943B75BFA71D26698F33807C0A82C4AFF43116E6B0E97E087D64E, + 0x0337B7F3F182A6241093041180E874062C10467E0147E1ABD93857DDA7E6AA34, + ), + ( + 0x153CAC48663D8DE0C9F23D1A2CECF0BD14F6D7CF877EF833751F8A524D0F4C1C, + 0x1FF902721CD414E4C564C569143A0356D3B6CB7B1970067365C0A0F8ECB4976B, + ), + ) + + PointG1( + 0x0DA26CA39BACCC3B276B50CBD06DB50B1C544055C0C636256FA35AFDAFEE49BF, + 0x2238E1B69BC5E674C9351B702C26021F8EB254E0F890595F5F22CA04B2057480, + ) + + PointG2( + ( + 0x03D0A15AC5814B86F5463C48D5F7D398DA010569D67F979B2AF9381802B485FD, + 0x2D3DE1B5338AC2222D3D1BFCA2E20F7C1A280780BA9ABD54B46D42380FDA599C, + ), + ( + 0x243C33DBB5C54E9566FDDA8567E059B596FBA1E9AFEF57DEB1703F27CD93CE74, + 0x19779141BB51EAA0EA4F1FD39EFC61AEE4E6B40316248277599C599EC30C8DD4, + ), + ), + ), + pytest.param( + PointG1( + 0x2CC6C9ACABC199E21BE075D6D7885ACFA1F38FEC18999D78105C87E55A5D8EB7, + 0x238E3F5EDEA71116B4905645DF360589EED6E69FF4145A28C6AE29599CCB590E, + ) + + PointG2( + ( + 0x0E8248A6CCD8770C3CDBBD6D7F247C76F189978508B6F3514877833B00A7C593, + 0x261D44028C3119AD2707A456739918AD10B51E7257B539A34E7F479F2E76707A, + ), + ( + 0x2B359C070959C19EB7BB2BF1DBBB2CC060558F6DD682965535CBA0F2392D13B8, + 0x18A023E2B4D60C38C7C0AB6AF9FF0887DD192AC88B5070851F4D0E7495A1144D, + ), + ) + + PointG1( + 0x0ED1531303F89B56EBE6E9A39E7B7C4B5F2385D774AB00AB0B3C32C9B110552A, + 0x0794C8D242F2AA6F638A597E53D8F236C780FCAC4A7E2CABCB688896A84046C7, + ) + + PointG2( + ( + 0x13532C71AEAC024EEA1BBCCB01B45CEB4AD91E106200B7E25B0E30BC588D7835, + 0x20692D41373A18914E163949FA765D49DBAA5999B1D606300A469555DA182B59, + ), + ( + 0x1FE664FC1DC73F67D3261D81477FD5B43E9B7D9A376A09E4A2B82F935CE0EF73, + 0x0ABD60B3B4CA1E15EAE3DD484E5E22F0F8F50DFBC756B40CB2406E6A1D86C07C, + ), + ), + ), + pytest.param( + PointG1( + 0x2E565CD418929C3795ADF3EA378F2616AF24A1D7A93962C5BE375E7FBDFE3D73, + 0x1197465669E70FD0793C00FB922D25DD53C8C35D4D686985E4E04741569497D1, + ) + + Spec.INF_G2 + + PointG1( + 0x03A781E0964591A816D07C8D6AA23D23B2AD50AE3ACC529F877ABF4D13E3F35E, + 0x0FC25D443BA88FF661C914498D09F6C47BD3DB7F8768C13AC2602E02250C34D1, + ) + + Spec.INF_G2, + ), + pytest.param( + PointG1( + 0x2E5E8D67B60E1D06ACD7A490F8394BE4AAB0ECA89EAC6738FFF6664263500F2B, + 0x23A1B85312F58351B078BFABD3AB8517E383900CC23A4D9A8FDB0A5AE691BD00, + ) + + PointG2( + ( + 0x23751D707CD5ABABE78100ADE4BCC1691182EF8A6086BE7AF4A0A62B52D7A594, + 0x0DEA3332F3C63C37814CBA5AFB4380C5C3EE3920EF5DE5484C1961A98430C282, + ), + ( + 0x0C10E66F5BD143C35562D6B5F1BD6D0A256F4AFB69641A3D8C871F5CAA98FA6A, + 0x1C8F31E252726F5FB9F5F444F60B32FCF94BA5E077C9724D36246EC666D767CC, + ), + ) + + PointG1( + 0x1F0BEFE534AA028FAF6181644D6774E4E14F600A5657B3E2F6287115317F678C, + 0x13357844009932B0B873101C362A9EE9FEA643412DA278256377C345E3F409DC, + ) + + PointG2( + ( + 0x1DB60E215FC52C5AF9D1B5045473F2F06BB20399DE3CDE3CE877BA545B994F33, + 0x27C359CD987E9F2D05F015974E1B18B98B8F9684A24B0A50441244333BF5A35A, + ), + ( + 0x023036AEB27F556CA1E93DD351651594C723239A7C0CB15B8AB7A0446BA789FF, + 0x17E4FCBE1D017009100203F39E446D7B686E30FCE3323EF61D46BC956143947C, + ), + ), + ), + pytest.param( + PointG1( + 0x30618669FA4F387A7E9FCBF763BC0DC9908CF927D1F92B585CA17D46B7E97FD9, + 0x02ACC05526844E174394B69B1E0B78D24F7B5BD0CFADCB6A33AA6DC090D9028F, + ) + + PointG2( + ( + 0x160C5AF4494850EE7590972D0EFDA781E2879E76C807A16DD60EDE657E0BE6A8, + 0x230F495774D31E8B73BF7CE73E6F87826D7A59E1C47B508D5F953A61C2B4939F, + ), + ( + 0x0492560C98F9FEAB356C744C09F1EC80F5FC9CC579F9929A3C7D9046585431B7, + 0x273A1175635E2AB1F1B63838C13BD9D1DAF4DAD2620A0E72BEAE5F66AB88ACAB, + ), + ) + + PointG1( + 0x0F0887388FBCFEED9D128B7324B47676549D378C55D6D28B80CC179258A28017, + 0x11423DE6D1555ACFFE946EEBAEE182F8D007D5BAFEA10C7E00236552DE1C68B3, + ) + + PointG2( + ( + 0x2B74C50FE814021736DF034CFE502673B483BAA8F12825B9C7F74C59943CA535, + 0x16196E1E69CEE3DC1A0CEEBCD6163C57F0155AFB41D78AAC57966A2681FCCD02, + ), + ( + 0x29B85E084727DB2843D66CC73E163875AE0CDF5CE9386BD6B2BE7018476D4606, + 0x25BB91869E1C2453109BA45CDA0FA3F4BA9B8186DF72098E81CA6F131140D8B0, + ), + ), + ), + ], + ids=lambda _: "positive_", +) +def test_positive( + state_test: StateTestFiller, + pre: Alloc, + post: dict, + tx: Transaction, +) -> None: + """Test valid inputs where the pairing check succeeds.""" + state_test( + env=Environment(), + pre=pre, + tx=tx, + post=post, + ) diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json deleted file mode 100644 index 4aa2b913aeb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_empty_data_insufficient_gasFiller.json +++ /dev/null @@ -1,417 +0,0 @@ -{ - "ecpairing_empty_data_insufficient_gas": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "1", - "balance": "999999999999868294", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": {}, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "131706", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "40000", "80000", "150000" - ], - "gasPrice": "0x0a", - "nonce": "0x1", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": [0,1], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0x00" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "2", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [2], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00" : "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "2", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_inputsFiller.yml b/tests/static/state_tests/stZeroKnowledge/ecpairing_inputsFiller.yml deleted file mode 100644 index 5acfc66de33..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_inputsFiller.yml +++ /dev/null @@ -1,231 +0,0 @@ -ecpairing_inputs: - _info: - comment: Various inputs to the bn254_pairing precompile - - env: - currentCoinbase: 00000000000000000000000000000000c014bace - currentDifficulty: 0x20000 - currentGasLimit: 15000000 - currentNumber: 1 - currentTimestamp: 1000 - - expect: - - indexes: - data: :label positive - gas: !!int -1 - value: !!int -1 - network: - - ">=Cancun" - result: - 000000000000000000000000000000000000c0de: - storage: - 01: 1 - - indexes: - data: :label negative - gas: !!int -1 - value: !!int -1 - network: - - ">=Cancun" - result: - 000000000000000000000000000000000000c0de: - storage: - 01: 0 - - indexes: - data: - - :label invalid_g1_point - - :label invalid_g2_point - - :label invalid_g2_subgroup - gas: !!int -1 - value: !!int -1 - network: - - ">=Cancun" - result: - 000000000000000000000000000000000000c0de: - storage: - 01: 0xfe - - pre: - 00000000000000000000000000000000c014bace: - nonce: 1 - balance: 0 - code: '' - storage: { } - - 000000000000000000000000000000000000c0de: - nonce: 0 - balance: 0 - code: | - :yul shanghai - { - let size := calldatasize() - calldatacopy(0, 0, size) - let status := staticcall(0xffffffff, 8, 0, size, 0, 0x20) - let result := 0xfe - if status { - result := mload(0) - } - sstore(1, result) - } - storage: - 01: 0xcc # placeholder for the result - - a94f5374fce5edbc8e2a8697c15331677e6ebf0b: - nonce: 0 - balance: 1000000000000000000 - code: '' - storage: { } - - transaction: - to: 000000000000000000000000000000000000c0de - nonce: 0 - gasPrice: 10 - secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 - gasLimit: - - 15000000 - value: - - 0 - data: - - :label negative :raw 0x142c9123c08a0d7f66d95f3ad637a06b95700bc525073b75610884ef45416e1610104c796f40bfeef3588e996c040d2a88c0b4b85afd2578327b99413c6fe820198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d - - :label negative :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000092a62b029973fcd9ec18db33eb4c7b6b649a2e6196561761789e39bc84f11ac0a59f2672462be814a277f495d53244691c40da85d39b210ed3e099b397a4cf92ad603022931e8c20c927fa114866ca26b305156336511a9224d6bd88e5ba7fb2b44dd02df7f7a846f546c77f3330cc171abeea7747ec03607c4b754a07101421f4b96b82bd3631447045f1bb66198fa6a904e48092750762efd419fb5ff52b51fac61c1a7265d0e1a6433e9767cb51c71e9ac5a119be9894f509bf92b0fb1b4198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label negative :raw 0x104f6d8507d6a112e8fd516d70bfe3d2474539948276d36eee987be127a9e3ab199eef24146007e80386f391edc886f5ddba22b5cf131efa3b6ae71a673fc88e198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2642f046ad222f094c9282816131317b8d52fc0fee64f26898232432d34fdae605a5f2a2e8f15ba27e90f54faff78391b307b402a0ae995d1c12f92c0b574593198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label negative :raw 0x1f0ab114f50077d71a195869dd8c07e2a031a55a8dac07c522ee7ac74136c50c229c9d498f5ca70a27612a244743773fe22668370a91410b645fe22f2e6eb78c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000284869d750e478e4b09637f7ae55bcce23bd622f04e986e1cba0f64b59b023200a88bc2898a2930aee2b92055ca2f97360a79c598f5e8998fed7add43a692d1021f4f3ddd5250962baaefc6ef587f464c8fdad1bb7812b292dce48d5462039df14044ca96015f3c6666f98d756fbf7bd0e12c3e884db4100391da8a47deff16e00b30c250f71db58eb20e14d67cd98ebb47790a7e7d45d30a90ce707175f295b1e45eca08667a7cfe06158fae4a38cac01a37853e730eaa28b2f7167fd74c22d - - :label negative :raw 0x0624d2c76767981fadc8f74f29c034f7ae0522585e1e0201308109c40d1d5420251ba3c545339bbe22da0fe90692a099384c435ec0902c99be7e7a84d62bb49c0c0b524584214b17414a25236e4e2b6f4bf398ec62e9abeb7ea1f158d89df05b0e05f600bf1408ab25c0f3dbb98ff26c4d85a6ce6a63bebc3b2e360de77cf6062488eb90497d64621124420825abd353268fe00bd90726991d0ce623e59da9c62340b1fb006017382cb76606a873f48de8f31434cc243c8f465cb908d8cc734618cde0d7bde7e1da88fb8192ce94bea754f24a53f1f000f15b4c5c151c12df4f0066b16bf4229edf5375b78a5c7469ddf68f7d5c7577642ed2c90d5d42c231ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2948734db775bb41a29257214b19a6356e6640894c2a48f201addce62de7b41e1bb87bddbe46d75809751232405928c3314934082052131a64574ff5a59c7db7198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa09c91a687e6c44f2917682dc5d0a34be7c77fff361aa36610effab6f6d2d87ac13849277ed76b58020ab993f1847ebcc0f1bcf711fba15f4a7a80ab72b4fe9642f0c63d0c53b3dfbca27b6b43ae7fbf55a38d78a21470996485b03128accc20800556502356e37ed150db2e36531b0f275fd6835c0fc1945922e270b48c48a8602644c27b5dbd793592a70b735e22c798a5e309fa17a992a7dc2a050e01b298f194776b6a53439d7336f389d2a8f6651e40885f5ca2538b0dc9cb534fb23f7fa1e379e19dbffba1edf0a04505f67229e707a4b82f19285d3c186964e83e1553608ee58baa16641b1513f007da7d3cf58b503b80f73c7d8e792db63def167e0d82b1f95d6aa6fd6f5e6978d0135c206079770d5c3ba001967c5d94c5902f95fe9264ad64952cb1d30a7230bca35b3907b2457abdcd6052e14e2a132d76822222514f79ce35164acfdb802551e02a9aebdb20bf4248c0ccf5c6cf5e576908778410f8dfb99aaa272bbaa49012da81dfafa1a3c07eba89355602143c58f63df2939117a8203a67ab052af18032434b61fe6b33e0a6ad5ab70d57aef4444478b42ba123a80e91f77c135f657e2dbf5af0d07e9a4fb63585b88e5439ddab7741c0961198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e104316c97997c17267a1bb67365523b4388e1306d66ea6e4d8f4a4a4b65f5c7d06e286b49c56f6293b2cea30764f0d5eabe5817905468a41f09b77588f692e8b081070efe3d4913dde35bba2513c426d065dee815c478700cef07180fb6146182432428b1490a4f25053d4c20c8723a73de6f0681bd3a8fca41008a6c3c288252d50f18403272e96c10135f96db0f8d0aec25033ebdffb88d2e7956c9bb198ec072462211ebc0a2f042f993d5bd76caf4adb5e99610dcf7c1d992595e6976aa3 - - :label positive :raw 0x0084c3136563609ce6d7218719af3024e2163ea8124130cfb61c2521379b00672e775227ccd46bb5bd8b9f9714ecae9e037f8e91246b2a7e171337cf1332e3411fee9eea81af0f92485cb60cec6fdd90385b3f390c67d0885520bea38a07bb081242a8a318ba046cd7f4b87b4ede31c0c19f823ce0ab3192f36acc7683a9170411d50fa9a8a15815baf103030117065601aff6b54f4242d2a5a14e3147e89e25133ca084be363f41cb3886eed01fa8d896a609c22e099c4c9f5bb5a4363a57ad2f9b2caf0345e3ec3eccbc16af5713bbf15eaf2a17cd9f7a02966bd5e7ccd6fe185a77dfe45c4c1c9042c67fdb65d25bbd8b6f79dfdde27458a35792653443f3198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x00898cc97b5a1f95221e7272c6ea8ceb56e702d678ac6c24275a4f6147d2b27916f336255e3f8970fd79a12281e6a6bee510e7d2ce5117214f4dd8c764e00ef312580b380ddf94a3370e6842e68b260a12012ab02c883678abf3f0f37606f55c268f02e60dfc36a40bb1fa3dba22bba44953358031876c21748d5d57dfb39ef407c890d2b747cb1e0456c9c1b30c03badffb8cde540704104b016976d0a374472a3e2918076d66622d7d6014299b77850a74b2691dda1dadcd0232fbbfe2a9e02781b3ace921b11d98193720d1493609c4d47f607a2266d608185c6382b5d23519797c215563c8b73cc7f0041d1f5fe1ce017b36afbeffe56683e3ffccb9380b198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x082a5b0eb620c491dc7cfbf269ea3e9db35fdaf6c7c4baa25a829127a56f63c41c49e6c57c3c0ddca035138e5aadb79ac638f67a918e6a4377200ebfa80ed1880bf4734681e3030e126c2a595de85f80b46bd327bae8a860a3ed5f5be7318037116c5e07de19e858eb720604f6e2935bf0f5e40d9194cfba05bfea0ab69f1d82263ee7293c68743b04034a5b63e1d2b65261f7c6758d8084a50419cc65d02ad214189e61084d61cf2ad9b6140b951ca35ae18a008cb3c1c4904e59f462e66b0428ec2c3d544a901ad85af62e1ec02aac643e707a3a45983ef168877b6901a19d108e7a47061fd472bd715c35b71b842fc1914a8972e472a2a4faa4880e0d2787198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x09148ba3625b1d4862ecfed71970e395d22bc4dafaa4a662546e4fb39141d8ba0a8f563782b2b31347c9e7ced5a21d959a38f4ae4bbc7cd37b1180a0d491cad617f32b902d2096a48b25f94ad6c692a99c68e937a4bae3c820f25093cf2786ab155c57d2b7f4aefc0e1a44a78c7d59d2cac917546717c665dc001fa43cf5775317b81fe685dd2e24a14899ef74821d1d147b88fe0c63d0921eb45c191146e7e41c9ae775eba85ea225258c9bafdf5cbad6106cd79194f4b0f8e7814068370daf302ac8191cd6d55b858891d05b919ad95f5e2f16b78c5b0ad2ecc72c3fe238421a924fa7e779ad503830c25838c2489d9bbc21fd519ceb3f4a10f4dc3e3b72be198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x0ee7f0252e8210eaa3ee452c8731ad6864d8506ba61836f48c99a16a03d59b0d2ba1ddc868f452ef0cfdcac410e9d38d726557b05edc84f8d4f62203acc1f9f029aa08ecade2c1d537c14baf6cf62758c02e6f3c4eeb0b621ad3ab941b1559de11eac12aaf058f799ee8146f36a0bbbf8e67a0aa0f9e2c192bafd05ff8da45d303b7bd661becfa6ff5092b36f1768c815434f3b7f4254fb4b8abf68e36086cd3196caa297895d4a1d58a5fe388416fbac2a74fb9beb835dbbbaa8f6b63bf9cab29a00816ed140fc36e515f43fb054c891b4b07f013c9e6d5c3f284c8528c71ae2f060699e8f54b1028b78e5f016d8142563947adcac5a5857137b6958ddc995e141dd828af529924148912360fd71ef6a365a707173aa2c06c8290d54fae458e1cf61d5e9ceced0c662c6e2df96d63adc7d84e182fa0f62e08b9afdd5c90545e01f3e8049b7934995dee28faa0e401289b92ccd1a2f408c85383f5312f528c9e2c6aaa06b56e9d6c98a701b4a9cf2f8cfddbfa93d7104d5eafbad9a84b5174e5 - - :label positive :raw 0x0f740d88de760df099674c96dd2d476b42673d0f2972e6d5d1f9dba95a29d26a04a44d72c2a82088da663ff162fe2d3ddd4a139e1ef6c0bbb1124d8de75f7c68196346d9774f017c351dbbdd99960e834b188b3347b92fac7f83cc6453617fe11e3ba24a0848096a0d6484133af97b7487ca9a4309cb5574d8bb96cfd7f22678235603772d0e9cf9503d05742962b07cd0af71a7c7b757960ced6fcfa74d3ded1ceed193f30fbbe5e9a9438e82bac927a0977b49f6e476aee20923e1a230f2c4201af9371c7cea66800f961d6a7219da9c27fbe61b5df43fccb275d8c034bf8e1f0e7c5a1143b0f8e850d9516ea2c836b0331521829dc2b71dbf775078c770f4198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x107b8a2cb6318aabd95763c0cafc3b24d8a9acdf8dd967176f05c400951b3e0613a1c9847bf87c8cc79ef1120ed6e3e98412f0dd4e9c8c8c421057a2353279e6198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2fb5b7e464a0a76d9aca8698e73802782da01fce50384f459be1427855c0eb502e6c7af07418cd0203fad6a1abde95e745c41a78c6ad1ae7b1b2ada2e643fd37260e01b251f6f1c7e7ff4e580791dee8ea51d87a358e038b4efe30fac09383c10118c4d5b837bcc2bc89b5b398b5974e9f5944073b32078b7e231fec938883b004fc6369f7110fe3d25156c1bb9a72859cf2a04641f99ba4ee413c80da6a5fe422febda3c0c0632a56475b4214e5615e11e6dd3f96e6cea2854a87d4dacc5e55 - - :label positive :raw 0x117196c7ea11e6362bca58533a55de3deadc441b18b0a7ca68557f374dfed6a629b1b63f1d649480aa9655406c454b55cbbf8d29f3aedc30de3b0745bed3be52226ad93c0a164e73d8d9161f9d0206ab232fa5a08cb349f7df3633096cd04e920de4a56223ee43aa3c4a18bf4c84be1879dd9182fd4a03318a4bebd642627d1e142a0ed74ba11936e27101a43db8e16f6a603953c3ea4b14eaebbe117970268a2abced69ffbce2e34440530111050a4d72282dd5f4faa7703d5762d04327175619eedb06c5d1f53510f7f7464b39730659eccf0e9dfeec2cc131fd0d27c4f8e3043aaea131d0e69b79a816b675ac0dd21b4796046c149ca16df5884d615025c5238f967690e26443e6f5207b5c2af7fedb837d534282c7db1ca926a9bc06a7390ec4c043a606711a021205ef7d97785d9ae246ba06b2912e24ff9e669fb700b42714a2e42c4bd73a79cd7b2243d1b784cadb22a58e6360be1af873424efd420c12f54bdcf07ff30854629a0531065973197e685193051f2fa11a7761b0cc39f6 - - :label positive :raw 0x13b076f9e2ddf66bd1e9ec7509945ec37289d9ad65f210ed35e78ba2b02e7e3d2c6d9689097e79c4227b7b8519e4850be2d795f9496a70ae8607a3172208371a0774089b1be2375b269ac0cd913803af1e8e967c7a12ded9e38bbfe816cb6b2b25e481bf589a76e531e3cbaee9b47a07fb832b052a71029665a5ca89f1eb6d6b0f10223646f0d0f8f79189c456f40295fa02708a2629b8a88d7ae36caab470552b4bf562f83ed28edf524edc1646b4c4cd538bec5d544d8071f0c73406339b2e2043a8194e50b9ff3b93d13873035fee0ccc3b4a0fda33d34ac7a4771c9b884d291b24054553ecab7eb9a6807281a895bdcf29e95d8d3a2552749b7fc0932637198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x15d6eaaa18c5737e7bd229c2900f8deddf6da9c0e20e7e905e7b7491d041eaba2ab7d1b2a259b85054253da8947c2fd38b04a4ede3bfa6e258e22f668dcb5a63092a62b029973fcd9ec18db33eb4c7b6b649a2e6196561761789e39bc84f11ac0a59f2672462be814a277f495d53244691c40da85d39b210ed3e099b397a4cf92ad603022931e8c20c927fa114866ca26b305156336511a9224d6bd88e5ba7fb2b44dd02df7f7a846f546c77f3330cc171abeea7747ec03607c4b754a07101421f4b96b82bd3631447045f1bb66198fa6a904e48092750762efd419fb5ff52b51fac61c1a7265d0e1a6433e9767cb51c71e9ac5a119be9894f509bf92b0fb1b4198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x16f5d1473d8a9012df4efc624ae3b5fc3b1c1742bb73b9b62aa50c0dec9848ad1b2381a593f0a661db10b659329907fb62b4f5fd196092ef235f0775463b11f3054f9c54b1560a307e173c70fce534a2e4c7b248ec342f968a9db905fb31ba362513859b9c3a196e357d5d4f34e17f5cb2d78f4160103ecae86cb57a3e48ef7715e96b3ad7bfbccc491029f30be0ced0654c6c2600b49bfafc70af802b305a09154bb828c71576e1809723e3bbb5d459ece5bdccb9bcdff733761fe908e1e1d52f91cec7b5d03d4c5930875239f825c55849b352fa27b4e20581fc4a68950c752ee478820a0dc3f22866e7c5111d6fd1f057c18b7c9c1568173916ce67555c47198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x18dd52daaa11ff5dbb97c8776924d95b1bb86bf16481ba52519674873e0279ea0b32f4758cc18142794358e62b9c29951d3cb7e705d97e4cefd8422fa340ed5804cbac0707b92f59b87024017aae6941a3d8f42c6b93c619fa85cd54a3f0596325ef128bd051c44f95f7aa6122a390666691c2ec8a328f5302605f0aaae670db14a3194db0c978125b0212d2dbcf3639650e40f8acaeff5a5c20ba700de3966f004d3f0a629eb1456685db5a1b94d4b2f8dc0a9cdc5d29cccc5b596d88ba29fe0bcf53d38a1b0732fd90b73149559e0ee767f525875ebdb26f7f123136282afa28e440620ea4064d1f0190c75e2a36003f18643507a927926130eb54ecc1004d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x1b6e4577cc71df5e856ed88d2d14a464343f140b07693e3b08308570b28fd55b24198aa6ee0f5bfec020ad2ff15729434439e4af7554fa0f7395ee20cb926346246b8e8c771c3db7226a8066537632923d7d5a542f8e0d600e7f0195240f1ec513cbe706f9ba436dd4a781fab85fa2e9d82854446cf91182dcfa66eb68c4b7e72533a60b837f9cf4838c4c38f4f9c8988fee10c9895753e7925a86330e925db702f47f10f7da957cfcc613361ab6aaeb67f14d22c06eec14e47e36988c4ee06705a596bd22bbb13dc898acfdd420c88893dd09f7fd4875e8b3fb65b54ad9643f2847ab3c7d853e89cfdf520de28e1092c1955b7e17d9cba5808f047a3d6898fd2f64f057deda8bbb646d5b9864d9789a696abf2a42218f7af28baae517f5e45723bd3952d332068086b2079260b285896cb84c73ece3647094fac90d8b1374c21eebb3f8ea3c3d9147fa09e4506bcff1c222a02ea8b4904fc6df3bca1cc0505e133d9a4794eb099e9bdf82a6fecdb2e2e29b0867bf0fe557475dc758d796714e - - :label positive :raw 0x1ee2af29808bc7baad8eb3e87bf55588ef59763ae59585453aa57222a60409141756d11b0679f2e3c44a95592d270f55f76670c2d248fe2c0b391a11aa90d0ec0ea16e33157b6d0f197ed197ce3ad5b93ac91458632464dd5e4aa23ec628e6cb03c160eb0d2ab47566d495f1a53b7b1cdb659cb64e26c848c74267bc74ffeec81d5ee181514337f685e60ba02daccded24ea3122fb04d9da37790f3dce54587803087c55d223005ff8ad78f6f417b19caff564e8b8cb820d0eadb6bec43f0cf902b88f6e24920bd60dbbf082df1cd200abf141b6c01e7fcb262525364c14c20502958d26f4e6ad2d9b1db8a6b23e7fa5dc4d0e4c6673b0f840c000eeac001988198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x1f357db2cd961c374f81a4ae374f5306787361c3aea270815962003c0915b5d2044c12e4c6321f0a73b09480c1d7a84ce30ee9219b3b649ff36ec7553150428f1b789c458e1e033db933f65230c01f173dc581494d23407494818cbc70c5e4eb05685001b0f48e5191bc50797f1330beb69d7dabe58b9b7d0c9c86c61c8d2a3301c8dc500074bc4207038e94f028d954405d8b6ff8b3f1b52a7ce67c97382c0b0a9c7d7844ca3f0a571b04211c021dc96a29628119b067364a06fea760698a060452283eefd9b336e591f37119aa473f03932c9c6d7cb0256c93e2bb7ebc214024a87b7afbb4143434a5aecbec2c38e02c7e01e8b056b812c80deab761bd942906b4a2cadf0c0d14e9015f1dd1833e1a71bdecfcc8d400f0c96c309dd8f3f30e243fddb630078af3593c50273c6fbc2c33f2fc6e208ad1e6dd537079f569cd5f25e6c61eb8d52bfe15205fb66a6e90da703a7cb8b441023f90ae987e35c72f800e8e708e896b7ba90163f4dd87bb6660359ca5558473831dea4aac4d222fe443 - - :label positive :raw 0x21b1479be2a88d421d6aa893a59fe4966322436bcd047e610f90929a5823188a2feb0baed066808be65012e37e364243877a4d47b75cd9ffe4a5df3011a68f90198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa1aa2ba0e64e80047d931df5931420de2d4dc0b7b6fc83121a9f155ddf9d6577520108e265338e3f2bdcc276bf69d955d60c73419d7ba24c25a40e9efd4cb24b80dbbd035ab913dc40917c815e66941eef6529d94ecbaaee8f77efe9aac45aab22ff4691bd3aa5f5bbb6067c1a4392dc87bb7a9997f7a660dd960df462203c18f2d4e9ee9f56967d24826884a2473b374d24b5afef1cb8d11555a2a62249b44a907a93f02c17da88bbef2e8b41a34ee1137aa7edb0459e06be0bd88ef68a876b0 - - :label positive :raw 0x2371e7d92e9fc444d0e11526f0752b520318c80be68bf0131704b36b7976572e2dca8f05ed5d58e0f2e13c49ae40480c0f99dfcd9268521eea6c81c6387b66c4051a93d697db02afd3dcf8414ecb906a114a2bfdb6b06c95d41798d1801b3cbd2e275fef7a0bdb0a2aea77d8ec5817e66e199b3d55bc0fa308dcdda74e85060b1c7e33c2a72d6e12a31eababad3dbc388525135628102bb64742d9e325f43410115dc41fa10b2dbf99036f252ad6f00e8876b22f02cb4738dc4413b22ea9b2df09a760ea8f9bd87dc258a949395a03f7d2500c6e72c61f570986328a096b610a148027063c072345298117eb2cb980ad79601db31cc69bba6bcbe4937ada6720198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x23e6648726d779a5e9943a9cb2c3d89cc966f0ca965bbe7bbdc1bd93df6429302a1e299a0d2c7fb74af9e086c19b07b357c55e76d2c65fba3b122c8158ee2b76071a0694c6a785ae2ff2553f4c06e2d24d031b86a4023a0d41a095b9d35ec8d30c1ab42b9a9d852e0901c708a5a0dfa9920e0ba08828620a5ebbdf1ffb8f9d851741332dcd8798b695edf6be41e0e58803ab926516d0d600514c4572575b29241a64993ddd9be2bab46a7190024de9e051862f46ac3130db54ede8c322e604a22e198a9651f4d48dc87f0ebc9fba1061d49962668790edc37948681da728a79f1649dc12a9101ad7e6c1631c1290bec29720bf5617ee6b5afa720733748bc3fe2ae647da926e44cc8e5476a15ffc62f11eafc89cb7d1d9ea1107403e1773c49a2408eaaabd36aa0a8dc6db3fb091f3c8b4df202714f74ae8d8cca11a216a301725ef6bf83c607781e9c1696e31cb5baa60b9e2deb0856479b342737592c0961211d363f2f2fc286d903a1e94c6673714464530bdb734ded5608b4654466d3f35 - - :label positive :raw 0x24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d12684619840f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f622cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf031459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d - - :label positive :raw 0x2b5154892605b4b57c6f309a1f39d91a89d985264f9dc47342470b5605532939153954f4ac012e3d5860731081c59b0b5d9df76eeeca47c1ede99d0a73a8d1351b7962c4f91943b75bfa71d26698f33807c0a82c4aff43116e6b0e97e087d64e0337b7f3f182a6241093041180e874062c10467e0147e1abd93857dda7e6aa34153cac48663d8de0c9f23d1a2cecf0bd14f6d7cf877ef833751f8a524d0f4c1c1ff902721cd414e4c564c569143a0356d3b6cb7b1970067365c0a0f8ecb4976b0da26ca39baccc3b276b50cbd06db50b1c544055c0c636256fa35afdafee49bf2238e1b69bc5e674c9351b702c26021f8eb254e0f890595f5f22ca04b205748003d0a15ac5814b86f5463c48d5f7d398da010569d67f979b2af9381802b485fd2d3de1b5338ac2222d3d1bfca2e20f7c1a280780ba9abd54b46d42380fda599c243c33dbb5c54e9566fdda8567e059b596fba1e9afef57deb1703f27cd93ce7419779141bb51eaa0ea4f1fd39efc61aee4e6b40316248277599c599ec30c8dd4 - - :label positive :raw 0x2cc6c9acabc199e21be075d6d7885acfa1f38fec18999d78105c87e55a5d8eb7238e3f5edea71116b4905645df360589eed6e69ff4145a28c6ae29599ccb590e0e8248a6ccd8770c3cdbbd6d7f247c76f189978508b6f3514877833b00a7c593261d44028c3119ad2707a456739918ad10b51e7257b539a34e7f479f2e76707a2b359c070959c19eb7bb2bf1dbbb2cc060558f6dd682965535cba0f2392d13b818a023e2b4d60c38c7c0ab6af9ff0887dd192ac88b5070851f4d0e7495a1144d0ed1531303f89b56ebe6e9a39e7b7c4b5f2385d774ab00ab0b3c32c9b110552a0794c8d242f2aa6f638a597e53d8f236c780fcac4a7e2cabcb688896a84046c713532c71aeac024eea1bbccb01b45ceb4ad91e106200b7e25b0e30bc588d783520692d41373a18914e163949fa765d49dbaa5999b1d606300a469555da182b591fe664fc1dc73f67d3261d81477fd5b43e9b7d9a376a09e4a2b82f935ce0ef730abd60b3b4ca1e15eae3dd484e5e22f0f8f50dfbc756b40cb2406e6a1d86c07c - - :label positive :raw 0x2e565cd418929c3795adf3ea378f2616af24a1d7a93962c5be375e7fbdfe3d731197465669e70fd0793c00fb922d25dd53c8c35d4d686985e4e04741569497d1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003a781e0964591a816d07c8d6aa23d23b2ad50ae3acc529f877abf4d13e3f35e0fc25d443ba88ff661c914498d09f6c47bd3db7f8768c13ac2602e02250c34d10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label positive :raw 0x2e5e8d67b60e1d06acd7a490f8394be4aab0eca89eac6738fff6664263500f2b23a1b85312f58351b078bfabd3ab8517e383900cc23a4d9a8fdb0a5ae691bd0023751d707cd5ababe78100ade4bcc1691182ef8a6086be7af4a0a62b52d7a5940dea3332f3c63c37814cba5afb4380c5c3ee3920ef5de5484c1961a98430c2820c10e66f5bd143c35562d6b5f1bd6d0a256f4afb69641a3d8c871f5caa98fa6a1c8f31e252726f5fb9f5f444f60b32fcf94ba5e077c9724d36246ec666d767cc1f0befe534aa028faf6181644d6774e4e14f600a5657b3e2f6287115317f678c13357844009932b0b873101c362a9ee9fea643412da278256377c345e3f409dc1db60e215fc52c5af9d1b5045473f2f06bb20399de3cde3ce877ba545b994f3327c359cd987e9f2d05f015974e1b18b98b8f9684a24b0a50441244333bf5a35a023036aeb27f556ca1e93dd351651594c723239a7c0cb15b8ab7a0446ba789ff17e4fcbe1d017009100203f39e446d7b686e30fce3323ef61d46bc956143947c - - :label positive :raw 0x30618669fa4f387a7e9fcbf763bc0dc9908cf927d1f92b585ca17d46b7e97fd902acc05526844e174394b69b1e0b78d24f7b5bd0cfadcb6a33aa6dc090d9028f160c5af4494850ee7590972d0efda781e2879e76c807a16dd60ede657e0be6a8230f495774d31e8b73bf7ce73e6f87826d7a59e1c47b508d5f953a61c2b4939f0492560c98f9feab356c744c09f1ec80f5fc9cc579f9929a3c7d9046585431b7273a1175635e2ab1f1b63838c13bd9d1daf4dad2620a0e72beae5f66ab88acab0f0887388fbcfeed9d128b7324b47676549d378c55d6d28b80cc179258a2801711423de6d1555acffe946eebaee182f8d007d5bafea10c7e00236552de1c68b32b74c50fe814021736df034cfe502673b483baa8f12825b9c7f74c59943ca53516196e1e69cee3dc1a0ceebcd6163c57f0155afb41d78aac57966a2681fccd0229b85e084727db2843d66cc73e163875ae0cdf5ce9386bd6b2be7018476d460625bb91869e1c2453109ba45cda0fa3f4ba9b8186df72098e81ca6f131140d8b0 - - :label positive :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label positive :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103aa4b2aeff1bc7afc5cd39952c872c8f29d64188e8d18c1b65e526d6277a33209854e0ac153a98eff0fd08a0c73d46dbbe4209f8a6a4f2aad914e40686f4720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label positive :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ef4aac9b7954d5fc6eafae7f4f4c2a732ab05b45f8d50d102cee4973f36eb2c23db7d30c99e0a2a7f3bb5cd1f04635aaea58732b58887df93d9239c28230d282bd99d31a5054f2556d226f2e5ef0e075423d8604178b2e2c08006311caee54f0f11afb0c6073d12d21b13f4f78210e8ca9a66729206d3fcc2c1b04824c425f200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label positive :raw 0x06236320cf783a01e2b8be7816a84671de9e8bebda0e8f957809ee1253565bae0a4ce1ac405b9974e4eaf9342c2a43bd1fdc4edc2bd18235249bf51ec43287440000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label positive :raw 0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label positive :raw 0x24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d12684619840f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f622cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf031459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d1459f4140b271cbc8746de9dfcb477d5b72d50ef95bec5fef4a68dd69ddfdb2e2c589584551d16a9723b5d356d1ee2066d10381555cdc739e39efca2612fc544229ab0abdb0a7d1a5f0d93fb36ce41e12a31ba52fd9e3c27bebce524ab6c4e9b00f8756832b244377d06e2d00eeb95ec8096dcfd81f4e4931b50fea23c04a2fe29605352ce973ec48d1ab2c8355643c999b70ff771946078b519c556058c3d56059a65ae6e0189d4e04a966140aa40f781a1345824a90a91bb035e12ad29af1d24ab69f46f3e3333027d67d51af71571141bd5652b9829157a3c5d12684619840f0e1495665bccf97d627b714e8a49e9c77c21e8d5b383ad7dde7e50040d0f622cab595b9d579f8b82e433249b83ae1d7b62d7073a4f67cb3aeb9b316988907f1326d1905ffde0c77e8ebd98257aa239b05ae76c8ec7723ec19bbc8282b0debe130502106676b537e01cc356765e91c005d6c4bd1a75f5f6d41d2556c73e56ac2dc4cb08068b4aa5f14b7f1096ab35d5c13d78319ec7e66e9f67a1ff20cbbf03 - - :label positive :raw 0x1147057b17237df94a3186435acf66924e1d382b8c935fdd493ceb38c38def7303cd046286139915160357ce5b29b9ea28bfb781b71734455d20ef1a64be76ca0daa7cc4983cf74c94607519df747f61e317307c449bafb6923f6d6a65299a7e1d48db8f275830859fd61370addbc5d5ef3f0ce7491d16918e065f7e3727439d1ca8ac2f4a0f540e5505edbe1d15d13899a2a0dfccb012d068134ac66edec6252162c315417d1d12c9d7028c5619015391003a9006d4d8979784c7af2c4537a30d221a19ca86dafa8cb804daff78fd3d1bed30aa32e7d4029b1aa69afda2d750018628c766a98de1d0cca887a6d90303e68a7729490f25f937b76b57624ba0be14550ccf7139312da6fa9eb1259c6365b0bd688a27473ccb42bc5cd6f14c8abd165f8721ee9f614382c8c7edb103c941d3a55c1849c9787f34317777d5d9365b0d19da7439edb573a1b3e357faade63d5d68b6031771fd911459b7ab0bda9d3f25a50a44d10c99c5f107e3b3874f717873cb2d4674699a468204df27c0c50a9a0d7136c59b907615e1b45cf730fbfd6cf38b7e126e85e52be804620a23ace4fb03e80c29d24ed5cc407329ae093bb1be00f9e3c9332f532bc3658937110d76072129813bd7247065ac58eac42c81e874044e199f48c12aa749a9fe6bb6e4bddc1b72b9ab4579283e62445555d5b2921424213d09a776152361c46988b82be8a7111bc8198f932e379b8f9825f01af0f5e5cacbf8bfe274bf674f6eaa6e338e04259f58d438fd6391e158c991e155966218e6a432703a84068a325439657498571ba47a91d487cce77aa78390a295df54d9351637d67810c400415fb374278e3f24318bbc05a4e4d779b9498075841c360c6973c1c51dea254281829bbc9aef33198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa1e219772c16eee72450bbf43e9cadae7bf6b2e6ae6637cfeb1d1e8965287acfb0347e7bf4245debd3d00b6f51d2d50fd718e6769352f4fe1db0efe492fed2fc324fdcc7d4ed0953e3dad500c7ef9836fc61ded44ba454ec76f0a6d0687f4c1b4282b18f7e59c1db4852e622919b2ce9aa5980ca883eac312049c19a3deb79f6d0c9d6ce303b7811dd7ea506c8fa124837405bd209b8731bda79a66eb7206277b1ac5dac62d2332faa8069faca3b0d27fcdf95d8c8bafc9074ee72b5c1f33aa70 - - :label positive :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000be00be00bebebebebebe00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x000000000000000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca71ca8d3c16d87cfd450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x000000000000000000000000000000000000ffff7d7d7d7d7d7d7d7d7d7d7d7d30644e72e131a0297d7d7d7dffffffffff00000000000000000000000000000000000000000000000000000000ff7d7d7d7d7d817d7d7d7d7dffffffffffa100000000000000ffffffffffffffffffffffffffff7d7d7d7d7d7d7d7d7d7d7d7d30644e72e131a0297d7d7d7dffffffffff00000000000000000000000000000000000000000000000000000000ff7d7d7d7d7d817d7d7d7d7d827d7d7d7d7d7d - - :label invalid_g1_point :raw 0x0000000000002900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000fffffffffffffff80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x000000000000fffffffffdfffffe2e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x30644e72e131a029b85045ac81ec585dffffffffffffffffffffffffffffffffffff7d7dffff7d817f827d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d767d7d7d7d7d7d797d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7f7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d8d7d7d7d7d7d7d7dffffffffffffffffffffff01ffffffffffffffffffffff747d7d7d7d7d7d7d7d7dfd7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7d7dffffffffffffffffffffffff29ffffff0affffff0a - - :label invalid_g1_point :raw 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g1_point :raw 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47000000000000000000000000000000000000000000000000000000000000000000000000ffffff000060bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad0c693395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g1_point :raw 0x25a78fa05de3e5f7c69f35ab209d6595697e8664c3572a57ea0c971fe33532ed0bc38b0a2d9961cf8d392de63be18471ffaaa192111cd8adccc98b7d790b61140000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008013e823575500fffffffffffffffa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x2dec711c75595613e8f7e4723c19f6e69be2ebafe07e965a001f4fa00a41eecc10246180d145035dfe0e334a8e1f4274a189b8dde0b2cc683cddfd9cae9b634b198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffff0f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208d16d87cfd4700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g1_point :raw 0x0a12d3fb2743836bbbb51414a351e5e70429a5de70c0fe7cec084e47d6027709006a8c414196abf21da0b3f6944846c77a1032b519baa1abf125f4f84010c47a250f9cf43675bc1077753c607600f3e51b627a10f3aa68a7e462d89a6bd2a21312ae5d695c4f9792cf70228a1ba07e5e0c2cb47d7aecbae923a84a3734a94ff10bdcd3d0b8e47a925f98bad0184dfe81967aaff8db8f0dfae31afccbcb8c4bd6148dff646f2764243ba9100a930eb7cc8c766b58e0d9953256698da5dbe66cc31f372b78747db898121455853a5672e71977957f134615fd0dd1fab4938b65e7201458c7d8ec49141bd3289f8cc4d19bb52041d51187432579e2e67cab27c847198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa2110e6d9f2378c1c1cd070a3f1507c3aa924a60f67259abe487621b0d3c5c38f0c26130b8aaa54109a5d82fbb2782b9ed461a4b8faa69341ccf652d2f73e188722f1acbb03c4508760c2430af35865e7cdf9f3eb1224504fdcc3708ddb954a482a344fad01c2ed0ed73142ae1752429eaea515c6f3f6b941103cc21c2308e1cb159f15b842ba9c8449aa3268f981010d4c7142e5193473d80b464e964845c3f80efd30ac7b6f8d0d3ccbc2207587c2acbad1532dc0293f0d034cf8258cd428b300710c68e1b8b73a72a289422d2b6f841cc56fe8c51105021c56ae30c3ae1aca0b2ff392a2fc535427ec9b7e1ae1c35a7961986788cf648349190dd92e182f05198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daabebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebefdbebebebeabc689bebebebe43be92be5fbebebebebebebebebebebebebebebebebebebebebebebe9ebebebe2abebebebebebebebebebebebebebebebebebe - - :label invalid_g2_point :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffff0000000000000000ffffffffffffffffffff - - :label invalid_g2_point :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d00e9ff0000000000000000ffffffffffffffffbfffffffffffffffffffa120000000000000fffffffffff7ffffffffffff000000000000000000000000000000000000000000000000000000002d0002ff0000000000000000ffffffffffffffffbfffffffffffffffffffa120000000000000ff007d7d7d7d7d7d7d7d7d7d - - :label invalid_g2_point :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a0294fafba497e1ec6d18c48814a69000000010000000030000000cd71ec682d26313681ea8a1a9a410c862cc44a5d0000000000000000000001158d600a2d8411f2e9bd1a1b51eac64e43b0c511f2e9bd1a1b51eac64e43b0c511fc9ba8b80b727a2c28ee454fc286fd659262c510a3e7f11a4b0e4b74bebafc - - :label invalid_g2_point :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d00e9ff0000000000000000ffffffffffffffffbfb2ffffffffffffffffa120000000000000fffffffffff7ffffffffffff000000000000000000000000000000000000000000000000000000002d0002ff0000000000000000ffffffffffffffffbfffffffffffffffffffa120000000000000ff007d7d7d7d7d7d7d7d7d7d - - :label invalid_g2_point :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f8ffffffffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_point :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffa10000000000ffffffffffffffffffa100000000000000000000000000000000000000000000000000000000000000000016c46ebe0077418d002f28e20236919ad92313729f18578ba8547626478ea52c2b5b688b4d8078d1e1acd7acc7be7f9e0e30812ce2925b35559213646c93237f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_point :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c54d0dc0d9fd4ed005174a42fc3c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077005ed60ba723a2dd3a5fc35520f982963de61e3b563636fe6996cc2c3008035720ad16f835a46faca48c6d39ae00a10d3514e93ae3b946ee2f009ea2dccff97e198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed09068950585ff0759e99ecad6903000000000000000000000000000000002c000000000000000000000085b7aef328c21800deef5e0000aa426a00665e0000aa - - :label invalid_g2_point :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8329a0d6d5e7d14a774c3abff1435361da2ee5d8b4f3ee62085ce779f248b41d4a2fd37ae5468f6a17b7f9a0bcca02ee128bdced61402a566e4eee2d0fa825f03d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g2_point :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa27420cdc335fa81dff303b71cffb0256d7097c2b4c6715ca7b1589ea9386a41c2f851223d6bb1f3e68ddfb08f4c95f590f99227fb681a3b0abdf685cf12bde37d8ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000001f1cd7f247f2ae1ba9a1aeb4b32ed4c8c13c70c8861b6ab5340e276c58e1046b13d7de2b557e0ae2b53380ad596ba79f07c037c9d9aa17cf407e9ed86201436e - - :label invalid_g2_point :raw 0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed95bc4b313370b38ef355acdadcd122975b4b313370b38ef355acdadcd122975b120000c8db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g2_point :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1 - - :label invalid_g2_point :raw 0x2a4f1dbc9fe6d2882462fb11afeae7b7f2a0cf213b1f19c45cb222336283f3801141763c897c9a90e387ea80f68eb88c2d79aab680196d9538cd2ca632a5e81b0e540f5b5be91f82ed05349750761224f543068ce30d2d5e838bf66866f345200fa5ac8c46f725e54505019bda3356ef6e35b0a89b9b4f79bb0c62211235c9312e6d97a1f7e0428fc0be6be02c811095f5166710dcbe869c36a8ef89cac63e012657bbaf3bcfd106dd677eef03172f693a6c919776f441dc0fd47a4bd91d0487225fdab8fe6cd876363d27075cdf0d01c209da61b1634b574a5d811cfae407001216b7c3e2adc07c3bef31771c7bb9e1d02f07ff3a5b74953c4fd5bf9a7a6dff25f63fcc543337b8f6275f97d6479633b921541a96ac1bc2aff2e0905db7407c206776f9480168741eca625c06e5526b4664a02ce664bc656f39664d96278b6e1e40e8084fd648ba315f691e8367be1d4c13844421c87223d84829c31a0d7afe24b8042d4cb604ae66c0dc97ca8a9c2d22c743335d92bc401700f6b00d5cdc5b - - :label invalid_g2_point :raw 0x2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2e8ff2110ede0e189426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g2_point :raw 0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee2459000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000070a77c19a07df2e666ea36f7879462c0a78ebbdf5c70b3dd35d438dc58f0d9d0a2dd5b476a606a8243e7e879bddaa8086ba658087aacc4d986a10c74dd9e7742d46618f9d516e0f07a59d3c97f5e167a1b49ebe9fb30dd05bded8185a545420 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43 - - :label invalid_g2_subgroup :raw 0x0a96696a78e6818da746c504a8b83f7a3faea0dfee0a2c52751f3cfae5fe979b017a319dce2d1976671eddd5b909781c102e5eed5c40db00bdbd19a14397b889198e9393920daef312c20b9f1099ecefa8b45575d349b0a6f04c16d0d58af9001800deef121f1e76426a00665e5c4479674322d4f75edaddde46bd5cd992f6ed05a7a5759338c23ca603c1c4adf979e004c2f3e3c5bad6f07693c59a85d600a922376289c558493c1d6cc413a5f07dcb54526a964e4e687b65a881aa9752faa2 - - :label invalid_g2_subgroup :raw 0x111f95e1632a3624dd29bbc012e6462b7836eb9c80e281b9381e103aebe632372b38b76d492b3af692eb99d03cd8dcfd8a8c3a6e4a161037c42f542af5564c41198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879 - - :label invalid_g2_subgroup :raw 0x17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e75a20b641566a0c71c9069a5256391aa31e22021d36c037c108dfb79c66200bf257ae3d66a589214f980a2ae34f9544be2fcbcc13b21f4c1642f31aa4d200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e75a20b641566a0c71c9069a5256391aa31e22021d36c037c108dfb79c66200bf257ae3d66a589214f980a2ae34f9544be2fcbcc13b21f4c1642f31aa4d20 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000012ab9bb0c853fb1d884197cdefdf654c01a289b677094fe609c835d2b249dcc51460243cc357281001b8b257c6396865c729761ac575a85b2f8f0e58af439c84000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000fb1b0e8c8b85ec99ebedae0880006b0809f5151890cca524eea2c0b3ad87f3229d3e6bc7f0886b75e186b10564dc990258855e0311e3e2e72f9d9c0dfab4f0d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000fb1b0e8c8b85ec99ebedae0880006b0809f5151890cca524eea2c0b3ad87f3229d3e6bc7f0886b75e186b10564dc990258855e0311e3e2e72f9d9c0dfab4f0d - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000114cc34c5044c87540b942287d555ce935499ce155202081ca5ce495c356896009fd9490a6f214b7729f9574d53fce82a2d46b3ccf7499ab5616b2c4f36582d7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000192b7e3a0ca8b63592989fe8b2589465703315272bc730644e72e131a029b85045b68181585d00001b86b77538000000000100000000128a694e7017ae1db6a312c9ef648b1a4910a41e684cb554302044a2065f04680df2d76a91278279cf401d431c31876ee9c8ad35070694552ccbd368755413830000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000192b7e3a0ca8b63592989fe8b2589465703315272bc730644e72e131a029b85045b68181585d00001b86b77538000000000100000000128a694e7017ae1db6a312c9ef648b1a4910a41e684cb554302044a2065f04680df2d76a91278279cf401d431c31876ee9c8ad35070694552ccbd36875541383 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005b000000000045000000002a00000000008000000000000000000130644e72e131a029b65045b68181585d2b0d3025c6abdbaa75ef4d163a7cfd4017c66e1806ece8d631d792f8cbd8bdf7514a9058c183a3b2fcda7e86c44b7752301a6a722cdc812165b619f3cd2b21250d7f7083d0b984fdaf8636202e4ae0470000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d2b0d3025c6ab2eb4fbef4d16d87cfd4000000000005b004500000000000000002a000000000000000000000000000001109beddbaa84026c8f71d34a485af27fe418028129b55b0a0df51e3dba2310021aea54403ce01876467152aa79ca1f227b6b1e0f95b56cb0537583190252556d - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c54d5dc0d9fd4eda4742fc35100c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c549feddc0dd0d4005174a42fc3c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077 - - :label invalid_g2_subgroup :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ea1146af1a0c4df0000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000015d42e5a1c18703100bef65a743007bead1fc389b7d8f0a8ccda34b7d30620cb1c4156d243211b733af4f4fff11b9c0928308bf3c3102415e3105b986166d0cd00000000000000000000000000000000000000000000f8ffffffffffffff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000249409822e0000000000000000000000000000000000000001154baf30644e72e131a029b85045b66ac4175696816a916871ca8d3c208c161a46c432126f44fab27034ba2832173059ebf31a96607ada20f006b4f12d4a8bad410d8f02eee77897359cfc599b6ca4e8c2a47f641fc0cd6d4146d8eca263a85c7aa36500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g2_subgroup :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb431a3cf0c503b2dbc6e1b0f8aea605de20d8612fe14627c6f4d3706f8272a1cf842a0bb098018ca4392a1ddc08b9605602aed954308944ac729e2f99bfdd0166dd0000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000024b364d16400886c82900af060fd117cb2f4e0b93590cbf6ec34ed97f4c391ec26a10e3233aeff776d578de9178a9b7bb919e6eb6cf2cf924eb16ec8dc659af9 - - :label invalid_g2_subgroup :raw 0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b05040ff00000000000000000000000000000000000000002e00d573b028b22b9d347da8044a53c94b6c3aee7d9bfb00ab2c0a10eb4775e619e1a75be1c5d39a105504a0e5d16c949524742dde6bbb6e831668fef921a1430000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b050ffffffff585d97816a86b77537dafbef4d16d87cfd4500000000005b00450000f400000000002a00647d903b504c1a020000000000012db3d49da56012cf4f73cbf19fdb59ef41356cebb4f4b6f692f9a38fb282a9ff2d96db5d24dcea418a44feae6052fbc7788e65e521b17232666818386252176a - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000107b55de1642362d16b8f25dccf30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d800000009eae594f627b7ccf496d680f0266e7364f51d2d99ccd69801f29137d889e1e006ea1409d3f9bb38bd40e8da0701d122e059a02fc3c3c4a99a8cbf6e4290bdc0000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450000000000000000000000000000000000000107b55de1642362d16b8f25dccf30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d800000009eae594f627b7ccf496d680f0266e7364f51d2d99ccd69801f29137d889e1e006ea1409d3f9bb38bd40e8da0701d122e059a02fc3c3c4a99a8cbf6e4290bdc0 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b00450000000000da76b36b83c72830000000000000000000000830644e72e131a029b85045b68181585d97816a916871ca8d104d5b2baf5734631b8765e7f5163862fcd3bc29f751af42d869a0c8a329f5a53472d3c977038bb7068cd6bc298bd1ec695a49e1db0620332f26e03a4a0ed9076973c1fea43099f2000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b00450000fc00000000002a00647d903b504c1a0200000000000130644e72e131a029b85045b68181585d97816a86b77537dafbef4d16d87cfd450125b8edede9e4f320e4dbfd7ee46d23a82508c3b44dbb99cb29724daaa5c5602d663cc48c6d7469cc9df0e861f3a9b93239af8001f8ecf28b4572f201ef1369000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a00647d903b504c1a02000000000001247f1f6fbf2fe1fff7e28d816724080774979f57692c2fa8569ea1a3ce52dfc51f5c96f77d84ae24b701a32ff1b8d95b982c76bf5ab02e605c9ba4fa9f45b958 - - :label invalid_g2_subgroup :raw 0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002012cd187faae3648a35e12cc197ddb26d9d3a44a625d97816a86b77537dafbef30644e72e131a029b050ffffffff5802086325c1129ad4a34ebb48ee9634016008aef33d9388c8f993f0af340e047c1c9519d222062186f7b025291b6f6f4ef2293f1064b0e3345895dc4968bc8bb52fcbe960621c1f15cd7c693c7347078e32000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45012cd187faae3648a35e12cc197ddb26d9d3a44a625d97816a86b77537dafbef30644e72e131a029b050ffffffff5802086325c1129ad4a34ebb48ee9634016008aef33d9388c8f993f0af340e047c1c9519d222062186f7b025291b6f6f4ef2293f1064b0e3345895dc4968bc8bb52fcbe960621c1f15cd7c693c7347078e32 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b05045b68181585d97816a86b77537dafbef4d16d87cfd4500000000005b00450000fc00000000002a00647d903b504c1a020000000000012c32d7465b0607cfaebe0b13577b25e42fe6d9e49eeb9d5c0ca78cc17e114cbc2cd71c8288ebbd272a784c5b4921128cb68e9e2ddaaec0595b266126c4e526bd000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b05045b68181585d97816a86b77537dafbef4d16d87cfd4500000000005b00450000fc00000000002a00647d903b504c1a020000000000012c32d7465b0607cfaebe0b13577b25e42fe6d9e49eeb9d5c0ca78cc17e114cbc2cd71c8288ebbd272a784c5b4921128cb68e9e2ddaaec0595b266126c4e526bd - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a000000000000000000000000000001124ca5dc43ed1e22d1c616b50a7d4249a012c1d65330ae8e4cad70567c8231bb23f9415fa570e58e0ac61e4e6e7a6bd02a564f6b206a9d4645401b1d677bf3ab000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a000000000000000000000000000001124ca5dc43ed1e22d1c616b50a7d4249a012c1d65330ae8e4cad70567c8231bb23f9415fa570e58e0ac61e4e6e7a6bd02a564f6b206a9d4645401b1d677bf3ab - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a00647d903b504c1a02000000000001247f1f6fbf2fe1fff7e28d816724080774979f57692c2fa8569ea1a3ce52dfc51f5c96f77d84ae24b701a32ff1b8d95b982c76bf5ab02e605c9ba4fa9f45b958000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a86b77538dafbef4d16d87cfd4500000000005b004500000000000000002a00647d903b504c1a02000000000001247f1f6fbf2fe1fff7e28d816724080774979f57692c2fa8569ea1a3ce52dfc51f5c96f77d84ae24b701a32ff1b8d95b982c76bf5ab02e605c9ba4fa9f45b958 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a916871ca8d30140b193f92396c00000000005b0045000000000000000000000000000000080000000000000001301a8b8043356b83c4341d5e9cfc67071c61c0b053ec979b59ad8c0455b71c9815f88e8c709168c1ab898ca5288423b585331497f16b2c074dcbf76c2480e8c9000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d30140b193f92396c00000000005b0045000000000000000000000000000000080000000000000001301a8b8043356b83c4341d5e9cfc67071c61c0b053ec979b59ad8c0455b71c9815f88e8c709168c1ab898ca5288423b585331497f16b2c074dcbf76c2480e8c9 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd452b0d3f819fd0046aee4d0e54cc759ad714c473bd5f86a0d68df977f7450390f730644e72e131a029b85045ae0000000000000107b55de1642362d16b8fc4dccf2a5c3a27c4a417ea34f627b9481b9004e3b0ef59619daa16e846d8a152d6bf771301a8bb9c71966a4b557a21eea89447294e8a9cc1308f0c8eecb16dfbf5d53b000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd0000000000005b0045000000000000000000000000000000000000000000000001112006831f3f0e121585c21cdf0aaf63f09728bcfee141bb4cd407caae7715e319df1e217ad7b1f874726c6683ab87b423c1737f46a54dc5356a9b617c6b9e28000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1 - - :label invalid_g2_subgroup :raw 0x003db26a0b244fb3fd47f7f5f0f8a289e088fd932d340f0592696503fc62124824c9b9423ef04336563adc35604ba729a4c9e6104bfcb55517e3198b8edbdf981800deef121f1e76426a00665e5c4479674322d4f75edaddde46bd5cd992f6ed198e9393920d483a7260bfb731dd5d25f1aa493335a9e71297e485b7aef312c20b9f1099ecefa8b45575d349b0a6f04c16d0d58af9007f2c6d8bd7aa763a3b0e0b7c77862fe8d10d489a493a1a5c5d0f282c7d4e8148f340653c4b6297a1088f003db26a0b244fb3fd47f7f5f0f8a289e088fd932d340f0592696503fc62124824c9b9423ef04336563adc35604ba729a4c9e6104bfcb55517e3198b8edbdf98198e9393920d483a7260bfb731dd5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed2ba3e0cab22efbfef96e027f1a29ba7ec11a0f824024a3787d3cb8370b9eed71103ce48dac2e3ff691b61c7e4466adf35aa183aade7f15386bf7c789628b1b0e - - :label invalid_g2_subgroup :raw 0x0d1e4322f03fa0515f8ed6cb02b15e5a024b5092003dd7792d2ac055f14ac67d155c53a1daa56e3a5e9bd097cebfcd44038f2c606c8951310aae0ea01a44725300000000000000279573fbfe8e6c2300000000000030640472e131a029b85045255495ffba02a0ed6877a0a6ed4684235053c04cc3aaa05934e35bbb953673af0e1cec4c9d6d3921992e4c5c71523f5d097cde90f25b3e6c52c9c63e764a67870fe0cfe24e0b2f78d4f909c9131e3794fa911b1109df4a567b1423475cf409c1000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4700000000000000000000000000000000000000fcff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000212a3b4059e59d125dd17f662945170e1e13024fae97a401895690acac63cf681aecb67409d1d9c142ffd13375bd79fd0457deb278dfa91b5756378fb837fd60 - - :label invalid_g2_subgroup :raw 0x0e474956b0fbc11ba65f3c7632afb3c66a98340871cee7c974db4461d8791b8d25410e545457af7bb0e9d2f1f8126180f11dec9bfcf69cd2934e6814741c9aa2231e75fddf7e2fa8b38b7dd6fd13eb4b7046000000000000000000000200650000000000000000000000000000000000000000000000002546ac8393e836a2970d312fc0ac642c207b5b36e17990b4f7d0ef39cfe6f0d46b9c556a0b7935714b1e4cd9fd726048138dcdea456203d4b7414f3ba5ef7b37817aa98874d71c191f2e5efcb149c6a4914b8d85be71e79254f9fdf19f62de2b2f6cc0822e578a420f07fd874051cb395ca999e596047a25fc6bc12cba97dab578f9f903612c1c757f198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g2_subgroup :raw 0x102c9afaa6ac9d2553d0f47e2a945816f56b10014ddcc00ef63f5cda3d1431020db583622c614b32310911623e2f71f7871413d13dc372ace97f1813d2622d590a0e124cd6005b33c8a16492b1b451897b1679f44f3d288585ec8f82b49f6f501579cd1aa3fb1bf108c6b7b5d1f4ae1fae44099a8bf5fddc74d87665e29812ba0d5db514ca1c318cc409bcbf9a75055b1a8e7b783127734d902b6118b518ee962f24a2abda945e843c6952a5f0632365146cfd4e2034b70e41a78772fc404bea102c9afaa6ac9d2553d0f47e2a945816f56b10014ddcc00ef63f5cda3d14310222aecb10b4d054f7874734544351e666106d56c02aae57e052a17403061acfee0a0e124cd6005b33c8a16492b1b451897b1679f44f3d288585ec8f82b49f6f501579cd1aa3fb1bf108c6b7b5d1f4ae1fae44099a8bf5fddc74d87665e29812ba0d5db514ca1c318cc409bcbf9a75055b1a8e7b783127734d902b6118b518ee962f24a2abda945e843c6952a5f0632365146cfd4e2034b70e41a78772fc404bea - - :label invalid_g2_subgroup :raw 0x11c8f0ea735e099781f852fb93256540c7c7611ba324f67680f3dbfc00bbdda12d7fb8d83e13afa4ea8a9d8817cd5b7c5b1804aa1006af2a8ab7e9c7757b300c040000002db3759aaff5357156bc2e8d52eacd11efb7d108d3b4034162839a9300000000003000000000000000000000000000000000000000000031000000000649ebc27a3909e089c6023c7ed952098a3e5547ce56e79953929ba4d718f1311c2c7e752e7947b506c14a8300a0d15d9022bd6fba67461cc8a0783dfeba77fb11c8f0ea735e099781f852fb93256540c7c7611ba324f67680f3dbfc00bbdda102e4959aa31df084cdc5a82e69b3fce13c6965e7586b1b62b168a24f6301cd3b040000002db3759aaff5357156bc2e8d52eacd11efb7d108d3b4034162839a9300000000003000000000000000000000000000000000000000000031000000000649ebc27a3909e089c6023c7ed952098a3e5547ce56e79953929ba4d718f1311c2c7e752e7947b506c14a8300a0d15d9022bd6fba67461cc8a0783dfeba77fb - - :label invalid_g2_subgroup :raw 0x12ca97e893996e5bb392c57abba4578276654d2856b336b640eafd84de31140e055370544625ea3c3e85a42831dcaf47353695b158149bc2d5bf4061326f089e0e80426227ce5fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9000000000000000000000000000000000000000000000000000000c451f8749a05602fde384569be9950c3466d0fb40a66a63f202c3a685856cd21c76cea2be70ed4f367e657bc59c785bf6bf6ac33fb4b653e8bd68d1d838e0416e8c47b5f5312ca97e893996e5bb392c57abba4578276654d2856b336b640eafd84de31140e2b10de1e9b0bb5ed79caa18e4fa4a916624ad4e0105d2eca66614bb5a60df4a90e80426227ce5fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9000000000000000000000000000000000000000000000000000000c451f8749a05602fde384569be9950c3466d0fb40a66a63f202c3a685856cd21c76cea2be70ed4f367e657bc59c785bf6bf6ac33fb4b653e8bd68d1d838e0416e8c47b5f53 - - :label invalid_g2_subgroup :raw 0x1425b11b4fe47a394dbfc0ad3e99dc93c3e1c0980b9bcb68529ba9de33dbf585168b8cdff7ae7d084fd111608fa03e018b415fd4f0755f7e8f039a2d852bda0e0000000000000000000000000000000000000000000000000000000000005b00149bb18d1ece5fd647afba497e7ea7a2687e956e978e3072c4fc9ec579b809462061ebaffaedc532d8bb542f9d93cae5dc6c4b431833ee0a7be4d053e2e0d60d03c12e282e4442c88f5235d004e8edba3080754ca41c976d03cd332a9b6fa42d1425b11b4fe47a394dbfc0ad3e99dc93c3e1c0980b9bcb68529ba9de33dbf58519d8c192e9832321687f3455f1e11a5c0c400abc77fc6b0ead1cf1e953512339149bb18d1ece5fd647afba497e7ea7a2687e956e978e3572c4fc9ec579b809460000000000000000000000000000000000000000000000000000000000005b0029e864b516b661105d0a2708f21beaae1bf1636608ac53864c4d8f0ea2e7dc3805c3b957caa8f4c5f248e3e6e754304e9ba7e5b6dd3a4ece125f47811a525e65 - - :label invalid_g2_subgroup :raw 0x1565586940bbb0e082639a1e2c9ecfe96bff6cbda25a93c4d462b8360230067219767d96dd90432f459bf8f6181c9fea507bf7bcd4063fd070fe8e72093e8bf900000000000000000000000000000000000000000000000000000000000000e8000000000000000000000000000000000000000000000000000000000000000023812d70e97cfd777c5cf0b64b18400f3ea88afb56146bfc1f34071eebb0599827352c710f0e1711b5d18e672b5cab3c369cd8d84b70ed159bb712c7d929c8e51565586940bbb0e082639a1e2c9ecfe96bff6cbda25a93c4d462b8360230067216edd0dc03a15cfa72b44cc06964b873470572d4946b8abccb21fda4cf3e714e252b5ec0e7df7df26d0cc46dd811ace847a4174aa634c8d9269ccebb52845d7829a0fe67466554bc0a6c97089dec1ebac672344bc3a69b8fc6904f9b83438cbb24c159cda85a7f7e04f7e128101e8fbe502fee784946ffce0a9174424f0254b22b0c8ac28082e97eae5ee175ae2c1a6e466c7dd693238a386ec80f7743ffc517 - - :label invalid_g2_subgroup :raw 0x17ac723d48c98fce706845b61c254630acb6da96a9620fc6cd07276a4ef8936d1a515b7e403d2a46bb5387138f17d33c2b12e3d5051f9d22042921f35031035e000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002d8ad25dc006eea79b9c052a6a367b209d5c9215c8a4c325555a7e1e608abed022dd54ed23382326a8df674c7be35d7ac181c9625a10f508dd7fbd109760d76217ac723d48c98fce706845b61c254630acb6da96a9620fc6cd07276a4ef8936d1612f2f4a0f475e2fcfcbea2f26985216c6e86bc63522d6b37f76a23884bf9e9062ca96b10a86be7bc151a74e01170193f2ad046c2f5eb3a25a95592cc3a17752043c18fe0a47868239575b1c3700be7308890370eb6982f4e3e36916ebc28f52b7d22180be2bdca69028c5bf32181d203b2350781d675098b320766f5dcd9b02a21aa3010f604fea531e9264671d546cc94d8a0ddab42b7146573f5c1ed26fb - - :label invalid_g2_subgroup :raw 0x1c4189bbfe590521da71e6834b73a622528fd923e9421f18df9a48e9123b16aa15c8e4948927f2e089accb33c8d51b4c83ca69505f4a7801399573273d7439910000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800023ad956e40f22f18bf59310f6d23055f2a3fdc2713f05cf1b099a18041cd498220b15bb64c3c6223098439e4fc7e9b2bd956ed94b2bf1f066c281d41c8560ee51c4189bbfe590521da71e6834b73a622528fd923e9421f18df9a48e9123b16aa1a9b69de5809ad492ea37a82b8ac3d1113b701410927528c028b18ef9b08c3b60000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800023ad956e40f22f18bf59310f6d23055f2a3fdc2713f05cf1b099a18041cd498220b15bb64c3c6223098439e4fc7e9b2bd956ed94b2bf1f066c281d41c8560ee5 - - :label invalid_g2_subgroup :raw 0x1c934d642c245e76eb0c016b17e8eced3a1cf56ef6d787eace40bc0cb933dea902567d6e1141f67673e6f17a705f3d9764c6d5673f1f93e2ed5a21fd38e9a572000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007700000000000000000000001f3953d0d836a44e15aebef16dd187ccf9493693379fe7d1c5a2cf2deb87f89c0dd737c063475fc587c1574a8ff4e9e4f933118d67bb7ba4a70c79c1ccb0d3441c934d642c245e76eb0c016b17e8eced3a1cf56ef6d787eace40bc0cb933dea92e0dd104cfefa9b34469543c11221ac632ba952a295236aa4ec66a199f9357d5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007700000000000000000000001f3953d0d836a44e15aebef16dd187ccf9493693379fe7d1c5a2cf2deb87f89c0dd737c063475fc587c1574a8ff4e9e4f933118d67bb7ba4a70c79c1ccb0d344 - - :label invalid_g2_subgroup :raw 0x1ced814234531c29aa14f95e3a3f59657aacea69fa4c35dfa5b8e03c87e8075725c3327a2c4f61437d53abbb2bb75dc1dc4f2427c3e9d7714d5d83dae80697690ec85b4f8a9224b27145b3757b7bf6e7397bc04c8634404d924689e27bb8a261000000000000000000000000000000000000000000000000000000000000bf890e717255b589c7286f7bde23fe6ac9d838262d9e7ba5bc603e410abf27aada5b1760bbdb5183ae4e28f049cfe75fb9600b8fd03e63d9aa1a9bd709d23afbc12f1ced814234531c29aa14f95e3a3f59657aacea69fa4c35dfa5b8e03c87e807570aa11bf8b4e23ee63afc99fb55c9fa9bbb324669a487f31beec3083bf07665de0ec85b4f8a9224b27145b3757b7bf6e7397bc04c8634404d924689e27bb8a261000000000000000000000000000000000000000000000000000000000000bf890e717255b589c7286f7bde23fe6ac9d838262d9e7ba5bc603e410abf27aada5b1760bbdb5183ae4e28f049cfe75fb9600b8fd03e63d9aa1a9bd709d23afbc12f - - :label invalid_g2_subgroup :raw 0x1f9d02fa71d0ae244edc79709af68216d99a978a5e8fd92ebe793fff8317aad42cd6a493d88a0a87a6f6818c23fa87ff12fd84e5641e1081e849f6e88a488a4304bb53b8977e5f92a0bc372742c48309445cd3cfa9a62aee49f8130962b4b3b9203e205db4f19b37b60121b83a7333706db86431c6d835849957edf0509de1521f544b5e4ab6d13dcb7e89582aaee12a8410a7c6b2d8a5de7bd83e8cdb1fb1a82baef43e095caaf7c2aca272aee277d1da98d74656f2ca01b833c67dcc08ca5d000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1 - - :label invalid_g2_subgroup :raw 0x225fdab8fe6cd876363d27075cdf0d01c209da61b1634b574a5d811cfae407001216b7c3e2adc07c3bef31771c7bb9e1d02f07ff3a5b74953c4fd5bf9a7a6dff25f63fcc543337b8f6275f97d6479633b921541a96e0f2acaf901bc25db7407c206776f9480168741eca625c06e5526b4664a02ce664bc656f39664d96278b6e1e40e8084fd648ba315f691e8367be1d4c13844421c87223d84829c31a0d7afe24b8042d4cb604ae66c0dc97ca8a9c2d22c743335d92bc401700f6b00d5cdc5b2a4f1dbc9fe6d2882462fb11afeae7b7f2a0cf213b1f19c45cb222336283f3801141763c897c9a90e387ea80f68eb88c2d79aab680196d9538cd2ca632a5e81b0e540f5b5be91f82ed05349750761224f543068ce30d2d5e838bf66866f345200fa5ac8c46f725e54505019bda3356ef6e35b0a89b9b4f79bb0c62211235c9312e6d97a1f7e0428fc0be6be02c811095f5166710dcbe869c36a8ef89cac63e012657bbaf3bcfd106dd677eef03172f693a6c919776f441dc0fd47a4bd91d0487 - - :label invalid_g2_subgroup :raw 0x22847a3cd1cb28b60a51b54991d6dd86d206aa12b3873942c45a120b2e63a49226c3889c7b08d9288f13f64e6e3f166c59f57b5c014cbecf815a4aba4ebabbfb2e91f2b0f4f7a42c870fe8f6236ec1042bdeb2586a641808a5e09019514e83a02b078a1f12cb5426b6bcfeb9548566afb4bdf7454190eaf97f63e210f3a94ce1008a9ede8dde2c849793027433d90c626bc326bdc248dc223f537f7152955dac00b319b7060ad49091d9b52015b4ae8085bf6739b7f5a2c098c2f113ff33806a22847a3cd1cb28b60a51b54991d6dd86d206aa12b3873942c45a120b2e63a49226c3889c7b08d9288f13f64e6e3f166c59f57b5c014cbecf815a4aba4ebabbfb2e91f2b0f4f7a42c870fe8f6236ec1042bdeb2586a641808a5e09019514e83a02b078a1f12cb5426b6bcfeb9548566afb4bdf7454190eaf97f63e210f3a94ce1008a9ede8dde2c849793027433d90c626bc326bdc248dc223f537f7152955dac00b319b7060ad49091d9b52015b4ae8085bf6739b7f5a2c098c2f113ff33806a - - :label invalid_g2_subgroup :raw 0x26581613e6c802822867d2b3a0867fd7fd8cea503764ae1a9d01ec0d5364d1be0530ae3d4fe87ac76da4382835135ac0aec9b1ecd0705cf84c21b48327eade5407a13e1be6f9072893c0e5bb528c5cc22dd6370308dda1613068e064c6e5d15a067239c795d2ea27b85d93e54fc221d81e9de3ebc8e43c20d63608e7078fab6822fa7ea234e21aec74f4db0b365ae1e7cc6e7f4aac89bc460d0308b83399be8627705b19388ebeddbd35a5ce72830ec07e3f1bca3f4e9fdc0aebaab5a1fe91b126581613e6c802822867d2b3a0867fd7fd8cea503764ae1a9d01ec0d5364d1be2b33a035914925624aac0d8e4c6dfd9ce8b7b8a498016d94effed793b0921ef307a13e1be6f9072893c0e5bb528c5cc22dd6370308dda1613068e064c6e5d15a067239c795d2ea27b85d93e54fc221d81e9de3ebc8e43c20d63608e7078fab6822fa7ea234e21aec74f4db0b365ae1e7cc6e7f4aac89bc460d0308b83399be8627705b19388ebeddbd35a5ce72830ec07e3f1bca3f4e9fdc0aebaab5a1fe91b1 - - :label invalid_g2_subgroup :raw 0x28100e22df4dc1c6bf8801f63ffdef2af6bfb80147994395be6dc792479ca4f517414e05ac69d56dec03e0af314645b463414a7d831aff54459b6d409351a5a400002851fd14fbaa7fd586e3039a2d9fa136c42685cb2b5904bf0591b95b52fc000000000000000000000000000000000000000000000000000000000000000024d852a54e2d52ffc43b2e4f1993fd159ae7ec19af2f3ad548f6daa33bd0de310b0fabbc2f33ea444e5f3c92269f11fc30c048463973a914a6787dbd616e703e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g2_subgroup :raw 0x299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a2bedf30ba7d8bd0814e9d091913ea5bc6a4b60ee993e949507832df60190651900000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a04765b673958e321a3667524f042b2a12d3609a2cf3335f8349d5e20d6ec982e00000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b - - :label invalid_g2_subgroup :raw 0x2deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b500000000000000000000000000ff0a69a42c284614e3d7de26b3f9b2f3c71ff600000000000000000000000000000000000000000000000000000000000000001e2c7f9d6a525b6af5dad683c5e6408661da29780860c3209b2dddcad5a88795033123665850406fc2428227bbb3509fc71c911cf41623de1605cd3e0a281b902deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff95 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f - - :label invalid_g2_subgroup :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b004500000000000000000000000000000000000000000000000830644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d81702c919c023ce224a0c0b121dd4f578b39e0ddf00a55580b03265cb32fcb623bbf778240f6bf16b9a25500a02b09fbe8abfa933f9ee09effb104d712baf573463ef8c000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000830644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d81702c919c023ce224a0c0b121dd4f578b39e0ddf00a55580b03265cb32fcb623bbf778240f6bf16b9a25500a02b09fbe8abfa933f9ee09effb104d712baf573463ef8c000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd450d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000230644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa2742 - - :label invalid_g2_subgroup :raw 0x0272af94b7aeb772c1666db65ff3987fd8ec43b8454aad395232b5eef18ca2c51d5fc6b50ef577096ec2489356e8ecccd5ed5a144928c5338af5549701dbb40d255495ffba02a0ed6877a0a6ed658c93a1487a3319aaa05934e35bbb953673af00000000000000279573fbfe8e6c2300000000000030640472e131a029b85045090d17c2eaeda0d61dd0442997d161e176fb98a27091fe8b6b5746fe2f344a0f26f1f16556d24506af1fd1c8cb4b3b6dfa73e2ce958c50e3b937fd59a1df623f0272af94b7aeb772c1666db65ff3987fd8ec43b8454aad395232b5eef18ca2c5130487bdd23c2920498dfd232a986b90c194107d1f490559b12b377fd6a1493a255495ffba02a0ed6877a0a6ed658c93a1487a3319aaa05934e35bbb953673af00000000000000279573fbfe8e6c2300000000000030640472e131a029b85045090d17c2eaeda0d61dd0442997d161e176fb98a27091fe8b6b5746fe2f344a0f26f1f16556d24506af1fd1c8cb4b3b6dfa73e2ce958c50e3b937fd59a1df623f000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4700000000000000000000000000000000000000fcff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000212a3b4059e59d125dd17f662945170e1e13024fae97a401895690acac63cf681aecb67409d1d9c142ffd13375bd79fd0457deb278dfa91b5756378fb837fd60 - - :label invalid_g2_subgroup :raw 0x17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a - - :label invalid_g2_subgroup :raw 0x1bbefdb0536c0996d663a908adc2cae17180c53d971e73fe234a6927cd10da332481152785517c274b2dc4ab7b6cacbbdc7d7b8e4dd396faa05a119761130e5c039a49879c785fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9194b9757129492217d64c4b267e5e935137ae3859ec8b99cf6e6dc61ca90bdfd1c67b6b637c528053a25079e25734a67ffc5388209d11839b3ff1f92591c81ee09750d9bc6fdb71f16e6a69eea50e7288aac1c25a5cd674ca9c57d8ac06fac691bbefdb0536c0996d663a908adc2cae17180c53d971e73fe234a6927cd10da330be3394b5be024026d22810b0614aba1bb03ef031a9e33929bc67a7f7769eeeb039a49879c785fd647afba497e7ea7a2687e956e978e3572c3df73e9278302b9194b9757129492217d64c4b267e5e935137ae3859ec8b99cf6e6dc61ca90bdfd1c67b6b637c528053a25079e25734a67ffc5388209d11839b3ff1f92591c81ee09750d9bc6fdb71f16e6a69eea50e7288aac1c25a5cd674ca9c57d8ac06fac6929a0d6d5e7d14a774c3abff1435361da2ee5d8b4f3ee62085ce779f248b41d4a2fd37ae5468f6a17b7f9a0bcca02ee128bdced61402a566e4eee2d0fa825f03d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa - - :label invalid_g2_subgroup :raw 0x299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a2bedf30ba7d8bd0814e9d091913ea5bc6a4b60ee993e949507832df60190651900000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a04765b673958e321a3667524f042b2a12d3609a2cf3335f8349d5e20d6ec982e00000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b299a5917adb7b45c30cea045edaa623f5036280df176f4a2c751ca728c2c9e3a2bedf30ba7d8bd0814e9d091913ea5bc6a4b60ee993e949507832df60190651900000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000213d689af09b7f52ac4a04c34bcdb2f90521b1cd213edcfe48fa3063520b6be22ef0f3110ea3051248e907221493e6c2943ebe8d70794188a515ec23df5d9b2b - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080a77c09a07dfaf666ea36f7879462c0a78eb28f5c70b5ed35d438dc58f0d9d058bcabf53ccb1b6f2ad14e6bc531485dba856600b7941c8c5a4968940fba978210dc371bfd9736eb879d25be8a799eff45bea91130b9b2768689786235accd9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e7500000000000000000000000000000000000000000000000000000000000000000a535bc14c0f581a039d0bfb15e730b6bbb3d6e33ecda8c74ebd901deeb4ef8423e99eadcc72ced9221df2db154b36f6931270c3f21f4ec8c4206b9211924bb203a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e3580517e54f1fff192038a907711c8123997f785d2c2c9a214355466b60652ee53e4d00c662006274fb346e22eeb59635c82cb4e20e34da7230644e72e131c82cb4e2000000104e75a20b64000000000000000000150000000000000000006629c731270ef2ea6f8c3dad3832f95f309cb6a1591ad53af025c6e0809992f15234e5fe1b37771ce3bb5a62017c56c496e57673e2617634e900c587724d21f24e603a6303a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e35805187eff52e2187ff10f48d49a005dbede1f243e64ce508737f5b52bb1a997befa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bf0000000000000000001284bdd8e69832b232222d3493a6abb523575be2a5af6e88f5501cef408aa5bb0ca4d5b3c58e0bc7be2c8885e53c673b54f3057cff97cb1020cb2f5a9f61affb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005908648c919b2bd65122716e5e4aa74fb342e22eeb59635c84bb4e20e34da7230644e72e131a0296427b6542e3a6a00ccfa1d43577c305499096bbd8414f16c0df67cf39cb400a898e9aa727937ca9e07d92185f3fba6aa42be45ddad4fdadb145da376a6ec6d77185df39edde6e9037e58065a054cda2796f4e669bcdcbf1f - - :label invalid_g2_subgroup :raw 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b92493387900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a8305b993046905746641a19b500ebbbd30cf0068a845bfbee9de55b8fe57d1dee8243ef33537f73ef4ace4279d86344d93a5dc8c20c69045865c0fa3b924933879 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a0290000000000000000000000000000000040000000000000000001000000000000000000000000000000000000000017f66b9111253405000006f2a18a982e6e9436f171f8bcdb4f60b9ea1dafaf115f9228e11ddd98ca9680304502b9c299712d0cf851e73adc8ce68c549a5b2ae712a44811db357d3bdb9717956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a17956b549321b92c524d191a62b90c81f08e694af4dceb00a80094e53120d39e2fd15d78815388959caa54affa2d7b2c8d52c528e6a1f6c0a50fcf0498fac7ee30644e72e131a0290000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000016b9e28a32ee61a7ad5bd4bad29d64fc35a8fb46b510be2067907069497ae1f0c3c07c40f41a731fe27d953f1154b4e9a8acf3ef44608817150de0df916503a - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d977f9597358c206e72c88c16e622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2a314eca6adb97bf3a3872a406ecf97bf2bdd210b6cba667eba043f71c1ffc200ba9caa5888ae7c0e6d2b54181905e66769d9ed9badc43da3d9f3e56b46cb43b0acfd59a153bdc736907cc4a640a2fb675cdaa8066a58616537ce4cd7145aa061b1d6bf901bda3c5e3df60e3741d6f5d6660f4034e2f99545e0dc71e9b53af2c30644e72e131a029b85045b68181585d977f956e978c3572c8208c166622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2ad9bb009c15bdc11d5ed75a805d5f24ba0e10e5b7953e281e241f72d208ce880d6f072450fd6ef76dd73ff2924238cbee09ea4c6281b867a897d85d8d091b330acfd59a153bdc736907cc4a640a2fb675cdaa8066a58616537ce4cd7145aa061b1d6bf901bda3c5e3df60e3741d6f5d6660f4034e2f99545e0dc71e9b53af2c30644e72e131a029b85045b68181585d977f956e978c3572c8208c166622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2ad9bb009c15bdc11d5ed75a805d5f24ba0e10e5b7953e281e241f72d208ce880d6f072450fd6ef76dd73ff2924238cbee09ea4c6281b867a897d85d8d091b330acfd59a153bdc736907cc4a640a2fb675cdaa8066a58616537ce4cd7145aa061546e279df73fc63d470e4d30d63e9003120768e1a423138de12c4f83d294e1b30644e72e131a029b85045b68181585d977f956e978c3572c8208c166622b8b2000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2ad9bb009c15bdc11d5ed75a805d5f24ba0e10e5b7953e281e241f72d208ce880d6f072450fd6ef76dd73ff2924238cbee09ea4c6281b867a897d85d8d091b33 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb431a5d389ca17607c4b12d7f1c8463b960754dbbb74ee00f645ca559f5ee759ad5231fdb414002b25ebeed48fd799214f4db09a7dae25ac92c15b7e429e1800a70297861ced3673fa135f178751f203f13d8a4c9f15ad9fdbb4bb7468154af97f71698710af2efbde1687bc1530e7da2ca42c8e85baf594682890d36c8fb8d08f9106f1d083223bd63d1630baf008588ac9c0392c289c68afee37b013030a9f7d10128036f1a405f40bce08bc346f0f83cb8ca2fe81d18fdfffa984c97cef373580000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb431c251d57a884434484d488b3fa5bb0b0d8566a251bfa57cdcfa452ee114a19601bcd6dec5e0b17fb9bb77b1145793cd6a99534de85911f41c37934fc6f1f508e203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c15393157ad3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000005b004500000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45218c0cef2a606613357bfaa3c880e71ff8490195337fa26205a21ccd9a6949a313fed2c79add9d85b9949c5852ef8cccf02b69ea6fc4db0d1660ac7b50df39e1 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb430000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4500000000000000000000000000000000000000000000000000000000000000020833e47a2eaa8bbe12d33b2da1a4fa8d763f5c567fe0da6c5c9da2e246f2096f28dc125bf7443bc1826c69fe4c7bf30c26ec60882350e784c4848c822726eb43 - - :label invalid_g2_subgroup :raw 0x01ea6e2eae2a2501d6830a3f5ea1353a5f920719aaeeea537dde0df31bec7a802b40433b22aaaec8f6d6d21dc04994ab99ba4a4b16545f63430a6ecf01881e090000000004000000000000000000000000000000000000000000000000000000196ec634c6397f591ebee925f9fa9e89a1fa55ba5e38d5cb0f7dcfa49e0c0ae4260377b5b8fed1c2f2a2f848038464ffc8c3bd1d71844fcc85f64b478248b21d0990a17d0f06d3bb026b17967cc55b2160d7570fde6a448502bd28e8192db67e01ea6e2eae2a2501d6830a3f5ea1353a5f920719aaeeea537dde0df31bec7a8005240b37be86f160c1797398c137c3b1fdc72046521d6b29f9161d47d6f4df3e0000000004000000000000000000000000000000000000000000000000000000196ec634c6397f591ebee925f9fa9e89a1fa55ba5e38d5cb0f7dcfa49e0c0ae4260377b5b8fed1c2f2a2f848038464ffc8c3bd1d71844fcc85f64b478248b21d0990a17d0f06d3bb026b17967cc55b2160d7570fde6a448502bd28e8192db67e000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020d7d3be95c6b1fc7d70f2edc7b7bf6e7397bc04bc6aaa0584b9e5bbc064de4fa30644e72e131a029b85045b68181585d97816a9168543fedb0d3f28c77685fdb10fb4e584f10053cba1117d920db188f54d1ab64e66e10b6177401a44c71e25020f50c6423205b18d96cdf7a832041d89076cf36dcde6700e62833186acd60b6 - - :label invalid_g2_subgroup :raw 0x03a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e35805187eff52e2187ff10f48d49a005dbede1f243e64ce508737f5b52bb1a997befa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bf0000000000000000001284bdd8e69832b232222d3493a6abb523575be2a5af6e88f5501cef408aa5bb0ca4d5b3c58e0bc7be2c8885e53c673b54f3057cff97cb1020cb2f5a9f61affb03a99966a8db46602ac05b8f0d7669c3bc066fb7b9a188cc79e5239e27e3580517e54f1fff192038a907711c8123997f785d2c2c9a214355466b60652ee53e4d00c662006274fb346e22eeb59635c82cb4e20e34da7230644e72e131c82cb4e2000000104e75a20b64000000000000000000150000000000000000006629c731270ef2ea6f8c3dad3832f95f309cb6a1591ad53af025c6e0809992f15234e5fe1b37771ce3bb5a62017c56c496e57673e2617634e900c587724d21f24e603a630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800104e75a20b641566a0c71c9069a5256391aa31e22021d36c037c108dfb79c66200bf257ae3d66a589214f980a2ae34f9544be2fcbcc13b21f4c1642f31aa4d20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x0cdc335fa81dff303b71cffb0256d7097c2b4c6715ca7b1589ea9386a41c2f851e4077b7c1f3374bbd4750ed222848c47501b40fc4c11eadd3c39aeafa452459000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000001f1cd7f247f2ae1ba9a1aeb4b32ed4c8c13c70c8861b6ab5340e276c58e1046b13d7de2b557e0ae2b53380ad596ba79f07c037c9d9aa17cf407e9ed86201436e0cdc335fa81dff303b71cffb0256d7097c2b4c6715ca7b1589ea9386a41c2f851223d6bb1f3e68ddfb08f4c95f590f99227fb681a3b0abdf685cf12bde37d8ee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000001f1cd7f247f2ae1ba9a1aeb4b32ed4c8c13c70c8861b6ab5340e276c58e1046b13d7de2b557e0ae2b53380ad596ba79f07c037c9d9aa17cf407e9ed86201436e000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45000000000000004500000000000000000000000000000000000000000000000107b55de1642362d16b8fc4dccfec9e794d24968511cf8e252ed27afc4d72ca1e0301cb4d7e0b7b52a6a8f78613c403ead1543fedb0d3f28c77685fdb9eaa274212ee4836f908e5e39090a4124b75f3ec5b665a729997f55cdea80f76ab940c5902a12ba6400116479dcf5179e4d06471a65e72229fb444b34d8f07458a4a81570000000000ffffffff00000000000000000000000000000000000000000000000000000000ffffffff000000000000000000000000000000000000000000000000fb55bf7df894a746fbe20b6f8c54d5dc0d9fd4eda4742fc35100c45e6e27f912a20d63d446eb175733853b88dd36708eb7a81f5c79e7659c3a6e2b2c470077 - - :label invalid_g2_subgroup :raw 0x1838ccf8d820349a8c38a57dc0a5495577898e422509e4c9636e9737fe0dcd9116f566a30b7d2579fd6109eb09d66c005fdccdc0d91b28f43be34c5668f34f812a9a64f273fa329bc9c98ff2083c627609e2219177b9c5df7286af31a3b27e8120d85101e1e6af0126c00a95c645b192b3ea69ed72297deac1fbb0e6bd1440c600ec155ab3cd58005b488308578aaeeaeae9c65939f785bf693fa5763c174dd624d3b2adb35ad17933d0317a00436d10f2d6908faf109e7fe3db77a39d5c1711175bcec7c4c77c612df588174dd44362722f7b8e588a0ef599129cf123f63b8d2e1ff6c569e5cb0d20fb28504057d4f7ed248900ac99bd0f31a853af5c10a806198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd451800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21cc9a9eb823f8d97adee0206828c9f19eaf8f536c23207d68ae3d056a1480bb21990ddb90388b94f31089d3b4ff594d5449c04fcdf2a3681017b5d7749367ba1 - - :label invalid_g2_subgroup :raw 0x1bbf3321bfdf76e22ca0e95089338a772a4a2982dbede2571c14a258bd9874ff2b5aa74efa3429cd77acc68bd2e487960f34074d3a725444b06a552c1be0ca442471fa6c0785556dacbe4d9570fa9e89a2fa55ba5e38d5cb0f7dcfa49e0c0ae4181b42bbb36f2bb465708c62b0bd12ae5d6922cf5c4f928a7097f8db8f0dfae3103e85ddefbe5900ded1384badbc32c907c50baa4282172d02562116005aecdf2cce8d04251b64ced66cc7b66a1c54000e17872b10b4793f5bd81052e5ef3e5c1bbf3321bfdf76e22ca0e95089338a772a4a2982dbede2571c14a258bd9874ff0509a723e6fd765c40a37f2aae9cd0c7884d63442dff76488bb636eabc9c33032471fa6c0785556dacbe4d9570fa9e89a2fa55ba5e38d5cb0f7dcfa49e0c0ae4181b42bbb36f2bb465708c62b0bd12ae5d6922cf5c4f928a7097f8db8f0dfae3103e85ddefbe5900ded1384badbc32c907c50baa4282172d02562116005aecdf2cce8d04251b64ced66cc7b66a1c54000e17872b10b4793f5bd81052e5ef3e5c00710c68e1b8b73a72a289422d2b6f841cc56fe8c51105021c56ae30c3ae1aca0b2ff392a2fc535427ec9b7e1ae1c35a7961986788cf648349190dd92e182f05198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daabebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebebefdbebebebeabc689bebebebe43be92be5fbebebebebebebebebebebebebebebebebebebebebebebe9ebebebe2abebebebebebebebebebebebebebebebebebe - - :label invalid_g2_subgroup :raw 0x29c19b11665cbeb0fd496542e6115ceef9b628ab4bc7419802e7016cf1b2c931057cdbec3f7c2ad0f4da33b3cfd3234ea29f71c6c46b8b90eb2d4a5851adf74b00bb00b95e1b59fca2159a5f33f27f36b15fe6bcda0b1ee0381b0ef7dd804bd625ed3c1a0120b6531e39cca6f67f35f9a849cfbfe958cc1840d1c20cc6b3e1ad08cbba5815581dcea62fa0426dbff39c8f0e9fdc451b1fb127a4e7a4c058799619068e06466a9dd7543ac89d53a17a8beb6c11c59c3af32ea0c1bbc55e0fae7b2c52ab9e7e9296183b9695387e3ae3d06c9d11a98676e4e046914b36b636ddc4050abc3606826f8aeaac5aa7be9f44d15a55805037eb2b260c32d43bd32adef10763b017bc2777ac81ff30fff09f65381c24912bfc9d1490a23765b4830f0aae2b71c998abc367ad761da7e9900eb7e579989f82eee3338c17b8dc17e53e052b21e242369877673070a6b8b0307da6e84e32bdfb3eb09d514b25e8704bd55d431782c07d2d471af10469a13476a49ec51d1bc538d49bbaf85a63fdb6b412fb4a1bc85b155eee2e33bf5322810c7c0150158f373e998316edf821ae9804a2ac191899a5e18c57f4e6b5f736c2f21e95f4147a4235ed2c1f6e6615eb0e00979f0920568d8f3b2f2d0a6a596ea20b3e62191baf420de10125557f9a665900a82a5925a43a697ceaa9deba01a97d8722815e8185973a402e11fdca62fa908da409c4054081d5b9d0e3aa18a31cc5f9d0fa925205fd50a71edf4ca157a607587e24571c9cacf3b3d821146083f9e5fe6be23546643e3ad4540a1f02c02728010a4b9f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030644e72e131a029b85045b68181585d97816a916871ca8d3c208c166622b860000000000000004500000000000000000000000107b55de1642362d16b8fc4dc2215436159d2bdb4e084a6c63bd04f6b84d69bfad793da72c21b421f3f89b22f22b811a1a4fa51df281657f0b0a1add382fab768ac1ed8886bf979e2bf11402d - - :label invalid_g2_subgroup :raw 0x2deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b500000000000000000000000000ff0a69a42c284614e3d7de26b3f9b2f3c71ff600000000000000000000000000000000000000000000000000000000000000001e2c7f9d6a525b6af5dad683c5e6408661da29780860c3209b2dddcad5a88795033123665850406fc2428227bbb3509fc71c911cf41623de1605cd3e0a281b902deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff952deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff952deb529e45720f20be41088dfd7489c315e9e18fe23dd1c8a8183295dc770dee1090b3fcd1898780c332b7d73a602cadd1b26029124db9da19941250eda890b5000000000000000000000000000000000000000000275680008ded35ba000000000000000000000000000000000000000000000000000000000000000000000019367fe97b92d85d7c29090c2313de1a85f030239cfa71f939a197249cb17b890465a8498153883aca20e4de66ac02b1b6957fab9b4bce71df334cd6bee5ff95 - - :label invalid_g2_subgroup :raw 0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a36c98d1ece5fd647afba497e7ea7a2687e956e978e3572c3df75e9278302b9000000000000000000000000000000000000000000000000000000991b498795099a3faf27255b9542daf48d9588fc4d6927c7fcd88c5784a4245345474e1e4509a44ea53f191ddef8a32ec03a7e1a24e06588f8de364ba0024b3b8a062ca91a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a36c98d1ece5fd647afba497e7ea7a2687e956e978e3572c3df75e9278302b9000000000000000000000000000000000000000000000000000000991b498795099a3faf27255b9542daf48d9588fc4d6927c7fcd88c5784a4245345474e1e4509a44ea53f191ddef8a32ec03a7e1a24e06588f8de364ba0024b3b8a062ca91a000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd4530644e72e131a029b85045b68181585d97816a68917120ca8d3c8c16d87cfd4500000000005b004500000000000000000000000000000000000000004000000111ee2be185fb562c979eeb452df376f91c7852bfb8a6d5727024444a2fc58c152825d78e66be7952503e9e1bf2d8aad4c39f4ce4095349043106508bab20d6e5 - - :label invalid_g2_subgroup :raw 0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000310000000000000000000000000ccc369050590000000000000000000000000000000000000000000000000000000000000000034e16015e4aeadb3c1c93fd54f496a6a75271f9e514b6c51782d145a1771a9827910e860d8264c87a784c364d78f117ca598153fc5947c915eb6e2e7e0ad6d5000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - - :label invalid_g2_subgroup :raw 0x06e42bc7eb32a979b39a77435202c2a062c8bef977f46500b040fa35b8a45b2315ca114b0522bdd5e928f9629ed2a283d36141f3307071cad74fb768721cbb0e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006e42bc7eb32a979b39a77435202c2a062c8bef977f46500b040fa35b8a45b231a9a3d27dc0ee253cf274c53e2aeb5d9c420289e380158c264d0d4ae6660423900000000000000000000000000000000000000000000010000000000000000001611179006befd3749602129813bd7247045ac58ea0000000100000000000000202a170a4a4385bdcefbe36ade6cc7c0e9834b78fc6ca233e8de345a2d5782dc1699f57deaacb74e8b98bd8532c3f152570db884fc1755fbc0c8cb3ef54a537f26c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a2326c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a2326c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a2326c6e104e6c30ed077379b1762d05ac66a6d8e1bb0699ff4f8e3fa52568f0f7709179c965e45c4f28e2ee2affb9b86744b8f29df08357dc80776ecede39adc7f221276dfff5b3a2b6a46ec6c0e0891aefd121170d8361187b73b46e1c6b1218f29255d7955576bba25241ec1edfdfc08c9b8d29379d4213025fa95b0dbdd16460ff9fdfcccda82fb0dd8f17931e05823321073a1a4e484699acdc9d0f14ea6f60c25b531fed0c7e8899296888cc0b27fbb6dbfc2041d482e21d908e240772a23 diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json deleted file mode 100644 index 77702649a61..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_insufficient_gasFiller.json +++ /dev/null @@ -1,282 +0,0 @@ -{ - "ecpairing_one_point_insufficient_gas": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "3", - "balance": "999999999999603066", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "396934", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "75000", "90000", "100000" - ], - "gasPrice": "0x0a", - "nonce": "0x3", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json deleted file mode 100644 index 6772793e41f..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_not_in_subgroupFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_one_point_not_in_subgroup": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "20", - "balance": "999999999994821439", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5178561", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800d3270b7da683f988d3889abcdad9776ecd45abaca689f1118c3fd33404b4392588360d269af2cd3e0803839ea274c2b8f062a6308e8da85fd774c26f1bcb87" - ], - "gasLimit": [ - "0x39be8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x14", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "21", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zero_and_g1_invalidFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zero_and_g1_invalidFiller.json deleted file mode 100644 index a748cfd4d23..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_one_point_with_g2_zero_and_g1_invalidFiller.json +++ /dev/null @@ -1,276 +0,0 @@ -{ - "ecpairing_one_point_with_g2_zero_and_g1_invalid": { - "_info" : { - "comment" : "Use the ecpairing checker with one point, where g1 is not on the curve but g2 is zero. cpp-ethereum once had a bug in this case; as soon as cpp-ethereum recognized g2 zero, it returned something without checking the validity of g1" - }, - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "6", - "balance": "999999999999007220", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000001100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0x38c68", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x6", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "7", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ] - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json deleted file mode 100644 index 811101914ad..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_curve_orderFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_perturb_g2_by_curve_order": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "25", - "balance": "999999999993618935", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6381065", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c248652d61f350be9ffaba461cdfdd9cd68f770b1d71184b6e8ac0b2f0c992f6ee090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3abe8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x19", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "26", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json deleted file mode 100644 index cada2e7c7e1..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_g2_by_oneFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_perturb_g2_by_one": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "24", - "balance": "999999999993859423", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "6140577", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c31800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3ab68", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x18", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "25", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json deleted file mode 100644 index 4bcf50ea414..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_curve_orderFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_perturb_zeropoint_by_curve_order": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "22", - "balance": "999999999994344367", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5655633", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c030644e72e131a029b85045b68181585d2833e84879b9709143e1f593f00000010000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3b2e8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x16", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "23", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json deleted file mode 100644 index 34413ebea16..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_field_modulusFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_perturb_zeropoint_by_field_modulus": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "23", - "balance": "999999999994101959", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5898041", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd470000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3b368", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x17", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "24", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json deleted file mode 100644 index 397276a0f21..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_perturb_zeropoint_by_oneFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_perturb_zeropoint_by_one": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "21", - "balance": "999999999994584919", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "5415081", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3aba8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x15", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "22", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json deleted file mode 100644 index cdfbcb98012..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_fail_1Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecpairing_three_point_fail_1": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "19", - "balance": "999999999995221106", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4778894", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000240105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f00cacf3523caf879d7d05e30549f1e6fdce364cbb8724b0329c6c2a39d4f018e0692e55db067300e6e3fe56218fa2f940054e57e7ef92bf7d475a9d8a8502fd200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x672a8", "90000", "110000", "150000" - ], - "gasPrice": "0x0a", - "nonce": "0x13", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "20", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "20", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_match_1Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_match_1Filler.json deleted file mode 100644 index fc7c226eb89..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_three_point_match_1Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_three_point_match_1": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "18", - "balance": "999999999995612837", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4387163", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000240105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" - ], - "gasLimit": [ - "0x653a8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0x12", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "19", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json deleted file mode 100644 index 800154acbeb..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_1Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecpairing_two_point_fail_1": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "9", - "balance": "999999999998316309", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1683691", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x507a8", "90000", "110000" - ], - "gasPrice": "0x0a", - "nonce": "0x9", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "10", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "10", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json deleted file mode 100644 index 569cfad8ffe..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_fail_2Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecpairing_two_point_fail_2": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "16", - "balance": "999999999996222247", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3777753", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd03042700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002105384b6dd6c48634b9fe89cb3e19667c1fe6736c69df070d674c95a42b3b8242c0d8e67f0f2c14c43734b430d8be4265af8c4f7a67deb0b029fd2dff99cc6b9015eaec465d922580c7de5d4a5c26de75eaf2af6841b7412ef2eebd1e051076f1b4c21849e48de12d1bae2bad3299717aa8664ade430e19dec72a6e10a39b0ab" - ], - "gasLimit": [ - "0x517e8", "90000", "110000", "140000" - ], - "gasPrice": "0x0a", - "nonce": "0x10", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "17", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "17", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_2Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_2Filler.json deleted file mode 100644 index bc6954cc72a..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_2Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_two_point_match_2": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "13", - "balance": "999999999997150602", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2849398", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d" - ], - "gasLimit": [ - "0x507a8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xd", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "14", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_3Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_3Filler.json deleted file mode 100644 index cf1125f0b56..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_3Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_two_point_match_3": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "14", - "balance": "999999999996843881", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3156119", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x517a8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xe", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "15", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_4Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_4Filler.json deleted file mode 100644 index 28334101199..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_4Filler.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_two_point_match_4": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "15", - "balance": "999999999996533064", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "3466936", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75" - ], - "gasLimit": [ - "0x517a8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xf", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "16", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_5Filler.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_5Filler.json deleted file mode 100644 index 63d0e9788f3..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_match_5Filler.json +++ /dev/null @@ -1,419 +0,0 @@ -{ - "ecpairing_two_point_match_5": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "17", - "balance": "999999999995911366", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "4088634", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x4e7a8", "90000", "110000", "140000" - ], - "gasPrice": "0x0a", - "nonce": "0x11", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": 0, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "18", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - }, - { - "indexes": { - "data": 0, - "gas": [1,2,3], - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "18", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_oogFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_oogFiller.json deleted file mode 100644 index 6d9b15a43d7..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_point_oogFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_two_point_oog": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "12", - "balance": "999999999997402226", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "2597774", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa000000000000000000000000000000000000000000000000000000000000000130644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x3d6e8", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xc", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0xb10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "13", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} diff --git a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json b/tests/static/state_tests/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json deleted file mode 100644 index 6d47baf0dbd..00000000000 --- a/tests/static/state_tests/stZeroKnowledge/ecpairing_two_points_with_one_g2_zeroFiller.json +++ /dev/null @@ -1,287 +0,0 @@ -{ - "ecpairing_two_points_with_one_g2_zero": { - "env": { - "currentCoinbase": "0x3535353535353535353535353535353535353535", - "currentDifficulty": "0x020000", - "currentGasLimit": "0x5f5e100", - "currentNumber": "0x01", - "currentTimestamp": "1000" - }, - "pre": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": ":raw 0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "10", - "balance": "999999999998009588", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "balance": "1990412", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - }, - "transaction": { - "data": [ - ":raw 0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa" - ], - "gasLimit": [ - "0x4e828", "90000", "110000", "200000" - ], - "gasPrice": "0x0a", - "nonce": "0xa", - "secretKey": "0x044852b2a670ade5407e78fb2863c51de9fcb96542a07186fe3aeda6bb8a116d", - "to": "0xc305c901078781c232a2a521c2af7980f8385ee9", - "value": [ - "0x00" - ] - }, - "expect": [ - { - "indexes": { - "data": 0, - "gas": -1, - "value": 0 - }, - "network": [ - ">=Cancun" - ], - "result": { - "24143873e0e0815fdcbcffdbe09c979cbf9ad013": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000001": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "dceceaf3fc5c0a63d195d69b1a90011b7b19650d": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "c305c901078781c232a2a521c2af7980f8385ee9": { - "storage": { - "0x00": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563" - }, - "nonce": "1", - "balance": "0", - "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576107806004356004013511151558576004356004013560200160043560040161014037602061092061014051610160600060086305f5e0fff11558576020610900526109006040806109608284600060046018f150505061096080516020820120905060005561096060206020820352604081510160206001820306601f820103905060208203f350005b" - }, - "0000000000000000000000000000000000000005": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000008": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "13cbb8d99c6c4e0f2728c7d72606e78a29c4e224": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000003": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": { - "storage": {}, - "nonce": "11", - "code": "0x" - }, - "0000000000000000000000000000000000000006": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "0000000000000000000000000000000000000007": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "598443f1880ef585b21f1d7585bd0577402861e5": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "7d577a597b2742b498cb5cf0c26cdcd726d39e6e": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "0000000000000000000000000000000000000004": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "e0fc04fa2d34a66b779fd5cee748268032a146c0": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "3535353535353535353535353535353535353535": { - "storage": {}, - "nonce": "0", - "code": "0x" - }, - "0000000000000000000000000000000000000002": { - "storage": {}, - "nonce": "0", - "balance": "1", - "code": "0x" - }, - "77db2bebba79db42a978f896968f4afce746ea1f": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - }, - "90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c": { - "storage": {}, - "nonce": "0", - "balance": "1000000000000000000", - "code": "0x" - } - } - } - ], - "_info": { - "comment": "Puts the given data into the ECPAIRING precompile" - } - } -} From 7ec675142e2d531b6edbd0e76b8c39263430bebc Mon Sep 17 00:00:00 2001 From: spencer Date: Mon, 9 Mar 2026 10:30:02 +0000 Subject: [PATCH 25/37] fix(consume): delay client stop on test failure to flush logs (#2445) Add a 1-second delay before calling client.stop() when a test has failed, giving the client container time to flush its logs. Applied to both the main client fixture and the sync client fixture. --- .../plugins/consume/simulators/single_test_client.py | 6 ++++++ .../plugins/consume/simulators/sync/conftest.py | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py index 4045f922216..2d22fbb2e80 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/single_test_client.py @@ -5,6 +5,7 @@ import io import json import logging +import time from typing import Generator, Literal, cast import pytest @@ -76,6 +77,7 @@ def genesis_header(fixture: BlockchainFixtureCommon) -> FixtureHeader: @pytest.fixture(scope="function") def client( + request: pytest.FixtureRequest, hive_test: HiveTest, # configured within: rlp/conftest.py & engine/conftest.py client_files: dict, @@ -106,6 +108,10 @@ def client( assert client is not None, error_message logger.info(f"Client ({client_type.name}) ready!") yield client + # Allow the client to flush logs before stopping on failure. + result_call = getattr(request.node, "result_call", None) + if result_call is not None and result_call.failed: + time.sleep(1) logger.info(f"Stopping client ({client_type.name})...") with total_timing_data.time("Stop client"): client.stop() diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/sync/conftest.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/sync/conftest.py index ad01454d7c7..b715b1758c3 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/sync/conftest.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/sync/conftest.py @@ -6,6 +6,8 @@ import io import json +import logging +import time from typing import Dict, Generator, Mapping, cast import pytest @@ -188,6 +190,7 @@ def client_enode_url(client: Client) -> str: @pytest.fixture(scope="function") def sync_client( + request: pytest.FixtureRequest, hive_test: HiveTest, sync_client_files: Dict, environment: Dict, @@ -195,8 +198,6 @@ def sync_client( client_enode_url: str, # Get the enode URL from fixture ) -> Generator[Client, None, None]: """Start a sync client that will sync from the client under test.""" - import logging - logger = logging.getLogger(__name__) logger.info(f"Starting sync client setup for {sync_client_type.name}") @@ -253,6 +254,10 @@ def sync_client( yield sync_client # Cleanup + # Allow the client to flush logs before stopping on failure. + result_call = getattr(request.node, "result_call", None) + if result_call is not None and result_call.failed: + time.sleep(1) sync_client.stop() From d1929c538beea11f687947dfb5d0c9db4ec0d04f Mon Sep 17 00:00:00 2001 From: spencer Date: Mon, 9 Mar 2026 13:25:16 +0000 Subject: [PATCH 26/37] feat(tests): add ecpairing test for fq2 multiplicative inverse bug (#2450) --- .../eip197_ec_pairing/test_ecpairing.py | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tests/byzantium/eip197_ec_pairing/test_ecpairing.py b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py index 6c3aa6510c8..ecc1cf08936 100644 --- a/tests/byzantium/eip197_ec_pairing/test_ecpairing.py +++ b/tests/byzantium/eip197_ec_pairing/test_ecpairing.py @@ -143,6 +143,29 @@ Spec.PAIRING_TRUE, id="three_point_match_1", ), + pytest.param( + # e(16*G1, G2) * e(G1, -16*G2) == 1 + # Exercises the FQ2 multiplicative inverse for scalar 16, + # which previously triggered a bug in the specification. + PointG1( + 0x17F485337F6E10FCA0E385F7A93D1AC0A977E43995C3E4D9B8F89DAA6A183F44, + 0x05CCDC1561DB963516DA62C66EDD39D1BB9C6C4674990C4440403C88025C95AD, + ) + + Spec.G2 + + Spec.G1 + + PointG2( + ( + 0x27A819BCF5C2C30229550CC0D34EE9C923EE6C3033A89F0BE27204893B112207, + 0x29E39258393EE0C24EB66B69973E9FEB8B02E9D94A9897492C98EFE5B0EB459A, + ), + ( + 0x12C79F74D498D73F3F1C4F2489FF4C5EF88C6A2C932560FEC4B5D2A1AE20D274, + 0x1FBD1A0CA265F11112AF813152C1AD30B95AA1CBF94F7571552CA27658A6940C, + ), + ), + Spec.PAIRING_TRUE, + id="fq2_inverse_scalar_16", + ), ], ) @pytest.mark.ported_from( From 2aaa46fc227021d67265348273685a49a6f4a9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 9 Mar 2026 13:53:47 +0000 Subject: [PATCH 27/37] feat(tests): add gas consumption test for invalid ecadd/ecmul/ecpairing inputs (#2451) --- tests/byzantium/eip196_ec_add_mul/test_gas.py | 122 ++++++++++++++--- tests/byzantium/eip197_ec_pairing/test_gas.py | 124 +++++++++++++++--- 2 files changed, 209 insertions(+), 37 deletions(-) diff --git a/tests/byzantium/eip196_ec_add_mul/test_gas.py b/tests/byzantium/eip196_ec_add_mul/test_gas.py index 1d0224c843e..babaad835d7 100644 --- a/tests/byzantium/eip196_ec_add_mul/test_gas.py +++ b/tests/byzantium/eip196_ec_add_mul/test_gas.py @@ -5,13 +5,19 @@ Account, Address, Alloc, + CodeGasMeasure, + Fork, StateTestFiller, + Storage, Transaction, ) -from execution_testing.forks.helpers import Fork +from execution_testing import ( + Macros as Om, +) +from execution_testing.forks.forks.forks import Berlin from execution_testing.vm import Opcodes as Op -from .spec import Spec, ref_spec_196 +from .spec import PointG1, Scalar, Spec, ref_spec_196 REFERENCE_SPEC_GIT_PATH = ref_spec_196.git_path REFERENCE_SPEC_VERSION = ref_spec_196.version @@ -19,7 +25,7 @@ @pytest.mark.valid_from("Byzantium") @pytest.mark.parametrize( - "address", + "precompile_address", [ pytest.param(Spec.ECADD, id="ecadd"), pytest.param(Spec.ECMUL, id="ecmul"), @@ -29,34 +35,116 @@ def test_gas_costs( state_test: StateTestFiller, pre: Alloc, - fork: Fork, - address: Address, + precompile_address: Address, + precompile_gas: int, enough_gas: bool, ) -> None: """ Tests the constant gas behavior of `ecadd/ecmul` precompiled contracts. """ - gas_costs = fork.gas_costs() - gas = ( - gas_costs.GAS_PRECOMPILE_ECADD - if address == Spec.ECADD - else gas_costs.GAS_PRECOMPILE_ECMUL + gas = precompile_gas if enough_gas else precompile_gas - 1 + storage = Storage() + + account = pre.deploy_contract( + code=Op.SSTORE( + storage.store_next(1 if enough_gas else 0), + Op.STATICCALL(gas=gas, address=precompile_address), + ), + storage=storage.canary(), + ) + + tx = Transaction( + to=account, + sender=pre.fund_eoa(), + gas_limit=1_000_000, + protected=True, + ) + + post = {account: Account(storage=storage)} + + state_test(pre=pre, post=post, tx=tx) + + +@pytest.mark.valid_from("Byzantium") +@pytest.mark.parametrize( + "precompile_address, invalid_input", + [ + pytest.param( + Spec.ECADD, + PointG1(1, 3) + Spec.INF_G1, + id="ecadd", + ), + pytest.param( + Spec.ECMUL, + PointG1(1, 3) + Scalar(1), + id="ecmul", + ), + ], +) +@pytest.mark.parametrize( + "extra_gas", + [ + pytest.param(0, id="exact"), + pytest.param(100_000, id="extra_100k"), + ], +) +def test_invalid_gas_consumption( + state_test: StateTestFiller, + pre: Alloc, + fork: Fork, + precompile_address: Address, + precompile_gas: int, + invalid_input: bytes, + extra_gas: int, +) -> None: + """ + Test that invalid inputs to ecadd/ecmul consume all forwarded gas. + + Use CodeGasMeasure to verify the STATICCALL with invalid input + consumes exactly the warm call cost plus all forwarded gas. + """ + gas_forward = precompile_gas + extra_gas + input_size = len(invalid_input) + storage = Storage() + + staticcall_code = Op.STATICCALL( + gas=gas_forward, + address=precompile_address, + args_size=input_size, ) - if not enough_gas: - gas -= 1 + push_cost = staticcall_code.gas_cost(fork) - Op.STATICCALL( + address_warm=False + ).gas_cost(fork) + + # Pre-EIP-2929: fixed G_call = 700; Berlin+: warm access cost. + gas_costs = fork.gas_costs() + if fork >= Berlin: + staticcall_base = gas_costs.GAS_WARM_ACCOUNT_ACCESS + else: + staticcall_base = 700 account = pre.deploy_contract( - code=Op.SSTORE(0, Op.CALL(gas=gas, address=address)), - storage={0: 0xDEADBEEF}, + code=( + Om.MSTORE(invalid_input) + # Warm the precompile address + + Op.POP(Op.STATICCALL(gas=0, address=precompile_address)) + + CodeGasMeasure( + code=staticcall_code, + overhead_cost=push_cost, + extra_stack_items=1, + sstore_key=storage.store_next(staticcall_base + gas_forward), + ) + ), + storage=storage.canary(), ) tx = Transaction( to=account, sender=pre.fund_eoa(), - gas_limit=100_0000, - protected=fork.supports_protected_txs(), + gas_limit=1_000_000, + protected=True, ) - post = {account: Account(storage={0: 1 if enough_gas else 0})} + post = {account: Account(storage=storage)} state_test(pre=pre, post=post, tx=tx) diff --git a/tests/byzantium/eip197_ec_pairing/test_gas.py b/tests/byzantium/eip197_ec_pairing/test_gas.py index 4ea1de932f5..0717332c9c2 100644 --- a/tests/byzantium/eip197_ec_pairing/test_gas.py +++ b/tests/byzantium/eip197_ec_pairing/test_gas.py @@ -4,53 +4,137 @@ from execution_testing import ( Account, Alloc, + CodeGasMeasure, + Fork, StateTestFiller, + Storage, Transaction, ) -from execution_testing.base_types.base_types import Address -from execution_testing.forks.helpers import Fork +from execution_testing import ( + Macros as Om, +) +from execution_testing.forks.forks.forks import Berlin from execution_testing.vm import Opcodes as Op -REFERENCE_SPEC_GIT_PATH = "EIPS/eip-197.md" -REFERENCE_SPEC_VERSION = "9f9b3d33440e7c122b6c9192facfc380bc009422" +from .spec import PointG1, Spec, ref_spec_197 + +REFERENCE_SPEC_GIT_PATH = ref_spec_197.git_path +REFERENCE_SPEC_VERSION = ref_spec_197.version -EC_PAIRING_ADDRESS = Address(0x08) + +@pytest.fixture +def input_data() -> bytes: + """Default empty input data (0 pairs).""" + return b"" + + +@pytest.mark.valid_from("Byzantium") +@pytest.mark.parametrize("enough_gas", [True, False]) +def test_gas_costs( + state_test: StateTestFiller, + pre: Alloc, + precompile_gas: int, + enough_gas: bool, +) -> None: + """ + Test the base gas cost of the ecpairing precompile with zero pairs. + """ + gas = precompile_gas if enough_gas else precompile_gas - 1 + storage = Storage() + + account = pre.deploy_contract( + code=Op.SSTORE( + storage.store_next(1 if enough_gas else 0), + Op.STATICCALL(gas=gas, address=Spec.ECPAIRING), + ), + storage=storage.canary(), + ) + + tx = Transaction( + to=account, + sender=pre.fund_eoa(), + gas_limit=1_000_000, + protected=True, + ) + + post = {account: Account(storage=storage)} + + state_test(pre=pre, post=post, tx=tx) @pytest.mark.valid_from("Byzantium") @pytest.mark.parametrize( - "address", + "input_data", [ - pytest.param(EC_PAIRING_ADDRESS, id="ecpairing"), + pytest.param( + PointG1(1, 3) + Spec.G2, + id="invalid_g1_point", + ), ], ) -@pytest.mark.parametrize("enough_gas", [True, False]) -def test_gas_costs( +@pytest.mark.parametrize( + "extra_gas", + [ + pytest.param(0, id="exact"), + pytest.param(100_000, id="extra_100k"), + ], +) +def test_invalid_gas_consumption( state_test: StateTestFiller, pre: Alloc, fork: Fork, - address: Address, - enough_gas: bool, + precompile_gas: int, + input_data: bytes, + extra_gas: int, ) -> None: """ - Tests the constant gas behavior of `ecpairing` precompiled contract. + Test that invalid input to ecpairing consumes all forwarded gas. + + Use CodeGasMeasure to verify the STATICCALL with invalid input + consumes exactly the warm call cost plus all forwarded gas. """ - gas = fork.gas_costs().GAS_PRECOMPILE_ECPAIRING_BASE - if not enough_gas: - gas -= 1 + gas_forward = precompile_gas + extra_gas + input_size = len(input_data) + storage = Storage() + + staticcall_code = Op.STATICCALL( + gas=gas_forward, + address=Spec.ECPAIRING, + args_size=input_size, + ) + push_cost = staticcall_code.gas_cost(fork) - Op.STATICCALL( + address_warm=False + ).gas_cost(fork) + + # Pre-EIP-2929: fixed G_call = 700; Berlin+: warm access cost. + gas_costs = fork.gas_costs() + if fork >= Berlin: + staticcall_base = gas_costs.GAS_WARM_ACCOUNT_ACCESS + else: + staticcall_base = 700 account = pre.deploy_contract( - code=Op.SSTORE(0, Op.CALL(gas=gas, address=address)), - storage={0: 0xDEADBEEF}, + code=( + Om.MSTORE(input_data) + # Warm the precompile address + + Op.POP(Op.STATICCALL(gas=0, address=Spec.ECPAIRING)) + + CodeGasMeasure( + code=staticcall_code, + overhead_cost=push_cost, + extra_stack_items=1, + sstore_key=storage.store_next(staticcall_base + gas_forward), + ) + ), + storage=storage.canary(), ) tx = Transaction( to=account, sender=pre.fund_eoa(), - gas_limit=100_0000, - protected=fork.supports_protected_txs(), + gas_limit=1_000_000, + protected=True, ) - post = {account: Account(storage={0: 1 if enough_gas else 0})} + post = {account: Account(storage=storage)} state_test(pre=pre, post=post, tx=tx) From 45835307167b7a6fe5a6afd4c8279703858dc080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 9 Mar 2026 14:25:21 +0000 Subject: [PATCH 28/37] chore(tooling): add PR template instruction to CLAUDE.md (#2454) --- CLAUDE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CLAUDE.md b/CLAUDE.md index fbfea4acade..eb3a2e04fd0 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -29,6 +29,7 @@ When done with changes, ask the user if they'd like to run `/lint` before commit - **There is no `main` branch.** Default branch = most active fork (currently `forks/amsterdam`). Run `git remote show origin | grep HEAD` to check. - `mainnet` = stable specs for forks live on mainnet - PRs target the default branch +- PRs strictly follow the template in `.github/PULL_REQUEST_TEMPLATE.md`. In the Checklist section, include unchecked items that don't apply — only remove them if they are truly irrelevant to the PR type. ## PR Reviews From 595ea5ce975182001abaa487f39623a913b62cea Mon Sep 17 00:00:00 2001 From: Samuele Agostinelli Date: Mon, 9 Mar 2026 10:29:50 -0400 Subject: [PATCH 29/37] docs(specs, tests): fixed comments with values related to gas limits (#2300) * docs: fixed comments with values related to gas limits * docs: updated text explaining transaction gas limit and fixed incorrect value of 120 million * docs: clarified comment related to gas_limit --- .../exceptions/exceptions/transaction.py | 2 +- src/ethereum/forks/amsterdam/blocks.py | 8 +++++--- src/ethereum/forks/osaka/blocks.py | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/testing/src/execution_testing/exceptions/exceptions/transaction.py b/packages/testing/src/execution_testing/exceptions/exceptions/transaction.py index a2b90227fda..286a71e188d 100644 --- a/packages/testing/src/execution_testing/exceptions/exceptions/transaction.py +++ b/packages/testing/src/execution_testing/exceptions/exceptions/transaction.py @@ -175,7 +175,7 @@ class TransactionException(ExceptionBase): """Transaction causes block to go over blob gas limit.""" GAS_LIMIT_EXCEEDS_MAXIMUM = auto() """ - Transaction gas limit exceeds the maximum allowed limit of 30 million. + Transaction gas limit exceeds the maximum allowed limit for the given fork. """ TYPE_3_TX_ZERO_BLOBS = auto() """Transaction is type 3, but has no blobs.""" diff --git a/src/ethereum/forks/amsterdam/blocks.py b/src/ethereum/forks/amsterdam/blocks.py index cd0b6287eb1..09a15657002 100644 --- a/src/ethereum/forks/amsterdam/blocks.py +++ b/src/ethereum/forks/amsterdam/blocks.py @@ -162,9 +162,11 @@ class Header: Maximum gas allowed in this block. Pre [EIP-1559], this was the maximum gas that could be consumed by all transactions in the block. Post [EIP-1559], this is still the maximum gas limit, but the base fee per gas - is also considered when calculating the effective gas limit. This can be - [adjusted by a factor of 1/1024] from the previous block's gas limit, up - until a maximum of 30 million gas. + is adjusted so that effective block gas utilization targets 50% of + that limit. The gas_limit is a voted parameter that can be + [adjusted by a factor of 1/1024] from the previous block's limit by the + block proposer, allowing the network to coordinate on capacity + increases (e.g. the 60M limit proposed in EIP-7935). [EIP-1559]: https://eips.ethereum.org/EIPS/eip-1559 [adjusted by a factor of 1/1024]: diff --git a/src/ethereum/forks/osaka/blocks.py b/src/ethereum/forks/osaka/blocks.py index 9201611ae4b..c0d1de37f12 100644 --- a/src/ethereum/forks/osaka/blocks.py +++ b/src/ethereum/forks/osaka/blocks.py @@ -161,9 +161,11 @@ class Header: Maximum gas allowed in this block. Pre [EIP-1559], this was the maximum gas that could be consumed by all transactions in the block. Post [EIP-1559], this is still the maximum gas limit, but the base fee per gas - is also considered when calculating the effective gas limit. This can be - [adjusted by a factor of 1/1024] from the previous block's gas limit, up - until a maximum of 30 million gas. + is adjusted so that effective block gas utilization targets 50% of + that limit. The gas_limit is a voted parameter that can be + [adjusted by a factor of 1/1024] from the previous block's limit by the + block proposer, allowing the network to coordinate on capacity + increases (e.g. the 60M limit proposed in EIP-7935). [EIP-1559]: https://eips.ethereum.org/EIPS/eip-1559 [adjusted by a factor of 1/1024]: From 1363db6cb47a6e6fb162c5d0e65bdd27c2915d91 Mon Sep 17 00:00:00 2001 From: Guruprasad Kamath <48196632+gurukamath@users.noreply.github.com> Date: Mon, 9 Mar 2026 17:18:58 +0100 Subject: [PATCH 30/37] refactor(json_loader): json_loader to use the fill workflow (#2369) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(tests): identify and mark json_infra tests for same coverage * refactor(json_infra): fill-then-consume pipeline with 3-mode fixture source Replace the download-only json_infra CI flow with a fill-then-consume pipeline. The new default fills the json_infra-marked tests locally and runs the generated fixtures through the json_infra consumer. The old download behaviour is preserved via --fixture-source=download, and a --fixture-source=local mode allows re-running against fixtures already on disk without any setup step. - conftest: add --fixture-source={fill,download,local} option; fill mode runs `fill -m "json_infra and not slow and not benchmark and not derived_test"` into tests/json_infra/fixtures/locally_filled/ before collection; download mode reproduces the old behaviour; local mode skips setup and warns if no fixtures are present - tox.ini: add dependency_groups = test to json_infra env so fill is available - test.yaml: simplify json_infra job (drop fetch-depth, changed-files step, and --file-list posarg); keep setup-env for the t8n tool - test_rlp, test_trie, test_transaction, test_ethash: skip entire module when the ethereum_tests fixture set is absent so fill mode does not produce FileNotFoundError/collection errors * refactor(json_infra): simplify to fill-then-run via tox Move the fill step from a subprocess call inside pytest_sessionstart to an explicit command in tox.ini, making the pipeline transparent and removing hidden configuration (fork name, CPU count, marker expression) from conftest.py. - tox.ini: run `fill` then `pytest` as two explicit commands - conftest.py: remove _FixturesDownloader, --fixture-source option, subprocess fill logic, fixture_lock, and all associated imports - Remove test_trie, test_rlp, test_transaction, test_ethash and their helpers — these depended on the downloaded ethereum/tests fixtures which are no longer fetched - Remove TEST_FIXTURES / _FixtureSource from __init__.py - Remove fixture_lock from stash_keys.py * rename json_infra to json_loader across the codebase Rename the test directory, tox environment, pytest marker, and all references from json_infra to json_loader. * chore(json_loader): add coverage gate to catch stale test set Add --cov=ethereum and --cov-fail-under=80 so CI fails if coverage drops, signaling the minimal test set needs regeneration. * ci(json_loader): set fail coverage at 70 percent * ci(json_loader): move coverage gate to fill step Measure coverage during fill (same as py3) rather than during pytest consumption. This ensures apples-to-apples comparison: both envs discover the same source files, avoiding inflated denominators from passthrough forks that pytest --cov=ethereum force-discovers. --- .github/workflows/test.yaml | 14 +- CONTRIBUTING.md | 2 +- .../cli/pytest_commands/fill.py | 2 +- .../pytest_ini_files/pytest-execute-hive.ini | 2 +- .../pytest_ini_files/pytest-execute.ini | 2 +- .../pytest_ini_files/pytest-fill.ini | 2 +- pyproject.toml | 5 +- .../test_block_access_lists.py | 1 + .../test_block_access_lists_opcodes.py | 1 + .../eip2929_gas_cost_increases/test_call.py | 1 + tests/berlin/eip2930_access_list/test_acl.py | 1 + .../byzantium/eip196_ec_add_mul/test_ecadd.py | 1 + .../eip198_modexp_precompile/test_modexp.py | 1 + .../eip214_staticcall/test_staticcall.py | 1 + .../test_tstorage_execution_contexts.py | 1 + tests/cancun/eip4844_blobs/test_blob_txs.py | 5 + .../eip4844_blobs/test_blobhash_opcode.py | 1 + .../test_excess_blob_gas_fork_transition.py | 1 + .../test_point_evaluation_precompile.py | 1 + .../test_point_evaluation_precompile_gas.py | 1 + .../eip1052_extcodehash/test_extcodehash.py | 1 + .../test_shift_combinations.py | 1 + .../create/test_create_deposit_oog.py | 1 + tests/frontier/create/test_create_one_byte.py | 1 + .../create/test_create_suicide_during_init.py | 1 + .../create/test_create_suicide_store.py | 1 + .../identity_precompile/test_identity.py | 1 + tests/frontier/opcodes/test_all_opcodes.py | 3 + .../test_call_and_callcode_gas_calculation.py | 1 + tests/frontier/opcodes/test_calldatacopy.py | 1 + tests/frontier/opcodes/test_swap.py | 1 + tests/frontier/precompiles/test_ecrecover.py | 1 + .../frontier/precompiles/test_precompiles.py | 1 + tests/frontier/precompiles/test_ripemd.py | 1 + tests/frontier/touch/test_touch.py | 1 + tests/frontier/validation/test_transaction.py | 3 + tests/istanbul/eip152_blake2/test_blake2.py | 2 + tests/json_infra/__init__.py | 42 ---- .../helpers/load_transaction_tests.py | 36 ---- tests/json_infra/test_ethash.py | 155 --------------- tests/json_infra/test_rlp.py | 94 --------- tests/json_infra/test_transaction.py | 98 --------- tests/json_infra/test_trie.py | 142 ------------- tests/json_loader/__init__.py | 9 + tests/{json_infra => json_loader}/conftest.py | 187 +----------------- tests/{json_infra => json_loader}/hardfork.py | 0 .../helpers/__init__.py | 0 .../helpers/exceptional_test_patterns.py | 4 +- .../helpers/fixtures.py | 0 .../helpers/load_blockchain_tests.py | 0 .../helpers/load_state_tests.py | 0 .../helpers/load_vm_tests.py | 0 .../helpers/select_tests.py | 2 +- .../{json_infra => json_loader}/stash_keys.py | 6 +- .../test_ethash_general.py | 0 .../test_genesis.py | 0 .../test_optimized_state.py | 0 .../{json_infra => json_loader}/test_tools.py | 0 .../test_tools_new_fork.py | 0 .../{json_infra => json_loader}/test_trace.py | 0 .../test_transaction_codec.py | 0 .../test_tx_gas_limit.py | 1 + .../test_modexp_thresholds.py | 2 + .../test_blob_base_fee.py | 1 + .../test_max_block_rlp_size.py | 1 + .../test_count_leading_zeros.py | 1 + .../test_p256verify.py | 2 + .../test_initcollision.py | 1 + .../test_revert_in_create.py | 1 + .../test_bls12_g1add.py | 1 + .../test_bls12_g1msm.py | 1 + .../test_bls12_g1mul.py | 1 + .../test_bls12_g2add.py | 1 + .../test_bls12_g2msm.py | 2 + .../test_bls12_map_fp2_to_g2.py | 1 + .../test_bls12_map_fp_to_g1.py | 2 + .../test_bls12_pairing.py | 2 + ...t_bls12_variable_length_input_contracts.py | 2 + .../test_eip_mainnet.py | 1 + .../test_block_hashes.py | 1 + .../test_modified_contract.py | 2 + .../test_contract_deployment.py | 2 + .../test_modified_withdrawal_contract.py | 1 + .../test_multi_type_requests.py | 1 + tests/prague/eip7702_set_code_tx/test_gas.py | 1 + .../eip7702_set_code_tx/test_set_code_txs.py | 7 + .../test_set_code_txs_2.py | 1 + .../eip3860_initcode/test_initcode.py | 1 + .../eip4895_withdrawals/test_withdrawals.py | 1 + tox.ini | 22 ++- 90 files changed, 131 insertions(+), 776 deletions(-) delete mode 100644 tests/json_infra/__init__.py delete mode 100644 tests/json_infra/helpers/load_transaction_tests.py delete mode 100644 tests/json_infra/test_ethash.py delete mode 100644 tests/json_infra/test_rlp.py delete mode 100644 tests/json_infra/test_transaction.py delete mode 100644 tests/json_infra/test_trie.py create mode 100644 tests/json_loader/__init__.py rename tests/{json_infra => json_loader}/conftest.py (50%) rename tests/{json_infra => json_loader}/hardfork.py (100%) rename tests/{json_infra => json_loader}/helpers/__init__.py (100%) rename tests/{json_infra => json_loader}/helpers/exceptional_test_patterns.py (97%) rename tests/{json_infra => json_loader}/helpers/fixtures.py (100%) rename tests/{json_infra => json_loader}/helpers/load_blockchain_tests.py (100%) rename tests/{json_infra => json_loader}/helpers/load_state_tests.py (100%) rename tests/{json_infra => json_loader}/helpers/load_vm_tests.py (100%) rename tests/{json_infra => json_loader}/helpers/select_tests.py (98%) rename tests/{json_infra => json_loader}/stash_keys.py (51%) rename tests/{json_infra => json_loader}/test_ethash_general.py (100%) rename tests/{json_infra => json_loader}/test_genesis.py (100%) rename tests/{json_infra => json_loader}/test_optimized_state.py (100%) rename tests/{json_infra => json_loader}/test_tools.py (100%) rename tests/{json_infra => json_loader}/test_tools_new_fork.py (100%) rename tests/{json_infra => json_loader}/test_trace.py (100%) rename tests/{json_infra => json_loader}/test_transaction_codec.py (100%) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8ffe66477f6..d577145d811 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -94,23 +94,19 @@ jobs: PYPY_GC_MAX: "2G" PYPY_GC_MIN: "1G" - json_infra: + json_loader: runs-on: [self-hosted-ghr, size-xl-x64] needs: static steps: - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 with: submodules: recursive - fetch-depth: 0 # Fetch full history for commit comparison - uses: ./.github/actions/setup-uv - with: - python-version: "3.11" - uses: ./.github/actions/setup-env - - uses: ./.github/actions/setup-geth - - uses: ./.github/actions/get-changed-files - id: get-changed-files - - name: Run json infra tests - run: tox -e json_infra -- --file-list="${{ steps.get-changed-files.outputs.file_list }}" + - name: Fill and run json_loader tests + run: tox -e json_loader + env: + PYTEST_XDIST_AUTO_NUM_WORKERS: auto tests_pytest_py3: runs-on: [self-hosted-ghr, size-xl-x64] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fef4848bee9..bff6f1bd808 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -189,7 +189,7 @@ Below is an example. ```bash uv run pytest \ - 'tests/json_infra/test_state_tests.py::test_state_tests_frontier[stAttackTest - ContractCreationSpam - 0]' \ + 'tests/json_loader/test_state_tests.py::test_state_tests_frontier[stAttackTest - ContractCreationSpam - 0]' \ --evm_trace ``` diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/fill.py b/packages/testing/src/execution_testing/cli/pytest_commands/fill.py index 19ec420f944..126767bad00 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/fill.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/fill.py @@ -109,7 +109,7 @@ def _add_default_ignores(self, args: List[str]) -> List[str]: # Directories to ignore by default default_ignores = [ "tests/evm_tools", - "tests/json_infra", + "tests/json_loader", "tests/fixtures", ] diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini index cf402fdca37..3c0ba40f5c4 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini +++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute-hive.ini @@ -19,5 +19,5 @@ addopts = --tb short --dist load --ignore tests/cancun/eip4844_blobs/point_evaluation_vectors/ - --ignore tests/json_infra + --ignore tests/json_loader --ignore tests/evm_tools \ No newline at end of file diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini index b0759be945c..d148d89792c 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini +++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-execute.ini @@ -21,5 +21,5 @@ addopts = --tb short --dist load --ignore tests/cancun/eip4844_blobs/point_evaluation_vectors/ - --ignore tests/json_infra + --ignore tests/json_loader --ignore tests/evm_tools \ No newline at end of file diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini index 15d86805591..e72c1ffea0d 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini +++ b/packages/testing/src/execution_testing/cli/pytest_commands/pytest_ini_files/pytest-fill.ini @@ -19,7 +19,7 @@ addopts = --tb short --dist loadgroup --ignore tests/cancun/eip4844_blobs/point_evaluation_vectors/ - --ignore tests/json_infra + --ignore tests/json_loader --ignore tests/evm_tools # these customizations require the pytest-custom-report plugin report_passed_verbose = FILLED diff --git a/pyproject.toml b/pyproject.toml index f72b53387e9..0aebe3deadc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -289,6 +289,7 @@ markers = [ "json_blockchain_tests: marks tests as json_blockchain_tests (deselect with '-m \"not json_blockchain_tests\"')", "json_state_tests: marks tests as json_state_tests (deselect with '-m \"not json_state_tests\"')", "vm_test: marks tests as vm_test (deselect with '-m \"not vm_test\"')", + "json_loader: marks tests as minimal set for json_loader coverage (select with '-m json_loader')", ] [tool.coverage.run] @@ -453,7 +454,7 @@ skip = [ "*.tar.gz", "*.png", "*/tests/fixtures", - "*/json_infra/fixtures", + "*/json_loader/fixtures", "fixtures.*", "tmp", "*.coverage*", @@ -487,7 +488,7 @@ exclude = [ "^fixtures/", "^logs/", "^site/", - "^tests/json_infra/fixtures/", + "^tests/json_loader/fixtures/", ] plugins = ["pydantic.mypy"] diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py index 0f377f6f937..1c3f374db37 100644 --- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py +++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists.py @@ -1985,6 +1985,7 @@ def test_bal_multiple_storage_writes_same_slot( pytest.param([2, 3, 4], id="depth_3"), ], ) +@pytest.mark.json_loader def test_bal_nested_delegatecall_storage_writes_net_zero( pre: Alloc, blockchain_test: BlockchainTestFiller, diff --git a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py index 1d52ac2c8cb..0c0bb921567 100644 --- a/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py +++ b/tests/amsterdam/eip7928_block_level_access_lists/test_block_access_lists_opcodes.py @@ -538,6 +538,7 @@ def test_bal_call_no_delegation_and_oog_before_target_access( @pytest.mark.parametrize( "memory_expansion", [False, True], ids=["no_memory", "with_memory"] ) +@pytest.mark.json_loader def test_bal_call_no_delegation_oog_after_target_access( pre: Alloc, blockchain_test: BlockchainTestFiller, diff --git a/tests/berlin/eip2929_gas_cost_increases/test_call.py b/tests/berlin/eip2929_gas_cost_increases/test_call.py index 0ac8f376e61..66b28b90b12 100644 --- a/tests/berlin/eip2929_gas_cost_increases/test_call.py +++ b/tests/berlin/eip2929_gas_cost_increases/test_call.py @@ -17,6 +17,7 @@ @pytest.mark.valid_from("Berlin") +@pytest.mark.json_loader def test_call_insufficient_balance( state_test: StateTestFiller, pre: Alloc, env: Environment, fork: Fork ) -> None: diff --git a/tests/berlin/eip2930_access_list/test_acl.py b/tests/berlin/eip2930_access_list/test_acl.py index 71116c90741..678a25bae6c 100644 --- a/tests/berlin/eip2930_access_list/test_acl.py +++ b/tests/berlin/eip2930_access_list/test_acl.py @@ -213,6 +213,7 @@ def test_account_storage_warm_cold_state( ), ], ) +@pytest.mark.json_loader def test_transaction_intrinsic_gas_cost( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/byzantium/eip196_ec_add_mul/test_ecadd.py b/tests/byzantium/eip196_ec_add_mul/test_ecadd.py index 885fc0ead39..9e759ed7863 100644 --- a/tests/byzantium/eip196_ec_add_mul/test_ecadd.py +++ b/tests/byzantium/eip196_ec_add_mul/test_ecadd.py @@ -260,6 +260,7 @@ def test_valid( ], pr=["https://github.com/ethereum/execution-specs/pull/1935"], ) +@pytest.mark.json_loader def test_invalid( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/byzantium/eip198_modexp_precompile/test_modexp.py b/tests/byzantium/eip198_modexp_precompile/test_modexp.py index beff496046b..0344ca1b9d2 100644 --- a/tests/byzantium/eip198_modexp_precompile/test_modexp.py +++ b/tests/byzantium/eip198_modexp_precompile/test_modexp.py @@ -453,6 +453,7 @@ ids=lambda param: param.__repr__(), # only required to remove parameter # names (input/output) ) +@pytest.mark.json_loader def test_modexp( state_test: StateTestFiller, mod_exp_input: ModExpInput | Bytes, diff --git a/tests/byzantium/eip214_staticcall/test_staticcall.py b/tests/byzantium/eip214_staticcall/test_staticcall.py index d3926bcf710..c4ba24ccbe9 100644 --- a/tests/byzantium/eip214_staticcall/test_staticcall.py +++ b/tests/byzantium/eip214_staticcall/test_staticcall.py @@ -105,6 +105,7 @@ def bal_expectation_for_contract_with_markers( "stStaticFlagEnabled/StaticcallForPrecompilesIssue683Filler.yml" ) @pytest.mark.valid_from("Byzantium") +@pytest.mark.json_loader def test_staticcall_reentrant_call_to_precompile( pre: Alloc, state_test: StateTestFiller, diff --git a/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py b/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py index f35a2ed53fa..3d2111fd3d0 100644 --- a/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py +++ b/tests/cancun/eip1153_tstore/test_tstorage_execution_contexts.py @@ -368,6 +368,7 @@ def post( # noqa: D103 @CallContextTestCases.parametrize() +@pytest.mark.json_loader def test_subcall( state_test: StateTestFiller, env: Environment, diff --git a/tests/cancun/eip4844_blobs/test_blob_txs.py b/tests/cancun/eip4844_blobs/test_blob_txs.py index 28d3ce77229..a94d8b157e0 100644 --- a/tests/cancun/eip4844_blobs/test_blob_txs.py +++ b/tests/cancun/eip4844_blobs/test_blob_txs.py @@ -498,6 +498,7 @@ def generate_invalid_tx_max_fee_per_blob_gas_tests( [1_000_000_000], ) # Extra balance to cover block blob gas cost @pytest.mark.valid_from("Cancun") +@pytest.mark.json_loader def test_invalid_tx_max_fee_per_blob_gas( blockchain_test: BlockchainTestFiller, pre: Alloc, @@ -563,6 +564,7 @@ def test_invalid_tx_max_fee_per_blob_gas_state( ) @pytest.mark.exception_test @pytest.mark.valid_from("Cancun") +@pytest.mark.json_loader def test_invalid_normal_gas( state_test: StateTestFiller, state_env: Environment, @@ -603,6 +605,7 @@ def test_invalid_normal_gas( ) @pytest.mark.exception_test @pytest.mark.valid_from("Cancun") +@pytest.mark.json_loader def test_invalid_block_blob_count( blockchain_test: BlockchainTestFiller, pre: Alloc, @@ -934,6 +937,7 @@ def generate_invalid_tx_blob_count_tests( ) @pytest.mark.exception_test @pytest.mark.valid_from("Cancun") +@pytest.mark.json_loader def test_invalid_tx_blob_count( state_test: StateTestFiller, state_env: Environment, @@ -1049,6 +1053,7 @@ def test_invalid_blob_hash_versioning_single_tx( ) @pytest.mark.exception_test @pytest.mark.valid_from("Cancun") +@pytest.mark.json_loader def test_invalid_blob_hash_versioning_multiple_txs( blockchain_test: BlockchainTestFiller, pre: Alloc, diff --git a/tests/cancun/eip4844_blobs/test_blobhash_opcode.py b/tests/cancun/eip4844_blobs/test_blobhash_opcode.py index 20404301577..33a6a8d5183 100644 --- a/tests/cancun/eip4844_blobs/test_blobhash_opcode.py +++ b/tests/cancun/eip4844_blobs/test_blobhash_opcode.py @@ -306,6 +306,7 @@ def test_blobhash_scenarios( "invalid_calls", ], ) +@pytest.mark.json_loader def test_blobhash_invalid_blob_index( pre: Alloc, fork: Fork, diff --git a/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py b/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py index d5f6dbff75f..b36e7e5d84b 100644 --- a/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py +++ b/tests/cancun/eip4844_blobs/test_excess_blob_gas_fork_transition.py @@ -453,6 +453,7 @@ def test_invalid_post_fork_block_without_blob_fields( ), ], ) +@pytest.mark.json_loader def test_fork_transition_excess_blob_gas_at_blob_genesis( blockchain_test: BlockchainTestFiller, genesis_environment: Environment, diff --git a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py index be69af276cb..64a2aebdf08 100644 --- a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py +++ b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile.py @@ -353,6 +353,7 @@ def test_valid_inputs( ) @pytest.mark.parametrize("result", [Result.FAILURE]) @pytest.mark.valid_from("Cancun") +@pytest.mark.json_loader def test_invalid_inputs( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py index 02116fe122d..832f20f4365 100644 --- a/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py +++ b/tests/cancun/eip4844_blobs/test_point_evaluation_precompile_gas.py @@ -203,6 +203,7 @@ def post( ) @pytest.mark.parametrize("proof", ["correct", "incorrect"]) @pytest.mark.valid_from("Cancun") +@pytest.mark.json_loader def test_point_evaluation_precompile_gas_usage( state_test: StateTestFiller, pre: Dict, diff --git a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py index 4d18b2caf07..18d397ccd18 100644 --- a/tests/constantinople/eip1052_extcodehash/test_extcodehash.py +++ b/tests/constantinople/eip1052_extcodehash/test_extcodehash.py @@ -39,6 +39,7 @@ ], pr=["https://github.com/ethereum/execution-specs/pull/2249"], ) +@pytest.mark.json_loader def test_extcodehash_self( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py b/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py index 3d844d687fc..ef9380bc6cf 100644 --- a/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py +++ b/tests/constantinople/eip145_bitwise_shift/test_shift_combinations.py @@ -59,6 +59,7 @@ ], pr=["https://github.com/ethereum/execution-spec-tests/pull/1683"], ) +@pytest.mark.json_loader def test_combinations( state_test: StateTestFiller, pre: Alloc, opcode: Op, operation: Callable ) -> None: diff --git a/tests/frontier/create/test_create_deposit_oog.py b/tests/frontier/create/test_create_deposit_oog.py index fac46ba629d..6a322007580 100644 --- a/tests/frontier/create/test_create_deposit_oog.py +++ b/tests/frontier/create/test_create_deposit_oog.py @@ -21,6 +21,7 @@ @pytest.mark.valid_from("Frontier") @pytest.mark.parametrize("enough_gas", [True, False]) @pytest.mark.with_all_create_opcodes +@pytest.mark.json_loader def test_create_deposit_oog( state_test: StateTestFiller, fork: Fork, diff --git a/tests/frontier/create/test_create_one_byte.py b/tests/frontier/create/test_create_one_byte.py index cede8b537a8..3def274b2b5 100644 --- a/tests/frontier/create/test_create_one_byte.py +++ b/tests/frontier/create/test_create_one_byte.py @@ -32,6 +32,7 @@ ) @pytest.mark.valid_from("Frontier") @pytest.mark.with_all_create_opcodes +@pytest.mark.json_loader def test_create_one_byte( state_test: StateTestFiller, fork: Fork, diff --git a/tests/frontier/create/test_create_suicide_during_init.py b/tests/frontier/create/test_create_suicide_during_init.py index dbd7febbcef..79e26d80894 100644 --- a/tests/frontier/create/test_create_suicide_during_init.py +++ b/tests/frontier/create/test_create_suicide_during_init.py @@ -44,6 +44,7 @@ def __int__(self) -> int: "operation", [Operation.SUICIDE, Operation.SUICIDE_TO_ITSELF], ) +@pytest.mark.json_loader def test_create_suicide_during_transaction_create( state_test: StateTestFiller, fork: Fork, diff --git a/tests/frontier/create/test_create_suicide_store.py b/tests/frontier/create/test_create_suicide_store.py index 34cc31d53f4..0ae9abe8522 100644 --- a/tests/frontier/create/test_create_suicide_store.py +++ b/tests/frontier/create/test_create_suicide_store.py @@ -41,6 +41,7 @@ class Operation(IntEnum): ) @pytest.mark.valid_from("Frontier") @pytest.mark.with_all_create_opcodes +@pytest.mark.json_loader def test_create_suicide_store( state_test: StateTestFiller, fork: Fork, diff --git a/tests/frontier/identity_precompile/test_identity.py b/tests/frontier/identity_precompile/test_identity.py index 943668261da..cd608d12ef3 100644 --- a/tests/frontier/identity_precompile/test_identity.py +++ b/tests/frontier/identity_precompile/test_identity.py @@ -113,6 +113,7 @@ ), ], ) +@pytest.mark.json_loader def test_call_identity_precompile( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/frontier/opcodes/test_all_opcodes.py b/tests/frontier/opcodes/test_all_opcodes.py index d9d4eac34cf..a362b65cdcd 100644 --- a/tests/frontier/opcodes/test_all_opcodes.py +++ b/tests/frontier/opcodes/test_all_opcodes.py @@ -66,6 +66,7 @@ def prepare_suffix(opcode: Opcode) -> Bytecode: pr=["https://github.com/ethereum/execution-spec-tests/pull/748"], ) @pytest.mark.valid_from("Frontier") +@pytest.mark.json_loader def test_all_opcodes( state_test: StateTestFiller, pre: Alloc, fork: Fork ) -> None: @@ -151,6 +152,7 @@ def fork_opcodes_increasing_stack( @pytest.mark.parametrize_by_fork("opcode", fork_opcodes_increasing_stack) @pytest.mark.parametrize("fails", [True, False]) +@pytest.mark.json_loader def test_stack_overflow( state_test: StateTestFiller, pre: Alloc, @@ -227,6 +229,7 @@ def constant_gas_opcodes(fork: Fork) -> Generator[ParameterSet, None, None]: @pytest.mark.valid_from("Berlin") @pytest.mark.parametrize_by_fork("opcode", constant_gas_opcodes) +@pytest.mark.json_loader def test_constant_gas( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py b/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py index 5320a7a93e4..70b59fb1b06 100644 --- a/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py +++ b/tests/frontier/opcodes/test_call_and_callcode_gas_calculation.py @@ -318,6 +318,7 @@ def test_value_transfer_gas_calculation( @pytest.mark.parametrize("gas_shortage", [0, 1]) @pytest.mark.valid_from("Byzantium") @pytest.mark.valid_until("Berlin") +@pytest.mark.json_loader def test_value_transfer_gas_calculation_byzantium( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/frontier/opcodes/test_calldatacopy.py b/tests/frontier/opcodes/test_calldatacopy.py index 93012bb4dd4..787eac0cdeb 100644 --- a/tests/frontier/opcodes/test_calldatacopy.py +++ b/tests/frontier/opcodes/test_calldatacopy.py @@ -154,6 +154,7 @@ "sec", ], ) +@pytest.mark.json_loader def test_calldatacopy( state_test: StateTestFiller, code: Bytecode, diff --git a/tests/frontier/opcodes/test_swap.py b/tests/frontier/opcodes/test_swap.py index 2de28b8c370..77152f4f765 100644 --- a/tests/frontier/opcodes/test_swap.py +++ b/tests/frontier/opcodes/test_swap.py @@ -108,6 +108,7 @@ def test_swap( ids=lambda op: str(op), ) @pytest.mark.valid_from("Frontier") +@pytest.mark.json_loader def test_stack_underflow( state_test: StateTestFiller, fork: Fork, diff --git a/tests/frontier/precompiles/test_ecrecover.py b/tests/frontier/precompiles/test_ecrecover.py index ebcf921c247..38cd85f87cc 100644 --- a/tests/frontier/precompiles/test_ecrecover.py +++ b/tests/frontier/precompiles/test_ecrecover.py @@ -394,6 +394,7 @@ ), ], ) +@pytest.mark.json_loader def test_precompiles( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/frontier/precompiles/test_precompiles.py b/tests/frontier/precompiles/test_precompiles.py index 3326daf6f03..da5757101e9 100644 --- a/tests/frontier/precompiles/test_precompiles.py +++ b/tests/frontier/precompiles/test_precompiles.py @@ -57,6 +57,7 @@ def precompile_addresses(fork: Fork) -> Iterator[Tuple[Address, bool]]: @pytest.mark.parametrize_by_fork( "address,precompile_exists", precompile_addresses ) +@pytest.mark.json_loader def test_precompiles( state_test: StateTestFiller, address: Address, diff --git a/tests/frontier/precompiles/test_ripemd.py b/tests/frontier/precompiles/test_ripemd.py index 129c555845a..c20211fac03 100644 --- a/tests/frontier/precompiles/test_ripemd.py +++ b/tests/frontier/precompiles/test_ripemd.py @@ -141,6 +141,7 @@ ], ) @pytest.mark.parametrize("oog", [True, False]) +@pytest.mark.json_loader def test_precompiles( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/frontier/touch/test_touch.py b/tests/frontier/touch/test_touch.py index 3202986a2a4..5b6236ba424 100644 --- a/tests/frontier/touch/test_touch.py +++ b/tests/frontier/touch/test_touch.py @@ -13,6 +13,7 @@ @pytest.mark.valid_from("Frontier") @pytest.mark.valid_until("Berlin") +@pytest.mark.json_loader def test_zero_gas_price_and_touching( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/frontier/validation/test_transaction.py b/tests/frontier/validation/test_transaction.py index 2f10ce2bfed..6dceb27832c 100644 --- a/tests/frontier/validation/test_transaction.py +++ b/tests/frontier/validation/test_transaction.py @@ -15,6 +15,7 @@ @pytest.mark.exception_test +@pytest.mark.json_loader def test_tx_gas_limit( blockchain_test: BlockchainTestFiller, pre: Alloc, @@ -65,6 +66,7 @@ def test_tx_gas_limit( ], ) @pytest.mark.pre_alloc_mutable +@pytest.mark.json_loader def test_tx_nonce( blockchain_test: BlockchainTestFiller, pre: Alloc, @@ -106,6 +108,7 @@ def test_tx_nonce( (1, None), ], ) +@pytest.mark.json_loader def test_sender_balance( blockchain_test: BlockchainTestFiller, pre: Alloc, diff --git a/tests/istanbul/eip152_blake2/test_blake2.py b/tests/istanbul/eip152_blake2/test_blake2.py index 649f87ed14a..5f4d7afcdb9 100644 --- a/tests/istanbul/eip152_blake2/test_blake2.py +++ b/tests/istanbul/eip152_blake2/test_blake2.py @@ -508,6 +508,7 @@ def test_blake2b( ), ], ) +@pytest.mark.json_loader def test_blake2b_invalid_gas( state_test: StateTestFiller, pre: Alloc, @@ -632,6 +633,7 @@ def tx_gas_limits(fork: Fork) -> List[int]: ), ], ) +@pytest.mark.json_loader def test_blake2b_gas_limit( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/json_infra/__init__.py b/tests/json_infra/__init__.py deleted file mode 100644 index 605a843a165..00000000000 --- a/tests/json_infra/__init__.py +++ /dev/null @@ -1,42 +0,0 @@ -"""Tests related to json infrastructure.""" - -from typing import Dict, TypedDict - -from typing_extensions import NotRequired - -from .hardfork import TestHardfork - - -class _FixtureSource(TypedDict): - url: str - fixture_path: str - commit_hash: NotRequired[str] - - -# Update the links and commit hash in order to consume -# newer/other tests -TEST_FIXTURES: Dict[str, _FixtureSource] = { - "evm_tools_testdata": { - "url": "https://github.com/gurukamath/evm-tools-testdata.git", - "commit_hash": "792422d", - "fixture_path": "tests/json_infra/fixtures/evm_tools_testdata", - }, - "ethereum_tests": { - "url": "https://github.com/ethereum/tests.git", - "commit_hash": "c67e485ff8b5be9abc8ad15345ec21aa22e290d9", - "fixture_path": "tests/json_infra/fixtures/ethereum_tests", - }, - "latest_fork_tests": { - "url": "https://github.com/ethereum/execution-spec-tests/releases/download/v5.3.0/fixtures_develop.tar.gz", - "fixture_path": "tests/json_infra/fixtures/latest_fork_tests", - }, - "amsterdam_tests": { - "url": "https://github.com/ethereum/execution-spec-tests/releases/download/bal%40v3.0.1/fixtures_bal.tar.gz", - "fixture_path": "tests/json_infra/fixtures/amsterdam_tests", - }, -} - - -FORKS: Dict[str, TestHardfork] = { - fork.json_test_name: fork for fork in TestHardfork.discover() -} diff --git a/tests/json_infra/helpers/load_transaction_tests.py b/tests/json_infra/helpers/load_transaction_tests.py deleted file mode 100644 index 3847b33ac77..00000000000 --- a/tests/json_infra/helpers/load_transaction_tests.py +++ /dev/null @@ -1,36 +0,0 @@ -"""Helper function to load transaction tests from JSON files.""" - -import json -import os -from typing import Any, Dict - -from ethereum.utils.hexadecimal import hex_to_bytes - - -class NoTestsFoundError(Exception): - """ - An exception thrown when the test for a particular fork isn't - available in the json fixture. - """ - - -def load_test_transaction( - test_dir: str, test_file: str, network: str -) -> Dict[str, Any]: - """Loads transaction test data from a JSON file for a specific network.""" - pure_test_file = os.path.basename(test_file) - test_name = os.path.splitext(pure_test_file)[0] - path = os.path.join(test_dir, test_file) - - with open(path, "r") as fp: - json_data = json.load(fp)[f"{test_name}"] - - tx_rlp = hex_to_bytes(json_data["txbytes"]) - try: - test_result = json_data["result"][network] - except KeyError as e: - raise NoTestsFoundError( - f"No tests found for {network} in {test_file}" - ) from e - - return {"tx_rlp": tx_rlp, "test_result": test_result} diff --git a/tests/json_infra/test_ethash.py b/tests/json_infra/test_ethash.py deleted file mode 100644 index 03708d011f8..00000000000 --- a/tests/json_infra/test_ethash.py +++ /dev/null @@ -1,155 +0,0 @@ -"""Fork specific tests for the Ethash proof-of-work algorithm.""" - -import importlib -import json -import pkgutil -from typing import Any, Dict, List, cast - -import pytest -from ethereum_rlp import rlp -from ethereum_types.numeric import Uint - -from ethereum.crypto.hash import keccak256 -from ethereum.ethash import ( - cache_size, - dataset_size, - generate_cache, - generate_seed, - hashimoto_light, -) -from ethereum.utils.hexadecimal import ( - hex_to_bytes, - hex_to_bytes8, - hex_to_bytes32, -) -from ethereum.utils.numeric import le_uint32_sequence_to_bytes - -from . import FORKS, TEST_FIXTURES -from .helpers.load_blockchain_tests import Load -from .stash_keys import desired_forks_key - -ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"] - -POW_FORKS = [ - "Frontier", - "Homestead", - "EIP150", - "EIP158", - "Byzantium", - "ConstantinopleFix", - "Istanbul", - "Berlin", -] - - -@pytest.mark.slow -@pytest.mark.parametrize("json_fork", POW_FORKS) -def test_ethtest_fixtures( - json_fork: str, request: pytest.FixtureRequest -) -> None: - """Tests ethash proof-of-work validation against ethereum test fixtures.""" - desired_forks = request.config.stash.get(desired_forks_key, []) - if json_fork not in desired_forks: - pytest.skip(f"Fork {json_fork} not in desired forks") - - eels_fork = FORKS[json_fork].short_name - fork_module = importlib.import_module(f"ethereum.forks.{eels_fork}.fork") - - ethereum_tests = load_pow_test_fixtures(json_fork) - for test in ethereum_tests: - header = test["header"] - assert header.nonce == test["nonce"] - assert header.mix_digest == test["mix_digest"] - assert generate_seed(header.number) == test["seed"] - assert cache_size(header.number) == test["cache_size"] - assert dataset_size(header.number) == test["dataset_size"] - - header_hash = fork_module.generate_header_hash_for_pow(header) - assert header_hash == test["header_hash"] - - cache = generate_cache(header.number) - cache_hash = keccak256( - b"".join( - le_uint32_sequence_to_bytes(cache_item) for cache_item in cache - ) - ) - assert cache_hash == test["cache_hash"] - - mix_digest, result = hashimoto_light( - header_hash, header.nonce, cache, dataset_size(header.number) - ) - assert mix_digest == test["mix_digest"] - assert result == test["result"] - - -def load_pow_test_fixtures(json_fork: str) -> List[Dict[str, Any]]: - """ - Loads proof-of-work test fixtures for a specific fork - from JSON files. - """ - eels_fork = FORKS[json_fork].short_name - header = importlib.import_module( - f"ethereum.forks.{eels_fork}.blocks" - ).Header - - with open( - f"{ETHEREUM_TESTS_PATH}/PoWTests/ethash_tests.json" - ) as pow_test_file_handler: - return [ - { - "nonce": hex_to_bytes8(raw_fixture["nonce"]), - "mix_digest": hex_to_bytes32(raw_fixture["mixHash"]), - "header": rlp.decode_to( - header, hex_to_bytes(raw_fixture["header"]) - ), - "seed": hex_to_bytes32(raw_fixture["seed"]), - "result": hex_to_bytes32(raw_fixture["result"]), - "cache_size": Uint(raw_fixture["cache_size"]), - "dataset_size": Uint(raw_fixture["full_size"]), - "header_hash": hex_to_bytes32(raw_fixture["header_hash"]), - "cache_hash": hex_to_bytes32(raw_fixture["cache_hash"]), - } - for raw_fixture in json.load(pow_test_file_handler).values() - ] - - -@pytest.mark.slow -@pytest.mark.parametrize("json_fork", POW_FORKS) -@pytest.mark.parametrize( - "block_file_name", - [ - "block_1.json", - "block_1234567.json", - "block_12964999.json", - ], -) -def test_pow_validation_block_headers( - json_fork: str, block_file_name: str, request: pytest.FixtureRequest -) -> None: - """ - Tests proof-of-work validation on real block headers for - specific forks. - """ - desired_forks = request.config.stash.get(desired_forks_key, []) - if json_fork not in desired_forks: - pytest.skip(f"Fork {json_fork} not in desired forks") - - eels_fork = FORKS[json_fork].short_name - fork_module = importlib.import_module(f"ethereum.forks.{eels_fork}.fork") - - block_str_data = cast( - bytes, pkgutil.get_data("ethereum", f"assets/blocks/{block_file_name}") - ).decode() - block_json_data = json.loads(block_str_data) - - load = Load(eels_fork) - header = load.json_to_header(block_json_data) - fork_module.validate_proof_of_work(header) - - -# TODO: Once there is a method to download blocks, test the proof-of-work -# validation for the following blocks in each hardfork (except London as the -# current PoW algo won't work from London): -# * Start of hardfork -# * two random blocks inside the hardfork -# * End of hardfork diff --git a/tests/json_infra/test_rlp.py b/tests/json_infra/test_rlp.py deleted file mode 100644 index 33adbd9fde3..00000000000 --- a/tests/json_infra/test_rlp.py +++ /dev/null @@ -1,94 +0,0 @@ -"""Tests for RLP encoding and decoding using ethereum/tests fixtures.""" - -import json -import os -from typing import List, Sequence, Tuple - -import pytest -from ethereum_rlp import Extended, rlp - -from ethereum.forks.frontier.fork_types import Bytes, Uint -from ethereum.utils.hexadecimal import hex_to_bytes - -from . import TEST_FIXTURES - -ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"] - - -# -# Running ethereum/tests for rlp -# - - -def convert_to_rlp_native(obj: str | int | Sequence[str | int]) -> Extended: - """Converts test data objects to RLP-compatible native types.""" - if isinstance(obj, str): - return bytes(obj, "utf-8") - elif isinstance(obj, int): - return Uint(obj) - - # It's a sequence - return [convert_to_rlp_native(element) for element in obj] - - -def ethtest_fixtures_as_pytest_fixtures( - *test_files: str, -) -> List[Tuple[Extended, Bytes]]: - """Loads ethereum test fixtures and converts them to pytest fixtures.""" - base_path = f"{ETHEREUM_TESTS_PATH}/RLPTests/" - - test_data = dict() - for test_file in test_files: - with open(os.path.join(base_path, test_file), "r") as fp: - test_data.update(json.load(fp)) - - pytest_fixtures = [] - for test_details in test_data.values(): - if isinstance(test_details["in"], str) and test_details[ - "in" - ].startswith("#"): - test_details["in"] = int(test_details["in"][1:]) - - pytest_fixtures.append( - ( - convert_to_rlp_native(test_details["in"]), - hex_to_bytes(test_details["out"]), - ) - ) - - return pytest_fixtures - - -@pytest.mark.parametrize( - "raw_data, expected_encoded_data", - ethtest_fixtures_as_pytest_fixtures("rlptest.json"), -) -def test_ethtest_fixtures_for_rlp_encoding( - raw_data: Extended, expected_encoded_data: Bytes -) -> None: - """Tests RLP encoding against ethereum test fixtures.""" - assert rlp.encode(raw_data) == expected_encoded_data - - -@pytest.mark.parametrize( - "_raw_data, encoded_data", - ethtest_fixtures_as_pytest_fixtures("RandomRLPTests/example.json"), -) -def test_ethtest_fixtures_for_successfully_rlp_decoding( - _raw_data: Extended, encoded_data: Bytes -) -> None: - """Tests successful RLP decoding and re-encoding consistency.""" - decoded_data = rlp.decode(encoded_data) - assert rlp.encode(decoded_data) == encoded_data - - -@pytest.mark.parametrize( - "_raw_data, encoded_data", - ethtest_fixtures_as_pytest_fixtures("invalidRLPTest.json"), -) -def test_ethtest_fixtures_for_fails_in_rlp_decoding( - _raw_data: Bytes, encoded_data: Bytes -) -> None: - """Tests that invalid RLP data properly raises decoding errors.""" - with pytest.raises(rlp.DecodingError): - rlp.decode(encoded_data) diff --git a/tests/json_infra/test_transaction.py b/tests/json_infra/test_transaction.py deleted file mode 100644 index bc6398ad0f5..00000000000 --- a/tests/json_infra/test_transaction.py +++ /dev/null @@ -1,98 +0,0 @@ -"""Run the transaction tests from json fixtures.""" - -from typing import Callable - -import pytest -from ethereum_rlp import rlp - -from ethereum.exceptions import NonceOverflowError -from ethereum.forks.spurious_dragon.transactions import ( - Transaction, - validate_transaction, -) -from ethereum.utils.hexadecimal import hex_to_uint - -from . import FORKS, TEST_FIXTURES -from .helpers.load_transaction_tests import ( - NoTestsFoundError, - load_test_transaction, -) - -ETHEREUM_TESTS_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"] - -test_dir = f"{ETHEREUM_TESTS_PATH}/TransactionTests" - - -def _generate_high_nonce_tests_function(fork_name: str) -> Callable: - """ - Generates test functions for high nonce transaction validation - for a specific fork. - """ - - @pytest.mark.fork(fork_name) - @pytest.mark.parametrize( - "test_file_high_nonce", - [ - "ttNonce/TransactionWithHighNonce64Minus1.json", - "ttNonce/TransactionWithHighNonce64.json", - "ttNonce/TransactionWithHighNonce64Plus1.json", - ], - ) - def test_func(test_file_high_nonce: str) -> None: - try: - test = load_test_transaction( - test_dir, test_file_high_nonce, fork_name - ) - except NoTestsFoundError: - pytest.skip( - f"No tests found for {fork_name} in {test_file_high_nonce}" - ) - - tx = rlp.decode_to(Transaction, test["tx_rlp"]) - - with pytest.raises(NonceOverflowError): - validate_transaction(tx) - - test_func.__name__ = f"test_high_nonce_tests_{fork_name.lower()}" - return test_func - - -def _generate_nonce_tests_function(fork_name: str) -> Callable: - """ - Generates test functions for nonce transaction validation - for a specific fork. - """ - - @pytest.mark.parametrize( - "test_file_nonce", - [ - "ttNonce/TransactionWithHighNonce32.json", - "ttNonce/TransactionWithHighNonce64Minus2.json", - ], - ) - def test_func(test_file_nonce: str) -> None: - try: - test = load_test_transaction(test_dir, test_file_nonce, fork_name) - except NoTestsFoundError: - pytest.skip(f"No tests found for {fork_name} in {test_file_nonce}") - - tx = rlp.decode_to(Transaction, test["tx_rlp"]) - - result_intrinsic_gas_cost = hex_to_uint( - test["test_result"]["intrinsicGas"] - ) - - intrinsic_gas = validate_transaction(tx) - assert intrinsic_gas == result_intrinsic_gas_cost - - test_func.__name__ = f"test_nonce_tests_{fork_name.lower()}" - return test_func - - -for fork_name in FORKS.keys(): - locals()[f"test_high_nonce_tests_{fork_name.lower()}"] = ( - _generate_high_nonce_tests_function(fork_name) - ) - locals()[f"test_nonce_tests_{fork_name.lower()}"] = ( - _generate_nonce_tests_function(fork_name) - ) diff --git a/tests/json_infra/test_trie.py b/tests/json_infra/test_trie.py deleted file mode 100644 index 445736f3b3f..00000000000 --- a/tests/json_infra/test_trie.py +++ /dev/null @@ -1,142 +0,0 @@ -"""Run the trie tests from json fixtures.""" - -import importlib -import json -from typing import Any, Optional - -import pytest -from ethereum_types.bytes import Bytes - -from ethereum.utils.hexadecimal import has_hex_prefix, hex_to_bytes - -from . import FORKS, TEST_FIXTURES -from .stash_keys import desired_forks_key - -FIXTURE_PATH = TEST_FIXTURES["ethereum_tests"]["fixture_path"] - -forks = FORKS.keys() - - -def to_bytes(data: Optional[str]) -> Bytes: - """Converts string data to bytes, handling hex prefixes and None values.""" - if data is None: - return b"" - if has_hex_prefix(data): - return hex_to_bytes(data) - - return data.encode() - - -@pytest.mark.parametrize("fork", forks) -def test_trie_secure_hex(fork: str, request: pytest.FixtureRequest) -> None: - """Tests secure trie implementation with hex-encoded test data.""" - desired_forks = request.config.stash.get(desired_forks_key, []) - if fork not in desired_forks: - pytest.skip(f"Fork {fork} not in desired forks") - - tests = load_tests("hex_encoded_securetrie_test.json") - - eels_fork = FORKS[fork].short_name - trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie") - - for name, test in tests.items(): - st = trie_module.Trie(secured=True, default=b"") - for k, v in test.get("in").items(): - trie_module.trie_set(st, to_bytes(k), to_bytes(v)) - result = trie_module.root(st) - expected = hex_to_bytes(test.get("root")) - assert result == expected, f"test {name} failed" - - -@pytest.mark.parametrize("fork", forks) -def test_trie_secure(fork: str, request: pytest.FixtureRequest) -> None: - """Tests secure trie implementation with standard test data.""" - desired_forks = request.config.stash.get(desired_forks_key, []) - if fork not in desired_forks: - pytest.skip(f"Fork {fork} not in desired forks") - - tests = load_tests("trietest_secureTrie.json") - - eels_fork = FORKS[fork].short_name - trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie") - - for name, test in tests.items(): - st = trie_module.Trie(secured=True, default=b"") - for t in test.get("in"): - trie_module.trie_set(st, to_bytes(t[0]), to_bytes(t[1])) - result = trie_module.root(st) - expected = hex_to_bytes(test.get("root")) - assert result == expected, f"test {name} failed" - - -@pytest.mark.parametrize("fork", forks) -def test_trie_secure_any_order( - fork: str, request: pytest.FixtureRequest -) -> None: - """Tests secure trie implementation with any-order test data.""" - desired_forks = request.config.stash.get(desired_forks_key, []) - if fork not in desired_forks: - pytest.skip(f"Fork {fork} not in desired forks") - - tests = load_tests("trieanyorder_secureTrie.json") - - eels_fork = FORKS[fork].short_name - trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie") - - for name, test in tests.items(): - st = trie_module.Trie(secured=True, default=b"") - for k, v in test.get("in").items(): - trie_module.trie_set(st, to_bytes(k), to_bytes(v)) - result = trie_module.root(st) - expected = hex_to_bytes(test.get("root")) - assert result == expected, f"test {name} failed" - - -@pytest.mark.parametrize("fork", forks) -def test_trie(fork: str, request: pytest.FixtureRequest) -> None: - """Tests non-secure trie implementation with standard test data.""" - desired_forks = request.config.stash.get(desired_forks_key, []) - if fork not in desired_forks: - pytest.skip(f"Fork {fork} not in desired forks") - - tests = load_tests("trietest.json") - - eels_fork = FORKS[fork].short_name - trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie") - - for name, test in tests.items(): - st = trie_module.Trie(secured=False, default=b"") - for t in test.get("in"): - trie_module.trie_set(st, to_bytes(t[0]), to_bytes(t[1])) - result = trie_module.root(st) - expected = hex_to_bytes(test.get("root")) - assert result == expected, f"test {name} failed" - - -@pytest.mark.parametrize("fork", forks) -def test_trie_any_order(fork: str, request: pytest.FixtureRequest) -> None: - """Tests non-secure trie implementation with any-order test data.""" - desired_forks = request.config.stash.get(desired_forks_key, []) - if fork not in desired_forks: - pytest.skip(f"Fork {fork} not in desired forks") - - tests = load_tests("trieanyorder.json") - - eels_fork = FORKS[fork].short_name - trie_module = importlib.import_module(f"ethereum.forks.{eels_fork}.trie") - - for name, test in tests.items(): - st = trie_module.Trie(secured=False, default=b"") - for k, v in test.get("in").items(): - trie_module.trie_set(st, to_bytes(k), to_bytes(v)) - result = trie_module.root(st) - expected = hex_to_bytes(test.get("root")) - assert result == expected, f"test {name} failed" - - -def load_tests(path: str) -> Any: - """Loads test data from JSON file in the TrieTests directory.""" - with open(f"{FIXTURE_PATH}/TrieTests/" + path) as f: - tests = json.load(f) - - return tests diff --git a/tests/json_loader/__init__.py b/tests/json_loader/__init__.py new file mode 100644 index 00000000000..ab9dd4fca18 --- /dev/null +++ b/tests/json_loader/__init__.py @@ -0,0 +1,9 @@ +"""Tests related to json infrastructure.""" + +from typing import Dict + +from .hardfork import TestHardfork + +FORKS: Dict[str, TestHardfork] = { + fork.json_test_name: fork for fork in TestHardfork.discover() +} diff --git a/tests/json_infra/conftest.py b/tests/json_loader/conftest.py similarity index 50% rename from tests/json_infra/conftest.py rename to tests/json_loader/conftest.py index fc3a8cced93..c8491ba1350 100644 --- a/tests/json_infra/conftest.py +++ b/tests/json_loader/conftest.py @@ -1,42 +1,18 @@ """Pytest configuration for the json infra tests.""" -import os -import shutil -import tarfile -from glob import glob from pathlib import Path -from typing import ( - Callable, - Final, - Self, - Set, -) - -import git -import requests_cache +from typing import Callable + from _pytest.config.argparsing import Parser from _pytest.nodes import Item -from filelock import FileLock -from git.exc import GitCommandError, InvalidGitRepositoryError from pytest import Collector, Config, Session, fixture -from requests_cache import CachedSession -from requests_cache.backends.sqlite import SQLiteCache from ethereum_spec_tools.evm_tools.t8n import ForkCache -from . import FORKS, TEST_FIXTURES +from . import FORKS from .helpers import FixturesFile, FixtureTestItem from .helpers.select_tests import extract_affected_forks -from .stash_keys import desired_forks_key, fixture_lock, fork_cache_key - -try: - from xdist import get_xdist_worker_id -except ImportError: - - def get_xdist_worker_id(request_or_session: object) -> str: - """Fallback implementation when xdist is not available.""" - del request_or_session - return "master" +from .stash_keys import desired_forks_key, fork_cache_key @fixture() @@ -213,170 +189,19 @@ def pytest_collection_modifyitems(config: Config, items: list[Item]) -> None: items[:] = selected # keep only what matches -class _FixturesDownloader: - cache: Final[SQLiteCache] - session: Final[CachedSession] - root: Final[Path] - keep_cache_keys: Final[Set[str]] - - def __init__(self, root: Path) -> None: - self.root = root - self.cache = SQLiteCache(use_cache_dir=True, db_path="eels_cache") - self.session = requests_cache.CachedSession( - backend=self.cache, - ignored_parameters=["X-Amz-Signature", "X-Amz-Date"], - expire_after=24 * 60 * 60, - cache_control=True, - ) - self.keep_cache_keys = set() - - def fetch_http(self, url: str, location: str) -> None: - path = self.root.joinpath(location) - print(f"Downloading {location}...") - - with self.session.get(url, stream=True) as response: - if response.from_cache: - print(f"Cache hit {url}") - else: - print(f"Cache miss {url} :(") - - # Track the cache keys we've hit this session so we don't delete - # them. - all_responses = [response] + response.history - current_keys = set( - self.cache.create_key(request=r.request) for r in all_responses - ) - self.keep_cache_keys.update(current_keys) - - with tarfile.open(fileobj=response.raw, mode="r:gz") as tar: - shutil.rmtree(path, ignore_errors=True) - print(f"Extracting {location}...") - tar.extractall(path) - - def fetch_git(self, url: str, location: str, commit_hash: str) -> None: - path = self.root.joinpath(location) - if not os.path.exists(path): - print(f"Cloning {location}...") - repo = git.Repo.clone_from(url, to_path=path) - else: - print(f"{location} already available.") - repo = git.Repo(path) - - print(f"Checking out the correct commit {commit_hash}...") - # Try to checkout the relevant commit hash and if that fails - # fetch the latest changes and checkout the commit hash - last_exception = None - try: - repo.git.checkout(commit_hash) - except GitCommandError as e: - last_exception = e - for head in repo.heads: - repo.remotes.origin.fetch(head.name) - try: - repo.git.checkout(commit_hash) - last_exception = None - break - except GitCommandError as e: - last_exception = e - - if last_exception: - raise last_exception from None - - # Check if the submodule head matches the parent commit - # If not, update the submodule - for submodule in repo.submodules: - # Initialize the submodule if not already initialized - try: - submodule_repo = submodule.module() - except InvalidGitRepositoryError: - submodule.update(init=True, recursive=True) - continue - - # Commit expected by the parent repo - parent_commit = submodule.hexsha - - # Actual submodule head - submodule_head = submodule_repo.head.commit.hexsha - if parent_commit != submodule_head: - submodule.update(init=True, recursive=True) - - def __enter__(self) -> Self: - assert not self.keep_cache_keys - return self - - def __exit__( - self, exc_type: object, exc_value: object, traceback: object - ) -> None: - del exc_type, exc_value, traceback - cached = self.cache.filter(expired=True, invalid=True) - to_delete = set(x.cache_key for x in cached) - self.keep_cache_keys - if to_delete: - print(f"Evicting {len(to_delete)} from HTTP cache") - self.cache.delete(*to_delete, vacuum=True) - self.keep_cache_keys.clear() - - def pytest_sessionstart(session: Session) -> None: - """Initialize test fixtures and file locking at session start.""" + """Initialize the fork cache at session start.""" fork_cache = ForkCache() fork_cache.__enter__() session.stash[fork_cache_key] = fork_cache - if get_xdist_worker_id(session) != "master": - return - - lock_path = session.config.rootpath.joinpath("tests/fixtures/.lock") - stash = session.stash - lock_file = FileLock(str(lock_path), timeout=0) - lock_file.acquire() - - assert fixture_lock not in stash - stash[fixture_lock] = lock_file - - with _FixturesDownloader(session.config.rootpath) as downloader: - for _, props in TEST_FIXTURES.items(): - fixture_path = props["fixture_path"] - - os.makedirs(os.path.dirname(fixture_path), exist_ok=True) - - if "commit_hash" in props: - downloader.fetch_git( - props["url"], fixture_path, props["commit_hash"] - ) - else: - downloader.fetch_http( - props["url"], - fixture_path, - ) - - # Remove any python files in the downloaded files to avoid - # importing them. - for python_file in glob( - os.path.join(fixture_path, "**/*.py"), recursive=True - ): - try: - os.unlink(python_file) - except FileNotFoundError: - # Not breaking error, another process deleted it first - pass - def pytest_sessionfinish(session: Session, exitstatus: int) -> None: - """Clean up file locks at session finish.""" + """Clean up the fork cache at session finish.""" del exitstatus - session.stash[fork_cache_key].__exit__() del session.stash[fork_cache_key] - if get_xdist_worker_id(session) != "master": - return - - lock_file = session.stash[fixture_lock] - session.stash[fixture_lock] = None - - assert lock_file is not None - lock_file.release() - def pytest_collect_file( file_path: Path, parent: Collector diff --git a/tests/json_infra/hardfork.py b/tests/json_loader/hardfork.py similarity index 100% rename from tests/json_infra/hardfork.py rename to tests/json_loader/hardfork.py diff --git a/tests/json_infra/helpers/__init__.py b/tests/json_loader/helpers/__init__.py similarity index 100% rename from tests/json_infra/helpers/__init__.py rename to tests/json_loader/helpers/__init__.py diff --git a/tests/json_infra/helpers/exceptional_test_patterns.py b/tests/json_loader/helpers/exceptional_test_patterns.py similarity index 97% rename from tests/json_infra/helpers/exceptional_test_patterns.py rename to tests/json_loader/helpers/exceptional_test_patterns.py index a1ee9952275..921b87793c7 100644 --- a/tests/json_infra/helpers/exceptional_test_patterns.py +++ b/tests/json_loader/helpers/exceptional_test_patterns.py @@ -69,7 +69,7 @@ def exceptional_blockchain_test_patterns( f"tests/{ef}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py::test_valid\\[fork_{jf}-blockchain_test-multi_inf_pair-\\]", f"tests/{ef}/eip2935_historical_block_hashes_from_state/test_block_hashes\\.py::test_block_hashes_history\\[fork_{jf}-blockchain_test-full_history_plus_one_check_blockhash_first\\]", # Static tests from EEST - "tests/json_infra/fixtures/latest_fork_tests/fixtures/blockchain_tests/static", + "tests/json_loader/fixtures/latest_fork_tests/fixtures/blockchain_tests/static", ) # These are tests that are considered to be incorrect, @@ -132,7 +132,7 @@ def exceptional_state_test_patterns( f"tests/{ef}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py::test_valid\\[fork_{jf}-state_test-inf_pair-\\]", f"tests/{ef}/eip2537_bls_12_381_precompiles/test_bls12_pairing\\.py::test_valid\\[fork_{jf}-state_test-multi_inf_pair-\\]", # Static tests from EEST - "tests/json_infra/fixtures/latest_fork_tests/fixtures/state_tests/static", + "tests/json_loader/fixtures/latest_fork_tests/fixtures/state_tests/static", ) return TestPatterns( diff --git a/tests/json_infra/helpers/fixtures.py b/tests/json_loader/helpers/fixtures.py similarity index 100% rename from tests/json_infra/helpers/fixtures.py rename to tests/json_loader/helpers/fixtures.py diff --git a/tests/json_infra/helpers/load_blockchain_tests.py b/tests/json_loader/helpers/load_blockchain_tests.py similarity index 100% rename from tests/json_infra/helpers/load_blockchain_tests.py rename to tests/json_loader/helpers/load_blockchain_tests.py diff --git a/tests/json_infra/helpers/load_state_tests.py b/tests/json_loader/helpers/load_state_tests.py similarity index 100% rename from tests/json_infra/helpers/load_state_tests.py rename to tests/json_loader/helpers/load_state_tests.py diff --git a/tests/json_infra/helpers/load_vm_tests.py b/tests/json_loader/helpers/load_vm_tests.py similarity index 100% rename from tests/json_infra/helpers/load_vm_tests.py rename to tests/json_loader/helpers/load_vm_tests.py diff --git a/tests/json_infra/helpers/select_tests.py b/tests/json_loader/helpers/select_tests.py similarity index 98% rename from tests/json_infra/helpers/select_tests.py rename to tests/json_loader/helpers/select_tests.py index 602c5323a25..452a782e6c0 100644 --- a/tests/json_infra/helpers/select_tests.py +++ b/tests/json_loader/helpers/select_tests.py @@ -66,7 +66,7 @@ def extract_affected_forks( # Skip invalid paths continue - if file_path.is_relative_to("tests/json_infra/"): + if file_path.is_relative_to("tests/json_loader/"): # Run all forks if something changes in the test # framework return all_forks diff --git a/tests/json_infra/stash_keys.py b/tests/json_loader/stash_keys.py similarity index 51% rename from tests/json_infra/stash_keys.py rename to tests/json_loader/stash_keys.py index 842c838655c..63002ce3ab0 100644 --- a/tests/json_infra/stash_keys.py +++ b/tests/json_loader/stash_keys.py @@ -1,12 +1,8 @@ -"""Shared StashKey definitions for json_infra tests.""" +"""Shared StashKey definitions for json_loader tests.""" -from typing import Optional - -from filelock import FileLock from pytest import StashKey from ethereum_spec_tools.evm_tools.t8n import ForkCache desired_forks_key = StashKey[list[str]]() -fixture_lock = StashKey[Optional[FileLock]]() fork_cache_key = StashKey[ForkCache]() diff --git a/tests/json_infra/test_ethash_general.py b/tests/json_loader/test_ethash_general.py similarity index 100% rename from tests/json_infra/test_ethash_general.py rename to tests/json_loader/test_ethash_general.py diff --git a/tests/json_infra/test_genesis.py b/tests/json_loader/test_genesis.py similarity index 100% rename from tests/json_infra/test_genesis.py rename to tests/json_loader/test_genesis.py diff --git a/tests/json_infra/test_optimized_state.py b/tests/json_loader/test_optimized_state.py similarity index 100% rename from tests/json_infra/test_optimized_state.py rename to tests/json_loader/test_optimized_state.py diff --git a/tests/json_infra/test_tools.py b/tests/json_loader/test_tools.py similarity index 100% rename from tests/json_infra/test_tools.py rename to tests/json_loader/test_tools.py diff --git a/tests/json_infra/test_tools_new_fork.py b/tests/json_loader/test_tools_new_fork.py similarity index 100% rename from tests/json_infra/test_tools_new_fork.py rename to tests/json_loader/test_tools_new_fork.py diff --git a/tests/json_infra/test_trace.py b/tests/json_loader/test_trace.py similarity index 100% rename from tests/json_infra/test_trace.py rename to tests/json_loader/test_trace.py diff --git a/tests/json_infra/test_transaction_codec.py b/tests/json_loader/test_transaction_codec.py similarity index 100% rename from tests/json_infra/test_transaction_codec.py rename to tests/json_loader/test_transaction_codec.py diff --git a/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py b/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py index 273eac20411..83e89b8c616 100644 --- a/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py +++ b/tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py @@ -342,6 +342,7 @@ def total_cost_floor_per_token(fork: Fork) -> int: ) @pytest.mark.parametrize("zero_byte", [True, False]) @pytest.mark.valid_from("Osaka") +@pytest.mark.json_loader def test_tx_gas_limit_cap_full_calldata( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py b/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py index d00ebe6d406..dd71a6473f1 100644 --- a/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py +++ b/tests/osaka/eip7883_modexp_gas_increase/test_modexp_thresholds.py @@ -304,6 +304,7 @@ def test_modexp_gas_usage_contract_wrapper( @EIPChecklist.Precompile.Test.CallContexts.TxEntry() @EIPChecklist.Precompile.Test.ValueTransfer.NoFee() @pytest.mark.valid_from("Berlin") +@pytest.mark.json_loader def test_modexp_used_in_transaction_entry_points( state_test: StateTestFiller, pre: Alloc, @@ -683,6 +684,7 @@ def create_modexp_variable_gas_test_cases() -> Generator: @EIPChecklist.Precompile.Test.InputLengths.Zero() @EIPChecklist.GasCostChanges.Test.GasUpdatesMeasurement() @pytest.mark.valid_from("Berlin") +@pytest.mark.json_loader def test_modexp_variable_gas_cost( state_test: StateTestFiller, precompile_gas: int, diff --git a/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py b/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py index 68d2df98581..688e43d1f46 100644 --- a/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py +++ b/tests/osaka/eip7918_blob_reserve_price/test_blob_base_fee.py @@ -232,6 +232,7 @@ def get_boundary_scenarios(fork: Fork) -> Iterator[Any]: "parent_excess_blobs,block_base_fee_per_gas_delta", get_boundary_scenarios, ) +@pytest.mark.json_loader def test_reserve_price_boundary( blockchain_test: BlockchainTestFiller, env: Environment, diff --git a/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py b/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py index 5615bab195b..ee5ba4e3a77 100644 --- a/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py +++ b/tests/osaka/eip7934_block_rlp_limit/test_max_block_rlp_size.py @@ -693,6 +693,7 @@ def test_block_at_rlp_size_limit_boundary( @pytest.mark.with_all_typed_transactions @pytest.mark.verify_sync @pytest.mark.valid_from("Osaka") +@pytest.mark.json_loader def test_block_rlp_size_at_limit_with_all_typed_transactions( blockchain_test: BlockchainTestFiller, pre: Alloc, diff --git a/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py b/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py index 746e1794c39..4145ff894b6 100644 --- a/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py +++ b/tests/osaka/eip7939_count_leading_zeros/test_count_leading_zeros.py @@ -365,6 +365,7 @@ def test_clz_fork_transition( @pytest.mark.parametrize("valid_jump", [True, False]) @pytest.mark.parametrize("jumpi_condition", [True, False]) @pytest.mark.parametrize("bits", [0, 16, 64, 128, 255]) +@pytest.mark.json_loader def test_clz_jump_operation( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py b/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py index f268c6b6776..19830361c1b 100644 --- a/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py +++ b/tests/osaka/eip7951_p256verify_precompiles/test_p256verify.py @@ -43,6 +43,7 @@ @EIPChecklist.Precompile.Test.CallContexts.Normal() @EIPChecklist.Precompile.Test.Inputs.Valid() @EIPChecklist.Precompile.Test.Inputs.MaxValues() +@pytest.mark.json_loader def test_wycheproof_valid( state_test: StateTestFiller, pre: Alloc, post: dict, tx: Transaction ) -> None: @@ -968,6 +969,7 @@ def test_valid( @EIPChecklist.Precompile.Test.InputLengths.Static.TooLong() @EIPChecklist.Precompile.Test.OutOfBounds.Max() @EIPChecklist.Precompile.Test.OutOfBounds.MaxPlusOne() +@pytest.mark.json_loader def test_invalid( state_test: StateTestFiller, pre: Alloc, post: dict, tx: Transaction ) -> None: diff --git a/tests/paris/eip7610_create_collision/test_initcollision.py b/tests/paris/eip7610_create_collision/test_initcollision.py index bc1b2f60813..00783c454a2 100644 --- a/tests/paris/eip7610_create_collision/test_initcollision.py +++ b/tests/paris/eip7610_create_collision/test_initcollision.py @@ -61,6 +61,7 @@ @pytest.mark.with_all_contract_creating_tx_types +@pytest.mark.json_loader def test_init_collision_create_tx( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/paris/eip7610_create_collision/test_revert_in_create.py b/tests/paris/eip7610_create_collision/test_revert_in_create.py index 695a251897f..e1fe55815f8 100644 --- a/tests/paris/eip7610_create_collision/test_revert_in_create.py +++ b/tests/paris/eip7610_create_collision/test_revert_in_create.py @@ -102,6 +102,7 @@ def test_collision_with_create2_revert_in_initcode( ), ], ) +@pytest.mark.json_loader def test_create2_collision_storage( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py index 8987d9b36ac..314dc878e8d 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1add.py @@ -470,6 +470,7 @@ def test_gas( ), ], ) +@pytest.mark.json_loader def test_call_types( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py index a86fcfe5e15..1c2bbcab659 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1msm.py @@ -243,6 +243,7 @@ def test_valid( "precompile_gas_modifier", [100_000], ids=[""] ) # Add gas so that won't be the cause of failure @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) +@pytest.mark.json_loader def test_invalid( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py index 86c2aed6298..9dd0683e59a 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g1mul.py @@ -425,6 +425,7 @@ def test_gas( ), ], ) +@pytest.mark.json_loader def test_call_types( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py index 484a5ee77c5..91b4bd5b2c7 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2add.py @@ -218,6 +218,7 @@ ), ], ) +@pytest.mark.json_loader def test_valid( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py index 4fedbd44b2b..ebf26d6beba 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_g2msm.py @@ -254,6 +254,7 @@ def test_valid( "precompile_gas_modifier", [100_000], ids=[""] ) # Add gas so that won't be the cause of failure @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) +@pytest.mark.json_loader def test_invalid( state_test: StateTestFiller, pre: Alloc, @@ -292,6 +293,7 @@ def test_invalid( ), ], ) +@pytest.mark.json_loader def test_call_types( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py index b5555b3bedc..105b02d8f81 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp2_to_g2.py @@ -79,6 +79,7 @@ ), ], ) +@pytest.mark.json_loader def test_valid( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py index 348b370dbd9..5b57a9fd6ab 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_map_fp_to_g1.py @@ -64,6 +64,7 @@ ), ], ) +@pytest.mark.json_loader def test_valid( state_test: StateTestFiller, pre: Alloc, @@ -138,6 +139,7 @@ def test_isogeny_kernel_values( ], ) @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) +@pytest.mark.json_loader def test_invalid( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py index 62596672d8f..b3eeb4168de 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_pairing.py @@ -127,6 +127,7 @@ ), ], ) +@pytest.mark.json_loader def test_valid( state_test: StateTestFiller, pre: Alloc, @@ -393,6 +394,7 @@ def test_valid_multi_inf( ], ) @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) +@pytest.mark.json_loader def test_invalid( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py index a368657cc1c..5ad3d762e98 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_bls12_variable_length_input_contracts.py @@ -355,6 +355,7 @@ def test_invalid_zero_gas_g1msm( ) @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) @pytest.mark.parametrize("precompile_address", [Spec.G1MSM]) +@pytest.mark.json_loader def test_invalid_gas_g1msm( state_test: StateTestFiller, env: Environment, @@ -513,6 +514,7 @@ def test_invalid_zero_gas_g2msm( ) @pytest.mark.parametrize("expected_output", [Spec.INVALID], ids=[""]) @pytest.mark.parametrize("precompile_address", [Spec.G2MSM]) +@pytest.mark.json_loader def test_invalid_gas_g2msm( state_test: StateTestFiller, env: Environment, diff --git a/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py b/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py index 46680070787..b492c6d0fbc 100644 --- a/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py +++ b/tests/prague/eip2537_bls_12_381_precompiles/test_eip_mainnet.py @@ -75,6 +75,7 @@ ), ], ) +@pytest.mark.json_loader def test_eip_2537( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py b/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py index 892bd5afdc4..8fbd89046fd 100644 --- a/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py +++ b/tests/prague/eip2935_historical_block_hashes_from_state/test_block_hashes.py @@ -243,6 +243,7 @@ def test_block_hashes_history_at_transition( ], ) @pytest.mark.valid_from("Prague") +@pytest.mark.json_loader def test_block_hashes_history( blockchain_test: BlockchainTestFiller, pre: Alloc, diff --git a/tests/prague/eip6110_deposits/test_modified_contract.py b/tests/prague/eip6110_deposits/test_modified_contract.py index be34749ea1a..6ad3b63757f 100644 --- a/tests/prague/eip6110_deposits/test_modified_contract.py +++ b/tests/prague/eip6110_deposits/test_modified_contract.py @@ -183,6 +183,7 @@ def test_extra_logs( ], ) @pytest.mark.exception_test +@pytest.mark.json_loader def test_invalid_layout( blockchain_test: BlockchainTestFiller, pre: Alloc, @@ -233,6 +234,7 @@ def test_invalid_layout( @pytest.mark.parametrize("slice_bytes", [True, False]) @pytest.mark.exception_test +@pytest.mark.json_loader def test_invalid_log_length( blockchain_test: BlockchainTestFiller, pre: Alloc, slice_bytes: bool ) -> None: diff --git a/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py b/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py index 8978925c6e4..fb5095be8a5 100644 --- a/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py +++ b/tests/prague/eip7002_el_triggerable_withdrawals/test_contract_deployment.py @@ -6,6 +6,7 @@ from pathlib import Path from typing import Any, Generator +import pytest from execution_testing import ( Address, Alloc, @@ -24,6 +25,7 @@ REFERENCE_SPEC_VERSION = ref_spec_7002.version +@pytest.mark.json_loader @generate_system_contract_deploy_test( fork=Prague, tx_json_path=Path(realpath(__file__)).parent / "contract_deploy_tx.json", diff --git a/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py b/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py index adce6a08e0b..a97ae5368c1 100644 --- a/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py +++ b/tests/prague/eip7002_el_triggerable_withdrawals/test_modified_withdrawal_contract.py @@ -147,6 +147,7 @@ def test_extra_withdrawals( @generate_system_contract_error_test( # type: ignore[arg-type] max_gas_limit=Spec_EIP7002.SYSTEM_CALL_GAS_LIMIT, ) +@pytest.mark.json_loader def test_system_contract_errors() -> None: """ Test system contract raising different errors when called by the system diff --git a/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py b/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py index c6bc3bc17b8..22956ecbacf 100644 --- a/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py +++ b/tests/prague/eip7685_general_purpose_el_requests/test_multi_type_requests.py @@ -336,6 +336,7 @@ def get_contract_permutations( ), ], ) +@pytest.mark.json_loader def test_valid_multi_type_requests( blockchain_test: BlockchainTestFiller, pre: Alloc, diff --git a/tests/prague/eip7702_set_code_tx/test_gas.py b/tests/prague/eip7702_set_code_tx/test_gas.py index fa2befc63fe..712ea74f776 100644 --- a/tests/prague/eip7702_set_code_tx/test_gas.py +++ b/tests/prague/eip7702_set_code_tx/test_gas.py @@ -946,6 +946,7 @@ def test_gas_cost( @pytest.mark.parametrize( **gas_test_parameter_args(include_many=False, include_data=False) ) +@pytest.mark.json_loader def test_account_warming( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip7702_set_code_tx/test_set_code_txs.py b/tests/prague/eip7702_set_code_tx/test_set_code_txs.py index 593991c64c8..084f4d56b11 100644 --- a/tests/prague/eip7702_set_code_tx/test_set_code_txs.py +++ b/tests/prague/eip7702_set_code_tx/test_set_code_txs.py @@ -836,6 +836,7 @@ def test_set_code_to_self_caller( @pytest.mark.execute(pytest.mark.skip(reason="excessive gas")) +@pytest.mark.json_loader def test_set_code_max_depth_call_stack( state_test: StateTestFiller, pre: Alloc, @@ -904,6 +905,7 @@ def test_set_code_max_depth_call_stack( "value", [0, 1], ) +@pytest.mark.json_loader def test_set_code_call_set_code( state_test: StateTestFiller, pre: Alloc, @@ -2405,6 +2407,7 @@ def test_set_code_using_valid_synthetic_signatures( ), ], ) +@pytest.mark.json_loader def test_valid_tx_invalid_auth_signature( state_test: StateTestFiller, pre: Alloc, @@ -2694,6 +2697,7 @@ def test_nonce_validity( @pytest.mark.pre_alloc_mutable() +@pytest.mark.json_loader def test_nonce_overflow_after_first_authorization( state_test: StateTestFiller, pre: Alloc, @@ -3347,6 +3351,7 @@ def test_reset_code( @pytest.mark.exception_test +@pytest.mark.json_loader def test_contract_create( state_test: StateTestFiller, pre: Alloc, @@ -3375,6 +3380,7 @@ def test_contract_create( @pytest.mark.exception_test +@pytest.mark.json_loader def test_empty_authorization_list( state_test: StateTestFiller, pre: Alloc, @@ -3983,6 +3989,7 @@ def test_authorization_reusing_nonce( ) @pytest.mark.exception_test @pytest.mark.pre_alloc_mutable +@pytest.mark.json_loader def test_set_code_from_account_with_non_delegating_code( state_test: StateTestFiller, pre: Alloc, diff --git a/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py b/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py index 988dbf868bc..2a253dfe19b 100644 --- a/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py +++ b/tests/prague/eip7702_set_code_tx/test_set_code_txs_2.py @@ -1864,6 +1864,7 @@ def test_double_auth( @pytest.mark.xdist_group(name="bigmem") @pytest.mark.valid_from("Prague") +@pytest.mark.json_loader def test_pointer_resets_an_empty_code_account_with_storage( blockchain_test: BlockchainTestFiller, pre: Alloc, diff --git a/tests/shanghai/eip3860_initcode/test_initcode.py b/tests/shanghai/eip3860_initcode/test_initcode.py index 48fbf96108f..952f3727cf5 100644 --- a/tests/shanghai/eip3860_initcode/test_initcode.py +++ b/tests/shanghai/eip3860_initcode/test_initcode.py @@ -122,6 +122,7 @@ def initcode(fork: Fork, initcode_name: str) -> Initcode: pytest.param("over_limit_ones", marks=pytest.mark.exception_test), ], ) +@pytest.mark.json_loader def test_contract_creating_tx( state_test: StateTestFiller, env: Environment, diff --git a/tests/shanghai/eip4895_withdrawals/test_withdrawals.py b/tests/shanghai/eip4895_withdrawals/test_withdrawals.py index 272dc6293a9..b2ed6c94450 100644 --- a/tests/shanghai/eip4895_withdrawals/test_withdrawals.py +++ b/tests/shanghai/eip4895_withdrawals/test_withdrawals.py @@ -607,6 +607,7 @@ class ZeroAmountTestCases(Enum): # noqa: D101 list(ZeroAmountTestCases), ids=[case.value for case in ZeroAmountTestCases], ) +@pytest.mark.json_loader def test_zero_amount( blockchain_test: BlockchainTestFiller, pre: Alloc, diff --git a/tox.ini b/tox.ini index c8649607457..92a2e945669 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ requires = envlist = py3 pypy3 - json_infra + json_loader static tests_pytest_py3 tests_pytest_pypy3 @@ -79,15 +79,29 @@ commands = {posargs} \ packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_benchmarking.py -[testenv:json_infra] -description = Run the spec against released test fixtures +[testenv:json_loader] +description = Fill and run the spec against test fixtures +dependency_groups = + test commands = + fill \ + -m "json_loader and not derived_test" \ + --until Amsterdam \ + -n {env:PYTEST_XDIST_AUTO_NUM_WORKERS:6} --dist=loadgroup \ + --skip-index \ + --clean \ + --output="tests/json_loader/fixtures" \ + --cov-config=pyproject.toml \ + --cov=ethereum \ + # Coverage gate: if this drops, regenerate the minimal test set with + # minimize-tests (https://github.com/SamWilsn/minimize-tests). + --cov-fail-under=85 pytest \ -m "not slow" \ -n auto --maxprocesses 6 --dist=loadfile \ --basetemp="{temp_dir}/pytest" \ {posargs} \ - tests/json_infra + tests/json_loader [testenv:py3] description = Fill the tests using EELS (with Python) From 5052ee8d7b5275ce3a2ae9a8d299da74ab1f804e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 9 Mar 2026 22:42:17 +0000 Subject: [PATCH 31/37] fix(test-execute): stop inserting empty Account in execute empty_account() (#2461) * fix(testing): stop inserting empty Account in execute empty_account() The execute backend's `_empty_account()` was inserting `Account(nonce=0, balance=0)` into the pre-state, creating an EIP-161 "empty account" on-chain. This is inconsistent with the filler backend, which returns a bare address without adding it to the pre-state (truly nonexistent). The method's purpose is to return an unused address for a nonexistent account. Remove the unnecessary insertion so both backends behave identically. Update docstrings to clarify that the returned address refers to a nonexistent account, not an empty one. * test(testing): verify empty_account() does not insert into pre-state --- .../pytest_commands/plugins/execute/pre_alloc.py | 15 +++++---------- .../pytest_commands/plugins/filler/pre_alloc.py | 2 +- .../plugins/filler/tests/test_pre_alloc.py | 6 +++--- .../pytest_commands/plugins/shared/pre_alloc.py | 6 +++--- .../execution_testing/test_types/account_types.py | 6 +++--- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py index b1cc84451c5..e28fe8e9fc7 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/execute/pre_alloc.py @@ -741,18 +741,13 @@ def _fund_address( def _empty_account(self) -> Address: """ - Execute implementation of empty account creation. + Execute implementation of empty_account. + + Return a previously unused address. The account is not + created on-chain — it remains nonexistent. """ eoa = next(self._eoa_iterator) - logger.debug(f"Creating empty account at {eoa}") - - self.__internal_setitem__( - eoa, - Account( - nonce=0, - balance=0, - ), - ) + logger.debug(f"Returning unused address {eoa} (nonexistent account)") return Address(eoa) def minimum_balance_for_pending_transactions( diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py index 5044ba01095..8796dd2dfd3 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/pre_alloc.py @@ -378,7 +378,7 @@ def _fund_address( def _empty_account(self) -> Address: """ - Filler implementation of empty account creation. + Filler implementation of empty_account. """ salt = self.get_next_account_salt(EMPTY_ACCOUNT_HASH) return Address(eoa_from_hash(EMPTY_ACCOUNT_HASH, salt)) diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_pre_alloc.py index 9bcd3f134a8..9cf2a0e92e5 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_pre_alloc.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/filler/tests/test_pre_alloc.py @@ -143,13 +143,13 @@ def test_alloc_fund_eoa_basic() -> None: def test_alloc_empty_account() -> None: - """Test `Alloc.empty_account` functionality.""" + """Test `Alloc.empty_account` returns a nonexistent address.""" pre = create_test_alloc() empty_addr = pre.empty_account() - # Check that we get a valid address (address generation works) assert isinstance(empty_addr, Address) - # Note: empty_account() only returns address, doesn't add to pre + # The address must not be in the pre-state (nonexistent account). + assert empty_addr not in pre def test_alloc_deploy_contract_code_types() -> None: diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py index 09bb2b311c0..b8f0e7bce47 100644 --- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py +++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/shared/pre_alloc.py @@ -319,10 +319,10 @@ def _fund_address( def empty_account(self) -> Address: """ - Return a previously unused account guaranteed to be empty. + Return the address of a previously unused nonexistent account. - This ensures the account has zero balance, zero nonce, no code, and no - storage. The account is not a precompile or a system contract. + The address is guaranteed to not be a precompile or a system contract. + No account is created — it remains nonexistent in the pre-state. """ return self._empty_account() diff --git a/packages/testing/src/execution_testing/test_types/account_types.py b/packages/testing/src/execution_testing/test_types/account_types.py index 4cb216537ad..a9b26698d2c 100644 --- a/packages/testing/src/execution_testing/test_types/account_types.py +++ b/packages/testing/src/execution_testing/test_types/account_types.py @@ -483,10 +483,10 @@ def fund_address( def empty_account(self) -> Address: """ - Return a previously unused account guaranteed to be empty. + Return the address of a previously unused nonexistent account. - This ensures the account has zero balance, zero nonce, no code, and no - storage. The account is not a precompile or a system contract. + The address is guaranteed to not be a precompile or a system contract. + No account is created — it remains nonexistent in the pre-state. """ raise NotImplementedError( "empty_account is not implemented in the base class" From 962963988953ea7c17c58146964a79d1075706ff Mon Sep 17 00:00:00 2001 From: carsons-eels Date: Tue, 3 Mar 2026 12:29:57 -0500 Subject: [PATCH 32/37] refactor(spec-specs): add opcode gas constants --- src/ethereum/forks/amsterdam/vm/gas.py | 40 +++++++++++++++++++ .../amsterdam/vm/instructions/arithmetic.py | 33 +++++++++------ .../amsterdam/vm/instructions/bitwise.py | 31 +++++++++----- .../amsterdam/vm/instructions/comparison.py | 22 ++++++---- .../amsterdam/vm/instructions/control_flow.py | 12 ++++-- .../amsterdam/vm/instructions/environment.py | 22 +++++++--- .../forks/amsterdam/vm/instructions/memory.py | 16 +++++--- .../forks/amsterdam/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/arrow_glacier/vm/gas.py | 39 ++++++++++++++++++ .../vm/instructions/arithmetic.py | 33 +++++++++------ .../arrow_glacier/vm/instructions/bitwise.py | 28 ++++++++----- .../vm/instructions/comparison.py | 22 ++++++---- .../vm/instructions/control_flow.py | 12 ++++-- .../vm/instructions/environment.py | 22 +++++++--- .../arrow_glacier/vm/instructions/memory.py | 10 +++-- .../arrow_glacier/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/berlin/vm/gas.py | 39 ++++++++++++++++++ .../berlin/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/berlin/vm/instructions/bitwise.py | 28 ++++++++----- .../berlin/vm/instructions/comparison.py | 22 ++++++---- .../berlin/vm/instructions/control_flow.py | 12 ++++-- .../berlin/vm/instructions/environment.py | 22 +++++++--- .../forks/berlin/vm/instructions/memory.py | 10 +++-- .../forks/berlin/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/bpo1/vm/gas.py | 40 +++++++++++++++++++ .../forks/bpo1/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/bpo1/vm/instructions/bitwise.py | 31 +++++++++----- .../forks/bpo1/vm/instructions/comparison.py | 22 ++++++---- .../bpo1/vm/instructions/control_flow.py | 12 ++++-- .../forks/bpo1/vm/instructions/environment.py | 22 +++++++--- .../forks/bpo1/vm/instructions/memory.py | 16 +++++--- .../forks/bpo1/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/bpo2/vm/gas.py | 40 +++++++++++++++++++ .../forks/bpo2/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/bpo2/vm/instructions/bitwise.py | 31 +++++++++----- .../forks/bpo2/vm/instructions/comparison.py | 22 ++++++---- .../bpo2/vm/instructions/control_flow.py | 12 ++++-- .../forks/bpo2/vm/instructions/environment.py | 22 +++++++--- .../forks/bpo2/vm/instructions/memory.py | 16 +++++--- .../forks/bpo2/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/bpo3/vm/gas.py | 40 +++++++++++++++++++ .../forks/bpo3/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/bpo3/vm/instructions/bitwise.py | 31 +++++++++----- .../forks/bpo3/vm/instructions/comparison.py | 22 ++++++---- .../bpo3/vm/instructions/control_flow.py | 12 ++++-- .../forks/bpo3/vm/instructions/environment.py | 22 +++++++--- .../forks/bpo3/vm/instructions/memory.py | 16 +++++--- .../forks/bpo3/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/bpo4/vm/gas.py | 40 +++++++++++++++++++ .../forks/bpo4/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/bpo4/vm/instructions/bitwise.py | 31 +++++++++----- .../forks/bpo4/vm/instructions/comparison.py | 22 ++++++---- .../bpo4/vm/instructions/control_flow.py | 12 ++++-- .../forks/bpo4/vm/instructions/environment.py | 22 +++++++--- .../forks/bpo4/vm/instructions/memory.py | 16 +++++--- .../forks/bpo4/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/bpo5/vm/gas.py | 40 +++++++++++++++++++ .../forks/bpo5/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/bpo5/vm/instructions/bitwise.py | 31 +++++++++----- .../forks/bpo5/vm/instructions/comparison.py | 22 ++++++---- .../bpo5/vm/instructions/control_flow.py | 12 ++++-- .../forks/bpo5/vm/instructions/environment.py | 22 +++++++--- .../forks/bpo5/vm/instructions/memory.py | 16 +++++--- .../forks/bpo5/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/byzantium/vm/gas.py | 36 +++++++++++++++++ .../byzantium/vm/instructions/arithmetic.py | 33 +++++++++------ .../byzantium/vm/instructions/bitwise.py | 19 ++++++--- .../byzantium/vm/instructions/comparison.py | 22 ++++++---- .../byzantium/vm/instructions/control_flow.py | 12 ++++-- .../byzantium/vm/instructions/environment.py | 22 +++++++--- .../forks/byzantium/vm/instructions/memory.py | 10 +++-- .../forks/byzantium/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/cancun/vm/gas.py | 40 +++++++++++++++++++ .../cancun/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/cancun/vm/instructions/bitwise.py | 28 ++++++++----- .../cancun/vm/instructions/comparison.py | 22 ++++++---- .../cancun/vm/instructions/control_flow.py | 12 ++++-- .../cancun/vm/instructions/environment.py | 22 +++++++--- .../forks/cancun/vm/instructions/memory.py | 16 +++++--- .../forks/cancun/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/constantinople/vm/gas.py | 39 ++++++++++++++++++ .../vm/instructions/arithmetic.py | 33 +++++++++------ .../constantinople/vm/instructions/bitwise.py | 28 ++++++++----- .../vm/instructions/comparison.py | 22 ++++++---- .../vm/instructions/control_flow.py | 12 ++++-- .../vm/instructions/environment.py | 22 +++++++--- .../constantinople/vm/instructions/memory.py | 10 +++-- .../constantinople/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/dao_fork/vm/gas.py | 35 ++++++++++++++++ .../dao_fork/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/dao_fork/vm/instructions/bitwise.py | 19 ++++++--- .../dao_fork/vm/instructions/comparison.py | 22 ++++++---- .../dao_fork/vm/instructions/control_flow.py | 12 ++++-- .../dao_fork/vm/instructions/environment.py | 16 ++++++-- .../forks/dao_fork/vm/instructions/memory.py | 10 +++-- .../forks/dao_fork/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/frontier/vm/gas.py | 35 ++++++++++++++++ .../frontier/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/frontier/vm/instructions/bitwise.py | 19 ++++++--- .../frontier/vm/instructions/comparison.py | 22 ++++++---- .../frontier/vm/instructions/control_flow.py | 12 ++++-- .../frontier/vm/instructions/environment.py | 16 ++++++-- .../forks/frontier/vm/instructions/memory.py | 10 +++-- .../forks/frontier/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/gray_glacier/vm/gas.py | 39 ++++++++++++++++++ .../vm/instructions/arithmetic.py | 33 +++++++++------ .../gray_glacier/vm/instructions/bitwise.py | 28 ++++++++----- .../vm/instructions/comparison.py | 22 ++++++---- .../vm/instructions/control_flow.py | 12 ++++-- .../vm/instructions/environment.py | 22 +++++++--- .../gray_glacier/vm/instructions/memory.py | 10 +++-- .../gray_glacier/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/homestead/vm/gas.py | 35 ++++++++++++++++ .../homestead/vm/instructions/arithmetic.py | 33 +++++++++------ .../homestead/vm/instructions/bitwise.py | 19 ++++++--- .../homestead/vm/instructions/comparison.py | 22 ++++++---- .../homestead/vm/instructions/control_flow.py | 12 ++++-- .../homestead/vm/instructions/environment.py | 16 ++++++-- .../forks/homestead/vm/instructions/memory.py | 10 +++-- .../forks/homestead/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/istanbul/vm/gas.py | 39 ++++++++++++++++++ .../istanbul/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/istanbul/vm/instructions/bitwise.py | 28 ++++++++----- .../istanbul/vm/instructions/comparison.py | 22 ++++++---- .../istanbul/vm/instructions/control_flow.py | 12 ++++-- .../istanbul/vm/instructions/environment.py | 22 +++++++--- .../forks/istanbul/vm/instructions/memory.py | 10 +++-- .../forks/istanbul/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/london/vm/gas.py | 39 ++++++++++++++++++ .../london/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/london/vm/instructions/bitwise.py | 28 ++++++++----- .../london/vm/instructions/comparison.py | 22 ++++++---- .../london/vm/instructions/control_flow.py | 12 ++++-- .../london/vm/instructions/environment.py | 22 +++++++--- .../forks/london/vm/instructions/memory.py | 10 +++-- .../forks/london/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/muir_glacier/vm/gas.py | 39 ++++++++++++++++++ .../vm/instructions/arithmetic.py | 33 +++++++++------ .../muir_glacier/vm/instructions/bitwise.py | 28 ++++++++----- .../vm/instructions/comparison.py | 22 ++++++---- .../vm/instructions/control_flow.py | 12 ++++-- .../vm/instructions/environment.py | 22 +++++++--- .../muir_glacier/vm/instructions/memory.py | 10 +++-- .../muir_glacier/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/osaka/vm/gas.py | 40 +++++++++++++++++++ .../forks/osaka/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/osaka/vm/instructions/bitwise.py | 31 +++++++++----- .../forks/osaka/vm/instructions/comparison.py | 22 ++++++---- .../osaka/vm/instructions/control_flow.py | 12 ++++-- .../osaka/vm/instructions/environment.py | 22 +++++++--- .../forks/osaka/vm/instructions/memory.py | 16 +++++--- .../forks/osaka/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/paris/vm/gas.py | 39 ++++++++++++++++++ .../forks/paris/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/paris/vm/instructions/bitwise.py | 28 ++++++++----- .../forks/paris/vm/instructions/comparison.py | 22 ++++++---- .../paris/vm/instructions/control_flow.py | 12 ++++-- .../paris/vm/instructions/environment.py | 22 +++++++--- .../forks/paris/vm/instructions/memory.py | 10 +++-- .../forks/paris/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/prague/vm/gas.py | 40 +++++++++++++++++++ .../prague/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/prague/vm/instructions/bitwise.py | 28 ++++++++----- .../prague/vm/instructions/comparison.py | 22 ++++++---- .../prague/vm/instructions/control_flow.py | 12 ++++-- .../prague/vm/instructions/environment.py | 22 +++++++--- .../forks/prague/vm/instructions/memory.py | 16 +++++--- .../forks/prague/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/shanghai/vm/gas.py | 39 ++++++++++++++++++ .../shanghai/vm/instructions/arithmetic.py | 33 +++++++++------ .../forks/shanghai/vm/instructions/bitwise.py | 28 ++++++++----- .../shanghai/vm/instructions/comparison.py | 22 ++++++---- .../shanghai/vm/instructions/control_flow.py | 12 ++++-- .../shanghai/vm/instructions/environment.py | 22 +++++++--- .../forks/shanghai/vm/instructions/memory.py | 10 +++-- .../forks/shanghai/vm/instructions/stack.py | 14 +++++-- src/ethereum/forks/spurious_dragon/vm/gas.py | 35 ++++++++++++++++ .../vm/instructions/arithmetic.py | 33 +++++++++------ .../vm/instructions/bitwise.py | 19 ++++++--- .../vm/instructions/comparison.py | 22 ++++++---- .../vm/instructions/control_flow.py | 12 ++++-- .../vm/instructions/environment.py | 16 ++++++-- .../spurious_dragon/vm/instructions/memory.py | 10 +++-- .../spurious_dragon/vm/instructions/stack.py | 14 +++++-- .../forks/tangerine_whistle/vm/gas.py | 35 ++++++++++++++++ .../vm/instructions/arithmetic.py | 33 +++++++++------ .../vm/instructions/bitwise.py | 19 ++++++--- .../vm/instructions/comparison.py | 22 ++++++---- .../vm/instructions/control_flow.py | 12 ++++-- .../vm/instructions/environment.py | 16 ++++++-- .../vm/instructions/memory.py | 10 +++-- .../vm/instructions/stack.py | 14 +++++-- 192 files changed, 3224 insertions(+), 1073 deletions(-) diff --git a/src/ethereum/forks/amsterdam/vm/gas.py b/src/ethereum/forks/amsterdam/vm/gas.py index d3917935e27..a5a94706d9f 100644 --- a/src/ethereum/forks/amsterdam/vm/gas.py +++ b/src/ethereum/forks/amsterdam/vm/gas.py @@ -87,6 +87,46 @@ GAS_BLOCK_ACCESS_LIST_ITEM = Uint(2000) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_CLZ = GAS_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + @dataclass class ExtendMemory: diff --git a/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py b/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py b/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py index cc6fa2fbb23..0614ff61fed 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py @@ -14,7 +14,18 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_CLZ, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +45,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +70,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +95,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +119,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +145,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +180,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +210,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +240,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -262,7 +273,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/amsterdam/vm/instructions/comparison.py b/src/ethereum/forks/amsterdam/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/comparison.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py b/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/amsterdam/vm/instructions/environment.py b/src/ethereum/forks/amsterdam/vm/instructions/environment.py index f5f89bdfa59..98b03e02b9d 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/environment.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -178,7 +181,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -236,7 +239,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -294,7 +300,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -454,7 +463,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/amsterdam/vm/instructions/memory.py b/src/ethereum/forks/amsterdam/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/memory.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/amsterdam/vm/instructions/stack.py b/src/ethereum/forks/amsterdam/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/stack.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/arrow_glacier/vm/gas.py b/src/ethereum/forks/arrow_glacier/vm/gas.py index 1929dd5ca3b..c38b90d50d6 100644 --- a/src/ethereum/forks/arrow_glacier/vm/gas.py +++ b/src/ethereum/forks/arrow_glacier/vm/gas.py @@ -64,6 +64,45 @@ GAS_WARM_ACCESS = Uint(100) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py b/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py b/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py index fe1b70c1269..c7018574c29 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py @@ -26,8 +26,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_gas_extend_memory, charge_gas, @@ -173,7 +176,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -231,7 +234,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -289,7 +295,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -443,7 +452,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py b/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py b/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/berlin/vm/gas.py b/src/ethereum/forks/berlin/vm/gas.py index 477037c3298..fea396e188f 100644 --- a/src/ethereum/forks/berlin/vm/gas.py +++ b/src/ethereum/forks/berlin/vm/gas.py @@ -65,6 +65,45 @@ GAS_WARM_ACCESS = Uint(100) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/berlin/vm/instructions/arithmetic.py b/src/ethereum/forks/berlin/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/berlin/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/berlin/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/berlin/vm/instructions/bitwise.py b/src/ethereum/forks/berlin/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/berlin/vm/instructions/bitwise.py +++ b/src/ethereum/forks/berlin/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/berlin/vm/instructions/comparison.py b/src/ethereum/forks/berlin/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/berlin/vm/instructions/comparison.py +++ b/src/ethereum/forks/berlin/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/berlin/vm/instructions/control_flow.py b/src/ethereum/forks/berlin/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/berlin/vm/instructions/control_flow.py +++ b/src/ethereum/forks/berlin/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/berlin/vm/instructions/environment.py b/src/ethereum/forks/berlin/vm/instructions/environment.py index 63733aca3d5..8798f5a4b7b 100644 --- a/src/ethereum/forks/berlin/vm/instructions/environment.py +++ b/src/ethereum/forks/berlin/vm/instructions/environment.py @@ -26,8 +26,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_gas_extend_memory, charge_gas, @@ -173,7 +176,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -231,7 +234,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -289,7 +295,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -443,7 +452,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/berlin/vm/instructions/memory.py b/src/ethereum/forks/berlin/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/berlin/vm/instructions/memory.py +++ b/src/ethereum/forks/berlin/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/berlin/vm/instructions/stack.py b/src/ethereum/forks/berlin/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/berlin/vm/instructions/stack.py +++ b/src/ethereum/forks/berlin/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo1/vm/gas.py b/src/ethereum/forks/bpo1/vm/gas.py index 8b2e13fa8b5..105f8f63508 100644 --- a/src/ethereum/forks/bpo1/vm/gas.py +++ b/src/ethereum/forks/bpo1/vm/gas.py @@ -84,6 +84,46 @@ GAS_BLS_G2_MUL = Uint(22500) GAS_BLS_G2_MAP = Uint(23800) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_CLZ = GAS_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + @dataclass class ExtendMemory: diff --git a/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo1/vm/instructions/bitwise.py b/src/ethereum/forks/bpo1/vm/instructions/bitwise.py index cc6fa2fbb23..0614ff61fed 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo1/vm/instructions/bitwise.py @@ -14,7 +14,18 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_CLZ, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +45,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +70,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +95,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +119,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +145,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +180,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +210,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +240,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -262,7 +273,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo1/vm/instructions/comparison.py b/src/ethereum/forks/bpo1/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo1/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo1/vm/instructions/control_flow.py b/src/ethereum/forks/bpo1/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo1/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo1/vm/instructions/environment.py b/src/ethereum/forks/bpo1/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo1/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo1/vm/instructions/memory.py b/src/ethereum/forks/bpo1/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo1/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/bpo1/vm/instructions/stack.py b/src/ethereum/forks/bpo1/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo1/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo2/vm/gas.py b/src/ethereum/forks/bpo2/vm/gas.py index a2e5d1ab39a..81c5cbdad65 100644 --- a/src/ethereum/forks/bpo2/vm/gas.py +++ b/src/ethereum/forks/bpo2/vm/gas.py @@ -84,6 +84,46 @@ GAS_BLS_G2_MUL = Uint(22500) GAS_BLS_G2_MAP = Uint(23800) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_CLZ = GAS_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + @dataclass class ExtendMemory: diff --git a/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo2/vm/instructions/bitwise.py b/src/ethereum/forks/bpo2/vm/instructions/bitwise.py index cc6fa2fbb23..0614ff61fed 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo2/vm/instructions/bitwise.py @@ -14,7 +14,18 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_CLZ, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +45,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +70,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +95,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +119,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +145,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +180,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +210,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +240,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -262,7 +273,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo2/vm/instructions/comparison.py b/src/ethereum/forks/bpo2/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo2/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo2/vm/instructions/control_flow.py b/src/ethereum/forks/bpo2/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo2/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo2/vm/instructions/environment.py b/src/ethereum/forks/bpo2/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo2/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo2/vm/instructions/memory.py b/src/ethereum/forks/bpo2/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo2/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/bpo2/vm/instructions/stack.py b/src/ethereum/forks/bpo2/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo2/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo3/vm/gas.py b/src/ethereum/forks/bpo3/vm/gas.py index a2e5d1ab39a..81c5cbdad65 100644 --- a/src/ethereum/forks/bpo3/vm/gas.py +++ b/src/ethereum/forks/bpo3/vm/gas.py @@ -84,6 +84,46 @@ GAS_BLS_G2_MUL = Uint(22500) GAS_BLS_G2_MAP = Uint(23800) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_CLZ = GAS_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + @dataclass class ExtendMemory: diff --git a/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo3/vm/instructions/bitwise.py b/src/ethereum/forks/bpo3/vm/instructions/bitwise.py index cc6fa2fbb23..0614ff61fed 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo3/vm/instructions/bitwise.py @@ -14,7 +14,18 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_CLZ, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +45,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +70,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +95,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +119,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +145,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +180,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +210,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +240,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -262,7 +273,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo3/vm/instructions/comparison.py b/src/ethereum/forks/bpo3/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo3/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo3/vm/instructions/control_flow.py b/src/ethereum/forks/bpo3/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo3/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo3/vm/instructions/environment.py b/src/ethereum/forks/bpo3/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo3/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo3/vm/instructions/memory.py b/src/ethereum/forks/bpo3/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo3/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/bpo3/vm/instructions/stack.py b/src/ethereum/forks/bpo3/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo3/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo4/vm/gas.py b/src/ethereum/forks/bpo4/vm/gas.py index a2e5d1ab39a..81c5cbdad65 100644 --- a/src/ethereum/forks/bpo4/vm/gas.py +++ b/src/ethereum/forks/bpo4/vm/gas.py @@ -84,6 +84,46 @@ GAS_BLS_G2_MUL = Uint(22500) GAS_BLS_G2_MAP = Uint(23800) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_CLZ = GAS_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + @dataclass class ExtendMemory: diff --git a/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo4/vm/instructions/bitwise.py b/src/ethereum/forks/bpo4/vm/instructions/bitwise.py index cc6fa2fbb23..0614ff61fed 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo4/vm/instructions/bitwise.py @@ -14,7 +14,18 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_CLZ, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +45,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +70,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +95,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +119,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +145,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +180,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +210,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +240,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -262,7 +273,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo4/vm/instructions/comparison.py b/src/ethereum/forks/bpo4/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo4/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo4/vm/instructions/control_flow.py b/src/ethereum/forks/bpo4/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo4/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo4/vm/instructions/environment.py b/src/ethereum/forks/bpo4/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo4/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo4/vm/instructions/memory.py b/src/ethereum/forks/bpo4/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo4/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/bpo4/vm/instructions/stack.py b/src/ethereum/forks/bpo4/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo4/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo5/vm/gas.py b/src/ethereum/forks/bpo5/vm/gas.py index a2e5d1ab39a..81c5cbdad65 100644 --- a/src/ethereum/forks/bpo5/vm/gas.py +++ b/src/ethereum/forks/bpo5/vm/gas.py @@ -84,6 +84,46 @@ GAS_BLS_G2_MUL = Uint(22500) GAS_BLS_G2_MAP = Uint(23800) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_CLZ = GAS_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + @dataclass class ExtendMemory: diff --git a/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo5/vm/instructions/bitwise.py b/src/ethereum/forks/bpo5/vm/instructions/bitwise.py index cc6fa2fbb23..0614ff61fed 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo5/vm/instructions/bitwise.py @@ -14,7 +14,18 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_CLZ, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +45,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +70,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +95,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +119,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +145,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +180,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +210,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +240,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -262,7 +273,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo5/vm/instructions/comparison.py b/src/ethereum/forks/bpo5/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo5/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo5/vm/instructions/control_flow.py b/src/ethereum/forks/bpo5/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo5/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo5/vm/instructions/environment.py b/src/ethereum/forks/bpo5/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo5/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo5/vm/instructions/memory.py b/src/ethereum/forks/bpo5/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo5/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/bpo5/vm/instructions/stack.py b/src/ethereum/forks/bpo5/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo5/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/byzantium/vm/gas.py b/src/ethereum/forks/byzantium/vm/gas.py index b21cf5fd15d..adcff5dd650 100644 --- a/src/ethereum/forks/byzantium/vm/gas.py +++ b/src/ethereum/forks/byzantium/vm/gas.py @@ -64,6 +64,42 @@ GAS_RETURN_DATA_COPY = Uint(3) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py b/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/byzantium/vm/instructions/bitwise.py b/src/ethereum/forks/byzantium/vm/instructions/bitwise.py index 2a506f55751..cb37f6eca7d 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/bitwise.py +++ b/src/ethereum/forks/byzantium/vm/instructions/bitwise.py @@ -14,7 +14,14 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +41,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +66,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +91,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +115,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +141,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/byzantium/vm/instructions/comparison.py b/src/ethereum/forks/byzantium/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/comparison.py +++ b/src/ethereum/forks/byzantium/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/byzantium/vm/instructions/control_flow.py b/src/ethereum/forks/byzantium/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/control_flow.py +++ b/src/ethereum/forks/byzantium/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/byzantium/vm/instructions/environment.py b/src/ethereum/forks/byzantium/vm/instructions/environment.py index 0fa98ce55a5..2fb6855f846 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/environment.py +++ b/src/ethereum/forks/byzantium/vm/instructions/environment.py @@ -25,8 +25,11 @@ GAS_BASE, GAS_COPY, GAS_EXTERNAL, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, calculate_gas_extend_memory, charge_gas, ) @@ -167,7 +170,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -225,7 +228,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -283,7 +289,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -424,7 +433,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/byzantium/vm/instructions/memory.py b/src/ethereum/forks/byzantium/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/memory.py +++ b/src/ethereum/forks/byzantium/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/byzantium/vm/instructions/stack.py b/src/ethereum/forks/byzantium/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/stack.py +++ b/src/ethereum/forks/byzantium/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/cancun/vm/gas.py b/src/ethereum/forks/cancun/vm/gas.py index cddb2b59e8c..b375720fc82 100644 --- a/src/ethereum/forks/cancun/vm/gas.py +++ b/src/ethereum/forks/cancun/vm/gas.py @@ -74,6 +74,46 @@ BLOB_BASE_FEE_UPDATE_FRACTION = Uint(3338477) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/cancun/vm/instructions/arithmetic.py b/src/ethereum/forks/cancun/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/cancun/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/cancun/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/cancun/vm/instructions/bitwise.py b/src/ethereum/forks/cancun/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/cancun/vm/instructions/bitwise.py +++ b/src/ethereum/forks/cancun/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/cancun/vm/instructions/comparison.py b/src/ethereum/forks/cancun/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/cancun/vm/instructions/comparison.py +++ b/src/ethereum/forks/cancun/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/cancun/vm/instructions/control_flow.py b/src/ethereum/forks/cancun/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/cancun/vm/instructions/control_flow.py +++ b/src/ethereum/forks/cancun/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/cancun/vm/instructions/environment.py b/src/ethereum/forks/cancun/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/cancun/vm/instructions/environment.py +++ b/src/ethereum/forks/cancun/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/cancun/vm/instructions/memory.py b/src/ethereum/forks/cancun/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/cancun/vm/instructions/memory.py +++ b/src/ethereum/forks/cancun/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/cancun/vm/instructions/stack.py b/src/ethereum/forks/cancun/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/cancun/vm/instructions/stack.py +++ b/src/ethereum/forks/cancun/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/constantinople/vm/gas.py b/src/ethereum/forks/constantinople/vm/gas.py index 839cc3e3121..a6707988f46 100644 --- a/src/ethereum/forks/constantinople/vm/gas.py +++ b/src/ethereum/forks/constantinople/vm/gas.py @@ -65,6 +65,45 @@ GAS_CODE_HASH = Uint(400) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py b/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/constantinople/vm/instructions/bitwise.py b/src/ethereum/forks/constantinople/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/bitwise.py +++ b/src/ethereum/forks/constantinople/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/constantinople/vm/instructions/comparison.py b/src/ethereum/forks/constantinople/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/comparison.py +++ b/src/ethereum/forks/constantinople/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/constantinople/vm/instructions/control_flow.py b/src/ethereum/forks/constantinople/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/control_flow.py +++ b/src/ethereum/forks/constantinople/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/constantinople/vm/instructions/environment.py b/src/ethereum/forks/constantinople/vm/instructions/environment.py index d5572be1b4a..f935b995c17 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/environment.py +++ b/src/ethereum/forks/constantinople/vm/instructions/environment.py @@ -27,8 +27,11 @@ GAS_CODE_HASH, GAS_COPY, GAS_EXTERNAL, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, calculate_gas_extend_memory, charge_gas, ) @@ -169,7 +172,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -227,7 +230,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -285,7 +291,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -426,7 +435,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/constantinople/vm/instructions/memory.py b/src/ethereum/forks/constantinople/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/memory.py +++ b/src/ethereum/forks/constantinople/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/constantinople/vm/instructions/stack.py b/src/ethereum/forks/constantinople/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/stack.py +++ b/src/ethereum/forks/constantinople/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/dao_fork/vm/gas.py b/src/ethereum/forks/dao_fork/vm/gas.py index 3c60482255b..687fae69ca8 100644 --- a/src/ethereum/forks/dao_fork/vm/gas.py +++ b/src/ethereum/forks/dao_fork/vm/gas.py @@ -63,6 +63,41 @@ GAS_IDENTITY_WORD = Uint(3) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py b/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py b/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py index 2a506f55751..cb37f6eca7d 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py @@ -14,7 +14,14 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +41,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +66,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +91,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +115,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +141,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/dao_fork/vm/instructions/comparison.py b/src/ethereum/forks/dao_fork/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/comparison.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py b/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/dao_fork/vm/instructions/environment.py b/src/ethereum/forks/dao_fork/vm/instructions/environment.py index 83eb5528226..f2c91716993 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/environment.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/environment.py @@ -24,7 +24,9 @@ GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_VERY_LOW, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -165,7 +167,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -223,7 +225,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -281,7 +286,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/dao_fork/vm/instructions/memory.py b/src/ethereum/forks/dao_fork/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/memory.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/dao_fork/vm/instructions/stack.py b/src/ethereum/forks/dao_fork/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/stack.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/frontier/vm/gas.py b/src/ethereum/forks/frontier/vm/gas.py index 3c60482255b..687fae69ca8 100644 --- a/src/ethereum/forks/frontier/vm/gas.py +++ b/src/ethereum/forks/frontier/vm/gas.py @@ -63,6 +63,41 @@ GAS_IDENTITY_WORD = Uint(3) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/frontier/vm/instructions/arithmetic.py b/src/ethereum/forks/frontier/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/frontier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/frontier/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/frontier/vm/instructions/bitwise.py b/src/ethereum/forks/frontier/vm/instructions/bitwise.py index 2a506f55751..cb37f6eca7d 100644 --- a/src/ethereum/forks/frontier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/frontier/vm/instructions/bitwise.py @@ -14,7 +14,14 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +41,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +66,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +91,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +115,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +141,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/frontier/vm/instructions/comparison.py b/src/ethereum/forks/frontier/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/frontier/vm/instructions/comparison.py +++ b/src/ethereum/forks/frontier/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/frontier/vm/instructions/control_flow.py b/src/ethereum/forks/frontier/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/frontier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/frontier/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/frontier/vm/instructions/environment.py b/src/ethereum/forks/frontier/vm/instructions/environment.py index 83eb5528226..f2c91716993 100644 --- a/src/ethereum/forks/frontier/vm/instructions/environment.py +++ b/src/ethereum/forks/frontier/vm/instructions/environment.py @@ -24,7 +24,9 @@ GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_VERY_LOW, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -165,7 +167,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -223,7 +225,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -281,7 +286,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/frontier/vm/instructions/memory.py b/src/ethereum/forks/frontier/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/frontier/vm/instructions/memory.py +++ b/src/ethereum/forks/frontier/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/frontier/vm/instructions/stack.py b/src/ethereum/forks/frontier/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/frontier/vm/instructions/stack.py +++ b/src/ethereum/forks/frontier/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/gray_glacier/vm/gas.py b/src/ethereum/forks/gray_glacier/vm/gas.py index 1929dd5ca3b..c38b90d50d6 100644 --- a/src/ethereum/forks/gray_glacier/vm/gas.py +++ b/src/ethereum/forks/gray_glacier/vm/gas.py @@ -64,6 +64,45 @@ GAS_WARM_ACCESS = Uint(100) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py b/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/environment.py b/src/ethereum/forks/gray_glacier/vm/instructions/environment.py index fe1b70c1269..c7018574c29 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/environment.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/environment.py @@ -26,8 +26,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_gas_extend_memory, charge_gas, @@ -173,7 +176,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -231,7 +234,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -289,7 +295,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -443,7 +452,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/memory.py b/src/ethereum/forks/gray_glacier/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/memory.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/stack.py b/src/ethereum/forks/gray_glacier/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/stack.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/homestead/vm/gas.py b/src/ethereum/forks/homestead/vm/gas.py index 3c60482255b..687fae69ca8 100644 --- a/src/ethereum/forks/homestead/vm/gas.py +++ b/src/ethereum/forks/homestead/vm/gas.py @@ -63,6 +63,41 @@ GAS_IDENTITY_WORD = Uint(3) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/homestead/vm/instructions/arithmetic.py b/src/ethereum/forks/homestead/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/homestead/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/homestead/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/homestead/vm/instructions/bitwise.py b/src/ethereum/forks/homestead/vm/instructions/bitwise.py index 2a506f55751..cb37f6eca7d 100644 --- a/src/ethereum/forks/homestead/vm/instructions/bitwise.py +++ b/src/ethereum/forks/homestead/vm/instructions/bitwise.py @@ -14,7 +14,14 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +41,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +66,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +91,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +115,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +141,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/homestead/vm/instructions/comparison.py b/src/ethereum/forks/homestead/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/homestead/vm/instructions/comparison.py +++ b/src/ethereum/forks/homestead/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/homestead/vm/instructions/control_flow.py b/src/ethereum/forks/homestead/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/homestead/vm/instructions/control_flow.py +++ b/src/ethereum/forks/homestead/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/homestead/vm/instructions/environment.py b/src/ethereum/forks/homestead/vm/instructions/environment.py index 83eb5528226..f2c91716993 100644 --- a/src/ethereum/forks/homestead/vm/instructions/environment.py +++ b/src/ethereum/forks/homestead/vm/instructions/environment.py @@ -24,7 +24,9 @@ GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_VERY_LOW, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -165,7 +167,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -223,7 +225,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -281,7 +286,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/homestead/vm/instructions/memory.py b/src/ethereum/forks/homestead/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/homestead/vm/instructions/memory.py +++ b/src/ethereum/forks/homestead/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/homestead/vm/instructions/stack.py b/src/ethereum/forks/homestead/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/homestead/vm/instructions/stack.py +++ b/src/ethereum/forks/homestead/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/istanbul/vm/gas.py b/src/ethereum/forks/istanbul/vm/gas.py index eb56b502d0a..a6f37ee39ab 100644 --- a/src/ethereum/forks/istanbul/vm/gas.py +++ b/src/ethereum/forks/istanbul/vm/gas.py @@ -67,6 +67,45 @@ GAS_BLAKE2_PER_ROUND = Uint(1) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py b/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/istanbul/vm/instructions/bitwise.py b/src/ethereum/forks/istanbul/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/bitwise.py +++ b/src/ethereum/forks/istanbul/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/istanbul/vm/instructions/comparison.py b/src/ethereum/forks/istanbul/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/comparison.py +++ b/src/ethereum/forks/istanbul/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/istanbul/vm/instructions/control_flow.py b/src/ethereum/forks/istanbul/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/control_flow.py +++ b/src/ethereum/forks/istanbul/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/istanbul/vm/instructions/environment.py b/src/ethereum/forks/istanbul/vm/instructions/environment.py index f0cc93e67d8..a77ca394884 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/environment.py +++ b/src/ethereum/forks/istanbul/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COPY, GAS_EXTERNAL, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, calculate_gas_extend_memory, charge_gas, ) @@ -170,7 +173,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -228,7 +231,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -286,7 +292,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -427,7 +436,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/istanbul/vm/instructions/memory.py b/src/ethereum/forks/istanbul/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/memory.py +++ b/src/ethereum/forks/istanbul/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/istanbul/vm/instructions/stack.py b/src/ethereum/forks/istanbul/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/stack.py +++ b/src/ethereum/forks/istanbul/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/london/vm/gas.py b/src/ethereum/forks/london/vm/gas.py index 1929dd5ca3b..c38b90d50d6 100644 --- a/src/ethereum/forks/london/vm/gas.py +++ b/src/ethereum/forks/london/vm/gas.py @@ -64,6 +64,45 @@ GAS_WARM_ACCESS = Uint(100) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/london/vm/instructions/arithmetic.py b/src/ethereum/forks/london/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/london/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/london/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/london/vm/instructions/bitwise.py b/src/ethereum/forks/london/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/london/vm/instructions/bitwise.py +++ b/src/ethereum/forks/london/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/london/vm/instructions/comparison.py b/src/ethereum/forks/london/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/london/vm/instructions/comparison.py +++ b/src/ethereum/forks/london/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/london/vm/instructions/control_flow.py b/src/ethereum/forks/london/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/london/vm/instructions/control_flow.py +++ b/src/ethereum/forks/london/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/london/vm/instructions/environment.py b/src/ethereum/forks/london/vm/instructions/environment.py index fe1b70c1269..c7018574c29 100644 --- a/src/ethereum/forks/london/vm/instructions/environment.py +++ b/src/ethereum/forks/london/vm/instructions/environment.py @@ -26,8 +26,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_gas_extend_memory, charge_gas, @@ -173,7 +176,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -231,7 +234,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -289,7 +295,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -443,7 +452,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/london/vm/instructions/memory.py b/src/ethereum/forks/london/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/london/vm/instructions/memory.py +++ b/src/ethereum/forks/london/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/london/vm/instructions/stack.py b/src/ethereum/forks/london/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/london/vm/instructions/stack.py +++ b/src/ethereum/forks/london/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/muir_glacier/vm/gas.py b/src/ethereum/forks/muir_glacier/vm/gas.py index eb56b502d0a..a6f37ee39ab 100644 --- a/src/ethereum/forks/muir_glacier/vm/gas.py +++ b/src/ethereum/forks/muir_glacier/vm/gas.py @@ -67,6 +67,45 @@ GAS_BLAKE2_PER_ROUND = Uint(1) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py b/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/environment.py b/src/ethereum/forks/muir_glacier/vm/instructions/environment.py index f0cc93e67d8..a77ca394884 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/environment.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COPY, GAS_EXTERNAL, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, calculate_gas_extend_memory, charge_gas, ) @@ -170,7 +173,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -228,7 +231,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -286,7 +292,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -427,7 +436,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/memory.py b/src/ethereum/forks/muir_glacier/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/memory.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/stack.py b/src/ethereum/forks/muir_glacier/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/stack.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/osaka/vm/gas.py b/src/ethereum/forks/osaka/vm/gas.py index 5108bf63a7d..27190da1edd 100644 --- a/src/ethereum/forks/osaka/vm/gas.py +++ b/src/ethereum/forks/osaka/vm/gas.py @@ -84,6 +84,46 @@ GAS_BLS_G2_MUL = Uint(22500) GAS_BLS_G2_MAP = Uint(23800) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_CLZ = GAS_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + @dataclass class ExtendMemory: diff --git a/src/ethereum/forks/osaka/vm/instructions/arithmetic.py b/src/ethereum/forks/osaka/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/osaka/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/osaka/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/osaka/vm/instructions/bitwise.py b/src/ethereum/forks/osaka/vm/instructions/bitwise.py index cc6fa2fbb23..0614ff61fed 100644 --- a/src/ethereum/forks/osaka/vm/instructions/bitwise.py +++ b/src/ethereum/forks/osaka/vm/instructions/bitwise.py @@ -14,7 +14,18 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_LOW, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_CLZ, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +45,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +70,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +95,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +119,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +145,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +180,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +210,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +240,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -262,7 +273,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/osaka/vm/instructions/comparison.py b/src/ethereum/forks/osaka/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/osaka/vm/instructions/comparison.py +++ b/src/ethereum/forks/osaka/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/osaka/vm/instructions/control_flow.py b/src/ethereum/forks/osaka/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/osaka/vm/instructions/control_flow.py +++ b/src/ethereum/forks/osaka/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/osaka/vm/instructions/environment.py b/src/ethereum/forks/osaka/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/osaka/vm/instructions/environment.py +++ b/src/ethereum/forks/osaka/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/osaka/vm/instructions/memory.py b/src/ethereum/forks/osaka/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/osaka/vm/instructions/memory.py +++ b/src/ethereum/forks/osaka/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/osaka/vm/instructions/stack.py b/src/ethereum/forks/osaka/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/osaka/vm/instructions/stack.py +++ b/src/ethereum/forks/osaka/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/paris/vm/gas.py b/src/ethereum/forks/paris/vm/gas.py index 1929dd5ca3b..c38b90d50d6 100644 --- a/src/ethereum/forks/paris/vm/gas.py +++ b/src/ethereum/forks/paris/vm/gas.py @@ -64,6 +64,45 @@ GAS_WARM_ACCESS = Uint(100) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/paris/vm/instructions/arithmetic.py b/src/ethereum/forks/paris/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/paris/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/paris/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/paris/vm/instructions/bitwise.py b/src/ethereum/forks/paris/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/paris/vm/instructions/bitwise.py +++ b/src/ethereum/forks/paris/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/paris/vm/instructions/comparison.py b/src/ethereum/forks/paris/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/paris/vm/instructions/comparison.py +++ b/src/ethereum/forks/paris/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/paris/vm/instructions/control_flow.py b/src/ethereum/forks/paris/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/paris/vm/instructions/control_flow.py +++ b/src/ethereum/forks/paris/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/paris/vm/instructions/environment.py b/src/ethereum/forks/paris/vm/instructions/environment.py index ba2bb42a425..00e43488ea9 100644 --- a/src/ethereum/forks/paris/vm/instructions/environment.py +++ b/src/ethereum/forks/paris/vm/instructions/environment.py @@ -26,8 +26,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_gas_extend_memory, charge_gas, @@ -173,7 +176,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -231,7 +234,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -289,7 +295,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -443,7 +452,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/paris/vm/instructions/memory.py b/src/ethereum/forks/paris/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/paris/vm/instructions/memory.py +++ b/src/ethereum/forks/paris/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/paris/vm/instructions/stack.py b/src/ethereum/forks/paris/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/paris/vm/instructions/stack.py +++ b/src/ethereum/forks/paris/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/prague/vm/gas.py b/src/ethereum/forks/prague/vm/gas.py index ed1f651e23c..8605c776b57 100644 --- a/src/ethereum/forks/prague/vm/gas.py +++ b/src/ethereum/forks/prague/vm/gas.py @@ -81,6 +81,46 @@ GAS_BLS_G2_MAP = Uint(23800) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_MCOPY = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/prague/vm/instructions/arithmetic.py b/src/ethereum/forks/prague/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/prague/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/prague/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/prague/vm/instructions/bitwise.py b/src/ethereum/forks/prague/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/prague/vm/instructions/bitwise.py +++ b/src/ethereum/forks/prague/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/prague/vm/instructions/comparison.py b/src/ethereum/forks/prague/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/prague/vm/instructions/comparison.py +++ b/src/ethereum/forks/prague/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/prague/vm/instructions/control_flow.py b/src/ethereum/forks/prague/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/prague/vm/instructions/control_flow.py +++ b/src/ethereum/forks/prague/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/prague/vm/instructions/environment.py b/src/ethereum/forks/prague/vm/instructions/environment.py index 5848530a960..589e9d7fcba 100644 --- a/src/ethereum/forks/prague/vm/instructions/environment.py +++ b/src/ethereum/forks/prague/vm/instructions/environment.py @@ -28,8 +28,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_blob_gas_price, calculate_gas_extend_memory, @@ -176,7 +179,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -234,7 +237,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -292,7 +298,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -446,7 +455,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/prague/vm/instructions/memory.py b/src/ethereum/forks/prague/vm/instructions/memory.py index 6e111051ee3..1e650339074 100644 --- a/src/ethereum/forks/prague/vm/instructions/memory.py +++ b/src/ethereum/forks/prague/vm/instructions/memory.py @@ -20,7 +20,10 @@ from ..gas import ( GAS_BASE, GAS_COPY, - GAS_VERY_LOW, + GAS_OPCODE_MCOPY, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -49,7 +52,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -80,7 +83,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -108,7 +111,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -166,7 +169,10 @@ def mcopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(source, length), (destination, length)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/prague/vm/instructions/stack.py b/src/ethereum/forks/prague/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/prague/vm/instructions/stack.py +++ b/src/ethereum/forks/prague/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/shanghai/vm/gas.py b/src/ethereum/forks/shanghai/vm/gas.py index bd3ea9ec341..8b695d5d05a 100644 --- a/src/ethereum/forks/shanghai/vm/gas.py +++ b/src/ethereum/forks/shanghai/vm/gas.py @@ -65,6 +65,45 @@ GAS_CODE_INIT_PER_WORD = Uint(2) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_SHL = GAS_VERY_LOW +GAS_OPCODE_SHR = GAS_VERY_LOW +GAS_OPCODE_SAR = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_RETURNDATACOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py b/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/shanghai/vm/instructions/bitwise.py b/src/ethereum/forks/shanghai/vm/instructions/bitwise.py index 41dabe8185b..4e36a1a7959 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/bitwise.py +++ b/src/ethereum/forks/shanghai/vm/instructions/bitwise.py @@ -14,7 +14,17 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_SAR, + GAS_OPCODE_SHL, + GAS_OPCODE_SHR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +44,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +69,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +94,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +118,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +144,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -169,7 +179,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -199,7 +209,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -229,7 +239,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/shanghai/vm/instructions/comparison.py b/src/ethereum/forks/shanghai/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/comparison.py +++ b/src/ethereum/forks/shanghai/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/shanghai/vm/instructions/control_flow.py b/src/ethereum/forks/shanghai/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/control_flow.py +++ b/src/ethereum/forks/shanghai/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/shanghai/vm/instructions/environment.py b/src/ethereum/forks/shanghai/vm/instructions/environment.py index ba2bb42a425..00e43488ea9 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/environment.py +++ b/src/ethereum/forks/shanghai/vm/instructions/environment.py @@ -26,8 +26,11 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, + GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, - GAS_VERY_LOW, GAS_WARM_ACCESS, calculate_gas_extend_memory, charge_gas, @@ -173,7 +176,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -231,7 +234,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -289,7 +295,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -443,7 +452,10 @@ def returndatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/shanghai/vm/instructions/memory.py b/src/ethereum/forks/shanghai/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/memory.py +++ b/src/ethereum/forks/shanghai/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/shanghai/vm/instructions/stack.py b/src/ethereum/forks/shanghai/vm/instructions/stack.py index 0007a28acd4..a58e1e66e3f 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/stack.py +++ b/src/ethereum/forks/shanghai/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -65,7 +71,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -95,7 +101,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -127,7 +133,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/spurious_dragon/vm/gas.py b/src/ethereum/forks/spurious_dragon/vm/gas.py index 7f9fe700db3..8799d3ee595 100644 --- a/src/ethereum/forks/spurious_dragon/vm/gas.py +++ b/src/ethereum/forks/spurious_dragon/vm/gas.py @@ -63,6 +63,41 @@ GAS_IDENTITY_WORD = Uint(3) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py b/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py b/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py index 2a506f55751..cb37f6eca7d 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py @@ -14,7 +14,14 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +41,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +66,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +91,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +115,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +141,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py b/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py b/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py b/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py index 83eb5528226..f2c91716993 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py @@ -24,7 +24,9 @@ GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_VERY_LOW, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -165,7 +167,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -223,7 +225,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -281,7 +286,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py b/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py b/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/tangerine_whistle/vm/gas.py b/src/ethereum/forks/tangerine_whistle/vm/gas.py index ac02500d623..8d8f4ab57a6 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/gas.py +++ b/src/ethereum/forks/tangerine_whistle/vm/gas.py @@ -63,6 +63,41 @@ GAS_IDENTITY_WORD = Uint(3) +# Opcode specific vars used for repricing +GAS_OPCODE_ADD = GAS_VERY_LOW +GAS_OPCODE_SUB = GAS_VERY_LOW +GAS_OPCODE_MUL = GAS_LOW +GAS_OPCODE_DIV = GAS_LOW +GAS_OPCODE_SDIV = GAS_LOW +GAS_OPCODE_MOD = GAS_LOW +GAS_OPCODE_SMOD = GAS_LOW +GAS_OPCODE_ADDMOD = GAS_MID +GAS_OPCODE_MULMOD = GAS_MID +GAS_OPCODE_SIGNEXTEND = GAS_LOW +GAS_OPCODE_LT = GAS_VERY_LOW +GAS_OPCODE_GT = GAS_VERY_LOW +GAS_OPCODE_SLT = GAS_VERY_LOW +GAS_OPCODE_SGT = GAS_VERY_LOW +GAS_OPCODE_EQ = GAS_VERY_LOW +GAS_OPCODE_ISZERO = GAS_VERY_LOW +GAS_OPCODE_AND = GAS_VERY_LOW +GAS_OPCODE_OR = GAS_VERY_LOW +GAS_OPCODE_XOR = GAS_VERY_LOW +GAS_OPCODE_NOT = GAS_VERY_LOW +GAS_OPCODE_BYTE = GAS_VERY_LOW +GAS_OPCODE_JUMP = GAS_MID +GAS_OPCODE_JUMPI = GAS_HIGH +GAS_OPCODE_CALLDATALOAD = GAS_VERY_LOW +GAS_OPCODE_CALLDATACOPY = GAS_VERY_LOW +GAS_OPCODE_CODECOPY = GAS_VERY_LOW +GAS_OPCODE_MLOAD = GAS_VERY_LOW +GAS_OPCODE_MSTORE = GAS_VERY_LOW +GAS_OPCODE_MSTORE8 = GAS_VERY_LOW +GAS_OPCODE_PUSH_N = GAS_VERY_LOW +GAS_OPCODE_DUP_N = GAS_VERY_LOW +GAS_OPCODE_SWAP_N = GAS_VERY_LOW + + @dataclass class ExtendMemory: """ diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py index b7b1a370ad4..d74f7425823 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py @@ -20,9 +20,16 @@ from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_LOW, - GAS_MID, - GAS_VERY_LOW, + GAS_OPCODE_ADD, + GAS_OPCODE_ADDMOD, + GAS_OPCODE_DIV, + GAS_OPCODE_MOD, + GAS_OPCODE_MUL, + GAS_OPCODE_MULMOD, + GAS_OPCODE_SDIV, + GAS_OPCODE_SIGNEXTEND, + GAS_OPCODE_SMOD, + GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -44,7 +51,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -71,7 +78,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -98,7 +105,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -125,7 +132,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -158,7 +165,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -191,7 +198,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -221,7 +228,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -252,7 +259,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -283,7 +290,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -346,7 +353,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_LOW) + charge_gas(evm, GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py index 2a506f55751..cb37f6eca7d 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py @@ -14,7 +14,14 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_AND, + GAS_OPCODE_BYTE, + GAS_OPCODE_NOT, + GAS_OPCODE_OR, + GAS_OPCODE_XOR, + charge_gas, +) from ..stack import pop, push @@ -34,7 +41,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -59,7 +66,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -84,7 +91,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -108,7 +115,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -134,7 +141,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py index a6a3d99bc86..f18a1f221e8 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py @@ -14,7 +14,15 @@ from ethereum_types.numeric import U256, Uint from .. import Evm -from ..gas import GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_OPCODE_EQ, + GAS_OPCODE_GT, + GAS_OPCODE_ISZERO, + GAS_OPCODE_LT, + GAS_OPCODE_SGT, + GAS_OPCODE_SLT, + charge_gas, +) from ..stack import pop, push @@ -34,7 +42,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -60,7 +68,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -87,7 +95,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -113,7 +121,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -140,7 +148,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -166,7 +174,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py index b3b1f2316a7..3207f00d738 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py @@ -13,7 +13,13 @@ from ethereum_types.numeric import U256, Uint -from ...vm.gas import GAS_BASE, GAS_HIGH, GAS_JUMPDEST, GAS_MID, charge_gas +from ...vm.gas import ( + GAS_BASE, + GAS_JUMPDEST, + GAS_OPCODE_JUMP, + GAS_OPCODE_JUMPI, + charge_gas, +) from .. import Evm from ..exceptions import InvalidJumpDestError from ..stack import pop, push @@ -57,7 +63,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_MID) + charge_gas(evm, GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -84,7 +90,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_HIGH) + charge_gas(evm, GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py index 83eb5528226..f2c91716993 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py @@ -24,7 +24,9 @@ GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_VERY_LOW, + GAS_OPCODE_CALLDATACOPY, + GAS_OPCODE_CALLDATALOAD, + GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -165,7 +167,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -223,7 +225,10 @@ def calldatacopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -281,7 +286,10 @@ def codecopy(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(memory_start_index, size)] ) - charge_gas(evm, GAS_VERY_LOW + copy_gas_cost + extend_memory.cost) + charge_gas( + evm, + GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + ) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py index 3a242ba2f7a..74a9396629a 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py @@ -17,7 +17,9 @@ from .. import Evm from ..gas import ( GAS_BASE, - GAS_VERY_LOW, + GAS_OPCODE_MLOAD, + GAS_OPCODE_MSTORE, + GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -46,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -77,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -105,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_VERY_LOW + extend_memory.cost) + charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py index 0fc0d3fe4b5..4f1b8171e51 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py @@ -17,7 +17,13 @@ from .. import Evm, stack from ..exceptions import StackUnderflowError -from ..gas import GAS_BASE, GAS_VERY_LOW, charge_gas +from ..gas import ( + GAS_BASE, + GAS_OPCODE_DUP_N, + GAS_OPCODE_PUSH_N, + GAS_OPCODE_SWAP_N, + charge_gas, +) from ..memory import buffer_read @@ -62,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -92,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -124,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_VERY_LOW) + charge_gas(evm, GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( From 6c757994593031093d5ad5508497d23bcbcacf65 Mon Sep 17 00:00:00 2001 From: carsons-eels Date: Tue, 3 Mar 2026 15:09:34 -0500 Subject: [PATCH 33/37] refactor(spec-specs): renamed GAS_BLOBHASH_OPCODE to GAS_BLOBHASH to more clearly differentiate between intermediate constants and existing ones --- src/ethereum/forks/amsterdam/vm/gas.py | 2 +- src/ethereum/forks/amsterdam/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/bpo1/vm/gas.py | 2 +- src/ethereum/forks/bpo1/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/bpo2/vm/gas.py | 2 +- src/ethereum/forks/bpo2/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/bpo3/vm/gas.py | 2 +- src/ethereum/forks/bpo3/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/bpo4/vm/gas.py | 2 +- src/ethereum/forks/bpo4/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/bpo5/vm/gas.py | 2 +- src/ethereum/forks/bpo5/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/cancun/vm/gas.py | 2 +- src/ethereum/forks/cancun/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/osaka/vm/gas.py | 2 +- src/ethereum/forks/osaka/vm/instructions/environment.py | 4 ++-- src/ethereum/forks/prague/vm/gas.py | 2 +- src/ethereum/forks/prague/vm/instructions/environment.py | 4 ++-- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/ethereum/forks/amsterdam/vm/gas.py b/src/ethereum/forks/amsterdam/vm/gas.py index a5a94706d9f..ea87d412529 100644 --- a/src/ethereum/forks/amsterdam/vm/gas.py +++ b/src/ethereum/forks/amsterdam/vm/gas.py @@ -67,7 +67,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/amsterdam/vm/instructions/environment.py b/src/ethereum/forks/amsterdam/vm/instructions/environment.py index 98b03e02b9d..ea48276dd30 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/environment.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -583,7 +583,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/bpo1/vm/gas.py b/src/ethereum/forks/bpo1/vm/gas.py index 105f8f63508..bc6d512698a 100644 --- a/src/ethereum/forks/bpo1/vm/gas.py +++ b/src/ethereum/forks/bpo1/vm/gas.py @@ -66,7 +66,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/bpo1/vm/instructions/environment.py b/src/ethereum/forks/bpo1/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo1/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/bpo2/vm/gas.py b/src/ethereum/forks/bpo2/vm/gas.py index 81c5cbdad65..9d87d29f244 100644 --- a/src/ethereum/forks/bpo2/vm/gas.py +++ b/src/ethereum/forks/bpo2/vm/gas.py @@ -66,7 +66,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/bpo2/vm/instructions/environment.py b/src/ethereum/forks/bpo2/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo2/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/bpo3/vm/gas.py b/src/ethereum/forks/bpo3/vm/gas.py index 81c5cbdad65..9d87d29f244 100644 --- a/src/ethereum/forks/bpo3/vm/gas.py +++ b/src/ethereum/forks/bpo3/vm/gas.py @@ -66,7 +66,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/bpo3/vm/instructions/environment.py b/src/ethereum/forks/bpo3/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo3/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/bpo4/vm/gas.py b/src/ethereum/forks/bpo4/vm/gas.py index 81c5cbdad65..9d87d29f244 100644 --- a/src/ethereum/forks/bpo4/vm/gas.py +++ b/src/ethereum/forks/bpo4/vm/gas.py @@ -66,7 +66,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/bpo4/vm/instructions/environment.py b/src/ethereum/forks/bpo4/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo4/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/bpo5/vm/gas.py b/src/ethereum/forks/bpo5/vm/gas.py index 81c5cbdad65..9d87d29f244 100644 --- a/src/ethereum/forks/bpo5/vm/gas.py +++ b/src/ethereum/forks/bpo5/vm/gas.py @@ -66,7 +66,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/bpo5/vm/instructions/environment.py b/src/ethereum/forks/bpo5/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo5/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/cancun/vm/gas.py b/src/ethereum/forks/cancun/vm/gas.py index b375720fc82..d28192c2e67 100644 --- a/src/ethereum/forks/cancun/vm/gas.py +++ b/src/ethereum/forks/cancun/vm/gas.py @@ -65,7 +65,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/cancun/vm/instructions/environment.py b/src/ethereum/forks/cancun/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/cancun/vm/instructions/environment.py +++ b/src/ethereum/forks/cancun/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/osaka/vm/gas.py b/src/ethereum/forks/osaka/vm/gas.py index 27190da1edd..32673fe71b3 100644 --- a/src/ethereum/forks/osaka/vm/gas.py +++ b/src/ethereum/forks/osaka/vm/gas.py @@ -66,7 +66,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/osaka/vm/instructions/environment.py b/src/ethereum/forks/osaka/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/osaka/vm/instructions/environment.py +++ b/src/ethereum/forks/osaka/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): diff --git a/src/ethereum/forks/prague/vm/gas.py b/src/ethereum/forks/prague/vm/gas.py index 8605c776b57..51ed3ee2d29 100644 --- a/src/ethereum/forks/prague/vm/gas.py +++ b/src/ethereum/forks/prague/vm/gas.py @@ -65,7 +65,7 @@ GAS_COLD_ACCOUNT_ACCESS = Uint(2600) GAS_WARM_ACCESS = Uint(100) GAS_CODE_INIT_PER_WORD = Uint(2) -GAS_BLOBHASH_OPCODE = Uint(3) +GAS_BLOBHASH = Uint(3) GAS_POINT_EVALUATION = Uint(50000) GAS_PER_BLOB = U64(2**17) diff --git a/src/ethereum/forks/prague/vm/instructions/environment.py b/src/ethereum/forks/prague/vm/instructions/environment.py index 589e9d7fcba..7a2f15c7001 100644 --- a/src/ethereum/forks/prague/vm/instructions/environment.py +++ b/src/ethereum/forks/prague/vm/instructions/environment.py @@ -24,7 +24,7 @@ from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, - GAS_BLOBHASH_OPCODE, + GAS_BLOBHASH, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, @@ -573,7 +573,7 @@ def blob_hash(evm: Evm) -> None: index = pop(evm.stack) # GAS - charge_gas(evm, GAS_BLOBHASH_OPCODE) + charge_gas(evm, GAS_BLOBHASH) # OPERATION if int(index) < len(evm.message.tx_env.blob_versioned_hashes): From 1b0910fa8dd24c1ebb4f5aba9504908cb659c707 Mon Sep 17 00:00:00 2001 From: carsons-eels Date: Tue, 3 Mar 2026 15:10:29 -0500 Subject: [PATCH 34/37] refactor(testing): add per-opcode gas constants to GasCosts Add 39 GAS_OPCODE_* fields to the GasCosts dataclass and update opcode_gas_map() in all forks to reference per-opcode fields instead of shared tier constants. --- .../execution_testing/forks/forks/forks.py | 126 ++++++++++++------ .../src/execution_testing/forks/gas_costs.py | 41 ++++++ 2 files changed, 128 insertions(+), 39 deletions(-) diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py index d7525f437cb..97df3bc3edb 100644 --- a/packages/testing/src/execution_testing/forks/forks/forks.py +++ b/packages/testing/src/execution_testing/forks/forks/forks.py @@ -201,6 +201,46 @@ def gas_costs( GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR=0, GAS_PRECOMPILE_P256VERIFY=0, GAS_BLOCK_ACCESS_LIST_ITEM=0, + # Opcode specific gas constants for repricing + GAS_OPCODE_ADD=3, + GAS_OPCODE_SUB=3, + GAS_OPCODE_MUL=5, + GAS_OPCODE_DIV=5, + GAS_OPCODE_SDIV=5, + GAS_OPCODE_MOD=5, + GAS_OPCODE_SMOD=5, + GAS_OPCODE_ADDMOD=8, + GAS_OPCODE_MULMOD=8, + GAS_OPCODE_SIGNEXTEND=5, + GAS_OPCODE_LT=3, + GAS_OPCODE_GT=3, + GAS_OPCODE_SLT=3, + GAS_OPCODE_SGT=3, + GAS_OPCODE_EQ=3, + GAS_OPCODE_ISZERO=3, + GAS_OPCODE_AND=3, + GAS_OPCODE_OR=3, + GAS_OPCODE_XOR=3, + GAS_OPCODE_NOT=3, + GAS_OPCODE_BYTE=3, + GAS_OPCODE_SHL=3, + GAS_OPCODE_SHR=3, + GAS_OPCODE_SAR=3, + GAS_OPCODE_CLZ=5, + GAS_OPCODE_BLOBHASH=3, + GAS_OPCODE_JUMP=8, + GAS_OPCODE_JUMPI=10, + GAS_OPCODE_CALLDATALOAD=3, + GAS_OPCODE_CALLDATACOPY=3, + GAS_OPCODE_CODECOPY=3, + GAS_OPCODE_RETURNDATACOPY=3, + GAS_OPCODE_MLOAD=3, + GAS_OPCODE_MSTORE=3, + GAS_OPCODE_MSTORE8=3, + GAS_OPCODE_MCOPY=3, + GAS_OPCODE_PUSH_N=3, + GAS_OPCODE_DUP_N=3, + GAS_OPCODE_SWAP_N=3, ) @classmethod @@ -338,33 +378,33 @@ def opcode_gas_map( return { # Stop and arithmetic operations Opcodes.STOP: 0, - Opcodes.ADD: gas_costs.GAS_VERY_LOW, - Opcodes.MUL: gas_costs.GAS_LOW, - Opcodes.SUB: gas_costs.GAS_VERY_LOW, - Opcodes.DIV: gas_costs.GAS_LOW, - Opcodes.SDIV: gas_costs.GAS_LOW, - Opcodes.MOD: gas_costs.GAS_LOW, - Opcodes.SMOD: gas_costs.GAS_LOW, - Opcodes.ADDMOD: gas_costs.GAS_MID, - Opcodes.MULMOD: gas_costs.GAS_MID, + Opcodes.ADD: gas_costs.GAS_OPCODE_ADD, + Opcodes.MUL: gas_costs.GAS_OPCODE_MUL, + Opcodes.SUB: gas_costs.GAS_OPCODE_SUB, + Opcodes.DIV: gas_costs.GAS_OPCODE_DIV, + Opcodes.SDIV: gas_costs.GAS_OPCODE_SDIV, + Opcodes.MOD: gas_costs.GAS_OPCODE_MOD, + Opcodes.SMOD: gas_costs.GAS_OPCODE_SMOD, + Opcodes.ADDMOD: gas_costs.GAS_OPCODE_ADDMOD, + Opcodes.MULMOD: gas_costs.GAS_OPCODE_MULMOD, Opcodes.EXP: lambda op: ( gas_costs.GAS_EXPONENTIATION + gas_costs.GAS_EXPONENTIATION_PER_BYTE * ((op.metadata["exponent"].bit_length() + 7) // 8) ), - Opcodes.SIGNEXTEND: gas_costs.GAS_LOW, + Opcodes.SIGNEXTEND: gas_costs.GAS_OPCODE_SIGNEXTEND, # Comparison & bitwise logic operations - Opcodes.LT: gas_costs.GAS_VERY_LOW, - Opcodes.GT: gas_costs.GAS_VERY_LOW, - Opcodes.SLT: gas_costs.GAS_VERY_LOW, - Opcodes.SGT: gas_costs.GAS_VERY_LOW, - Opcodes.EQ: gas_costs.GAS_VERY_LOW, - Opcodes.ISZERO: gas_costs.GAS_VERY_LOW, - Opcodes.AND: gas_costs.GAS_VERY_LOW, - Opcodes.OR: gas_costs.GAS_VERY_LOW, - Opcodes.XOR: gas_costs.GAS_VERY_LOW, - Opcodes.NOT: gas_costs.GAS_VERY_LOW, - Opcodes.BYTE: gas_costs.GAS_VERY_LOW, + Opcodes.LT: gas_costs.GAS_OPCODE_LT, + Opcodes.GT: gas_costs.GAS_OPCODE_GT, + Opcodes.SLT: gas_costs.GAS_OPCODE_SLT, + Opcodes.SGT: gas_costs.GAS_OPCODE_SGT, + Opcodes.EQ: gas_costs.GAS_OPCODE_EQ, + Opcodes.ISZERO: gas_costs.GAS_OPCODE_ISZERO, + Opcodes.AND: gas_costs.GAS_OPCODE_AND, + Opcodes.OR: gas_costs.GAS_OPCODE_OR, + Opcodes.XOR: gas_costs.GAS_OPCODE_XOR, + Opcodes.NOT: gas_costs.GAS_OPCODE_NOT, + Opcodes.BYTE: gas_costs.GAS_OPCODE_BYTE, # SHA3 Opcodes.SHA3: cls._with_memory_expansion( lambda op: ( @@ -380,15 +420,17 @@ def opcode_gas_map( Opcodes.ORIGIN: gas_costs.GAS_BASE, Opcodes.CALLER: gas_costs.GAS_BASE, Opcodes.CALLVALUE: gas_costs.GAS_BASE, - Opcodes.CALLDATALOAD: gas_costs.GAS_VERY_LOW, + Opcodes.CALLDATALOAD: gas_costs.GAS_OPCODE_CALLDATALOAD, Opcodes.CALLDATASIZE: gas_costs.GAS_BASE, Opcodes.CALLDATACOPY: cls._with_memory_expansion( - cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs), + cls._with_data_copy( + gas_costs.GAS_OPCODE_CALLDATACOPY, gas_costs + ), memory_expansion_calculator, ), Opcodes.CODESIZE: gas_costs.GAS_BASE, Opcodes.CODECOPY: cls._with_memory_expansion( - cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs), + cls._with_data_copy(gas_costs.GAS_OPCODE_CODECOPY, gas_costs), memory_expansion_calculator, ), Opcodes.GASPRICE: gas_costs.GAS_BASE, @@ -410,13 +452,16 @@ def opcode_gas_map( # Stack, memory, storage and flow operations Opcodes.POP: gas_costs.GAS_BASE, Opcodes.MLOAD: cls._with_memory_expansion( - gas_costs.GAS_VERY_LOW, memory_expansion_calculator + gas_costs.GAS_OPCODE_MLOAD, + memory_expansion_calculator, ), Opcodes.MSTORE: cls._with_memory_expansion( - gas_costs.GAS_VERY_LOW, memory_expansion_calculator + gas_costs.GAS_OPCODE_MSTORE, + memory_expansion_calculator, ), Opcodes.MSTORE8: cls._with_memory_expansion( - gas_costs.GAS_VERY_LOW, memory_expansion_calculator + gas_costs.GAS_OPCODE_MSTORE8, + memory_expansion_calculator, ), Opcodes.SLOAD: lambda op: ( gas_costs.GAS_WARM_SLOAD @@ -426,25 +471,25 @@ def opcode_gas_map( Opcodes.SSTORE: lambda op: cls._calculate_sstore_gas( op, gas_costs ), - Opcodes.JUMP: gas_costs.GAS_MID, - Opcodes.JUMPI: gas_costs.GAS_HIGH, + Opcodes.JUMP: gas_costs.GAS_OPCODE_JUMP, + Opcodes.JUMPI: gas_costs.GAS_OPCODE_JUMPI, Opcodes.PC: gas_costs.GAS_BASE, Opcodes.MSIZE: gas_costs.GAS_BASE, Opcodes.GAS: gas_costs.GAS_BASE, Opcodes.JUMPDEST: gas_costs.GAS_JUMPDEST, # Push operations (PUSH1 through PUSH32) **{ - getattr(Opcodes, f"PUSH{i}"): gas_costs.GAS_VERY_LOW + getattr(Opcodes, f"PUSH{i}"): gas_costs.GAS_OPCODE_PUSH_N for i in range(1, 33) }, # Dup operations (DUP1 through DUP16) **{ - getattr(Opcodes, f"DUP{i}"): gas_costs.GAS_VERY_LOW + getattr(Opcodes, f"DUP{i}"): gas_costs.GAS_OPCODE_DUP_N for i in range(1, 17) }, # Swap operations (SWAP1 through SWAP16) **{ - getattr(Opcodes, f"SWAP{i}"): gas_costs.GAS_VERY_LOW + getattr(Opcodes, f"SWAP{i}"): gas_costs.GAS_OPCODE_SWAP_N for i in range(1, 17) }, # Logging operations @@ -1690,7 +1735,10 @@ def opcode_gas_map( **base_map, Opcodes.RETURNDATASIZE: gas_costs.GAS_BASE, Opcodes.RETURNDATACOPY: cls._with_memory_expansion( - cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs), + cls._with_data_copy( + gas_costs.GAS_OPCODE_RETURNDATACOPY, + gas_costs, + ), memory_expansion_calculator, ), Opcodes.STATICCALL: cls._with_memory_expansion( @@ -1784,9 +1832,9 @@ def opcode_gas_map( ) return { **base_map, - Opcodes.SHL: gas_costs.GAS_VERY_LOW, - Opcodes.SHR: gas_costs.GAS_VERY_LOW, - Opcodes.SAR: gas_costs.GAS_VERY_LOW, + Opcodes.SHL: gas_costs.GAS_OPCODE_SHL, + Opcodes.SHR: gas_costs.GAS_OPCODE_SHR, + Opcodes.SAR: gas_costs.GAS_OPCODE_SAR, Opcodes.EXTCODEHASH: cls._with_account_access(0, gas_costs), Opcodes.CREATE2: cls._with_memory_expansion( lambda op: cls._calculate_create2_gas(op, gas_costs), @@ -2680,7 +2728,7 @@ def opcode_gas_map( return { **base_map, # EIP-4844: Shard Blob Transactions - Opcodes.BLOBHASH: gas_costs.GAS_VERY_LOW, + Opcodes.BLOBHASH: gas_costs.GAS_OPCODE_BLOBHASH, # EIP-7516: BLOBBASEFEE opcode Opcodes.BLOBBASEFEE: gas_costs.GAS_BASE, # EIP-1153: Transient storage opcodes @@ -2688,7 +2736,7 @@ def opcode_gas_map( Opcodes.TSTORE: gas_costs.GAS_WARM_SLOAD, # EIP-5656: MCOPY - Memory copying instruction Opcodes.MCOPY: cls._with_memory_expansion( - cls._with_data_copy(gas_costs.GAS_VERY_LOW, gas_costs), + cls._with_data_copy(gas_costs.GAS_OPCODE_MCOPY, gas_costs), memory_expansion_calculator, ), } @@ -3150,7 +3198,7 @@ def opcode_gas_map( ) return { **base_map, - Opcodes.CLZ: gas_costs.GAS_LOW, + Opcodes.CLZ: gas_costs.GAS_OPCODE_CLZ, } @classmethod diff --git a/packages/testing/src/execution_testing/forks/gas_costs.py b/packages/testing/src/execution_testing/forks/gas_costs.py index eb632dd0888..f7bb3727771 100644 --- a/packages/testing/src/execution_testing/forks/gas_costs.py +++ b/packages/testing/src/execution_testing/forks/gas_costs.py @@ -91,3 +91,44 @@ class GasCosts: REFUND_AUTH_PER_EXISTING_ACCOUNT: int GAS_BLOCK_ACCESS_LIST_ITEM: int + + # Opcode specific gas constants for repricing + GAS_OPCODE_ADD: int + GAS_OPCODE_SUB: int + GAS_OPCODE_MUL: int + GAS_OPCODE_DIV: int + GAS_OPCODE_SDIV: int + GAS_OPCODE_MOD: int + GAS_OPCODE_SMOD: int + GAS_OPCODE_ADDMOD: int + GAS_OPCODE_MULMOD: int + GAS_OPCODE_SIGNEXTEND: int + GAS_OPCODE_LT: int + GAS_OPCODE_GT: int + GAS_OPCODE_SLT: int + GAS_OPCODE_SGT: int + GAS_OPCODE_EQ: int + GAS_OPCODE_ISZERO: int + GAS_OPCODE_AND: int + GAS_OPCODE_OR: int + GAS_OPCODE_XOR: int + GAS_OPCODE_NOT: int + GAS_OPCODE_BYTE: int + GAS_OPCODE_SHL: int + GAS_OPCODE_SHR: int + GAS_OPCODE_SAR: int + GAS_OPCODE_CLZ: int + GAS_OPCODE_BLOBHASH: int + GAS_OPCODE_JUMP: int + GAS_OPCODE_JUMPI: int + GAS_OPCODE_CALLDATALOAD: int + GAS_OPCODE_CALLDATACOPY: int + GAS_OPCODE_CODECOPY: int + GAS_OPCODE_RETURNDATACOPY: int + GAS_OPCODE_MLOAD: int + GAS_OPCODE_MSTORE: int + GAS_OPCODE_MSTORE8: int + GAS_OPCODE_MCOPY: int + GAS_OPCODE_PUSH_N: int + GAS_OPCODE_DUP_N: int + GAS_OPCODE_SWAP_N: int From 4fb062e62cc4f1e0f359239a3a49dc263834d257 Mon Sep 17 00:00:00 2001 From: carsons-eels Date: Mon, 9 Mar 2026 22:44:20 -0400 Subject: [PATCH 35/37] refactor: move post-frontier opcodes --- .../execution_testing/forks/forks/forks.py | 25 +++++++++++++------ .../src/execution_testing/forks/gas_costs.py | 16 ++++++------ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py index 97df3bc3edb..a9fb21ea910 100644 --- a/packages/testing/src/execution_testing/forks/forks/forks.py +++ b/packages/testing/src/execution_testing/forks/forks/forks.py @@ -223,21 +223,14 @@ def gas_costs( GAS_OPCODE_XOR=3, GAS_OPCODE_NOT=3, GAS_OPCODE_BYTE=3, - GAS_OPCODE_SHL=3, - GAS_OPCODE_SHR=3, - GAS_OPCODE_SAR=3, - GAS_OPCODE_CLZ=5, - GAS_OPCODE_BLOBHASH=3, GAS_OPCODE_JUMP=8, GAS_OPCODE_JUMPI=10, GAS_OPCODE_CALLDATALOAD=3, GAS_OPCODE_CALLDATACOPY=3, GAS_OPCODE_CODECOPY=3, - GAS_OPCODE_RETURNDATACOPY=3, GAS_OPCODE_MLOAD=3, GAS_OPCODE_MSTORE=3, GAS_OPCODE_MSTORE8=3, - GAS_OPCODE_MCOPY=3, GAS_OPCODE_PUSH_N=3, GAS_OPCODE_DUP_N=3, GAS_OPCODE_SWAP_N=3, @@ -1778,6 +1771,7 @@ def gas_costs( GAS_PRECOMPILE_ECMUL=40_000, GAS_PRECOMPILE_ECPAIRING_BASE=100_000, GAS_PRECOMPILE_ECPAIRING_PER_POINT=80_000, + GAS_OPCODE_RETURNDATACOPY=3, ) @@ -1816,6 +1810,20 @@ def create_opcodes( block_number=block_number, timestamp=timestamp ) + @classmethod + def gas_costs( + cls, *, block_number: int = 0, timestamp: int = 0 + ) -> GasCosts: + """At Constantinople, shift opcodes are introduced.""" + return replace( + super(Constantinople, cls).gas_costs( + block_number=block_number, timestamp=timestamp + ), + GAS_OPCODE_SHL=3, + GAS_OPCODE_SHR=3, + GAS_OPCODE_SAR=3, + ) + @classmethod def opcode_gas_map( cls, *, block_number: int = 0, timestamp: int = 0 @@ -2700,6 +2708,8 @@ def gas_costs( block_number=block_number, timestamp=timestamp ), GAS_PRECOMPILE_POINT_EVALUATION=50_000, + GAS_OPCODE_BLOBHASH=3, + GAS_OPCODE_MCOPY=3, ) @classmethod @@ -2829,6 +2839,7 @@ def gas_costs( GAS_PRECOMPILE_BLS_G2MAP=23_800, GAS_PRECOMPILE_BLS_PAIRING_BASE=37_700, GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR=32_600, + GAS_OPCODE_CLZ=5, ) @classmethod diff --git a/packages/testing/src/execution_testing/forks/gas_costs.py b/packages/testing/src/execution_testing/forks/gas_costs.py index f7bb3727771..2bd1997042d 100644 --- a/packages/testing/src/execution_testing/forks/gas_costs.py +++ b/packages/testing/src/execution_testing/forks/gas_costs.py @@ -114,21 +114,23 @@ class GasCosts: GAS_OPCODE_XOR: int GAS_OPCODE_NOT: int GAS_OPCODE_BYTE: int - GAS_OPCODE_SHL: int - GAS_OPCODE_SHR: int - GAS_OPCODE_SAR: int - GAS_OPCODE_CLZ: int - GAS_OPCODE_BLOBHASH: int GAS_OPCODE_JUMP: int GAS_OPCODE_JUMPI: int GAS_OPCODE_CALLDATALOAD: int GAS_OPCODE_CALLDATACOPY: int GAS_OPCODE_CODECOPY: int - GAS_OPCODE_RETURNDATACOPY: int GAS_OPCODE_MLOAD: int GAS_OPCODE_MSTORE: int GAS_OPCODE_MSTORE8: int - GAS_OPCODE_MCOPY: int GAS_OPCODE_PUSH_N: int GAS_OPCODE_DUP_N: int GAS_OPCODE_SWAP_N: int + + # Defined post-Frontier + GAS_OPCODE_SHL: int = 0 + GAS_OPCODE_SHR: int = 0 + GAS_OPCODE_SAR: int = 0 + GAS_OPCODE_RETURNDATACOPY: int = 0 + GAS_OPCODE_BLOBHASH: int = 0 + GAS_OPCODE_MCOPY: int = 0 + GAS_OPCODE_CLZ: int = 0 From 7aad8e3b2aace31aa728d89b703fd0d4ce199286 Mon Sep 17 00:00:00 2001 From: carsons-eels Date: Mon, 9 Mar 2026 23:26:18 -0400 Subject: [PATCH 36/37] refactor: added gas tiers for the test code --- .../execution_testing/forks/forks/forks.py | 86 ++++++++++--------- .../src/execution_testing/forks/gas_costs.py | 6 ++ 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py index a9fb21ea910..b504aaba038 100644 --- a/packages/testing/src/execution_testing/forks/forks/forks.py +++ b/packages/testing/src/execution_testing/forks/forks/forks.py @@ -46,7 +46,13 @@ TransactionDataFloorCostCalculator, TransactionIntrinsicCostCalculator, ) -from ..gas_costs import GasCosts +from ..gas_costs import ( + GAS_HIGH, + GAS_LOW, + GAS_MID, + GAS_VERY_LOW, + GasCosts, +) from .helpers import ceiling_division, fake_exponential CURRENT_FILE = Path(realpath(__file__)) @@ -202,38 +208,38 @@ def gas_costs( GAS_PRECOMPILE_P256VERIFY=0, GAS_BLOCK_ACCESS_LIST_ITEM=0, # Opcode specific gas constants for repricing - GAS_OPCODE_ADD=3, - GAS_OPCODE_SUB=3, - GAS_OPCODE_MUL=5, - GAS_OPCODE_DIV=5, - GAS_OPCODE_SDIV=5, - GAS_OPCODE_MOD=5, - GAS_OPCODE_SMOD=5, - GAS_OPCODE_ADDMOD=8, - GAS_OPCODE_MULMOD=8, - GAS_OPCODE_SIGNEXTEND=5, - GAS_OPCODE_LT=3, - GAS_OPCODE_GT=3, - GAS_OPCODE_SLT=3, - GAS_OPCODE_SGT=3, - GAS_OPCODE_EQ=3, - GAS_OPCODE_ISZERO=3, - GAS_OPCODE_AND=3, - GAS_OPCODE_OR=3, - GAS_OPCODE_XOR=3, - GAS_OPCODE_NOT=3, - GAS_OPCODE_BYTE=3, - GAS_OPCODE_JUMP=8, - GAS_OPCODE_JUMPI=10, - GAS_OPCODE_CALLDATALOAD=3, - GAS_OPCODE_CALLDATACOPY=3, - GAS_OPCODE_CODECOPY=3, - GAS_OPCODE_MLOAD=3, - GAS_OPCODE_MSTORE=3, - GAS_OPCODE_MSTORE8=3, - GAS_OPCODE_PUSH_N=3, - GAS_OPCODE_DUP_N=3, - GAS_OPCODE_SWAP_N=3, + GAS_OPCODE_ADD=GAS_VERY_LOW, + GAS_OPCODE_SUB=GAS_VERY_LOW, + GAS_OPCODE_MUL=GAS_LOW, + GAS_OPCODE_DIV=GAS_LOW, + GAS_OPCODE_SDIV=GAS_LOW, + GAS_OPCODE_MOD=GAS_LOW, + GAS_OPCODE_SMOD=GAS_LOW, + GAS_OPCODE_ADDMOD=GAS_MID, + GAS_OPCODE_MULMOD=GAS_MID, + GAS_OPCODE_SIGNEXTEND=GAS_LOW, + GAS_OPCODE_LT=GAS_VERY_LOW, + GAS_OPCODE_GT=GAS_VERY_LOW, + GAS_OPCODE_SLT=GAS_VERY_LOW, + GAS_OPCODE_SGT=GAS_VERY_LOW, + GAS_OPCODE_EQ=GAS_VERY_LOW, + GAS_OPCODE_ISZERO=GAS_VERY_LOW, + GAS_OPCODE_AND=GAS_VERY_LOW, + GAS_OPCODE_OR=GAS_VERY_LOW, + GAS_OPCODE_XOR=GAS_VERY_LOW, + GAS_OPCODE_NOT=GAS_VERY_LOW, + GAS_OPCODE_BYTE=GAS_VERY_LOW, + GAS_OPCODE_JUMP=GAS_MID, + GAS_OPCODE_JUMPI=GAS_HIGH, + GAS_OPCODE_CALLDATALOAD=GAS_VERY_LOW, + GAS_OPCODE_CALLDATACOPY=GAS_VERY_LOW, + GAS_OPCODE_CODECOPY=GAS_VERY_LOW, + GAS_OPCODE_MLOAD=GAS_VERY_LOW, + GAS_OPCODE_MSTORE=GAS_VERY_LOW, + GAS_OPCODE_MSTORE8=GAS_VERY_LOW, + GAS_OPCODE_PUSH_N=GAS_VERY_LOW, + GAS_OPCODE_DUP_N=GAS_VERY_LOW, + GAS_OPCODE_SWAP_N=GAS_VERY_LOW, ) @classmethod @@ -1771,7 +1777,7 @@ def gas_costs( GAS_PRECOMPILE_ECMUL=40_000, GAS_PRECOMPILE_ECPAIRING_BASE=100_000, GAS_PRECOMPILE_ECPAIRING_PER_POINT=80_000, - GAS_OPCODE_RETURNDATACOPY=3, + GAS_OPCODE_RETURNDATACOPY=GAS_VERY_LOW, ) @@ -1819,9 +1825,9 @@ def gas_costs( super(Constantinople, cls).gas_costs( block_number=block_number, timestamp=timestamp ), - GAS_OPCODE_SHL=3, - GAS_OPCODE_SHR=3, - GAS_OPCODE_SAR=3, + GAS_OPCODE_SHL=GAS_VERY_LOW, + GAS_OPCODE_SHR=GAS_VERY_LOW, + GAS_OPCODE_SAR=GAS_VERY_LOW, ) @classmethod @@ -2708,8 +2714,8 @@ def gas_costs( block_number=block_number, timestamp=timestamp ), GAS_PRECOMPILE_POINT_EVALUATION=50_000, - GAS_OPCODE_BLOBHASH=3, - GAS_OPCODE_MCOPY=3, + GAS_OPCODE_BLOBHASH=GAS_VERY_LOW, + GAS_OPCODE_MCOPY=GAS_VERY_LOW, ) @classmethod @@ -2839,7 +2845,7 @@ def gas_costs( GAS_PRECOMPILE_BLS_G2MAP=23_800, GAS_PRECOMPILE_BLS_PAIRING_BASE=37_700, GAS_PRECOMPILE_BLS_PAIRING_PER_PAIR=32_600, - GAS_OPCODE_CLZ=5, + GAS_OPCODE_CLZ=GAS_LOW, ) @classmethod diff --git a/packages/testing/src/execution_testing/forks/gas_costs.py b/packages/testing/src/execution_testing/forks/gas_costs.py index 2bd1997042d..5ef97ce3e99 100644 --- a/packages/testing/src/execution_testing/forks/gas_costs.py +++ b/packages/testing/src/execution_testing/forks/gas_costs.py @@ -2,6 +2,12 @@ from dataclasses import dataclass +# Common Gas Cost Tiers +GAS_VERY_LOW = 3 +GAS_LOW = 5 +GAS_MID = 8 +GAS_HIGH = 10 + @dataclass(kw_only=True, frozen=True) class GasCosts: From 799cf49bceb82d8c8e43de2df116a3fe017f09d8 Mon Sep 17 00:00:00 2001 From: carsons-eels Date: Tue, 10 Mar 2026 00:58:18 -0400 Subject: [PATCH 37/37] refactor: use gas module refs for opcode constants --- .../amsterdam/vm/instructions/arithmetic.py | 32 +++++++------------ .../amsterdam/vm/instructions/bitwise.py | 29 ++++++----------- .../amsterdam/vm/instructions/comparison.py | 20 ++++-------- .../amsterdam/vm/instructions/control_flow.py | 7 ++-- .../amsterdam/vm/instructions/environment.py | 14 +++----- .../forks/amsterdam/vm/instructions/memory.py | 14 +++----- .../forks/amsterdam/vm/instructions/stack.py | 11 +++---- .../vm/instructions/arithmetic.py | 32 +++++++------------ .../arrow_glacier/vm/instructions/bitwise.py | 26 ++++++--------- .../vm/instructions/comparison.py | 20 ++++-------- .../vm/instructions/control_flow.py | 7 ++-- .../vm/instructions/environment.py | 14 +++----- .../arrow_glacier/vm/instructions/memory.py | 11 +++---- .../arrow_glacier/vm/instructions/stack.py | 11 +++---- .../berlin/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/berlin/vm/instructions/bitwise.py | 26 ++++++--------- .../berlin/vm/instructions/comparison.py | 20 ++++-------- .../berlin/vm/instructions/control_flow.py | 7 ++-- .../berlin/vm/instructions/environment.py | 14 +++----- .../forks/berlin/vm/instructions/memory.py | 11 +++---- .../forks/berlin/vm/instructions/stack.py | 11 +++---- .../forks/bpo1/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/bpo1/vm/instructions/bitwise.py | 29 ++++++----------- .../forks/bpo1/vm/instructions/comparison.py | 20 ++++-------- .../bpo1/vm/instructions/control_flow.py | 7 ++-- .../forks/bpo1/vm/instructions/environment.py | 14 +++----- .../forks/bpo1/vm/instructions/memory.py | 14 +++----- .../forks/bpo1/vm/instructions/stack.py | 11 +++---- .../forks/bpo2/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/bpo2/vm/instructions/bitwise.py | 29 ++++++----------- .../forks/bpo2/vm/instructions/comparison.py | 20 ++++-------- .../bpo2/vm/instructions/control_flow.py | 7 ++-- .../forks/bpo2/vm/instructions/environment.py | 14 +++----- .../forks/bpo2/vm/instructions/memory.py | 14 +++----- .../forks/bpo2/vm/instructions/stack.py | 11 +++---- .../forks/bpo3/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/bpo3/vm/instructions/bitwise.py | 29 ++++++----------- .../forks/bpo3/vm/instructions/comparison.py | 20 ++++-------- .../bpo3/vm/instructions/control_flow.py | 7 ++-- .../forks/bpo3/vm/instructions/environment.py | 14 +++----- .../forks/bpo3/vm/instructions/memory.py | 14 +++----- .../forks/bpo3/vm/instructions/stack.py | 11 +++---- .../forks/bpo4/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/bpo4/vm/instructions/bitwise.py | 29 ++++++----------- .../forks/bpo4/vm/instructions/comparison.py | 20 ++++-------- .../bpo4/vm/instructions/control_flow.py | 7 ++-- .../forks/bpo4/vm/instructions/environment.py | 14 +++----- .../forks/bpo4/vm/instructions/memory.py | 14 +++----- .../forks/bpo4/vm/instructions/stack.py | 11 +++---- .../forks/bpo5/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/bpo5/vm/instructions/bitwise.py | 29 ++++++----------- .../forks/bpo5/vm/instructions/comparison.py | 20 ++++-------- .../bpo5/vm/instructions/control_flow.py | 7 ++-- .../forks/bpo5/vm/instructions/environment.py | 14 +++----- .../forks/bpo5/vm/instructions/memory.py | 14 +++----- .../forks/bpo5/vm/instructions/stack.py | 11 +++---- .../byzantium/vm/instructions/arithmetic.py | 32 +++++++------------ .../byzantium/vm/instructions/bitwise.py | 17 ++++------ .../byzantium/vm/instructions/comparison.py | 20 ++++-------- .../byzantium/vm/instructions/control_flow.py | 7 ++-- .../byzantium/vm/instructions/environment.py | 14 +++----- .../forks/byzantium/vm/instructions/memory.py | 11 +++---- .../forks/byzantium/vm/instructions/stack.py | 11 +++---- .../cancun/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/cancun/vm/instructions/bitwise.py | 26 ++++++--------- .../cancun/vm/instructions/comparison.py | 20 ++++-------- .../cancun/vm/instructions/control_flow.py | 7 ++-- .../cancun/vm/instructions/environment.py | 14 +++----- .../forks/cancun/vm/instructions/memory.py | 14 +++----- .../forks/cancun/vm/instructions/stack.py | 11 +++---- .../vm/instructions/arithmetic.py | 32 +++++++------------ .../constantinople/vm/instructions/bitwise.py | 26 ++++++--------- .../vm/instructions/comparison.py | 20 ++++-------- .../vm/instructions/control_flow.py | 7 ++-- .../vm/instructions/environment.py | 14 +++----- .../constantinople/vm/instructions/memory.py | 11 +++---- .../constantinople/vm/instructions/stack.py | 11 +++---- .../dao_fork/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/dao_fork/vm/instructions/bitwise.py | 17 ++++------ .../dao_fork/vm/instructions/comparison.py | 20 ++++-------- .../dao_fork/vm/instructions/control_flow.py | 7 ++-- .../dao_fork/vm/instructions/environment.py | 11 +++---- .../forks/dao_fork/vm/instructions/memory.py | 11 +++---- .../forks/dao_fork/vm/instructions/stack.py | 11 +++---- .../frontier/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/frontier/vm/instructions/bitwise.py | 17 ++++------ .../frontier/vm/instructions/comparison.py | 20 ++++-------- .../frontier/vm/instructions/control_flow.py | 7 ++-- .../frontier/vm/instructions/environment.py | 11 +++---- .../forks/frontier/vm/instructions/memory.py | 11 +++---- .../forks/frontier/vm/instructions/stack.py | 11 +++---- .../vm/instructions/arithmetic.py | 32 +++++++------------ .../gray_glacier/vm/instructions/bitwise.py | 26 ++++++--------- .../vm/instructions/comparison.py | 20 ++++-------- .../vm/instructions/control_flow.py | 7 ++-- .../vm/instructions/environment.py | 14 +++----- .../gray_glacier/vm/instructions/memory.py | 11 +++---- .../gray_glacier/vm/instructions/stack.py | 11 +++---- .../homestead/vm/instructions/arithmetic.py | 32 +++++++------------ .../homestead/vm/instructions/bitwise.py | 17 ++++------ .../homestead/vm/instructions/comparison.py | 20 ++++-------- .../homestead/vm/instructions/control_flow.py | 7 ++-- .../homestead/vm/instructions/environment.py | 11 +++---- .../forks/homestead/vm/instructions/memory.py | 11 +++---- .../forks/homestead/vm/instructions/stack.py | 11 +++---- .../istanbul/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/istanbul/vm/instructions/bitwise.py | 26 ++++++--------- .../istanbul/vm/instructions/comparison.py | 20 ++++-------- .../istanbul/vm/instructions/control_flow.py | 7 ++-- .../istanbul/vm/instructions/environment.py | 14 +++----- .../forks/istanbul/vm/instructions/memory.py | 11 +++---- .../forks/istanbul/vm/instructions/stack.py | 11 +++---- .../london/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/london/vm/instructions/bitwise.py | 26 ++++++--------- .../london/vm/instructions/comparison.py | 20 ++++-------- .../london/vm/instructions/control_flow.py | 7 ++-- .../london/vm/instructions/environment.py | 14 +++----- .../forks/london/vm/instructions/memory.py | 11 +++---- .../forks/london/vm/instructions/stack.py | 11 +++---- .../vm/instructions/arithmetic.py | 32 +++++++------------ .../muir_glacier/vm/instructions/bitwise.py | 26 ++++++--------- .../vm/instructions/comparison.py | 20 ++++-------- .../vm/instructions/control_flow.py | 7 ++-- .../vm/instructions/environment.py | 14 +++----- .../muir_glacier/vm/instructions/memory.py | 11 +++---- .../muir_glacier/vm/instructions/stack.py | 11 +++---- .../forks/osaka/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/osaka/vm/instructions/bitwise.py | 29 ++++++----------- .../forks/osaka/vm/instructions/comparison.py | 20 ++++-------- .../osaka/vm/instructions/control_flow.py | 7 ++-- .../osaka/vm/instructions/environment.py | 14 +++----- .../forks/osaka/vm/instructions/memory.py | 14 +++----- .../forks/osaka/vm/instructions/stack.py | 11 +++---- .../forks/paris/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/paris/vm/instructions/bitwise.py | 26 ++++++--------- .../forks/paris/vm/instructions/comparison.py | 20 ++++-------- .../paris/vm/instructions/control_flow.py | 7 ++-- .../paris/vm/instructions/environment.py | 14 +++----- .../forks/paris/vm/instructions/memory.py | 11 +++---- .../forks/paris/vm/instructions/stack.py | 11 +++---- .../prague/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/prague/vm/instructions/bitwise.py | 26 ++++++--------- .../prague/vm/instructions/comparison.py | 20 ++++-------- .../prague/vm/instructions/control_flow.py | 7 ++-- .../prague/vm/instructions/environment.py | 14 +++----- .../forks/prague/vm/instructions/memory.py | 14 +++----- .../forks/prague/vm/instructions/stack.py | 11 +++---- .../shanghai/vm/instructions/arithmetic.py | 32 +++++++------------ .../forks/shanghai/vm/instructions/bitwise.py | 26 ++++++--------- .../shanghai/vm/instructions/comparison.py | 20 ++++-------- .../shanghai/vm/instructions/control_flow.py | 7 ++-- .../shanghai/vm/instructions/environment.py | 14 +++----- .../forks/shanghai/vm/instructions/memory.py | 11 +++---- .../forks/shanghai/vm/instructions/stack.py | 11 +++---- .../vm/instructions/arithmetic.py | 32 +++++++------------ .../vm/instructions/bitwise.py | 17 ++++------ .../vm/instructions/comparison.py | 20 ++++-------- .../vm/instructions/control_flow.py | 7 ++-- .../vm/instructions/environment.py | 11 +++---- .../spurious_dragon/vm/instructions/memory.py | 11 +++---- .../spurious_dragon/vm/instructions/stack.py | 11 +++---- .../vm/instructions/arithmetic.py | 32 +++++++------------ .../vm/instructions/bitwise.py | 17 ++++------ .../vm/instructions/comparison.py | 20 ++++-------- .../vm/instructions/control_flow.py | 7 ++-- .../vm/instructions/environment.py | 11 +++---- .../vm/instructions/memory.py | 11 +++---- .../vm/instructions/stack.py | 11 +++---- 168 files changed, 1025 insertions(+), 1858 deletions(-) diff --git a/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py b/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py b/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py index 0614ff61fed..3cb188b8579 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/bitwise.py @@ -13,17 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_CLZ, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -45,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -70,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -95,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -119,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -145,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -180,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -210,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -240,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -273,7 +264,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CLZ) + charge_gas(evm, gas.GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/amsterdam/vm/instructions/comparison.py b/src/ethereum/forks/amsterdam/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/comparison.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py b/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/amsterdam/vm/instructions/environment.py b/src/ethereum/forks/amsterdam/vm/instructions/environment.py index ea48276dd30..3e2a9e053c8 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/environment.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state_tracker import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -181,7 +177,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -241,7 +237,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -302,7 +298,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -465,7 +461,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/amsterdam/vm/instructions/memory.py b/src/ethereum/forks/amsterdam/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/memory.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/amsterdam/vm/instructions/stack.py b/src/ethereum/forks/amsterdam/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/amsterdam/vm/instructions/stack.py +++ b/src/ethereum/forks/amsterdam/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py b/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py b/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py index c7018574c29..31b236e66ca 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/environment.py @@ -19,17 +19,13 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_gas_extend_memory, @@ -176,7 +172,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -236,7 +232,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -297,7 +293,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -454,7 +450,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py b/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py b/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py +++ b/src/ethereum/forks/arrow_glacier/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/berlin/vm/instructions/arithmetic.py b/src/ethereum/forks/berlin/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/berlin/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/berlin/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/berlin/vm/instructions/bitwise.py b/src/ethereum/forks/berlin/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/berlin/vm/instructions/bitwise.py +++ b/src/ethereum/forks/berlin/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/berlin/vm/instructions/comparison.py b/src/ethereum/forks/berlin/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/berlin/vm/instructions/comparison.py +++ b/src/ethereum/forks/berlin/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/berlin/vm/instructions/control_flow.py b/src/ethereum/forks/berlin/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/berlin/vm/instructions/control_flow.py +++ b/src/ethereum/forks/berlin/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/berlin/vm/instructions/environment.py b/src/ethereum/forks/berlin/vm/instructions/environment.py index 8798f5a4b7b..c2770cd8fa4 100644 --- a/src/ethereum/forks/berlin/vm/instructions/environment.py +++ b/src/ethereum/forks/berlin/vm/instructions/environment.py @@ -19,17 +19,13 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_gas_extend_memory, @@ -176,7 +172,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -236,7 +232,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -297,7 +293,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -454,7 +450,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/berlin/vm/instructions/memory.py b/src/ethereum/forks/berlin/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/berlin/vm/instructions/memory.py +++ b/src/ethereum/forks/berlin/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/berlin/vm/instructions/stack.py b/src/ethereum/forks/berlin/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/berlin/vm/instructions/stack.py +++ b/src/ethereum/forks/berlin/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo1/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo1/vm/instructions/bitwise.py b/src/ethereum/forks/bpo1/vm/instructions/bitwise.py index 0614ff61fed..3cb188b8579 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo1/vm/instructions/bitwise.py @@ -13,17 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_CLZ, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -45,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -70,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -95,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -119,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -145,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -180,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -210,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -240,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -273,7 +264,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CLZ) + charge_gas(evm, gas.GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo1/vm/instructions/comparison.py b/src/ethereum/forks/bpo1/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo1/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo1/vm/instructions/control_flow.py b/src/ethereum/forks/bpo1/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo1/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo1/vm/instructions/environment.py b/src/ethereum/forks/bpo1/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo1/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo1/vm/instructions/memory.py b/src/ethereum/forks/bpo1/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo1/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/bpo1/vm/instructions/stack.py b/src/ethereum/forks/bpo1/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/bpo1/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo1/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo2/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo2/vm/instructions/bitwise.py b/src/ethereum/forks/bpo2/vm/instructions/bitwise.py index 0614ff61fed..3cb188b8579 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo2/vm/instructions/bitwise.py @@ -13,17 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_CLZ, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -45,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -70,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -95,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -119,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -145,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -180,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -210,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -240,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -273,7 +264,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CLZ) + charge_gas(evm, gas.GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo2/vm/instructions/comparison.py b/src/ethereum/forks/bpo2/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo2/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo2/vm/instructions/control_flow.py b/src/ethereum/forks/bpo2/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo2/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo2/vm/instructions/environment.py b/src/ethereum/forks/bpo2/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo2/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo2/vm/instructions/memory.py b/src/ethereum/forks/bpo2/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo2/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/bpo2/vm/instructions/stack.py b/src/ethereum/forks/bpo2/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/bpo2/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo2/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo3/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo3/vm/instructions/bitwise.py b/src/ethereum/forks/bpo3/vm/instructions/bitwise.py index 0614ff61fed..3cb188b8579 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo3/vm/instructions/bitwise.py @@ -13,17 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_CLZ, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -45,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -70,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -95,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -119,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -145,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -180,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -210,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -240,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -273,7 +264,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CLZ) + charge_gas(evm, gas.GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo3/vm/instructions/comparison.py b/src/ethereum/forks/bpo3/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo3/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo3/vm/instructions/control_flow.py b/src/ethereum/forks/bpo3/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo3/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo3/vm/instructions/environment.py b/src/ethereum/forks/bpo3/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo3/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo3/vm/instructions/memory.py b/src/ethereum/forks/bpo3/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo3/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/bpo3/vm/instructions/stack.py b/src/ethereum/forks/bpo3/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/bpo3/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo3/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo4/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo4/vm/instructions/bitwise.py b/src/ethereum/forks/bpo4/vm/instructions/bitwise.py index 0614ff61fed..3cb188b8579 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo4/vm/instructions/bitwise.py @@ -13,17 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_CLZ, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -45,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -70,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -95,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -119,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -145,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -180,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -210,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -240,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -273,7 +264,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CLZ) + charge_gas(evm, gas.GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo4/vm/instructions/comparison.py b/src/ethereum/forks/bpo4/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo4/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo4/vm/instructions/control_flow.py b/src/ethereum/forks/bpo4/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo4/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo4/vm/instructions/environment.py b/src/ethereum/forks/bpo4/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo4/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo4/vm/instructions/memory.py b/src/ethereum/forks/bpo4/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo4/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/bpo4/vm/instructions/stack.py b/src/ethereum/forks/bpo4/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/bpo4/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo4/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py b/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/bpo5/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/bpo5/vm/instructions/bitwise.py b/src/ethereum/forks/bpo5/vm/instructions/bitwise.py index 0614ff61fed..3cb188b8579 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/bitwise.py +++ b/src/ethereum/forks/bpo5/vm/instructions/bitwise.py @@ -13,17 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_CLZ, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -45,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -70,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -95,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -119,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -145,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -180,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -210,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -240,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -273,7 +264,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CLZ) + charge_gas(evm, gas.GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/bpo5/vm/instructions/comparison.py b/src/ethereum/forks/bpo5/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/comparison.py +++ b/src/ethereum/forks/bpo5/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/bpo5/vm/instructions/control_flow.py b/src/ethereum/forks/bpo5/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/control_flow.py +++ b/src/ethereum/forks/bpo5/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/bpo5/vm/instructions/environment.py b/src/ethereum/forks/bpo5/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/environment.py +++ b/src/ethereum/forks/bpo5/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/bpo5/vm/instructions/memory.py b/src/ethereum/forks/bpo5/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/memory.py +++ b/src/ethereum/forks/bpo5/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/bpo5/vm/instructions/stack.py b/src/ethereum/forks/bpo5/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/bpo5/vm/instructions/stack.py +++ b/src/ethereum/forks/bpo5/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py b/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/byzantium/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/byzantium/vm/instructions/bitwise.py b/src/ethereum/forks/byzantium/vm/instructions/bitwise.py index cb37f6eca7d..476d71d7603 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/bitwise.py +++ b/src/ethereum/forks/byzantium/vm/instructions/bitwise.py @@ -13,13 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -41,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -66,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -91,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -115,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -141,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/byzantium/vm/instructions/comparison.py b/src/ethereum/forks/byzantium/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/comparison.py +++ b/src/ethereum/forks/byzantium/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/byzantium/vm/instructions/control_flow.py b/src/ethereum/forks/byzantium/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/control_flow.py +++ b/src/ethereum/forks/byzantium/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/byzantium/vm/instructions/environment.py b/src/ethereum/forks/byzantium/vm/instructions/environment.py index 2fb6855f846..9221133e41c 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/environment.py +++ b/src/ethereum/forks/byzantium/vm/instructions/environment.py @@ -18,17 +18,13 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BALANCE, GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, calculate_gas_extend_memory, charge_gas, @@ -170,7 +166,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -230,7 +226,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -291,7 +287,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -435,7 +431,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/byzantium/vm/instructions/memory.py b/src/ethereum/forks/byzantium/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/memory.py +++ b/src/ethereum/forks/byzantium/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/byzantium/vm/instructions/stack.py b/src/ethereum/forks/byzantium/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/byzantium/vm/instructions/stack.py +++ b/src/ethereum/forks/byzantium/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/cancun/vm/instructions/arithmetic.py b/src/ethereum/forks/cancun/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/cancun/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/cancun/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/cancun/vm/instructions/bitwise.py b/src/ethereum/forks/cancun/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/cancun/vm/instructions/bitwise.py +++ b/src/ethereum/forks/cancun/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/cancun/vm/instructions/comparison.py b/src/ethereum/forks/cancun/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/cancun/vm/instructions/comparison.py +++ b/src/ethereum/forks/cancun/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/cancun/vm/instructions/control_flow.py b/src/ethereum/forks/cancun/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/cancun/vm/instructions/control_flow.py +++ b/src/ethereum/forks/cancun/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/cancun/vm/instructions/environment.py b/src/ethereum/forks/cancun/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/cancun/vm/instructions/environment.py +++ b/src/ethereum/forks/cancun/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/cancun/vm/instructions/memory.py b/src/ethereum/forks/cancun/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/cancun/vm/instructions/memory.py +++ b/src/ethereum/forks/cancun/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/cancun/vm/instructions/stack.py b/src/ethereum/forks/cancun/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/cancun/vm/instructions/stack.py +++ b/src/ethereum/forks/cancun/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py b/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/constantinople/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/constantinople/vm/instructions/bitwise.py b/src/ethereum/forks/constantinople/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/bitwise.py +++ b/src/ethereum/forks/constantinople/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/constantinople/vm/instructions/comparison.py b/src/ethereum/forks/constantinople/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/comparison.py +++ b/src/ethereum/forks/constantinople/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/constantinople/vm/instructions/control_flow.py b/src/ethereum/forks/constantinople/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/control_flow.py +++ b/src/ethereum/forks/constantinople/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/constantinople/vm/instructions/environment.py b/src/ethereum/forks/constantinople/vm/instructions/environment.py index f935b995c17..bcd2195bfdf 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/environment.py +++ b/src/ethereum/forks/constantinople/vm/instructions/environment.py @@ -19,7 +19,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BALANCE, @@ -27,10 +27,6 @@ GAS_CODE_HASH, GAS_COPY, GAS_EXTERNAL, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, calculate_gas_extend_memory, charge_gas, @@ -172,7 +168,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -232,7 +228,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -293,7 +289,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -437,7 +433,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/constantinople/vm/instructions/memory.py b/src/ethereum/forks/constantinople/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/memory.py +++ b/src/ethereum/forks/constantinople/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/constantinople/vm/instructions/stack.py b/src/ethereum/forks/constantinople/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/constantinople/vm/instructions/stack.py +++ b/src/ethereum/forks/constantinople/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py b/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py b/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py index cb37f6eca7d..476d71d7603 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/bitwise.py @@ -13,13 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -41,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -66,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -91,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -115,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -141,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/dao_fork/vm/instructions/comparison.py b/src/ethereum/forks/dao_fork/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/comparison.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py b/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/dao_fork/vm/instructions/environment.py b/src/ethereum/forks/dao_fork/vm/instructions/environment.py index f2c91716993..a4cc54062b5 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/environment.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/environment.py @@ -18,15 +18,12 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BALANCE, GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -167,7 +164,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -227,7 +224,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -288,7 +285,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/dao_fork/vm/instructions/memory.py b/src/ethereum/forks/dao_fork/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/memory.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/dao_fork/vm/instructions/stack.py b/src/ethereum/forks/dao_fork/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/dao_fork/vm/instructions/stack.py +++ b/src/ethereum/forks/dao_fork/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/frontier/vm/instructions/arithmetic.py b/src/ethereum/forks/frontier/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/frontier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/frontier/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/frontier/vm/instructions/bitwise.py b/src/ethereum/forks/frontier/vm/instructions/bitwise.py index cb37f6eca7d..476d71d7603 100644 --- a/src/ethereum/forks/frontier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/frontier/vm/instructions/bitwise.py @@ -13,13 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -41,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -66,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -91,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -115,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -141,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/frontier/vm/instructions/comparison.py b/src/ethereum/forks/frontier/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/frontier/vm/instructions/comparison.py +++ b/src/ethereum/forks/frontier/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/frontier/vm/instructions/control_flow.py b/src/ethereum/forks/frontier/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/frontier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/frontier/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/frontier/vm/instructions/environment.py b/src/ethereum/forks/frontier/vm/instructions/environment.py index f2c91716993..a4cc54062b5 100644 --- a/src/ethereum/forks/frontier/vm/instructions/environment.py +++ b/src/ethereum/forks/frontier/vm/instructions/environment.py @@ -18,15 +18,12 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BALANCE, GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -167,7 +164,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -227,7 +224,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -288,7 +285,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/frontier/vm/instructions/memory.py b/src/ethereum/forks/frontier/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/frontier/vm/instructions/memory.py +++ b/src/ethereum/forks/frontier/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/frontier/vm/instructions/stack.py b/src/ethereum/forks/frontier/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/frontier/vm/instructions/stack.py +++ b/src/ethereum/forks/frontier/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py b/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/environment.py b/src/ethereum/forks/gray_glacier/vm/instructions/environment.py index c7018574c29..31b236e66ca 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/environment.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/environment.py @@ -19,17 +19,13 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_gas_extend_memory, @@ -176,7 +172,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -236,7 +232,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -297,7 +293,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -454,7 +450,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/memory.py b/src/ethereum/forks/gray_glacier/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/memory.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/gray_glacier/vm/instructions/stack.py b/src/ethereum/forks/gray_glacier/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/gray_glacier/vm/instructions/stack.py +++ b/src/ethereum/forks/gray_glacier/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/homestead/vm/instructions/arithmetic.py b/src/ethereum/forks/homestead/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/homestead/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/homestead/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/homestead/vm/instructions/bitwise.py b/src/ethereum/forks/homestead/vm/instructions/bitwise.py index cb37f6eca7d..476d71d7603 100644 --- a/src/ethereum/forks/homestead/vm/instructions/bitwise.py +++ b/src/ethereum/forks/homestead/vm/instructions/bitwise.py @@ -13,13 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -41,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -66,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -91,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -115,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -141,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/homestead/vm/instructions/comparison.py b/src/ethereum/forks/homestead/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/homestead/vm/instructions/comparison.py +++ b/src/ethereum/forks/homestead/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/homestead/vm/instructions/control_flow.py b/src/ethereum/forks/homestead/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/homestead/vm/instructions/control_flow.py +++ b/src/ethereum/forks/homestead/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/homestead/vm/instructions/environment.py b/src/ethereum/forks/homestead/vm/instructions/environment.py index f2c91716993..a4cc54062b5 100644 --- a/src/ethereum/forks/homestead/vm/instructions/environment.py +++ b/src/ethereum/forks/homestead/vm/instructions/environment.py @@ -18,15 +18,12 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BALANCE, GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -167,7 +164,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -227,7 +224,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -288,7 +285,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/homestead/vm/instructions/memory.py b/src/ethereum/forks/homestead/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/homestead/vm/instructions/memory.py +++ b/src/ethereum/forks/homestead/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/homestead/vm/instructions/stack.py b/src/ethereum/forks/homestead/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/homestead/vm/instructions/stack.py +++ b/src/ethereum/forks/homestead/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py b/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/istanbul/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/istanbul/vm/instructions/bitwise.py b/src/ethereum/forks/istanbul/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/bitwise.py +++ b/src/ethereum/forks/istanbul/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/istanbul/vm/instructions/comparison.py b/src/ethereum/forks/istanbul/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/comparison.py +++ b/src/ethereum/forks/istanbul/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/istanbul/vm/instructions/control_flow.py b/src/ethereum/forks/istanbul/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/control_flow.py +++ b/src/ethereum/forks/istanbul/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/istanbul/vm/instructions/environment.py b/src/ethereum/forks/istanbul/vm/instructions/environment.py index a77ca394884..9e720ab49c1 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/environment.py +++ b/src/ethereum/forks/istanbul/vm/instructions/environment.py @@ -19,7 +19,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BALANCE, @@ -28,10 +28,6 @@ GAS_COPY, GAS_EXTERNAL, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, calculate_gas_extend_memory, charge_gas, @@ -173,7 +169,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -233,7 +229,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -294,7 +290,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -438,7 +434,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/istanbul/vm/instructions/memory.py b/src/ethereum/forks/istanbul/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/memory.py +++ b/src/ethereum/forks/istanbul/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/istanbul/vm/instructions/stack.py b/src/ethereum/forks/istanbul/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/istanbul/vm/instructions/stack.py +++ b/src/ethereum/forks/istanbul/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/london/vm/instructions/arithmetic.py b/src/ethereum/forks/london/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/london/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/london/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/london/vm/instructions/bitwise.py b/src/ethereum/forks/london/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/london/vm/instructions/bitwise.py +++ b/src/ethereum/forks/london/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/london/vm/instructions/comparison.py b/src/ethereum/forks/london/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/london/vm/instructions/comparison.py +++ b/src/ethereum/forks/london/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/london/vm/instructions/control_flow.py b/src/ethereum/forks/london/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/london/vm/instructions/control_flow.py +++ b/src/ethereum/forks/london/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/london/vm/instructions/environment.py b/src/ethereum/forks/london/vm/instructions/environment.py index c7018574c29..31b236e66ca 100644 --- a/src/ethereum/forks/london/vm/instructions/environment.py +++ b/src/ethereum/forks/london/vm/instructions/environment.py @@ -19,17 +19,13 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_gas_extend_memory, @@ -176,7 +172,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -236,7 +232,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -297,7 +293,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -454,7 +450,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/london/vm/instructions/memory.py b/src/ethereum/forks/london/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/london/vm/instructions/memory.py +++ b/src/ethereum/forks/london/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/london/vm/instructions/stack.py b/src/ethereum/forks/london/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/london/vm/instructions/stack.py +++ b/src/ethereum/forks/london/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py b/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py b/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py b/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py b/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/environment.py b/src/ethereum/forks/muir_glacier/vm/instructions/environment.py index a77ca394884..9e720ab49c1 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/environment.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/environment.py @@ -19,7 +19,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BALANCE, @@ -28,10 +28,6 @@ GAS_COPY, GAS_EXTERNAL, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, calculate_gas_extend_memory, charge_gas, @@ -173,7 +169,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -233,7 +229,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -294,7 +290,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -438,7 +434,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/memory.py b/src/ethereum/forks/muir_glacier/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/memory.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/muir_glacier/vm/instructions/stack.py b/src/ethereum/forks/muir_glacier/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/muir_glacier/vm/instructions/stack.py +++ b/src/ethereum/forks/muir_glacier/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/osaka/vm/instructions/arithmetic.py b/src/ethereum/forks/osaka/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/osaka/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/osaka/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/osaka/vm/instructions/bitwise.py b/src/ethereum/forks/osaka/vm/instructions/bitwise.py index 0614ff61fed..3cb188b8579 100644 --- a/src/ethereum/forks/osaka/vm/instructions/bitwise.py +++ b/src/ethereum/forks/osaka/vm/instructions/bitwise.py @@ -13,17 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_CLZ, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -45,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -70,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -95,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -119,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -145,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -180,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -210,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -240,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: @@ -273,7 +264,7 @@ def count_leading_zeros(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CLZ) + charge_gas(evm, gas.GAS_OPCODE_CLZ) # OPERATION bit_length = U256(x.bit_length()) diff --git a/src/ethereum/forks/osaka/vm/instructions/comparison.py b/src/ethereum/forks/osaka/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/osaka/vm/instructions/comparison.py +++ b/src/ethereum/forks/osaka/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/osaka/vm/instructions/control_flow.py b/src/ethereum/forks/osaka/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/osaka/vm/instructions/control_flow.py +++ b/src/ethereum/forks/osaka/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/osaka/vm/instructions/environment.py b/src/ethereum/forks/osaka/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/osaka/vm/instructions/environment.py +++ b/src/ethereum/forks/osaka/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/osaka/vm/instructions/memory.py b/src/ethereum/forks/osaka/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/osaka/vm/instructions/memory.py +++ b/src/ethereum/forks/osaka/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/osaka/vm/instructions/stack.py b/src/ethereum/forks/osaka/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/osaka/vm/instructions/stack.py +++ b/src/ethereum/forks/osaka/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/paris/vm/instructions/arithmetic.py b/src/ethereum/forks/paris/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/paris/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/paris/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/paris/vm/instructions/bitwise.py b/src/ethereum/forks/paris/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/paris/vm/instructions/bitwise.py +++ b/src/ethereum/forks/paris/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/paris/vm/instructions/comparison.py b/src/ethereum/forks/paris/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/paris/vm/instructions/comparison.py +++ b/src/ethereum/forks/paris/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/paris/vm/instructions/control_flow.py b/src/ethereum/forks/paris/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/paris/vm/instructions/control_flow.py +++ b/src/ethereum/forks/paris/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/paris/vm/instructions/environment.py b/src/ethereum/forks/paris/vm/instructions/environment.py index 00e43488ea9..54bac51928d 100644 --- a/src/ethereum/forks/paris/vm/instructions/environment.py +++ b/src/ethereum/forks/paris/vm/instructions/environment.py @@ -19,17 +19,13 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_gas_extend_memory, @@ -176,7 +172,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -236,7 +232,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -297,7 +293,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -454,7 +450,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/paris/vm/instructions/memory.py b/src/ethereum/forks/paris/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/paris/vm/instructions/memory.py +++ b/src/ethereum/forks/paris/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/paris/vm/instructions/stack.py b/src/ethereum/forks/paris/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/paris/vm/instructions/stack.py +++ b/src/ethereum/forks/paris/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/prague/vm/instructions/arithmetic.py b/src/ethereum/forks/prague/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/prague/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/prague/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/prague/vm/instructions/bitwise.py b/src/ethereum/forks/prague/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/prague/vm/instructions/bitwise.py +++ b/src/ethereum/forks/prague/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/prague/vm/instructions/comparison.py b/src/ethereum/forks/prague/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/prague/vm/instructions/comparison.py +++ b/src/ethereum/forks/prague/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/prague/vm/instructions/control_flow.py b/src/ethereum/forks/prague/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/prague/vm/instructions/control_flow.py +++ b/src/ethereum/forks/prague/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/prague/vm/instructions/environment.py b/src/ethereum/forks/prague/vm/instructions/environment.py index 7a2f15c7001..936297a73a6 100644 --- a/src/ethereum/forks/prague/vm/instructions/environment.py +++ b/src/ethereum/forks/prague/vm/instructions/environment.py @@ -20,7 +20,7 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, @@ -28,10 +28,6 @@ GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_blob_gas_price, @@ -179,7 +175,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -239,7 +235,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -300,7 +296,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -457,7 +453,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/prague/vm/instructions/memory.py b/src/ethereum/forks/prague/vm/instructions/memory.py index 1e650339074..bccc5fd6f01 100644 --- a/src/ethereum/forks/prague/vm/instructions/memory.py +++ b/src/ethereum/forks/prague/vm/instructions/memory.py @@ -16,14 +16,10 @@ from ethereum.utils.numeric import ceil32 -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, GAS_COPY, - GAS_OPCODE_MCOPY, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -52,7 +48,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -83,7 +79,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -111,7 +107,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -171,7 +167,7 @@ def mcopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_MCOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/prague/vm/instructions/stack.py b/src/ethereum/forks/prague/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/prague/vm/instructions/stack.py +++ b/src/ethereum/forks/prague/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py b/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/shanghai/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/shanghai/vm/instructions/bitwise.py b/src/ethereum/forks/shanghai/vm/instructions/bitwise.py index 4e36a1a7959..4e0a487a749 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/bitwise.py +++ b/src/ethereum/forks/shanghai/vm/instructions/bitwise.py @@ -13,16 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_SAR, - GAS_OPCODE_SHL, - GAS_OPCODE_SHR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -44,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -69,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -94,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -118,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -144,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): @@ -179,7 +171,7 @@ def bitwise_shl(evm: Evm) -> None: value = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_SHL) + charge_gas(evm, gas.GAS_OPCODE_SHL) # OPERATION if shift < Uint(256): @@ -209,7 +201,7 @@ def bitwise_shr(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SHR) + charge_gas(evm, gas.GAS_OPCODE_SHR) # OPERATION if shift < U256(256): @@ -239,7 +231,7 @@ def bitwise_sar(evm: Evm) -> None: signed_value = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SAR) + charge_gas(evm, gas.GAS_OPCODE_SAR) # OPERATION if shift < 256: diff --git a/src/ethereum/forks/shanghai/vm/instructions/comparison.py b/src/ethereum/forks/shanghai/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/comparison.py +++ b/src/ethereum/forks/shanghai/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/shanghai/vm/instructions/control_flow.py b/src/ethereum/forks/shanghai/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/control_flow.py +++ b/src/ethereum/forks/shanghai/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/shanghai/vm/instructions/environment.py b/src/ethereum/forks/shanghai/vm/instructions/environment.py index 00e43488ea9..54bac51928d 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/environment.py +++ b/src/ethereum/forks/shanghai/vm/instructions/environment.py @@ -19,17 +19,13 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..exceptions import OutOfBoundsRead from ..gas import ( GAS_BASE, GAS_COLD_ACCOUNT_ACCESS, GAS_COPY, GAS_FAST_STEP, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, - GAS_OPCODE_RETURNDATACOPY, GAS_RETURN_DATA_COPY, GAS_WARM_ACCESS, calculate_gas_extend_memory, @@ -176,7 +172,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -236,7 +232,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -297,7 +293,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -454,7 +450,7 @@ def returndatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_RETURNDATACOPY + copy_gas_cost + extend_memory.cost, ) if Uint(return_data_start_position) + Uint(size) > ulen(evm.return_data): raise OutOfBoundsRead diff --git a/src/ethereum/forks/shanghai/vm/instructions/memory.py b/src/ethereum/forks/shanghai/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/memory.py +++ b/src/ethereum/forks/shanghai/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/shanghai/vm/instructions/stack.py b/src/ethereum/forks/shanghai/vm/instructions/stack.py index a58e1e66e3f..3aaadbf69ab 100644 --- a/src/ethereum/forks/shanghai/vm/instructions/stack.py +++ b/src/ethereum/forks/shanghai/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -71,7 +68,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: if num_bytes == 0: charge_gas(evm, GAS_BASE) else: - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -101,7 +98,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -133,7 +130,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py b/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py b/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py index cb37f6eca7d..476d71d7603 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/bitwise.py @@ -13,13 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -41,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -66,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -91,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -115,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -141,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py b/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py b/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py b/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py index f2c91716993..a4cc54062b5 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/environment.py @@ -18,15 +18,12 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BALANCE, GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -167,7 +164,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -227,7 +224,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -288,7 +285,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py b/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py b/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py +++ b/src/ethereum/forks/spurious_dragon/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = ( diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py index d74f7425823..e1bf43acdad 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/arithmetic.py @@ -16,20 +16,10 @@ from ethereum.utils.numeric import get_sign -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_EXPONENTIATION, GAS_EXPONENTIATION_PER_BYTE, - GAS_OPCODE_ADD, - GAS_OPCODE_ADDMOD, - GAS_OPCODE_DIV, - GAS_OPCODE_MOD, - GAS_OPCODE_MUL, - GAS_OPCODE_MULMOD, - GAS_OPCODE_SDIV, - GAS_OPCODE_SIGNEXTEND, - GAS_OPCODE_SMOD, - GAS_OPCODE_SUB, charge_gas, ) from ..stack import pop, push @@ -51,7 +41,7 @@ def add(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ADD) + charge_gas(evm, gas.GAS_OPCODE_ADD) # OPERATION result = x.wrapping_add(y) @@ -78,7 +68,7 @@ def sub(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SUB) + charge_gas(evm, gas.GAS_OPCODE_SUB) # OPERATION result = x.wrapping_sub(y) @@ -105,7 +95,7 @@ def mul(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MUL) + charge_gas(evm, gas.GAS_OPCODE_MUL) # OPERATION result = x.wrapping_mul(y) @@ -132,7 +122,7 @@ def div(evm: Evm) -> None: divisor = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_DIV) + charge_gas(evm, gas.GAS_OPCODE_DIV) # OPERATION if divisor == 0: @@ -165,7 +155,7 @@ def sdiv(evm: Evm) -> None: divisor = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SDIV) + charge_gas(evm, gas.GAS_OPCODE_SDIV) # OPERATION if divisor == 0: @@ -198,7 +188,7 @@ def mod(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_MOD) + charge_gas(evm, gas.GAS_OPCODE_MOD) # OPERATION if y == 0: @@ -228,7 +218,7 @@ def smod(evm: Evm) -> None: y = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SMOD) + charge_gas(evm, gas.GAS_OPCODE_SMOD) # OPERATION if y == 0: @@ -259,7 +249,7 @@ def addmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_ADDMOD) + charge_gas(evm, gas.GAS_OPCODE_ADDMOD) # OPERATION if z == 0: @@ -290,7 +280,7 @@ def mulmod(evm: Evm) -> None: z = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_MULMOD) + charge_gas(evm, gas.GAS_OPCODE_MULMOD) # OPERATION if z == 0: @@ -353,7 +343,7 @@ def signextend(evm: Evm) -> None: value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_SIGNEXTEND) + charge_gas(evm, gas.GAS_OPCODE_SIGNEXTEND) # OPERATION if byte_num > U256(31): diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py index cb37f6eca7d..476d71d7603 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/bitwise.py @@ -13,13 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_AND, - GAS_OPCODE_BYTE, - GAS_OPCODE_NOT, - GAS_OPCODE_OR, - GAS_OPCODE_XOR, charge_gas, ) from ..stack import pop, push @@ -41,7 +36,7 @@ def bitwise_and(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_AND) + charge_gas(evm, gas.GAS_OPCODE_AND) # OPERATION push(evm.stack, x & y) @@ -66,7 +61,7 @@ def bitwise_or(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_OR) + charge_gas(evm, gas.GAS_OPCODE_OR) # OPERATION push(evm.stack, x | y) @@ -91,7 +86,7 @@ def bitwise_xor(evm: Evm) -> None: y = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_XOR) + charge_gas(evm, gas.GAS_OPCODE_XOR) # OPERATION push(evm.stack, x ^ y) @@ -115,7 +110,7 @@ def bitwise_not(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_NOT) + charge_gas(evm, gas.GAS_OPCODE_NOT) # OPERATION push(evm.stack, ~x) @@ -141,7 +136,7 @@ def get_byte(evm: Evm) -> None: word = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_BYTE) + charge_gas(evm, gas.GAS_OPCODE_BYTE) # OPERATION if byte_index >= U256(32): diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py index f18a1f221e8..f30d048f94f 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/comparison.py @@ -13,14 +13,8 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( - GAS_OPCODE_EQ, - GAS_OPCODE_GT, - GAS_OPCODE_ISZERO, - GAS_OPCODE_LT, - GAS_OPCODE_SGT, - GAS_OPCODE_SLT, charge_gas, ) from ..stack import pop, push @@ -42,7 +36,7 @@ def less_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_LT) + charge_gas(evm, gas.GAS_OPCODE_LT) # OPERATION result = U256(left < right) @@ -68,7 +62,7 @@ def signed_less_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SLT) + charge_gas(evm, gas.GAS_OPCODE_SLT) # OPERATION result = U256(left < right) @@ -95,7 +89,7 @@ def greater_than(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_GT) + charge_gas(evm, gas.GAS_OPCODE_GT) # OPERATION result = U256(left > right) @@ -121,7 +115,7 @@ def signed_greater_than(evm: Evm) -> None: right = pop(evm.stack).to_signed() # GAS - charge_gas(evm, GAS_OPCODE_SGT) + charge_gas(evm, gas.GAS_OPCODE_SGT) # OPERATION result = U256(left > right) @@ -148,7 +142,7 @@ def equal(evm: Evm) -> None: right = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_EQ) + charge_gas(evm, gas.GAS_OPCODE_EQ) # OPERATION result = U256(left == right) @@ -174,7 +168,7 @@ def is_zero(evm: Evm) -> None: x = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_ISZERO) + charge_gas(evm, gas.GAS_OPCODE_ISZERO) # OPERATION result = U256(x == 0) diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py index 3207f00d738..fabe929c4ce 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/control_flow.py @@ -13,11 +13,10 @@ from ethereum_types.numeric import U256, Uint +from ...vm import gas from ...vm.gas import ( GAS_BASE, GAS_JUMPDEST, - GAS_OPCODE_JUMP, - GAS_OPCODE_JUMPI, charge_gas, ) from .. import Evm @@ -63,7 +62,7 @@ def jump(evm: Evm) -> None: jump_dest = Uint(pop(evm.stack)) # GAS - charge_gas(evm, GAS_OPCODE_JUMP) + charge_gas(evm, gas.GAS_OPCODE_JUMP) # OPERATION if jump_dest not in evm.valid_jump_destinations: @@ -90,7 +89,7 @@ def jumpi(evm: Evm) -> None: conditional_value = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_JUMPI) + charge_gas(evm, gas.GAS_OPCODE_JUMPI) # OPERATION if conditional_value == 0: diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py index f2c91716993..a4cc54062b5 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/environment.py @@ -18,15 +18,12 @@ from ...state import get_account, get_code from ...utils.address import to_address_masked from ...vm.memory import buffer_read, memory_write -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BALANCE, GAS_BASE, GAS_COPY, GAS_EXTERNAL, - GAS_OPCODE_CALLDATACOPY, - GAS_OPCODE_CALLDATALOAD, - GAS_OPCODE_CODECOPY, calculate_gas_extend_memory, charge_gas, ) @@ -167,7 +164,7 @@ def calldataload(evm: Evm) -> None: start_index = pop(evm.stack) # GAS - charge_gas(evm, GAS_OPCODE_CALLDATALOAD) + charge_gas(evm, gas.GAS_OPCODE_CALLDATALOAD) # OPERATION value = buffer_read(evm.message.data, start_index, U256(32)) @@ -227,7 +224,7 @@ def calldatacopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CALLDATACOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION @@ -288,7 +285,7 @@ def codecopy(evm: Evm) -> None: ) charge_gas( evm, - GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, + gas.GAS_OPCODE_CODECOPY + copy_gas_cost + extend_memory.cost, ) # OPERATION diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py index 74a9396629a..90b2f06a271 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/memory.py @@ -14,12 +14,9 @@ from ethereum_types.bytes import Bytes from ethereum_types.numeric import U256, Uint -from .. import Evm +from .. import Evm, gas from ..gas import ( GAS_BASE, - GAS_OPCODE_MLOAD, - GAS_OPCODE_MSTORE, - GAS_OPCODE_MSTORE8, calculate_gas_extend_memory, charge_gas, ) @@ -48,7 +45,7 @@ def mstore(evm: Evm) -> None: evm.memory, [(start_position, U256(len(value)))] ) - charge_gas(evm, GAS_OPCODE_MSTORE + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -79,7 +76,7 @@ def mstore8(evm: Evm) -> None: evm.memory, [(start_position, U256(1))] ) - charge_gas(evm, GAS_OPCODE_MSTORE8 + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MSTORE8 + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by @@ -107,7 +104,7 @@ def mload(evm: Evm) -> None: extend_memory = calculate_gas_extend_memory( evm.memory, [(start_position, U256(32))] ) - charge_gas(evm, GAS_OPCODE_MLOAD + extend_memory.cost) + charge_gas(evm, gas.GAS_OPCODE_MLOAD + extend_memory.cost) # OPERATION evm.memory += b"\x00" * extend_memory.expand_by diff --git a/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py b/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py index 4f1b8171e51..e102cc1a2c9 100644 --- a/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py +++ b/src/ethereum/forks/tangerine_whistle/vm/instructions/stack.py @@ -15,13 +15,10 @@ from ethereum_types.numeric import U256, Uint -from .. import Evm, stack +from .. import Evm, gas, stack from ..exceptions import StackUnderflowError from ..gas import ( GAS_BASE, - GAS_OPCODE_DUP_N, - GAS_OPCODE_PUSH_N, - GAS_OPCODE_SWAP_N, charge_gas, ) from ..memory import buffer_read @@ -68,7 +65,7 @@ def push_n(evm: Evm, num_bytes: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_PUSH_N) + charge_gas(evm, gas.GAS_OPCODE_PUSH_N) # OPERATION data_to_push = U256.from_be_bytes( @@ -98,7 +95,7 @@ def dup_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_DUP_N) + charge_gas(evm, gas.GAS_OPCODE_DUP_N) if item_number >= len(evm.stack): raise StackUnderflowError data_to_duplicate = evm.stack[len(evm.stack) - 1 - item_number] @@ -130,7 +127,7 @@ def swap_n(evm: Evm, item_number: int) -> None: pass # GAS - charge_gas(evm, GAS_OPCODE_SWAP_N) + charge_gas(evm, gas.GAS_OPCODE_SWAP_N) if item_number >= len(evm.stack): raise StackUnderflowError evm.stack[-1], evm.stack[-1 - item_number] = (