cw/fix tests e2e staging (#1590)

- **Some initial fixes** - **Update deployment folders, works on katana** - **Fix DualVMToken for legacy sn ERC20** - **Fix declaration for StarknetToken** - **Remove useless fixtures** - **Refacto relayers**  - - - This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/kkrt-labs/kakarot/1590)
kkrt-labs · Nov 12, 2024 · 2121e99 · 2121e99
1 parent edf237f
commit 2121e99
Show file tree

Hide file tree

Showing 66 changed files with 922 additions and 643 deletions.
diff --git a/.env.example b/.env.example
@@ -1,64 +1,48 @@
-# A Github token to download the CI artifacts
-# Used for fetching resources in the kakarot_scripts
+# Tokens for coverage and CI
+CODECOV_TOKEN=
 GITHUB_TOKEN=
-
-# An infura RPC key for mainnet/testnet
+# API keys
 INFURA_KEY=
+VOYAGER_API_KEY=
+NETHERMIND_API_KEY=
 
-# Account used by default in all kakarot_scripts
-# Prefixed accounts {NETWORK}_ will take precedeance over the default one
-MADARA_ACCOUNT_ADDRESS=0x3
-MADARA_PRIVATE_KEY=0x00c1cf1490de1352865301bb8705143f3ef938f97fdf892f1090dcb5ac7bcd1d
-
-SHARINGAN_ACCOUNT_ADDRESS=
-SHARINGAN_PRIVATE_KEY=
-SHARINGAN_RPC_URL="https://sharingan.madara.zone"
-
-# First account when using these networks with seed = 0
-STARKNET_DEVNET_ACCOUNT_ADDRESS=0x64b48806902a367c8598f4f95c305e8c1a1acba5f082d294a43793113115691
-STARKNET_DEVNET_PRIVATE_KEY=0x71d7bb07b9a64f6f78ac4c816aff4da9
-
-STARKNET_SEPOLIA_RELAYER_ACCOUNT_ADDRESS=
-STARKNET_SEPOLIA_RELAYER_PRIVATE_KEY=
-STARKNET_SEPOLIA_ACCOUNT_ADDRESS=
-STARKNET_SEPOLIA_PRIVATE_KEY=
+# Starknet accounts
+STARKNET_DEVNET_ACCOUNT_ADDRESS=
+STARKNET_DEVNET_PRIVATE_KEY=
+# This default value is Anvil first account private key
+STARKNET_DEVNET_EVM_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 
 KATANA_ACCOUNT_ADDRESS=0xb3ff441a68610b30fd5e2abbf3a1548eb6ba6f3559f2862bf2dc757e5828ca
 KATANA_PRIVATE_KEY=0x2bbf4f9fd0bbb2e60b0316c1fe0b76cf7a4d0198bd493ced9b8df2a3a24d68a
+# This default value is Anvil first account private key
+KATANA_EVM_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
 
-# Kakarot Sepolia (Testnet production and Testnet staging)
-KAKAROT_SEPOLIA_ACCOUNT_ADDRESS=
-KAKAROT_SEPOLIA_PRIVATE_KEY=
-KAKAROT_SEPOLIA_RPC_URL=https://juno-kakarot-dev.karnot.xyz/
-
-KAKAROT_STAGING_ACCOUNT_ADDRESS=
-KAKAROT_STAGING_PRIVATE_KEY=
-KAKAROT_STAGING_RPC_URL=https://juno-kakarot-testnet-stage.karnot.xyz
+SEPOLIA_ACCOUNT_ADDRESS=
+SEPOLIA_PRIVATE_KEY=
+SEPOLIA_EVM_PRIVATE_KEY=
 
-# An EVM address that receives the fees
-KAKAROT_COINBASE_RECIPIENT=0x20eB005C0b9c906691F885eca5895338E15c36De
+STAGING_ACCOUNT_ADDRESS=
+STAGING_PRIVATE_KEY=
+STAGING_EVM_PRIVATE_KEY=
 
-# Default values in case no network match
-ACCOUNT_ADDRESS=
-PRIVATE_KEY=
+MAINNET_ACCOUNT_ADDRESS=
+MAINNET_PRIVATE_KEY=
+MAINNET_EVM_PRIVATE_KEY=
 
