Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ use starknet_api::transaction::fields::{
Fee,
PaymasterData,
ProofFacts,
Proof,
ResourceBounds,
Tip,
TransactionSignature,
Expand Down Expand Up @@ -267,6 +268,7 @@ fn invoke_transaction() -> RpcInvokeTransaction {
paymaster_data: PaymasterData(vec![]),
account_deployment_data: AccountDeploymentData(vec![]),
proof_facts: ProofFacts::default(),
proof: Proof::default(),
})
}

Expand Down Expand Up @@ -1062,6 +1064,7 @@ fn test_invoke_tx_size_of() {
// + internal_invoke_tx.signature.dynamic_size()
// + internal_invoke_tx.tip.dynamic_size();
// + internal_invoke_tx.proof_facts.dynamic_size();
// + internal_invoke_tx.proof.dynamic_size();

assert_eq!(invoke_tx.size_bytes(), 480);
assert_eq!(invoke_tx.size_bytes(), 504);
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use starknet_api::transaction::fields::{
Calldata,
ContractAddressSalt,
PaymasterData,
Proof,
ProofFacts,
ResourceBounds,
Tip,
Expand Down Expand Up @@ -126,6 +127,7 @@ impl From<DeprecatedGatewayInvokeTransactionV3> for RpcInvokeTransactionV3 {
nonce_data_availability_mode: deprecated_invoke_tx.nonce_data_availability_mode,
fee_data_availability_mode: deprecated_invoke_tx.fee_data_availability_mode,
proof_facts: ProofFacts::default(),
proof: Proof::default(),
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion crates/apollo_infra/src/serde_utils_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use starknet_api::rpc_transaction::{
RpcInvokeTransactionV3,
RpcTransaction,
};
use starknet_api::transaction::fields::ProofFacts;
use starknet_api::transaction::fields::{Proof, ProofFacts};
use starknet_types_core::felt::Felt;

use crate::serde_utils::SerdeWrapper;
Expand Down Expand Up @@ -66,6 +66,7 @@ fn serde_rpc_invoke_tx() {
nonce_data_availability_mode: DataAvailabilityMode::L1,
fee_data_availability_mode: DataAvailabilityMode::L1,
proof_facts: ProofFacts::default(),
proof: Proof::default(),
};
let rpc_invoke_tx = RpcInvokeTransaction::V3(invoke_tx);

Expand Down
2 changes: 1 addition & 1 deletion crates/apollo_mempool/src/mempool_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ fn metrics_correctness() {
pending_queue_size: 1,
get_txs_size: 1,
delayed_declares_size: 1,
total_size_in_bytes: 1952,
total_size_in_bytes: 2024,
evictions_count: 1,
transaction_time_spent_until_batched: HistogramValue {
sum: 2.0,
Expand Down
1 change: 1 addition & 0 deletions crates/apollo_test_utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,7 @@ auto_impl_get_test_instance! {
pub paymaster_data: PaymasterData,
pub account_deployment_data: AccountDeploymentData,
pub proof_facts: ProofFacts,
pub proof: Proof,
}
pub struct SequencerContractAddress(pub ContractAddress);
pub struct Signature {
Expand Down
5 changes: 4 additions & 1 deletion crates/starknet_api/src/rpc_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use crate::transaction::fields::{
Calldata,
ContractAddressSalt,
PaymasterData,
Proof,
ProofFacts,
Tip,
TransactionSignature,
Expand Down Expand Up @@ -576,7 +577,8 @@ pub struct RpcInvokeTransactionV3 {
pub fee_data_availability_mode: DataAvailabilityMode,
#[serde(default)]
pub proof_facts: ProofFacts,
// TODO(AvivG): Add proof field.
#[serde(default)]
pub proof: Proof,
}

impl InvokeTransactionV3Trait for RpcInvokeTransactionV3 {
Expand Down Expand Up @@ -665,6 +667,7 @@ impl TryFrom<InvokeTransactionV3> for RpcInvokeTransactionV3 {
calldata: value.calldata,
account_deployment_data: value.account_deployment_data,
proof_facts: value.proof_facts,
proof: Proof::default(),
})
}
}
Expand Down
3 changes: 2 additions & 1 deletion crates/starknet_api/src/rpc_transaction_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,10 @@ fn test_invoke_tx_size_of() {
// + tx_v3.paymaster_data.dynamic_size()
// + tx_v3.account_deployment_data.dynamic_size();
// + tx_v3.proof_facts.dynamic_size();
// + tx_v3.proof.dynamic_size();

// Check the size of the V3 invoke transaction.
assert_eq!(tx_v3.size_bytes(), 480);
assert_eq!(tx_v3.size_bytes(), 504);
} else {
panic!("Expected RpcTransaction::Invoke");
}
Expand Down
4 changes: 4 additions & 0 deletions crates/starknet_api/src/test_utils/invoke.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use crate::transaction::fields::{
Calldata,
Fee,
PaymasterData,
Proof,
ProofFacts,
Tip,
TransactionSignature,
Expand Down Expand Up @@ -51,6 +52,7 @@ pub struct InvokeTxArgs {
pub only_query: bool,
pub tx_hash: TransactionHash,
pub proof_facts: ProofFacts,
// TODO(AvivG): Consider adding `proof` field.
}

impl Default for InvokeTxArgs {
Expand Down Expand Up @@ -159,6 +161,8 @@ pub fn rpc_invoke_tx(invoke_args: InvokeTxArgs) -> RpcTransaction {
paymaster_data: invoke_args.paymaster_data,
account_deployment_data: invoke_args.account_deployment_data,
proof_facts: invoke_args.proof_facts,
// TODO(AvivG): Consider getting proof field from invoke_args.
proof: Proof::default(),
}))
}

Expand Down
Loading