Skip to content

Commit cffcee4

Browse files
starknet_api: add proof to rpc_invoke_v3
1 parent 3a1e7cd commit cffcee4

File tree

7 files changed

+18
-3
lines changed

7 files changed

+18
-3
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
@@ -111,6 +111,7 @@ use starknet_api::transaction::fields::{
111111
ContractAddressSalt,
112112
Fee,
113113
PaymasterData,
114+
Proof,
114115
ResourceBounds,
115116
Tip,
116117
TransactionSignature,
@@ -265,6 +266,7 @@ fn invoke_transaction() -> RpcInvokeTransaction {
265266
fee_data_availability_mode: DataAvailabilityMode::L1,
266267
paymaster_data: PaymasterData(vec![]),
267268
account_deployment_data: AccountDeploymentData(vec![]),
269+
proof: Proof::default(),
268270
})
269271
}
270272

@@ -1059,6 +1061,7 @@ fn test_invoke_tx_size_of() {
10591061
// + internal_invoke_tx.sender_address.dynamic_size()
10601062
// + internal_invoke_tx.signature.dynamic_size()
10611063
// + internal_invoke_tx.tip.dynamic_size();
1064+
// + internal_invoke_tx.proof.dynamic_size();
10621065

1063-
assert_eq!(invoke_tx.size_bytes(), 448);
1066+
assert_eq!(invoke_tx.size_bytes(), 488);
10641067
}

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
ResourceBounds,
2526
Tip,
2627
TransactionSignature,
@@ -124,6 +125,7 @@ impl From<DeprecatedGatewayInvokeTransactionV3> for RpcInvokeTransactionV3 {
124125
account_deployment_data: deprecated_invoke_tx.account_deployment_data,
125126
nonce_data_availability_mode: deprecated_invoke_tx.nonce_data_availability_mode,
126127
fee_data_availability_mode: deprecated_invoke_tx.fee_data_availability_mode,
128+
proof: Proof::default(),
127129
}
128130
}
129131
}

crates/apollo_infra/src/serde_utils_test.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use starknet_api::rpc_transaction::{
1111
RpcInvokeTransactionV3,
1212
RpcTransaction,
1313
};
14+
use starknet_api::transaction::fields::Proof;
1415
use starknet_types_core::felt::Felt;
1516

1617
use crate::serde_utils::SerdeWrapper;
@@ -64,6 +65,7 @@ fn serde_rpc_invoke_tx() {
6465
account_deployment_data: Default::default(),
6566
nonce_data_availability_mode: DataAvailabilityMode::L1,
6667
fee_data_availability_mode: DataAvailabilityMode::L1,
68+
proof: Proof::default(),
6769
};
6870
let rpc_invoke_tx = RpcInvokeTransaction::V3(invoke_tx);
6971

crates/apollo_test_utils/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -873,6 +873,7 @@ auto_impl_get_test_instance! {
873873
pub fee_data_availability_mode: DataAvailabilityMode,
874874
pub paymaster_data: PaymasterData,
875875
pub account_deployment_data: AccountDeploymentData,
876+
pub proof: Proof,
876877
}
877878
pub struct SequencerContractAddress(pub ContractAddress);
878879
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,
@@ -574,7 +575,8 @@ pub struct RpcInvokeTransactionV3 {
574575
pub account_deployment_data: AccountDeploymentData,
575576
pub nonce_data_availability_mode: DataAvailabilityMode,
576577
pub fee_data_availability_mode: DataAvailabilityMode,
577-
// TODO(AvivG): Add proof facts.
578+
#[serde(default)]
579+
pub proof: Proof,
578580
}
579581

580582
impl InvokeTransactionV3Trait for RpcInvokeTransactionV3 {
@@ -658,6 +660,7 @@ impl TryFrom<InvokeTransactionV3> for RpcInvokeTransactionV3 {
658660
sender_address: value.sender_address,
659661
calldata: value.calldata,
660662
account_deployment_data: value.account_deployment_data,
663+
proof: Proof::default(),
661664
})
662665
}
663666
}

crates/starknet_api/src/rpc_transaction_test.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,10 @@ fn test_invoke_tx_size_of() {
137137
// + tx_v3.fee_data_availability_mode.dynamic_size()
138138
// + tx_v3.paymaster_data.dynamic_size()
139139
// + tx_v3.account_deployment_data.dynamic_size();
140+
// + tx_v3.proof.dynamic_size();
140141

141142
// Check the size of the V3 invoke transaction.
142-
assert_eq!(tx_v3.size_bytes(), 448);
143+
assert_eq!(tx_v3.size_bytes(), 488);
143144
} else {
144145
panic!("Expected RpcTransaction::Invoke");
145146
}

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 {
@@ -158,6 +160,7 @@ pub fn rpc_invoke_tx(invoke_args: InvokeTxArgs) -> RpcTransaction {
158160
fee_data_availability_mode: invoke_args.fee_data_availability_mode,
159161
paymaster_data: invoke_args.paymaster_data,
160162
account_deployment_data: invoke_args.account_deployment_data,
163+
proof: Proof::default(),
161164
}))
162165
}
163166

0 commit comments

Comments
 (0)