Skip to content

Commit 598fc87

Browse files
starknet_api: add proof facts to invoke v3
1 parent b9ad526 commit 598fc87

File tree

13 files changed

+27
-2
lines changed

13 files changed

+27
-2
lines changed

crates/apollo_protobuf/src/converters/transaction.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,9 @@ impl TryFrom<protobuf::InvokeV3> for InvokeTransactionV3 {
647647
fee_data_availability_mode,
648648
paymaster_data,
649649
account_deployment_data,
650+
// TODO(AvivG): Get proof_facts from P2P protocol, until then, lost during protobuf
651+
// serialization/deserialization.
652+
proof_facts: None,
650653
})
651654
}
652655
}

crates/apollo_protobuf/src/converters/transaction_test.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ fn convert_invoke_transaction_v3_to_vec_u8_and_back() {
121121
let mut transaction =
122122
starknet_api::transaction::InvokeTransactionV3::get_test_instance(&mut rng);
123123
transaction.resource_bounds = *RESOURCE_BOUNDS_MAPPING;
124+
// TODO(AvivG): Remove this once proof_facts is added to P2P protocol.
125+
transaction.proof_facts = None;
124126
let transaction = StarknetApiTransaction::Invoke(InvokeTransaction::V3(transaction));
125127

126128
let transaction_output = create_transaction_output!(InvokeTransactionOutput, Invoke);

crates/apollo_rpc/src/v0_8/api/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,8 @@ impl From<InvokeTransaction> for starknet_api::transaction::InvokeTransaction {
630630
fee_data_availability_mode,
631631
paymaster_data,
632632
account_deployment_data,
633+
// TODO(AvivG): Get proof facts from rpc_v8 once supported.
634+
proof_facts: None,
633635
}),
634636
}
635637
}

crates/apollo_rpc/src/v0_8/transaction.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ pub struct InvokeTransactionV3 {
447447
pub account_deployment_data: AccountDeploymentData,
448448
pub nonce_data_availability_mode: DataAvailabilityMode,
449449
pub fee_data_availability_mode: DataAvailabilityMode,
450+
// TODO(AvivG): Add proof facts to rpc_v8.
450451
}
451452

452453
impl From<InvokeTransactionV3> for client_transaction::InvokeTransaction {
@@ -536,6 +537,7 @@ impl TryFrom<starknet_api::transaction::InvokeTransaction> for InvokeTransaction
536537
fee_data_availability_mode,
537538
paymaster_data,
538539
account_deployment_data,
540+
proof_facts: _,
539541
},
540542
) => Ok(Self::Version3(InvokeTransactionV3 {
541543
sender_address,

crates/apollo_starknet_client/src/reader/objects/transaction.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ pub struct IntermediateInvokeTransaction {
515515
pub account_deployment_data: Option<AccountDeploymentData>,
516516
pub transaction_hash: TransactionHash,
517517
pub version: TransactionVersion,
518+
// TODO(AvivG): Consider adding proof facts.
518519
}
519520

520521
// TODO(shahak, 01/11/2023): Add conversion tests.
@@ -628,6 +629,7 @@ impl TryFrom<IntermediateInvokeTransaction> for starknet_api::transaction::Invok
628629
msg: "Invoke V3 must contain account_deployment_data field.".to_string(),
629630
},
630631
)?,
632+
proof_facts: None,
631633
})
632634
}
633635
}

crates/apollo_storage/src/serialization/serializers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,7 @@ auto_storage_serde_conditionally_compressed! {
12921292
pub fee_data_availability_mode: DataAvailabilityMode,
12931293
pub paymaster_data: PaymasterData,
12941294
pub account_deployment_data: AccountDeploymentData,
1295+
pub proof_facts: Option<Vec<Felt>>,
12951296
}
12961297

12971298
pub struct L1HandlerTransaction {

crates/apollo_test_utils/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,7 @@ auto_impl_get_test_instance! {
725725
pub fee_data_availability_mode: DataAvailabilityMode,
726726
pub paymaster_data: PaymasterData,
727727
pub account_deployment_data: AccountDeploymentData,
728+
pub proof_facts: Option<Vec<Felt>>,
728729
}
729730
pub enum L1DataAvailabilityMode {
730731
Calldata = 0,

crates/blockifier_reexecution/resources/raw_rpc_json_objects/transactions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
"tip": "0x0",
6969
"transaction_hash": "0xa7c7db686c7f756ceb7ca85a759caef879d425d156da83d6a836f86851983",
7070
"type": "INVOKE",
71-
"version": "0x3"
71+
"version": "0x3",
72+
"proof_facts": []
7273
},
7374
"deploy_account_v1": {
7475
"transaction_hash": "0x2a2e13cd94f911ea18c20a81e853314e37de58d49d13aa3a92370accd4338e8",

crates/native_blockifier/src/py_invoke_function.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ struct PyInvokeTransactionV3 {
8181
pub fee_data_availability_mode: PyDataAvailabilityMode,
8282
pub paymaster_data: Vec<PyFelt>,
8383
pub account_deployment_data: Vec<PyFelt>,
84+
// TODO(AvivG): Add proof facts.
8485
}
8586

8687
impl TryFrom<PyInvokeTransactionV3> for InvokeTransactionV3 {
@@ -101,6 +102,8 @@ impl TryFrom<PyInvokeTransactionV3> for InvokeTransactionV3 {
101102
account_deployment_data: AccountDeploymentData(from_py_felts(
102103
tx.account_deployment_data,
103104
)),
105+
// TODO(AvivG): Get from PyInvokeTransactionV3 once supported.
106+
proof_facts: None,
104107
})
105108
}
106109
}

crates/starknet_api/resources/transaction_hash.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@
103103
"0x1c3a868705399362140bf5ae33f955f1c946a8f836d4c052f2aff397bcfe80a",
104104
"0x78163ce5979e2bc8a944ba353a63c194ca4f63d393bbaaa95857daa9223e93c"
105105
],
106-
"tip": "0x0"
106+
"tip": "0x0",
107+
"proof_facts": []
107108
}
108109
}
109110
},

0 commit comments

Comments
 (0)