Replace chain_id with chain_hash_fragment in TxDetails, to aid in deterministic signature checking

crates/full-node/sov-api-spec/openapi-v3.yaml

@@ -1000,53 +1000,6 @@ components:
       items:
         type: integer
         format: uint64
-    PartialTransaction:
-      type: object
-      properties:
-        sender_pub_key:
-          type: string
-          format: byte
-        generation:
-          type: integer
-          format: uint64
-        gas_price:
-          $ref: "#/components/schemas/GasPrice"
-        sequencer:
-          type: string
-          format: byte
-        sequencer_rollup_address:
-          type: string
-          format: byte
-        encoded_call_message:
-          type: string
-          format: byte
-        details:
-          $ref: "#/components/schemas/TxDetails"
-      required:
-        - sender_pub_key
-        - generation
-        - encoded_call_message
-        - details
-    TxDetails:
-      type: object
-      properties:
-        max_priority_fee_bips:
-          type: integer
-          format: uint64
-        max_fee:
-          type: string
-          description: A decimal string representation of a u128 value
-          pattern: ^\d+$
-          example: "340282366920938463463374607431768211455"
-        gas_limit:
-          $ref: "#/components/schemas/GasUnit"
-        chain_id:
-          type: integer
-          format: uint64
-      required:
-        - max_priority_fee_bips
-        - max_fee
-        - chain_id
     SimulateExecutionResponse:
       type: object
       properties:

crates/full-node/sov-ethereum/tests/integration/evm/evm_account_abstraction.rs

@@ -15,32 +15,25 @@ type TestSpec = EvmTestSpec;
 #[tokio::test(flavor = "multi_thread")]
 #[ignore = "Account abstraction for the EVM is disabled"]
 async fn test_evm_account_abstraction() {
-    let (test_rollup, test_client, chain_id) = setup_with_simple_storage(0, EVM_EXTENSION).await;
+    let (test_rollup, test_client, _chain_id) = setup_with_simple_storage(0, EVM_EXTENSION).await;
 
     // Before executing the evm checks we need to insert the credentials in the `Accounts`.
-    send_insert_credentials(&test_client, test_client.address(), chain_id).await;
+    send_insert_credentials(&test_client, test_client.address()).await;
     // Execute the evm tests.
     execute_evm_tests(&test_client).await.unwrap();
 
     test_rollup.rollup_task.abort();
 }
 
