Fix chain ID from a Word to Uint64. (#553)

Author: silathdiir

bus-mapping/src/circuit_input_builder.rs

@@ -587,14 +587,14 @@ pub fn keccak_inputs(block: &Block, code_db: &CodeDB) -> Result<Vec<Vec<u8>>, Er
     let mut keccak_inputs = Vec::new();
     // Tx Circuit
     let txs: Vec<geth_types::Transaction> = block.txs.iter().map(|tx| tx.into()).collect();
-    keccak_inputs.extend_from_slice(&keccak_inputs_tx_circuit(&txs, block.chain_id().as_u64())?);
+    keccak_inputs.extend_from_slice(&keccak_inputs_tx_circuit(&txs, block.chain_id())?);
     log::debug!(
         "keccak total len after txs: {}",
         keccak_inputs.iter().map(|i| i.len()).sum::<usize>()
     );
     // PI circuit
     keccak_inputs.push(keccak_inputs_pi_circuit(
-        block.chain_id().as_u64(),
+        block.chain_id(),
         block.prev_state_root,
         block.withdraw_root,
         &block.headers,
@@ -827,7 +827,7 @@ type EthBlock = eth_types::Block<eth_types::Transaction>;
 /// the necessary information and using the CircuitInputBuilder.
 pub struct BuilderClient<P: JsonRpcClient> {
     cli: GethClient<P>,
-    chain_id: Word,
+    chain_id: u64,
     circuits_params: CircuitsParams,
 }
 
@@ -895,7 +895,7 @@ impl<P: JsonRpcClient> BuilderClient<P> {
 
         Ok(Self {
             cli: client,
-            chain_id: chain_id.into(),
+            chain_id,
             circuits_params,
         })
     }

bus-mapping/src/circuit_input_builder/block.rs

@@ -7,7 +7,7 @@ use crate::{
     operation::{OperationContainer, RWCounter},
     Error,
 };
-use eth_types::{Address, Hash, ToWord, Word, U256};
+use eth_types::{Address, Hash, ToWord, Word};
 use std::collections::{BTreeMap, HashMap};
 
 /// Context of a [`Block`] which can mutate in a [`Transaction`].
@@ -70,7 +70,7 @@ impl Default for BlockSteps {
 #[derive(Debug, Clone)]
 pub struct BlockHead {
     /// chain id
-    pub chain_id: Word,
+    pub chain_id: u64,
     /// history hashes contains most recent 256 block hashes in history, where
     /// the lastest one is at history_hashes[history_hashes.len() - 1].
     pub history_hashes: Vec<Word>,
@@ -92,7 +92,7 @@ pub struct BlockHead {
 impl BlockHead {
     /// Create a new block.
     pub fn new(
-        chain_id: Word,
+        chain_id: u64,
         history_hashes: Vec<Word>,
         eth_block: &eth_types::Block<eth_types::Transaction>,
     ) -> Result<Self, Error> {
@@ -160,7 +160,7 @@ pub struct Block {
     /// Circuits Setup Paramteres
     pub circuits_params: CircuitsParams,
     /// chain id
-    pub chain_id: Word,
+    pub chain_id: u64,
 }
 
 impl Block {
@@ -187,7 +187,7 @@ impl Block {
     }
     /// Create a new block.
     pub fn new<TX>(
-        chain_id: Word,
+        chain_id: u64,
         history_hashes: Vec<Word>,
         eth_block: &eth_types::Block<eth_types::Transaction>,
         circuits_params: CircuitsParams,
@@ -219,7 +219,7 @@ impl Block {
     }
 
     /// Return the chain id.
-    pub fn chain_id(&self) -> U256 {
+    pub fn chain_id(&self) -> u64 {
         self.chain_id
     }
 

bus-mapping/src/evm/opcodes/chainid.rs

@@ -54,7 +54,7 @@ mod chainid_tests {
             },
             (
                 RW::WRITE,
-                &StackOp::new(1, StackAddress::from(1023), *MOCK_CHAIN_ID)
+                &StackOp::new(1, StackAddress::from(1023), (*MOCK_CHAIN_ID).into())
             )
         );
     }

bus-mapping/src/mock.rs

@@ -20,7 +20,7 @@ pub struct BlockData {
     /// CodeDB
     pub code_db: CodeDB,
     /// chain id
-    pub chain_id: Word,
+    pub chain_id: u64,
     /// history hashes contains most recent 256 block hashes in history, where
     /// the lastest one is at history_hashes[history_hashes.len() - 1].
     pub history_hashes: Vec<Word>,

circuit-benchmarks/src/super_circuit.rs

@@ -43,13 +43,11 @@ mod tests {
 
         let mut rng = ChaChaRng::seed_from_u64(2);
 
-        let chain_id = (*MOCK_CHAIN_ID).as_u64();
-
         let bytecode = bytecode! {
             STOP
         };
 
-        let wallet_a = LocalWallet::new(&mut rng).with_chain_id(chain_id);
+        let wallet_a = LocalWallet::new(&mut rng).with_chain_id(*MOCK_CHAIN_ID);
 
         let addr_a = wallet_a.address();
         let addr_b = address!("0x000000000000000000000000000000000000BBBB");

circuit-benchmarks/src/tx_circuit.rs

@@ -80,9 +80,8 @@ mod tests {
 
         let max_txs: usize = 2_usize.pow(degree) / ROWS_PER_TX;
 
-        let chain_id: u64 = mock::MOCK_CHAIN_ID.low_u64();
         let txs = vec![mock::CORRECT_MOCK_TXS[0].clone().into()];
-        let circuit = TxCircuit::<Fr>::new(max_txs, MAX_CALLDATA, chain_id, txs);
+        let circuit = TxCircuit::<Fr>::new(max_txs, MAX_CALLDATA, *mock::MOCK_CHAIN_ID, txs);
         (degree as usize, circuit)
     }
 

eth-types/src/evm_types/block_utils.rs

@@ -8,10 +8,10 @@ pub const NUM_PREV_BLOCK_ALLOWED: u64 = 256;
 
 /// Calculate block hash by chain ID and block number (only for scroll).
 /// Return a pair of input and output.
-pub fn calculate_block_hash(chain_id: U256, block_number: U256) -> (Vec<u8>, U256) {
+pub fn calculate_block_hash(chain_id: u64, block_number: U256) -> (Vec<u8>, U256) {
     let mut input = vec![0; 16];
 
-    U64([chain_id.low_u64()]).to_big_endian(&mut input[..8]);
+    U64([chain_id]).to_big_endian(&mut input[..8]);
     U64([block_number.low_u64()]).to_big_endian(&mut input[8..]);
 
     let output = U256::from_big_endian(&keccak256(&input));

eth-types/src/geth_types.rs

@@ -355,7 +355,7 @@ impl Transaction {
 #[derive(Debug, Clone)]
 pub struct GethData {
     /// chain id
-    pub chain_id: Word,
+    pub chain_id: u64,
     /// history hashes contains most recent 256 block hashes in history, where
     /// the lastest one is at history_hashes[history_hashes.len() - 1].
     pub history_hashes: Vec<Word>,
@@ -372,10 +372,10 @@ impl GethData {
     pub fn sign(&mut self, wallets: &HashMap<Address, LocalWallet>) {
         for tx in self.eth_block.transactions.iter_mut() {
             let wallet = wallets.get(&tx.from).unwrap();
-            assert_eq!(Word::from(wallet.chain_id()), self.chain_id);
+            assert_eq!(wallet.chain_id(), self.chain_id);
             let geth_tx: Transaction = (&*tx).into();
             let req: TransactionRequest = (&geth_tx).into();
-            let sig = wallet.sign_transaction_sync(&req.chain_id(self.chain_id.as_u64()).into());
+            let sig = wallet.sign_transaction_sync(&req.chain_id(self.chain_id).into());
             tx.v = U64::from(sig.v);
             tx.r = sig.r;
             tx.s = sig.s;

external-tracer/src/lib.rs

@@ -11,7 +11,7 @@ use std::collections::HashMap;
 #[derive(Debug, Default, Clone, Serialize)]
 pub struct TraceConfig {
     /// chain id
-    pub chain_id: Word,
+    pub chain_id: u64,
     /// history hashes contains most recent 256 block hashes in history, where
     /// the lastest one is at history_hashes[history_hashes.len() - 1].
     pub history_hashes: Vec<Word>,

geth-utils/gethutil/trace.go

@@ -115,7 +115,7 @@ type Transaction struct {
 }
 
 type TraceConfig struct {
-	ChainID *hexutil.Big `json:"chain_id"`
+	ChainID uint64 `json:"chain_id"`
 	// HistoryHashes contains most recent 256 block hashes in history,
 	// where the lastest one is at HistoryHashes[len(HistoryHashes)-1].
 	HistoryHashes []*hexutil.Big             `json:"history_hashes"`
@@ -130,7 +130,7 @@ func newUint64(val uint64) *uint64 { return &val }
 
 func Trace(config TraceConfig) ([]*ExecutionResult, error) {
 	chainConfig := params.ChainConfig{
-		ChainID:             toBigInt(config.ChainID),
+		ChainID:             new(big.Int).SetUint64(config.ChainID),
 		HomesteadBlock:      big.NewInt(0),
 		DAOForkBlock:        big.NewInt(0),
 		DAOForkSupport:      true,