chore(sequencing): reorder central transactions fields

starkware-libs · Jan 12, 2025 · 45529d0 · 45529d0
1 parent c337e9f
commit 45529d0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 25 deletions.
diff --git a/crates/sequencing/papyrus_consensus_orchestrator/src/cende/central_objects.rs b/crates/sequencing/papyrus_consensus_orchestrator/src/cende/central_objects.rs
@@ -146,19 +146,18 @@ impl From<ValidResourceBounds> for CentralResourceBounds {
     }
 }
 
-// TODO(Yael): organize the fields of transactions in the same order.
 #[derive(Debug, PartialEq, Serialize)]
 pub struct CentralInvokeTransactionV3 {
-    pub sender_address: ContractAddress,
-    pub calldata: Calldata,
-    pub signature: TransactionSignature,
-    pub nonce: Nonce,
     pub resource_bounds: CentralResourceBounds,
     pub tip: Tip,
-    pub paymaster_data: PaymasterData,
-    pub account_deployment_data: AccountDeploymentData,
+    pub signature: TransactionSignature,
+    pub nonce: Nonce,
+    pub sender_address: ContractAddress,
+    pub calldata: Calldata,
     pub nonce_data_availability_mode: u32,
     pub fee_data_availability_mode: u32,
+    pub paymaster_data: PaymasterData,
+    pub account_deployment_data: AccountDeploymentData,
     pub hash_value: TransactionHash,
 }
 
@@ -196,12 +195,12 @@ pub struct CentralDeployAccountTransactionV3 {
     pub nonce: Nonce,
     pub class_hash: ClassHash,
     pub contract_address_salt: ContractAddressSalt,
+    pub sender_address: ContractAddress,
     pub constructor_calldata: Calldata,
     pub nonce_data_availability_mode: u32,
     pub fee_data_availability_mode: u32,
     pub paymaster_data: PaymasterData,
     pub hash_value: TransactionHash,
-    pub sender_address: ContractAddress,
 }
 
 impl From<DeployAccountTransaction> for CentralDeployAccountTransactionV3 {

diff --git a/crates/sequencing/papyrus_consensus_orchestrator/src/cende/central_objects_test.rs b/crates/sequencing/papyrus_consensus_orchestrator/src/cende/central_objects_test.rs
@@ -147,25 +147,24 @@ fn central_deploy_account_tx_json() -> Value {
     let deploy_account_tx = DeployAccountTransaction {
         tx: starknet_api::transaction::DeployAccountTransaction::V3(DeployAccountTransactionV3 {
             resource_bounds: resource_bounds(),
+            tip: Tip(1),
             signature: TransactionSignature(felt_vector()),
             nonce: nonce!(1),
-            tip: Tip(1),
-            paymaster_data: PaymasterData(vec![]),
-            nonce_data_availability_mode: DataAvailabilityMode::L1,
-            fee_data_availability_mode: DataAvailabilityMode::L1,
-
             class_hash: ClassHash(felt!(
                 "0x1b5a0b09f23b091d5d1fa2f660ddfad6bcfce607deba23806cd7328ccfb8ee9"
             )),
             contract_address_salt: ContractAddressSalt(felt!(2_u8)),
             constructor_calldata: Calldata(Arc::new(felt_vector())),
+            nonce_data_availability_mode: DataAvailabilityMode::L1,
+            fee_data_availability_mode: DataAvailabilityMode::L1,
+            paymaster_data: PaymasterData(vec![]),
         }),
-        tx_hash: TransactionHash(felt!(
-            "0x429cb4dc45610a80a96800ab350a11ff50e2d69e25c7723c002934e66b5a282"
-        )),
         contract_address: contract_address!(
             "0x4c2e031b0ddaa38e06fd9b1bf32bff739965f9d64833006204c67cbc879a57c"
         ),
+        tx_hash: TransactionHash(felt!(
+            "0x429cb4dc45610a80a96800ab350a11ff50e2d69e25c7723c002934e66b5a282"
+        )),
     };
 
     let central_transaction_written = CentralTransactionWritten {
@@ -182,29 +181,29 @@ fn central_declare_tx_json() -> Value {
     let declare_tx = DeclareTransaction {
         tx: starknet_api::transaction::DeclareTransaction::V3(DeclareTransactionV3 {
             resource_bounds: resource_bounds(),
-            sender_address: contract_address!("0x12fd537"),
+            tip: Tip(1),
             signature: TransactionSignature(felt_vector()),
             nonce: nonce!(1),
-            tip: Tip(1),
-            paymaster_data: PaymasterData(vec![]),
-            nonce_data_availability_mode: DataAvailabilityMode::L1,
-            fee_data_availability_mode: DataAvailabilityMode::L1,
-            account_deployment_data: AccountDeploymentData(vec![]),
             class_hash: ClassHash(felt!(
                 "0x3a59046762823dc87385eb5ac8a21f3f5bfe4274151c6eb633737656c209056"
             )),
             compiled_class_hash: CompiledClassHash(felt!("0x1")),
+            sender_address: contract_address!("0x12fd537"),
+            nonce_data_availability_mode: DataAvailabilityMode::L1,
+            fee_data_availability_mode: DataAvailabilityMode::L1,
+            paymaster_data: PaymasterData(vec![]),
+            account_deployment_data: AccountDeploymentData(vec![]),
         }),
-        tx_hash: TransactionHash(felt!(
-            "0x41e7d973115400a98a7775190c27d4e3b1fcd8cd40b7d27464f6c3f10b8b706"
-        )),
         class_info: ClassInfo {
             // The contract class is not used by the central object.
             contract_class: ContractClass::V0(Default::default()),
             sierra_program_length: 8844,
             abi_length: 11237,
             sierra_version: SierraVersion::new(1, 6, 0),
         },
+        tx_hash: TransactionHash(felt!(
+            "0x41e7d973115400a98a7775190c27d4e3b1fcd8cd40b7d27464f6c3f10b8b706"
+        )),
     };
     let central_transaction_written = CentralTransactionWritten {
         tx: CentralTransaction::Declare(CentralDeclareTransaction::V3(declare_tx.into())),