-async fn send_insert_credentials(
-    test_client: &SimpleStorageClient,
-    from_addr: Address,
-    chain_id: u64,
-) {
-    let tx = create_insert_credentials(from_addr, chain_id);
+async fn send_insert_credentials(test_client: &SimpleStorageClient, from_addr: Address) {
+    let tx = create_insert_credentials(from_addr);
     test_client
         .send_transaction_and_wait_slot(&tx)
         .await
         .unwrap();
 }
 
-fn create_insert_credentials(
-    from_addr: Address,
-    chain_id: u64,
-) -> Transaction<TestRuntime<TestSpec>, TestSpec> {
+fn create_insert_credentials(from_addr: Address) -> Transaction<TestRuntime<TestSpec>, TestSpec> {
     let nonce = 0;
     let key_and_address = read_private_key::<TestSpec>("tx_signer_private_key.json");
     let key = key_and_address.private_key;
@@ -62,7 +55,7 @@ fn create_insert_credentials(
         &chain_hash,
         UnsignedTransaction::new(
             msg,
-            chain_id,
+            chain_hash,
             max_priority_fee_bips,
             max_fee,
             UniquenessData::Nonce(nonce),

crates/full-node/sov-rollup-apis/src/endpoints/simulate.rs

@@ -14,7 +14,6 @@ use sov_modules_api::capabilities::{
     AuthorizationData, ChainState, TransactionAuthorizer, UniquenessData,
 };
 use sov_modules_api::common::Amount;
-use sov_modules_api::macros::config_value;
 use sov_modules_api::prelude::anyhow;
 use sov_modules_api::sov_universal_wallet::schema::{RollupRoots, SchemaError};
 use sov_modules_api::transaction::{Credentials, PriorityFeeBips, TxDetails};
@@ -271,7 +270,7 @@ impl<S: Spec, R: Runtime<S>> SovereignSimulate<S, R> {
             .transpose()
             .map_err(|e| SimulateError::InvalidInput(format!("{e:?}")))?;
         Ok(TxDetails {
-            chain_id: config_value!("CHAIN_ID"),
+            chain_hash_fragment: 0,
             max_priority_fee_bips: partial
                 .max_priority_fee_bips
                 .unwrap_or(PriorityFeeBips::ZERO),

crates/full-node/sov-sequencer/src/common.rs

@@ -587,6 +587,8 @@ pub fn pre_exec_err_to_accept_tx_err(err: PreExecError) -> ErrorObject {
 pub enum AcceptTxErrorCode {
     /// The transaction's `maxFeePerGas` was below the rollup base fee.
     InsufficientMaxFeePerGas,
+    /// The transaction's chain hash fragment did not match the current runtime schema.
+    InvalidChainHashFragment,
 }
 
 /// Structured details attached to `accept_tx` failures.
@@ -607,6 +609,9 @@ impl AcceptTxErrorDetails {
             AuthenticationError::FatalError(FatalError::InsufficientMaxFeePerGas { .. }, _) => {
                 Some(AcceptTxErrorCode::InsufficientMaxFeePerGas)
             }
+            AuthenticationError::FatalError(FatalError::InvalidChainHashFragment { .. }, _) => {
+                Some(AcceptTxErrorCode::InvalidChainHashFragment)
+            }
             _ => None,
         };
 

crates/full-node/sov-sequencer/tests/integration/setup_mode.rs

@@ -336,7 +336,7 @@ fn encode_zero_gas_tx(
         max_fee: Amount::ZERO,
         max_priority_fee_bips: PriorityFeeBips::ZERO,
         gas_limit: None,
-        chain_id: config_value!("CHAIN_ID"),
+        chain_hash_fragment: 0,
     };
     let tx = test_signed_transaction::<TestRuntime<TestSpec>, TestSpec>(
         key,

crates/full-node/sov-sequencer/tests/integration/utils.rs

@@ -142,7 +142,7 @@ pub fn generate_paymaster_tx<RT: Runtime<TestSpec> + EncodeCall<Paymaster<TestSp
         max_priority_fee_bips: TEST_DEFAULT_MAX_PRIORITY_FEE,
         max_fee: TEST_DEFAULT_MAX_FEE,
         gas_limit: Some(TEST_DEFAULT_GAS_LIMIT.into()),
-        chain_id: config_value!("CHAIN_ID"),
+        chain_hash_fragment: 0,
     };
     TransactionType::<RT, TestSpec>::sign_and_serialize(
         <RT as EncodeCall<Paymaster<TestSpec>>>::to_decodable(message),

crates/module-system/hyperlane/tests/integration/warp/bridged_gas_token.rs

@@ -1,5 +1,4 @@
 use sov_hyperlane_integration::warp::{Admin, StoredTokenKind, TokenKind, WarpRouteId};
-use sov_modules_api::macros::config_value;
 use sov_modules_api::prelude::UnwrapInfallible;
 use sov_modules_api::transaction::{PriorityFeeBips, TxDetails};
 use sov_test_utils::{
@@ -104,7 +103,7 @@ fn register_relayer_gasless(runner: &mut TestRunner<RT, S>, relayer: &TestUser<S
                 max_fee: Amount::ZERO,
                 max_priority_fee_bips: PriorityFeeBips::ZERO,
                 gas_limit: None,
-                chain_id: config_value!("CHAIN_ID"),
+                chain_hash_fragment: 0,
             },
         },
         assert: Box::new(|result, _| {
@@ -134,7 +133,7 @@ pub fn enroll_router_gasless(
                 max_fee: Amount::ZERO,
                 max_priority_fee_bips: PriorityFeeBips::ZERO,
                 gas_limit: None,
-                chain_id: config_value!("CHAIN_ID"),
+                chain_hash_fragment: 0,
             },
         },
         assert: Box::new(move |result, _| {
@@ -177,7 +176,7 @@ pub fn register_warp_route_gasless(
                 max_fee: Amount::ZERO,
                 max_priority_fee_bips: PriorityFeeBips::ZERO,
                 gas_limit: None,
-                chain_id: config_value!("CHAIN_ID"),
+                chain_hash_fragment: 0,
             },
         },
         assert: Box::new(move |result, _| {
@@ -258,7 +257,7 @@ fn do_inbound_transfer_gasless(
 				max_fee: Amount::ZERO,
 				max_priority_fee_bips: PriorityFeeBips::ZERO,
 				gas_limit: None,
-				chain_id: config_value!("CHAIN_ID"),
+					chain_hash_fragment: 0,
 			}
         },
         assert: Box::new(move |result, state| {
@@ -344,7 +343,7 @@ fn test_bridged_gas_token() {
                 max_fee: Amount::ZERO,
                 max_priority_fee_bips: PriorityFeeBips::ZERO,
                 gas_limit: None,
-                chain_id: config_value!("CHAIN_ID"),
+                chain_hash_fragment: 0,
             },
         },
         assert: Box::new(move |result, _| {
@@ -364,7 +363,7 @@ fn test_bridged_gas_token() {
                 max_fee: Amount::ZERO,
                 max_priority_fee_bips: PriorityFeeBips::ZERO,
                 gas_limit: None,
-                chain_id: config_value!("CHAIN_ID"),
+                chain_hash_fragment: 0,
             },
         },
         assert: Box::new(move |result, _| {

crates/module-system/hyperlane/tests/integration/with_agent/helpers/mod.rs

@@ -217,7 +217,7 @@ impl HyperlaneBuilder {
 
         // Current image is based on https://github.com/Sovereign-Labs/hyperlane-monorepo/tree/theodore/multisig-upgrade
         let docker_image = docker_image
-            .unwrap_or_else(|_| "ghcr.io/ross-weir/hyperlane-agent:multisig_upgrade2".into());
+            .unwrap_or_else(|_| "ghcr.io/theodorebugnet/hyperlane-agent:multisig_upgrade-4".into());
         let (name, tag) = docker_image
             .split_once(':')
             .unwrap_or((&docker_image, "latest"));