Shasta bindings

_typos.toml

@@ -1,5 +1,2 @@
 [files]
-extend-exclude = [
-    "node/src/l1/abi/*.json",
-    "node/src/l2/abi/*.json"
-]
+extend-exclude = ["**/*.json"]

e2e_tests/taiko_inbox.py

@@ -1,7 +1,7 @@
 from web3 import Web3
 import json
 
-with open("../whitelist/src/l1/abi/ITaikoInbox.json") as f:
+with open("../whitelist/src/l1/pacaya/abi/ITaikoInbox.json") as f:
     abi = json.load(f)
 
 def get_last_batch_id(l1_client, taiko_inbox_address):

e2e_tests/utils.py

@@ -123,7 +123,7 @@ def send_n_txs_without_waiting(eth_client, private_key, n):
         send_transaction(nonce+i, account, '0.00009', eth_client, private_key)
 
 def wait_for_batch_proposed_event(eth_client, taiko_inbox_address, from_block):
-    with open("../whitelist/src/l1/abi/ITaikoInbox.json") as f:
+    with open("../whitelist/src/l1/pacaya/abi/ITaikoInbox.json") as f:
         abi = json.load(f)
 
     contract = eth_client.eth.contract(address=taiko_inbox_address, abi=abi)
@@ -159,15 +159,15 @@ def print_batch_info(event):
     print("---")
 
 def get_current_operator(eth_client, l1_contract_address):
-    with open("../whitelist/src/l1/abi/PreconfWhitelist.json") as f:
+    with open("../whitelist/src/l1/pacaya/abi/PreconfWhitelist.json") as f:
         abi = json.load(f)
 
     contract = eth_client.eth.contract(address=l1_contract_address, abi=abi)
     return contract.functions.getOperatorForCurrentEpoch().call()
 
 def get_next_operator(eth_client, l1_contract_address):
     import json
-    with open("../whitelist/src/l1/abi/PreconfWhitelist.json") as f:
+    with open("../whitelist/src/l1/pacaya/abi/PreconfWhitelist.json") as f:
         abi = json.load(f)
 
     contract = eth_client.eth.contract(address=l1_contract_address, abi=abi)
@@ -193,7 +193,7 @@ def wait_till_next_l1_slot(beacon_client):
     time.sleep(l1_slot_duration - current_time)
 
 def get_last_batch_proposed_event(eth_client, taiko_inbox_address, from_block):
-    with open("../whitelist/src/l1/abi/ITaikoInbox.json") as f:
+    with open("../whitelist/src/l1/pacaya/abi/ITaikoInbox.json") as f:
         abi = json.load(f)
 
     contract = eth_client.eth.contract(address=taiko_inbox_address, abi=abi)

whitelist/src/chain_monitor/batch_proposed_receiver.rs

@@ -1,4 +1,4 @@
-use crate::l1::bindings::taiko_inbox::ITaikoInbox;
+use crate::l1::pacaya::bindings::taiko_inbox::ITaikoInbox;
 use alloy::primitives::Address;
 use alloy::sol_types::SolEvent;
 use anyhow::Error;

whitelist/src/chain_monitor/mod.rs

@@ -1,4 +1,4 @@
-use crate::l1::bindings::taiko_inbox::ITaikoInbox;
+use crate::l1::pacaya::bindings::taiko_inbox::ITaikoInbox;
 use alloy::primitives::{Address, B256};
 use anyhow::{Error, anyhow};
 use batch_proposed_receiver::BatchProposedEventReceiver;

whitelist/src/forced_inclusion/mod.rs

@@ -1,4 +1,4 @@
-use crate::l1::execution_layer::ExecutionLayer;
+use crate::l1::pacaya::execution_layer::ExecutionLayer;
 use alloy::rpc::types::Transaction;
 use anyhow::Error;
 use common::{blob::blob_parser::extract_transactions_from_blob, l1::ethereum_l1::EthereumL1};

whitelist/src/l1/mod.rs

@@ -1,4 +1,2 @@
-pub mod bindings;
-pub mod config;
-pub mod execution_layer;
-mod propose_batch_builder;
+pub mod pacaya;
+pub mod shasta;

whitelist/src/l1/bindings.rs → whitelist/src/l1/pacaya/bindings.rs

@@ -4,7 +4,7 @@ sol!(
     #[allow(missing_docs)]
     #[sol(rpc)]
     PreconfWhitelist,
-    "src/l1/abi/PreconfWhitelist.json"
+    "src/l1/pacaya/abi/PreconfWhitelist.json"
 );
 
 sol! {
@@ -79,15 +79,15 @@ pub mod taiko_inbox {
         #[allow(missing_docs)]
         #[sol(rpc)]
         ITaikoInbox,
-        "src/l1/abi/ITaikoInbox.json"
+        "src/l1/pacaya/abi/ITaikoInbox.json"
     );
 }
 
 sol!(
     #[allow(missing_docs)]
     #[sol(rpc)]
     PreconfRouter,
-    "src/l1/abi/PreconfRouter.json"
+    "src/l1/pacaya/abi/PreconfRouter.json"
 );
 
 pub mod preconf_router {
@@ -117,7 +117,7 @@ pub mod taiko_wrapper {
         #[allow(missing_docs)]
         #[sol(rpc)]
         TaikoWrapper,
-        "src/l1/abi/TaikoWrapper.json"
+        "src/l1/pacaya/abi/TaikoWrapper.json"
     );
 }
 

whitelist/src/l1/pacaya/mod.rs

@@ -0,0 +1,4 @@
+pub mod bindings;
+pub mod config;
+pub mod execution_layer;
+mod propose_batch_builder;