From a7c3e4890064bf703371607491108b11031577ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Walter?= <clement0walter@gmail.com>
Date: Wed, 21 Aug 2024 11:13:12 +0300
Subject: [PATCH] Misc. minor fixes to have the test running on sn sepolia

---
 .../starknet-sepolia/declarations.json        | 22 ++++++++++++-------
 deployments/starknet-sepolia/deployments.json | 21 +++++++++++++++---
 kakarot_scripts/constants.py                  |  6 ++---
 kakarot_scripts/utils/kakarot.py              |  2 +-
 kakarot_scripts/utils/starknet.py             |  3 ++-
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/deployments/starknet-sepolia/declarations.json b/deployments/starknet-sepolia/declarations.json
index 77d9b7a69..9774fe9f5 100644
--- a/deployments/starknet-sepolia/declarations.json
+++ b/deployments/starknet-sepolia/declarations.json
@@ -1,9 +1,15 @@
 {
-  "kakarot": "0x6aa7b2a71ce0e28301a6547b8eb38c5f4130d0091b5aa8a12c8f380efcbc4c4",
-  "account_contract": "0x56d311021950bf65ee500426e007b9e3ced0db97f9c1e0d29a9e03d79a9bf6c",
-  "uninitialized_account": "0x1d8b8047e26b484d3f6262d1967217d980d0f2dfc69afa5661492bd5bfe2954",
-  "EVM": "0x78e943202d567c81ec9b523e5121c15914210f915dd7bce69f09ceb5ae91934",
-  "OpenzeppelinAccount": "0x452189b6cd1ef66a7daef29cbffb77ce809cac95449687aabb169117c04e2f9",
-  "Cairo1Helpers": "0xff0ec0846982c93e48ed5130dba8efe5905c099d0ffe45c1fd777a97a2b71a",
-  "replace_class": "0x5cd1a33bc766f50965fe2343e6aec12a12c562b3bb653085b88dc6751b71682"
-}
+  "account_contract": "0x6cb1275516c11f6c1f9d2758bd212d2c40d8136ebd353c316779b754a216d83",
+  "uninitialized_account_fixture": "0x2957ff0877441dddcd140e6af50a3d45712f4f7205a36a846110a70297036be",
+  "uninitialized_account": "0x45f7d0803659c3f58b5b6ba46f349178253dadabbfc6ab47fa1ba4bab4699f8",
+  "EVM": "0x1ce258b332ad964d0d0a472b7795615a84f25196b733a319e101b948f3064a8",
+  "OpenzeppelinAccount": "0x6153ccf69fd20f832c794df36e19135f0070d0576144f0b47f75a226e4be530",
+  "Cairo1Helpers": "0x28ece3751ecf5bdf2d791eb64a65bfb6a8816432b698870dba2f38a36101d58",
+  "Cairo1HelpersFixture": "0x4e7811d9bbba41193bd3c77d05c16f7aaa55dd1d601686b50f6fa0e3766a712",
+  "replace_class": "0xa187318c5e79b010cf45975f589f0a8d441fadde5b1e7ccad46501568437b5",
+  "Counter": "0x4fc47610d8c9ce0bcfc2f9e03658f0fbcd3e0a9c351a1aa59d465a33533a7c8",
+  "MockPragmaOracle": "0x675f00328ff84f127d71b179b3f3a3a06ce8432054770cddd5729c8d62866da",
+  "StarknetToken": "0x27dd8ce628866f1544202ae06ec57b3c9b1f775d5f7c2797de7aa1586ecf693",
+  "ERC20": "0x3c5ee4bc12f4247cd8071150c3f5d9bee71f40b0ef7aeae59f468d898f60933",
+  "kakarot": "0x3f9e4ac97c943181453ce74f1fd1c163c154c40d9cbbbe5c2453512ee1a86e6"
+}
\ No newline at end of file
diff --git a/deployments/starknet-sepolia/deployments.json b/deployments/starknet-sepolia/deployments.json
index 4f8a8d55a..7bcc0e175 100644
--- a/deployments/starknet-sepolia/deployments.json
+++ b/deployments/starknet-sepolia/deployments.json
@@ -1,7 +1,22 @@
 {
   "kakarot": {
-    "address": "0x464f7e37179d2f93ea208795bdb2d0912e8257f6fb5f67ae2559251523aee19",
-    "tx": "0x209a134f8c8f3a9b9e98c2e4789476d4432aceeb252ecfb3dba069cec5ec974",
+    "address": "0x6f625bb0bd82401b268c1ba9fa0973bb9cdf732c6a6f21fe14dfd4c82a28e89",
+    "tx": "0x36c51e168146d9c104a4323a2dddf873a9a54d52b02f5cbc83d8cb957426f60",
     "artifact": "build/kakarot.json"
+  },
+  "EVM": {
+    "address": "0x41c4025537b9677034f3b58f6e722e19c40a7b77a82e3851fdc6b7adf5ad414",
+    "tx": "0xa0b92fd60470ac35b5a64236bacbe86d6b5aaea30997aced328123cba74024",
+    "artifact": "build/fixtures/EVM.json"
+  },
+  "Counter": {
+    "address": "0x2d6741b182475b7cfc62ec1000fbcba553ea08f2e603fa2840d0288cd2d1e3c",
+    "tx": "0xd1781094a55ac09c3177e6799f9d484c5477baa6d120923c942da5c2fdbfea",
+    "artifact": "build/fixtures/Counter.json"
+  },
+  "MockPragmaOracle": {
+    "address": "0x17e64c92b06da9a331da9fd333a683a33019ae2a393254caf332d4158edc74d",
+    "tx": "0x3d6b91602c1e290bc65c6f85751f5ea156cf982d01c6bf1ea694d7398a9d5a5",
+    "artifact": "build/ssj/contracts_MockPragmaOracle"
   }
-}
+}
\ No newline at end of file
diff --git a/kakarot_scripts/constants.py b/kakarot_scripts/constants.py
index 3547a6703..1b743bf13 100644
--- a/kakarot_scripts/constants.py
+++ b/kakarot_scripts/constants.py
@@ -41,9 +41,9 @@ class NetworkType(Enum):
     "sepolia": {
         "name": "starknet-sepolia",
         "explorer_url": "https://sepolia.starkscan.co/",
-        "rpc_url": "https://starknet-sepolia.public.blastapi.io/rpc/v0_6",
+        "rpc_url": os.getenv("STARKNET_SEPOLIA_RPC_URL"),
         "l1_rpc_url": f"https://sepolia.infura.io/v3/{os.getenv('INFURA_KEY')}",
-        "type": NetworkType.PROD,
+        "type": NetworkType.STAGING,
         "chain_id": StarknetChainId.SEPOLIA,
         "check_interval": 5,
         "max_wait": 30,
@@ -215,7 +215,6 @@ class ArtifactType(Enum):
     {"contract_name": "Counter", "is_account_contract": False},
 ]
 DECLARED_CONTRACTS = [
-    {"contract_name": "kakarot", "cairo_version": ArtifactType.cairo0},
     {"contract_name": "account_contract", "cairo_version": ArtifactType.cairo0},
     {
         "contract_name": "uninitialized_account_fixture",
@@ -231,6 +230,7 @@ class ArtifactType(Enum):
     {"contract_name": "MockPragmaOracle", "cairo_version": ArtifactType.cairo1},
     {"contract_name": "StarknetToken", "cairo_version": ArtifactType.cairo1},
     {"contract_name": "ERC20", "cairo_version": ArtifactType.cairo0},
+    {"contract_name": "kakarot", "cairo_version": ArtifactType.cairo0},
 ]
 
 # PRE-EIP155 TX
diff --git a/kakarot_scripts/utils/kakarot.py b/kakarot_scripts/utils/kakarot.py
index 17794733d..e1933f837 100644
--- a/kakarot_scripts/utils/kakarot.py
+++ b/kakarot_scripts/utils/kakarot.py
@@ -559,7 +559,7 @@ async def eth_send_transaction(
 
     payload = {
         "type": 0x2,
-        "chainId": NETWORK["chain_id"],
+        "chainId": NETWORK["chain_id"] % 2**32,
         "nonce": nonce,
         "gas": gas,
         "maxPriorityFeePerGas": 1,
diff --git a/kakarot_scripts/utils/starknet.py b/kakarot_scripts/utils/starknet.py
index 4de3adc14..d72c5fa65 100644
--- a/kakarot_scripts/utils/starknet.py
+++ b/kakarot_scripts/utils/starknet.py
@@ -85,7 +85,7 @@ async def get_starknet_account(
     key_pair = KeyPair.from_private_key(int(private_key, 16))
 
     public_key = None
-    for selector in ["get_public_key", "getPublicKey", "getSigner"]:
+    for selector in ["get_public_key", "getPublicKey", "getSigner", "get_owner"]:
         try:
             call = Call(
                 to_addr=address,
@@ -105,6 +105,7 @@ async def get_starknet_account(
                 or "Invalid message selector." in message
                 or "StarknetErrorCode.ENTRY_POINT_NOT_FOUND_IN_CONTRACT" in message
                 or ("code 40" in message and "not found in contract" in message)
+                or "{'error': 'Invalid message selector'}" in message
             ):
                 continue
             else: