remove coinbase constructor arg

kkrt-labs · Sep 24, 2024 · c2c24f7 · c2c24f7
1 parent 87153b8
commit c2c24f7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 14 deletions.
diff --git a/kakarot_scripts/constants.py b/kakarot_scripts/constants.py
@@ -223,7 +223,7 @@ class ChainId(IntEnum):
 ETH_TOKEN_ADDRESS = 0x49D36570D4E46F48E99674BD3FCC84644DDD6B96F7C741B1562B82F9E004DC7
 COINBASE = int(
     os.getenv("KAKAROT_COINBASE_RECIPIENT")
-    or "0x20eB005C0b9c906691F885eca5895338E15c36De",
+    or "0x20eB005C0b9c906691F885eca5895338E15c36De",  # Defaults to faucet on appchain sepolia
     16,
 )
 CAIRO_ZERO_DIR = Path("src")

diff --git a/kakarot_scripts/deploy_kakarot.py b/kakarot_scripts/deploy_kakarot.py
@@ -6,7 +6,6 @@
     ARACHNID_PROXY_DEPLOYER,
     ARACHNID_PROXY_SIGNED_TX,
     BLOCK_GAS_LIMIT,
-    COINBASE,
     CREATEX_DEPLOYER,
     CREATEX_SIGNED_TX,
     DECLARED_CONTRACTS,
@@ -63,7 +62,6 @@ async def main():
             class_hash["account_contract"],  # account_contract_class_hash_
             class_hash["uninitialized_account"],  # uninitialized_account_class_hash_
             class_hash["Cairo1Helpers"],
-            COINBASE,
             BLOCK_GAS_LIMIT,
         )
         starknet_deployments["Counter"] = await deploy_starknet("Counter")
@@ -105,7 +103,6 @@ async def main():
             class_hash["account_contract"],  # account_contract_class_hash_
             class_hash["uninitialized_account"],  # uninitialized_account_class_hash_
             class_hash["Cairo1Helpers"],
-            COINBASE,
             BLOCK_GAS_LIMIT,
         )
         await invoke(

diff --git a/src/kakarot/kakarot.cairo b/src/kakarot/kakarot.cairo
@@ -78,7 +78,6 @@ func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr
     account_contract_class_hash: felt,
     uninitialized_account_class_hash: felt,
     cairo1_helpers_class_hash: felt,
-    coinbase: felt,
     block_gas_limit: felt,
 ) {
     return Kakarot.constructor(
@@ -87,7 +86,6 @@ func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr
         account_contract_class_hash,
         uninitialized_account_class_hash,
         cairo1_helpers_class_hash,
-        coinbase,
         block_gas_limit,
     );
 }

diff --git a/src/kakarot/library.cairo b/src/kakarot/library.cairo
@@ -43,22 +43,19 @@ namespace Kakarot {
     // @param account_contract_class_hash The clash hash of the contract account.
     // @param uninitialized_account_class_hash The class hash of the uninitialized account used for deterministic address calculation.
     // @param cairo1_helpers_class_hash The precompiles class hash for precompiles not implemented in Kakarot.
-    // @param coinbase The EOA whose key is owned by the deployer (or known to be owned by Coinbase)
     func constructor{syscall_ptr: felt*, pedersen_ptr: HashBuiltin*, range_check_ptr}(
         owner: felt,
         native_token_address,
         account_contract_class_hash,
         uninitialized_account_class_hash,
         cairo1_helpers_class_hash,
-        coinbase,
         block_gas_limit,
     ) {
         Ownable.initializer(owner);
         Kakarot_native_token_address.write(native_token_address);
         Kakarot_account_contract_class_hash.write(account_contract_class_hash);
         Kakarot_uninitialized_account_class_hash.write(uninitialized_account_class_hash);
         Kakarot_cairo1_helpers_class_hash.write(cairo1_helpers_class_hash);
-        Kakarot_coinbase.write(coinbase);
         Kakarot_block_gas_limit.write(block_gas_limit);
         return ();
     }

diff --git a/tests/utils/constants.py b/tests/utils/constants.py
@@ -19,11 +19,6 @@
 # Account balance is the amount of funds that the account has after being deployed
 ACCOUNT_BALANCE = PRE_FUND_AMOUNT
 
-# Coinbase address is the address of the sequencer
-MOCK_COINBASE_ADDRESS = (
-    0x388CA486B82E20CC81965D056B4CDCAACDFFE0CF08E20ED8BA10EA97A487004
-)
-
 # STACK
 STACK_MAX_DEPTH = 1024