From c2c24f77388967a3df6415d83b7018b6f36855e0 Mon Sep 17 00:00:00 2001 From: enitrat Date: Tue, 24 Sep 2024 10:14:03 +0200 Subject: [PATCH] remove coinbase constructor arg --- kakarot_scripts/constants.py | 2 +- kakarot_scripts/deploy_kakarot.py | 3 --- src/kakarot/kakarot.cairo | 2 -- src/kakarot/library.cairo | 3 --- tests/utils/constants.py | 5 ----- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/kakarot_scripts/constants.py b/kakarot_scripts/constants.py index c2a65152e..79195b300 100644 --- 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 index 3ebffeb45..cd1d604e5 100644 --- 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 index ddcc71c1b..07a8558a5 100644 --- 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 index 5a4af623d..4b48922eb 100644 --- a/src/kakarot/library.cairo +++ b/src/kakarot/library.cairo @@ -43,14 +43,12 @@ 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); @@ -58,7 +56,6 @@ namespace Kakarot { 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 index 55a0ab7b3..fcf8c4bf5 100644 --- 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