From 50d38029695f826ab31ab1a393aca96bc6d6e635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Walter?= Date: Mon, 11 Nov 2024 20:39:47 +0100 Subject: [PATCH] Add staging-core deployments --- .gitignore | 3 +- deployments/staging-core/declarations.json | 19 +++++++ deployments/staging-core/deployments.json | 9 ++++ .../staging-core/kakarot_deployments.json | 50 +++++++++++++++++++ deployments/staging-core/l1_addresses.json | 5 ++ kakarot_scripts/constants.py | 14 ++++++ kakarot_scripts/utils/kakarot.py | 2 +- kakarot_scripts/utils/l1.py | 2 +- 8 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 deployments/staging-core/declarations.json create mode 100644 deployments/staging-core/deployments.json create mode 100644 deployments/staging-core/kakarot_deployments.json create mode 100644 deployments/staging-core/l1_addresses.json diff --git a/.gitignore b/.gitignore index 5070cb4fb..bcfb427e4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,9 +8,10 @@ venv # starknet deployments/* +!deployments/mainnet/ !deployments/sepolia/ !deployments/staging/ -!deployments/mainnet/ +!deployments/staging-core/ artifacts build diff --git a/deployments/staging-core/declarations.json b/deployments/staging-core/declarations.json new file mode 100644 index 000000000..4435ec835 --- /dev/null +++ b/deployments/staging-core/declarations.json @@ -0,0 +1,19 @@ +{ + "account_contract": "0x6d8537c7a5d4c20e616a137c11ee87601bf8d3e924091ce0f283820d3a8e9fe", + "BalanceSender": "0x292ec825bc8f7a528218ca8a3306684fbf53589afe5626b2c71790f893ac39a", + "BenchmarkCairoCalls": "0x58dc8a979af32668e05579313d1d6c672d3b668f72778780e8b2e97964159c3", + "Cairo1Helpers": "0x6c84a7ed6ee3fa25d198f058b8c8a06d9d4e4dc040efd6fa4d741f00fdc1b63", + "Cairo1HelpersFixture": "0x3810527e57a1df22d701b2c48f3d739e8fe3550876cb16435706d1448f89cbe", + "Counter": "0x27ccfaf84757dabd7885d410018bf0e264c881e4799a47f555b96bf21e5af5b", + "ERC20": "0x4254337f7006c7c084dd9b13788b20e299791a5449a42f1b1b2f79929295fe7", + "EVM": "0x43874217327a745d07d5048a6a62d56dea6874aad134c6f21cd717aa5ae10ae", + "kakarot": "0xd86d695be75d6ad8230240725f827aa6818cbd9de8af6b544ede6d5ad06a42", + "MockPragmaOracle": "0x62b05bb353abcee67e5ebc49bfb1c3582151963a15a02a56cefc0bb4497ee59", + "MockPragmaSummaryStats": "0x70cebf28afbc91d72f0adde181565ae21f5b5f37ab712ac96a079cd4a97051f", + "OpenzeppelinAccount": "0x3a58e037be64a3608dfe423eeb8a77b400b0f56f1f5e0ed4937d3c873f988e2", + "replace_class": "0x451a4decb11b581b288d8a0512ab6f6ea7f1fd89caefbb415e510ec7f17efe1", + "StarknetToken": "0x6f21cf3ad9047d263aa8cc3a0565fcacff33a13746348017b2ad851d23f3290", + "uninitialized_account_fixture": "0x60d4817e4e3881965ff4e27a55a4a7da7bf2865c7209bdb367af2f86c740b35", + "uninitialized_account": "0x7b2de5e73ff7eb338d76c967dd5aa3f3004574d326b8c1402bb819d4983b8b6", + "UniversalLibraryCaller": "0x244fd35db35b48882ca2e6c2966821bd54f302b131fb22ea98e5534da390482" +} \ No newline at end of file diff --git a/deployments/staging-core/deployments.json b/deployments/staging-core/deployments.json new file mode 100644 index 000000000..d2d696ad2 --- /dev/null +++ b/deployments/staging-core/deployments.json @@ -0,0 +1,9 @@ +{ + "EVM": "0x3681f3cfdc97e89714dcc272074d7513e78aec979252e0e59eb85857de89b22", + "Counter": "0x41872aef44417ee222b17cf58aef434e10bb29604d3f789e01cd292ed8cd3f3", + "MockPragmaOracle": "0x487893f3414f9b3a90c3ef8221fabe73ea190b206ee1c969cb1fc5da40ff04a", + "MockPragmaSummaryStats": "0x6b824a7106aa7428e880e58db35ffba50e90fc3baabaa6418daed099774c2dd", + "UniversalLibraryCaller": "0x4c6cc89ccbd932b1cf72e1e8ae45950cf84fc15ad134eda9daea9d8748a3b1b", + "BenchmarkCairoCalls": "0x2eb949afed5b91b2a3a154edfa773f3a8e4b7002f71c909bf585607c6dfbdce", + "kakarot": "0x2728e29541ceb8f741427e8efc88e8c7f73d2a9289e658800a146eec97c8bcc" +} \ No newline at end of file diff --git a/deployments/staging-core/kakarot_deployments.json b/deployments/staging-core/kakarot_deployments.json new file mode 100644 index 000000000..3d229177f --- /dev/null +++ b/deployments/staging-core/kakarot_deployments.json @@ -0,0 +1,50 @@ +{ + "WETH9": { + "address": "0xd52042e28e6f726738A48497A0728Fc5977AF3F8", + "starknet_address": "0xe9868dd0908f1d08e0aac73b671f24a7dd9187a38b214dc66812a4630fc52b" + }, + "Coinbase": { + "address": "0x61B3bF630b719D54cE0D5256b598d40da1680Eec", + "starknet_address": "0x14be2e9a4d8682aff133e39a713f2ad95ad4e08830cbc21138638a28d96875a" + }, + "Starknet Token": { + "address": "0x87Ce4c6e0BF156031e74a07C5b725800f9dF56CA", + "starknet_address": "0x236a0f0203f26abd8b33086a4c5b2a4c256bc2cb42f9b2b0116d3efc732e27b" + }, + "Starknet Voting Token": { + "address": "0x7a2deE402F31632592e3c9270D4F12E450877F86", + "starknet_address": "0x5f811868759a352ad8fa70de1e2330f8ce5154994651812d330cb558abf690" + }, + "USDC": { + "address": "0xc9c677a629AAe7A149f5F0E7546394f2630e8E9e", + "starknet_address": "0x647f8288e798f12f18bd3b5248fc77596460b6ebcb035f26b903b6567a8d64" + }, + "USDT": { + "address": "0x506De97018260b95ddF3D1b4C3d795a639b04d3F", + "starknet_address": "0x7ccff26a88476ebc02602605cafdbfd927205477f44a0e55ae53017a72d1d73" + }, + "Wrapped BTC": { + "address": "0x20a6338AE7C41A5f70Fb8C660C8cc5B3F5f631f7", + "starknet_address": "0x3399b49e88c37c9d5ce0846ffe99f0d24852a59b02c9c958d1ef9d050531a2f" + }, + "Wrapped liquid staked Ether 2.0": { + "address": "0xd88b092890db8c02E0c7a838841d88f3Cf4D8286", + "starknet_address": "0xc09188bad513771a223bc19e4dd1e06631622353425a61cb3210191c3267f7" + }, + "Multicall3": { + "address": "0xcA11bde05977b3631167028862bE2a173976CA11", + "starknet_address": "0x1790e5d1c67fdfd8cbe8fdfc4d0299934238970f0b5c9ce1cc6708988c36816" + }, + "ArachnidProxy": { + "address": "0x4e59b44847b379578588920cA78FbF26c0B4956C", + "starknet_address": "0x4bf0a6cf4450fba581b0d52d270f535be5c97dff4fe77187d881153d0da6a8a" + }, + "CreateX": { + "address": "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed", + "starknet_address": "0x500affd7e59226cb5fc6d16d5da6da4a3c9c4bc04e137f33291c88a6fcd6638" + }, + "L2KakarotMessaging": { + "address": "0x91DB3f3f7cA7607647885F2CF2ccEA28892aC049", + "starknet_address": "0x1b34166ef30a0b85721efafe75488055b0bfebea1a0855d99086850595adbf2" + } +} \ No newline at end of file diff --git a/deployments/staging-core/l1_addresses.json b/deployments/staging-core/l1_addresses.json new file mode 100644 index 000000000..4f2096d0d --- /dev/null +++ b/deployments/staging-core/l1_addresses.json @@ -0,0 +1,5 @@ +{ + "StarknetCore": "0xE2Bb56ee936fd6433DC0F6e7e3b8365C906AA057", + "StarknetVerifier": "0x07ec0D28e50322Eb0C159B9090ecF3aeA8346DFe", + "L1KakarotMessaging": "0x116E79f6127494Ee0D04B721b9F2530c6903E2C7" +} \ No newline at end of file diff --git a/kakarot_scripts/constants.py b/kakarot_scripts/constants.py index 97110ef1a..c23d55268 100644 --- a/kakarot_scripts/constants.py +++ b/kakarot_scripts/constants.py @@ -77,6 +77,20 @@ class NetworkType(Enum): "argent_multisig_api": "https://cloud.argent-api.com/v1/multisig/starknet/sepolia", "token_addresses_file": TOKEN_ADDRESSES_DIR / "sepolia.json", }, + "staging-core": { + "name": "staging-core", + "explorer_url": "https://sepolia.starkscan.co/", + "rpc_url": f"https://rpc.nethermind.io/sepolia-juno/?apikey={os.getenv('NETHERMIND_API_KEY')}", + "l1_rpc_url": f"https://sepolia.infura.io/v3/{os.getenv('INFURA_KEY')}", + "type": NetworkType.STAGING, + "chain_id": StarknetChainId.SEPOLIA % MAX_SAFE_CHAIN_ID, + "check_interval": 1, + "max_wait": 30, + "class_hash": 0x061DAC032F228ABEF9C6626F995015233097AE253A7F72D68552DB02F2971B8F, + "voyager_api_url": "https://sepolia-api.voyager.online/beta", + "argent_multisig_api": "https://cloud.argent-api.com/v1/multisig/starknet/sepolia", + "token_addresses_file": TOKEN_ADDRESSES_DIR / "sepolia.json", + }, "starknet-devnet": { "name": "starknet-devnet", "explorer_url": "", diff --git a/kakarot_scripts/utils/kakarot.py b/kakarot_scripts/utils/kakarot.py index 05fb261c9..133d5a05f 100644 --- a/kakarot_scripts/utils/kakarot.py +++ b/kakarot_scripts/utils/kakarot.py @@ -785,7 +785,7 @@ async def send_starknet_transaction( # starknet_py.net.client_errors.ClientError: Client failed with code 29. Message: Transaction hash not found time.sleep(check_interval) else: - raise ValueError(f"❌ Transaction not found: {tx_hash}") + raise ValueError(f"❌ Transaction not found: 0x{tx_hash:064x}") transaction_events = [ event diff --git a/kakarot_scripts/utils/l1.py b/kakarot_scripts/utils/l1.py index 968c674b9..8727b32cb 100644 --- a/kakarot_scripts/utils/l1.py +++ b/kakarot_scripts/utils/l1.py @@ -121,7 +121,7 @@ def send_l1_transaction( evm_account = caller_eoa or EvmAccount.from_key(EVM_PRIVATE_KEY) evm_tx = L1_RPC_PROVIDER.eth.account.sign_transaction(transaction, evm_account.key) tx_hash = L1_RPC_PROVIDER.eth.send_raw_transaction(evm_tx.raw_transaction) - logger.info(f"⏳ Waiting for transaction {tx_hash.hex()}") + logger.info(f"⏳ Waiting for transaction {tx_hash}") receipt = L1_RPC_PROVIDER.eth.wait_for_transaction_receipt(tx_hash, timeout=5 * 60) response = [] if not receipt.status: