Merge branch 'main' into build/db-version

madara-alliance · Dec 19, 2024 · c566ae8 · c566ae8
2 parents 422acc5 + 280cb4e
commit c566ae8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Next release
 
 - feat(db): add database version management system
+- fix(rpc): fix BroadcastedDeclareTxn V3 in starknet-types-rpc
 - fix: oracle need condition
 - fix(block_production): continue pending block now reexecutes the previous transactions
 - feat(services): reworked Madara services for better cancellation control

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/client/devnet/src/lib.rs b/crates/client/devnet/src/lib.rs
@@ -376,7 +376,6 @@ mod tests {
             account_deployment_data: vec![],
             nonce_data_availability_mode: DaMode::L1,
             fee_data_availability_mode: DaMode::L1,
-            version: starknet_types_rpc::Version::X3,
         });
 
         let res = chain.sign_and_add_declare_tx(declare_txn, sender_address).unwrap();

diff --git a/crates/primitives/gateway/src/user_transaction.rs b/crates/primitives/gateway/src/user_transaction.rs
@@ -196,10 +196,6 @@ impl From<UserDeclareV3Transaction> for BroadcastedDeclareTxnV3<Felt> {
             contract_class: transaction.contract_class.into(),
             paymaster_data: transaction.paymaster_data,
             account_deployment_data: transaction.account_deployment_data,
-            version: match transaction.is_query {
-                true => starknet_types_rpc::Version::X100000000000000000000000000000003,
-                false => starknet_types_rpc::Version::X3,
-            },
         }
     }
 }