-# An EVM private to define a default EOA for EVM related kakarot_scripts
-STARKNET_SEPOLIA_EVM_PRIVATE_KEY=
-# This default value is Anvil first account private key
-KATANA_EVM_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+# Network
+STARKNET_NETWORK=katana
 
+# Set to python to use the python implementation of Protocol Buffers
 # Because cairo-land generated files used protobuf<=3.20 and web3.py uses protobuf ~4
 PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
 
 # To override the default web3 provider uri http://localhost:8545, putting as default
 # the default Kakarot RPC URL of kakarot-rpc repo
 WEB3_HTTP_PROVIDER_URI="http://0.0.0.0:3030"
 
+# Hypothesis profile
 HYPOTHESIS_PROFILE=dev
 
-VOYAGER_API_URL=
-VOYAGER_API_KEY=
-
 # Private key to sign transactions for RLP scripts/compute_rlp_encoding.ts
 # Warning: Do not use this key in production systems
 PRIVATE_KEY_RLP_SCRIPT=0x6be0067ba259624aa28f796b703e7d095925a470b17786767bd09aaa3fc2ceea
diff --git a/.github/workflows/ssj-ef-tests.yml b/.github/workflows/ssj-ef-tests.yml
@@ -11,7 +11,6 @@ permissions: read-all
 
 jobs:
   ef-tests:
-    # trunk-ignore(actionlint/runner-label)
     runs-on: ubuntu-latest-16-cores
     steps:
       - name: Checkout code

diff --git a/.github/workflows/ssj-tests-unit.yml b/.github/workflows/ssj-tests-unit.yml
@@ -12,7 +12,7 @@ permissions: read-all
 
 jobs:
   unit-tests:
-    runs-on: ubuntu-latest-16-cores # trunk-ignore(actionlint/runner-label)
+    runs-on: ubuntu-latest-16-cores
     steps:
       - uses: actions/checkout@v4
       - uses: foundry-rs/setup-snfoundry@v3

