Skip to content

Commit 0d7026e

Browse files
starknet_api: add proof to rpc_invoke_v3
1 parent 41ce710 commit 0d7026e

File tree

8 files changed

+19
-5
lines changed

8 files changed

+19
-5
lines changed

crates/apollo_consensus_orchestrator/src/cende/central_objects_test.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ use starknet_api::transaction::fields::{
112112
Fee,
113113
PaymasterData,
114114
ProofFacts,
115+
Proof,
115116
ResourceBounds,
116117
Tip,
117118
TransactionSignature,
@@ -267,6 +268,7 @@ fn invoke_transaction() -> RpcInvokeTransaction {
267268
paymaster_data: PaymasterData(vec![]),
268269
account_deployment_data: AccountDeploymentData(vec![]),
269270
proof_facts: ProofFacts::default(),
271+
proof: Proof::default(),
270272
})
271273
}
272274

@@ -1062,6 +1064,7 @@ fn test_invoke_tx_size_of() {
10621064
// + internal_invoke_tx.signature.dynamic_size()
10631065
// + internal_invoke_tx.tip.dynamic_size();
10641066
// + internal_invoke_tx.proof_facts.dynamic_size();
1067+
// + internal_invoke_tx.proof.dynamic_size();
10651068

1066-
assert_eq!(invoke_tx.size_bytes(), 480);
1069+
assert_eq!(invoke_tx.size_bytes(), 520);
10671070
}

crates/apollo_http_server/src/deprecated_gateway_transaction.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use starknet_api::transaction::fields::{
2121
Calldata,
2222
ContractAddressSalt,
2323
PaymasterData,
24+
Proof,
2425
ProofFacts,
2526
ResourceBounds,
2627
Tip,
@@ -126,6 +127,7 @@ impl From<DeprecatedGatewayInvokeTransactionV3> for RpcInvokeTransactionV3 {
126127
nonce_data_availability_mode: deprecated_invoke_tx.nonce_data_availability_mode,
127128
fee_data_availability_mode: deprecated_invoke_tx.fee_data_availability_mode,
128129
proof_facts: ProofFacts::default(),
130+
proof: Proof::default(),
129131
}
130132
}
131133
}

crates/apollo_infra/src/serde_utils_test.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use starknet_api::rpc_transaction::{
1111
RpcInvokeTransactionV3,
1212
RpcTransaction,
1313
};
14-
use starknet_api::transaction::fields::ProofFacts;
14+
use starknet_api::transaction::fields::{Proof, ProofFacts};
1515
use starknet_types_core::felt::Felt;
1616

1717
use crate::serde_utils::SerdeWrapper;
@@ -66,6 +66,7 @@ fn serde_rpc_invoke_tx() {
6666
nonce_data_availability_mode: DataAvailabilityMode::L1,
6767
fee_data_availability_mode: DataAvailabilityMode::L1,
6868
proof_facts: ProofFacts::default(),
69+
proof: Proof::default(),
6970
};
7071
let rpc_invoke_tx = RpcInvokeTransaction::V3(invoke_tx);
7172

crates/apollo_mempool/src/mempool_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,7 @@ fn metrics_correctness() {
13071307
pending_queue_size: 1,
13081308
get_txs_size: 1,
13091309
delayed_declares_size: 1,
1310-
total_size_in_bytes: 1952,
1310+
total_size_in_bytes: 2024,
13111311
evictions_count: 1,
13121312
transaction_time_spent_until_batched: HistogramValue {
13131313
sum: 2.0,

crates/apollo_test_utils/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,7 @@ auto_impl_get_test_instance! {
874874
pub paymaster_data: PaymasterData,
875875
pub account_deployment_data: AccountDeploymentData,
876876
pub proof_facts: ProofFacts,
877+
pub proof: Proof,
877878
}
878879
pub struct SequencerContractAddress(pub ContractAddress);
879880
pub struct Signature {

crates/starknet_api/src/rpc_transaction.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use crate::transaction::fields::{
2020
Calldata,
2121
ContractAddressSalt,
2222
PaymasterData,
23+
Proof,
2324
ProofFacts,
2425
Tip,
2526
TransactionSignature,
@@ -576,7 +577,8 @@ pub struct RpcInvokeTransactionV3 {
576577
pub fee_data_availability_mode: DataAvailabilityMode,
577578
#[serde(default)]
578579
pub proof_facts: ProofFacts,
579-
// TODO(AvivG): Add proof field.
580+
#[serde(default)]
581+
pub proof: Proof,
580582
}
581583

582584
impl InvokeTransactionV3Trait for RpcInvokeTransactionV3 {
@@ -660,6 +662,7 @@ impl TryFrom<InvokeTransactionV3> for RpcInvokeTransactionV3 {
660662
calldata: value.calldata,
661663
account_deployment_data: value.account_deployment_data,
662664
proof_facts: value.proof_facts,
665+
proof: Proof::default(),
663666
})
664667
}
665668
}

crates/starknet_api/src/rpc_transaction_test.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,10 @@ fn test_invoke_tx_size_of() {
138138
// + tx_v3.paymaster_data.dynamic_size()
139139
// + tx_v3.account_deployment_data.dynamic_size();
140140
// + tx_v3.proof_facts.dynamic_size();
141+
// + tx_v3.proof.dynamic_size();
141142

142143
// Check the size of the V3 invoke transaction.
143-
assert_eq!(tx_v3.size_bytes(), 480);
144+
assert_eq!(tx_v3.size_bytes(), 520);
144145
} else {
145146
panic!("Expected RpcTransaction::Invoke");
146147
}

crates/starknet_api/src/test_utils/invoke.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use crate::transaction::fields::{
2020
Calldata,
2121
Fee,
2222
PaymasterData,
23+
Proof,
2324
ProofFacts,
2425
Tip,
2526
TransactionSignature,
@@ -51,6 +52,7 @@ pub struct InvokeTxArgs {
5152
pub only_query: bool,
5253
pub tx_hash: TransactionHash,
5354
pub proof_facts: ProofFacts,
55+
// TODO(AvivG): Consider adding `proof` field.
5456
}
5557

5658
impl Default for InvokeTxArgs {
@@ -159,6 +161,7 @@ pub fn rpc_invoke_tx(invoke_args: InvokeTxArgs) -> RpcTransaction {
159161
paymaster_data: invoke_args.paymaster_data,
160162
account_deployment_data: invoke_args.account_deployment_data,
161163
proof_facts: invoke_args.proof_facts,
164+
proof: Proof::default(),
162165
}))
163166
}
164167

0 commit comments

Comments
 (0)