From 2a0ac46ccc4b662899e9b37c0b6d18b9e5240a82 Mon Sep 17 00:00:00 2001 From: marioiordanov Date: Thu, 12 Oct 2023 19:51:17 +0300 Subject: [PATCH 1/2] set transaction version for deploy account to be hardcoded to 1, because blockifier returns error when using the version that is for fee estimation --- .../rpc/transactions/broadcasted_deploy_account_transaction.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs b/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs index 613fa661f..e78939022 100644 --- a/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs +++ b/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs @@ -3,6 +3,7 @@ use std::sync::Arc; use cairo_felt::Felt252; use serde::{Deserialize, Serialize}; use starknet_api::core::calculate_contract_address; +use starknet_api::hash::StarkFelt; use starknet_api::transaction::Fee; use crate::contract_address::ContractAddress; @@ -74,7 +75,7 @@ impl BroadcastedDeployAccountTransaction { let sn_api_transaction = starknet_api::transaction::DeployAccountTransaction { max_fee: self.common.max_fee, - version: starknet_api::transaction::TransactionVersion(self.common.version.into()), + version: starknet_api::transaction::TransactionVersion(StarkFelt::from(1u8)), signature: starknet_api::transaction::TransactionSignature( self.common.signature.iter().map(|felt| felt.into()).collect(), ), From f9db2ce37227ec67178611d8b05b75a891c78663 Mon Sep 17 00:00:00 2001 From: marioiordanov Date: Thu, 12 Oct 2023 19:59:46 +0300 Subject: [PATCH 2/2] extract transaction version to const --- .../transactions/broadcasted_deploy_account_transaction.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs b/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs index e78939022..837e6b52d 100644 --- a/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs +++ b/crates/types/src/rpc/transactions/broadcasted_deploy_account_transaction.rs @@ -3,8 +3,8 @@ use std::sync::Arc; use cairo_felt::Felt252; use serde::{Deserialize, Serialize}; use starknet_api::core::calculate_contract_address; -use starknet_api::hash::StarkFelt; use starknet_api::transaction::Fee; +use starknet_rs_ff::FieldElement; use crate::contract_address::ContractAddress; use crate::error::DevnetResult; @@ -15,6 +15,8 @@ use crate::felt::{ use crate::rpc::transactions::deploy_account_transaction::DeployAccountTransaction; use crate::rpc::transactions::BroadcastedTransactionCommon; +const TRANSACTION_VERSION: FieldElement = FieldElement::ONE; + #[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)] pub struct BroadcastedDeployAccountTransaction { #[serde(flatten)] @@ -75,7 +77,7 @@ impl BroadcastedDeployAccountTransaction { let sn_api_transaction = starknet_api::transaction::DeployAccountTransaction { max_fee: self.common.max_fee, - version: starknet_api::transaction::TransactionVersion(StarkFelt::from(1u8)), + version: starknet_api::transaction::TransactionVersion(TRANSACTION_VERSION.into()), signature: starknet_api::transaction::TransactionSignature( self.common.signature.iter().map(|felt| felt.into()).collect(), ),