diff --git a/.gitignore b/.gitignore
@@ -8,11 +8,10 @@ venv
 
 # starknet
 deployments/*
-!deployments/kakarot-sepolia/
-!deployments/starknet-sepolia/
-!deployments/starknet-sepolia-staging/
-!deployments/starknet-mainnet/
-!deployments/kakarot-staging/
+!deployments/mainnet/
+!deployments/sepolia/
+!deployments/staging/
+!deployments/staging-core/
 artifacts
 build
 

diff --git a/.trunk/configs/.codespellrc b/.trunk/configs/.codespellrc
@@ -1,5 +1,5 @@
 [codespell]
-ignore-words-list = keypair,astroid,uvloop,crate
+ignore-words-list = keypair,astroid,uvloop,crate,amountIn
 skip = '.git'
 check-filenames =
 check-hidden =
diff --git a/.trunk/configs/ruff.toml b/.trunk/configs/ruff.toml
@@ -1,5 +1,5 @@
 # Generic, formatter-friendly config.
-select = ["B", "D3", "D4", "E", "F"]
+select = ["B", "D3", "D4", "E", "F", "ARG"]
 
 # Never enforce `E501` (line length violations). This should be handled by formatters.
 ignore = ["E501"]
diff --git a/Makefile b/Makefile
@@ -42,7 +42,7 @@ build: $(SSJ_DIR)
 declare: build build-sol
 	uv run declare
 
-deploy: build build-sol
+deploy: declare
 	uv run deploy
 
 fetch-ef-tests:

diff --git a/cairo_zero/tests/src/backend/test_starknet.py b/cairo_zero/tests/src/backend/test_starknet.py
@@ -13,9 +13,9 @@ def test_should_return_env_with_given_origin_and_gas_price(self, cairo_run):
     class TestSaveValidJumpdests:
         @SyscallHandler.patch(
             "IERC20.balanceOf",
-            lambda addr, data: [0, 0],
+            lambda *_: [0, 0],
         )
-        @SyscallHandler.patch("IAccount.write_jumpdests", lambda addr, data: [])
+        @SyscallHandler.patch("IAccount.write_jumpdests", lambda *_: [])
         def test_should_save_jumpdests_to_storage(self, cairo_run):
             jumpdests = {0x1: True, 0x10: False, 0x101: True}
             contract_address = 0x97283590

diff --git a/cairo_zero/tests/src/kakarot/accounts/test_account_contract.py b/cairo_zero/tests/src/kakarot/accounts/test_account_contract.py
@@ -41,9 +41,9 @@ def bytecode(self, request):
         return random.randbytes(request.param)
 
     class TestInitialize:
-        @SyscallHandler.patch("IKakarot.register_account", lambda addr, data: [])
-        @SyscallHandler.patch("IKakarot.get_native_token", lambda addr, data: [0xDEAD])
-        @SyscallHandler.patch("IERC20.approve", lambda addr, data: [1])
+        @SyscallHandler.patch("IKakarot.register_account", lambda *_: [])
+        @SyscallHandler.patch("IKakarot.get_native_token", lambda *_: [0xDEAD])
+        @SyscallHandler.patch("IERC20.approve", lambda *_: [1])
         @SyscallHandler.patch("Ownable_owner", 0x1234)
         def test_should_set_storage_variables(self, cairo_run):
             cairo_run("test__initialize", evm_address=0xABDE1)
@@ -64,7 +64,7 @@ def test_should_set_storage_variables(self, cairo_run):
                 calldata=[0xABDE1],
             )
 
-        @SyscallHandler.patch("IKakarot.register_account", lambda addr, data: [])
+        @SyscallHandler.patch("IKakarot.register_account", lambda *_: [])
         @SyscallHandler.patch("Account_is_initialized", 1)
         def test_should_run_only_once(self, cairo_run):
             with cairo_error(message="Account already initialized"):
@@ -270,7 +270,7 @@ def test_should_execute_starknet_call(self, cairo_run):
                 int(True)
             ]
             with SyscallHandler.patch(
-                function_selector, lambda addr, data: expected_return_data
+                function_selector, lambda *_: expected_return_data
             ):
                 return_data, success = cairo_run(
                     "test__execute_starknet_call",
@@ -383,11 +383,11 @@ def test_should_raise_invalid_signature_for_invalid_chain_id_when_tx_type0_not_p
                     chain_id=CHAIN_ID + 1,
                 )
 
-        @SyscallHandler.patch("IKakarot.get_native_token", lambda _, __: [0xDEAD])
-        @SyscallHandler.patch("IERC20.balanceOf", lambda _, __: int_to_uint256(10**128))
+        @SyscallHandler.patch("IKakarot.get_native_token", lambda *_: [0xDEAD])
+        @SyscallHandler.patch("IERC20.balanceOf", lambda *_: int_to_uint256(10**128))
         @SyscallHandler.patch(
             "IKakarot.eth_send_raw_unsigned_tx",
-            lambda _, __: [1, 0x68656C6C6F, 1, 1],  # hello
+            lambda *_: [1, 0x68656C6C6F, 1, 1],  # hello
         )
         def test_pass_authorized_pre_eip155_transaction(self, cairo_run):
             rlp_decoded = rlp.decode(PRE_EIP155_TX["ArachnidProxy"]["signed_tx"])
@@ -429,13 +429,13 @@ def test_pass_authorized_pre_eip155_transaction(self, cairo_run):
             assert output_len == 1
             assert output[0] == 0x68656C6C6F
 
-        @SyscallHandler.patch("IERC20.balanceOf", lambda _, __: int_to_uint256(10**128))
+        @SyscallHandler.patch("IERC20.balanceOf", lambda *_: int_to_uint256(10**128))
         @SyscallHandler.patch(
             "IKakarot.eth_send_raw_unsigned_tx",
-            lambda _, __: [1, 0x68656C6C6F, 1, 1],  # hello
+            lambda *_: [1, 0x68656C6C6F, 1, 1],  # hello
         )
         @pytest.mark.parametrize("transaction", TRANSACTIONS)
-        def test_pass_all_transactions_types(self, cairo_run, seed, transaction):
+        def test_pass_all_transactions_types(self, cairo_run, transaction):
             """
             Note: the seeds 41 and 42 have been manually selected after observing that some private keys
             were making the Counter deploy transaction failing because their signature parameters length (s and v)
@@ -466,10 +466,10 @@ def test_pass_all_transactions_types(self, cairo_run, seed, transaction):
             assert output_len == 1
             assert output[0] == 0x68656C6C6F
 
-        @SyscallHandler.patch("IERC20.balanceOf", lambda _, __: int_to_uint256(10**128))
+        @SyscallHandler.patch("IERC20.balanceOf", lambda *_: int_to_uint256(10**128))
         @SyscallHandler.patch(
             "IKakarot.eth_send_raw_unsigned_tx",
-            lambda _, __: [1, 0x68656C6C6F, 1, 1],  # hello
+            lambda *_: [1, 0x68656C6C6F, 1, 1],  # hello
         )
         def test_should_pass_all_data_len(self, cairo_run, bytecode):
             transaction = {

diff --git a/cairo_zero/tests/src/kakarot/instructions/test_environmental_information.py b/cairo_zero/tests/src/kakarot/instructions/test_environmental_information.py
@@ -40,17 +40,15 @@ def test_should_push_address(self, cairo_run):
             cairo_run("test__exec_address__should_push_address_to_stack")
 
     class TestExtCodeSize:
-        @SyscallHandler.patch("IERC20.balanceOf", lambda addr, data: [0, 1])
-        @SyscallHandler.patch("IAccount.get_nonce", lambda addr, data: [1])
+        @SyscallHandler.patch("IERC20.balanceOf", lambda *_: [0, 1])
+        @SyscallHandler.patch("IAccount.get_nonce", lambda *_: [1])
         @SyscallHandler.patch(
             "Kakarot_evm_to_starknet_address", EXISTING_ACCOUNT, 0x1234
         )
-        @SyscallHandler.patch(
-            "IAccount.get_code_hash", lambda sn_addr, data: [0x1, 0x1]
-        )
+        @SyscallHandler.patch("IAccount.get_code_hash", lambda *_: [0x1, 0x1])
         def test_extcodesize_should_push_code_size(self, cairo_run, bytecode, address):
             with SyscallHandler.patch(
-                "IAccount.bytecode", lambda addr, data: [len(bytecode), *bytecode]
+                "IAccount.bytecode", lambda *_: [len(bytecode), *bytecode]
             ):
                 output = cairo_run("test__exec_extcodesize", address=address)
 
@@ -66,20 +64,18 @@ class TestExtCodeCopy:
                 "offset_is_bytecodelen",
             ],
         )
-        @SyscallHandler.patch("IERC20.balanceOf", lambda addr, data: [0, 1])
-        @SyscallHandler.patch("IAccount.get_nonce", lambda addr, data: [1])
+        @SyscallHandler.patch("IERC20.balanceOf", lambda *_: [0, 1])
+        @SyscallHandler.patch("IAccount.get_nonce", lambda *_: [1])
         @SyscallHandler.patch(
             "Kakarot_evm_to_starknet_address", EXISTING_ACCOUNT, 0x1234
         )
-        @SyscallHandler.patch(
-            "IAccount.get_code_hash", lambda sn_addr, data: [0x1, 0x1]
-        )
+        @SyscallHandler.patch("IAccount.get_code_hash", lambda *_: [0x1, 0x1])
         def test_extcodecopy_should_copy_code(
             self, cairo_run, size, offset, dest_offset, bytecode, address
         ):
 
             with SyscallHandler.patch(
-                "IAccount.bytecode", lambda addr, data: [len(bytecode), *bytecode]
+                "IAccount.bytecode", lambda *_: [len(bytecode), *bytecode]
             ):
                 memory = cairo_run(
                     "test__exec_extcodecopy",
@@ -109,21 +105,19 @@ def test_extcodecopy_should_copy_code(
                 "size_is_0",
             ],
         )
-        @SyscallHandler.patch("IERC20.balanceOf", lambda addr, data: [0, 1])
-        @SyscallHandler.patch("IAccount.get_nonce", lambda addr, data: [1])
+        @SyscallHandler.patch("IERC20.balanceOf", lambda *_: [0, 1])
+        @SyscallHandler.patch("IAccount.get_nonce", lambda *_: [1])
         @SyscallHandler.patch(
             "Kakarot_evm_to_starknet_address", EXISTING_ACCOUNT, 0x1234
         )
-        @SyscallHandler.patch(
-            "IAccount.get_code_hash", lambda sn_addr, data: [0x1, 0x1]
-        )
+        @SyscallHandler.patch("IAccount.get_code_hash", lambda *_: [0x1, 0x1])
         def test_extcodecopy_offset_high_zellic_issue_1258(
             self, cairo_run, size, bytecode, address
         ):
             offset_high = 1
 
             with SyscallHandler.patch(
-                "IAccount.bytecode", lambda addr, data: [len(bytecode), *bytecode]
+                "IAccount.bytecode", lambda *_: [len(bytecode), *bytecode]
             ):
                 memory = cairo_run(
                     "test__exec_extcodecopy_zellic_issue_1258",
@@ -228,13 +222,13 @@ def test_gasprice(self, cairo_run):
     class TestExtCodeHash:
         @SyscallHandler.patch(
             "IERC20.balanceOf",
-            lambda sn_addr, data: (
+            lambda sn_addr, _: (
                 [0, 1] if sn_addr == EXISTING_ACCOUNT_SN_ADDR else [0, 0]
             ),
         )
         @SyscallHandler.patch(
             "IAccount.get_nonce",
-            lambda sn_addr, data: [1] if sn_addr == EXISTING_ACCOUNT_SN_ADDR else [0],
+            lambda sn_addr, _: [1] if sn_addr == EXISTING_ACCOUNT_SN_ADDR else [0],
         )
         @SyscallHandler.patch(
             "Kakarot_evm_to_starknet_address",
@@ -247,11 +241,11 @@ def test_extcodehash__should_push_hash(
             with (
                 SyscallHandler.patch(
                     "IAccount.bytecode",
-                    lambda sn_addr, data: [len(bytecode), *bytecode],
+                    lambda *_: [len(bytecode), *bytecode],
                 ),
                 SyscallHandler.patch(
                     "IAccount.get_code_hash",
-                    lambda sn_addr, data: [*int_to_uint256(bytecode_hash)],
+                    lambda *_: [*int_to_uint256(bytecode_hash)],
                 ),
             ):
                 output = cairo_run("test__exec_extcodehash", address=address)

diff --git a/cairo_zero/tests/src/kakarot/precompiles/test_precompiles.py b/cairo_zero/tests/src/kakarot/precompiles/test_precompiles.py
@@ -83,9 +83,9 @@ class TestKakarotPrecompiles:
                 AUTHORIZED_CALLER_CODE,
                 1,
             )
-            @SyscallHandler.patch_deploy(lambda class_hash, data: [0])
+            @SyscallHandler.patch("deploy", lambda *_: [0])
             @SyscallHandler.patch("Kakarot_evm_to_starknet_address", CALLER_ADDRESS, 0)
-            @SyscallHandler.patch("ICairo.inc", lambda addr, data: [])
+            @SyscallHandler.patch("ICairo.inc", lambda *_: [])
             def test_should_deploy_account_when_sender_starknet_address_zero(
                 self,
                 cairo_run,
@@ -188,10 +188,10 @@ def test__cairo_precompiles(
                 ]
                 with SyscallHandler.patch(
                     "ICairo.inc",
-                    lambda addr, data: [],
+                    lambda *_: [],
                 ), SyscallHandler.patch(
                     "ICairo.get",
-                    lambda addr, data: cairo_return_data,
+                    lambda *_: cairo_return_data,
                 ):
                     return_data, reverted, gas_used = cairo_run(
                         "test__precompiles_run",

diff --git a/cairo_zero/tests/src/kakarot/test_account.py b/cairo_zero/tests/src/kakarot/test_account.py
@@ -57,7 +57,7 @@ def test_should_store_value_at_key(self, cairo_run, key, value):
 
     class TestOriginalStorage:
         @pytest.mark.parametrize("key, value", [(0, 0), (2**256 - 1, 2**256 - 1)])
-        @SyscallHandler.patch("IAccount.storage", lambda addr, data: [0x1337, 0])
+        @SyscallHandler.patch("IAccount.storage", lambda *_: [0x1337, 0])
         @SyscallHandler.patch("Kakarot_evm_to_starknet_address", 0xABDE1, 0x1234)
         def test_should_return_original_storage_when_state_modified(
             self, cairo_run, key, value
@@ -97,9 +97,7 @@ class TestHasCodeOrNonce:
                 (1, [1], True),
             ),
         )
-        @SyscallHandler.patch(
-            "IAccount.get_code_hash", lambda sn_addr, data: [0x1, 0x1]
-        )
+        @SyscallHandler.patch("IAccount.get_code_hash", lambda *_: [0x1, 0x1])
         def test_should_return_true_when_nonce(
             self, cairo_run, nonce, code, expected_result
         ):