Skip to content
Merged
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
3 changes: 3 additions & 0 deletions crates/apollo_protobuf/src/converters/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,9 @@ impl TryFrom<protobuf::InvokeV3> for InvokeTransactionV3 {
fee_data_availability_mode,
paymaster_data,
account_deployment_data,
// TODO(AvivG): Get proof_facts from P2P protocol, until then, lost during protobuf
// serialization/deserialization.
proof_facts: vec![],
})
}
}
Expand Down
2 changes: 2 additions & 0 deletions crates/apollo_protobuf/src/converters/transaction_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ fn convert_invoke_transaction_v3_to_vec_u8_and_back() {
let mut transaction =
starknet_api::transaction::InvokeTransactionV3::get_test_instance(&mut rng);
transaction.resource_bounds = *RESOURCE_BOUNDS_MAPPING;
// TODO(AvivG): Remove this once proof_facts is added to P2P protocol.
transaction.proof_facts = vec![];
let transaction = StarknetApiTransaction::Invoke(InvokeTransaction::V3(transaction));

let transaction_output = create_transaction_output!(InvokeTransactionOutput, Invoke);
Expand Down
2 changes: 2 additions & 0 deletions crates/apollo_rpc/src/v0_8/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,8 @@ impl From<InvokeTransaction> for starknet_api::transaction::InvokeTransaction {
fee_data_availability_mode,
paymaster_data,
account_deployment_data,
// TODO(AvivG): Get proof facts from rpc_v8 once supported.
proof_facts: vec![],
}),
}
}
Expand Down
2 changes: 2 additions & 0 deletions crates/apollo_rpc/src/v0_8/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ pub struct InvokeTransactionV3 {
pub account_deployment_data: AccountDeploymentData,
pub nonce_data_availability_mode: DataAvailabilityMode,
pub fee_data_availability_mode: DataAvailabilityMode,
// TODO(AvivG): Add proof facts to rpc_v8.
}

impl From<InvokeTransactionV3> for client_transaction::InvokeTransaction {
Expand Down Expand Up @@ -536,6 +537,7 @@ impl TryFrom<starknet_api::transaction::InvokeTransaction> for InvokeTransaction
fee_data_availability_mode,
paymaster_data,
account_deployment_data,
proof_facts: _,
},
) => Ok(Self::Version3(InvokeTransactionV3 {
sender_address,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ pub struct IntermediateInvokeTransaction {
pub account_deployment_data: Option<AccountDeploymentData>,
pub transaction_hash: TransactionHash,
pub version: TransactionVersion,
// TODO(AvivG): Consider adding proof facts.
}

// TODO(shahak, 01/11/2023): Add conversion tests.
Expand Down Expand Up @@ -628,6 +629,7 @@ impl TryFrom<IntermediateInvokeTransaction> for starknet_api::transaction::Invok
msg: "Invoke V3 must contain account_deployment_data field.".to_string(),
},
)?,
proof_facts: vec![],
})
}
}
Expand Down
1 change: 1 addition & 0 deletions crates/apollo_storage/src/serialization/serializers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,7 @@ auto_storage_serde_conditionally_compressed! {
pub fee_data_availability_mode: DataAvailabilityMode,
pub paymaster_data: PaymasterData,
pub account_deployment_data: AccountDeploymentData,
pub proof_facts: Vec<Felt>,
}

pub struct L1HandlerTransaction {
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 @@ -725,6 +725,7 @@ auto_impl_get_test_instance! {
pub fee_data_availability_mode: DataAvailabilityMode,
pub paymaster_data: PaymasterData,
pub account_deployment_data: AccountDeploymentData,
pub proof_facts: Vec<Felt>,
}
pub enum L1DataAvailabilityMode {
Calldata = 0,
Expand Down
3 changes: 3 additions & 0 deletions crates/native_blockifier/src/py_invoke_function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ struct PyInvokeTransactionV3 {
pub fee_data_availability_mode: PyDataAvailabilityMode,
pub paymaster_data: Vec<PyFelt>,
pub account_deployment_data: Vec<PyFelt>,
// TODO(AvivG): Add proof facts.
}

impl TryFrom<PyInvokeTransactionV3> for InvokeTransactionV3 {
Expand All @@ -101,6 +102,8 @@ impl TryFrom<PyInvokeTransactionV3> for InvokeTransactionV3 {
account_deployment_data: AccountDeploymentData(from_py_felts(
tx.account_deployment_data,
)),
// TODO(AvivG): Get from PyInvokeTransactionV3 once supported.
proof_facts: vec![],
})
}
}
Expand Down
3 changes: 3 additions & 0 deletions crates/starknet_api/src/rpc_transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,7 @@ pub struct RpcInvokeTransactionV3 {
pub account_deployment_data: AccountDeploymentData,
pub nonce_data_availability_mode: DataAvailabilityMode,
pub fee_data_availability_mode: DataAvailabilityMode,
// TODO(AvivG): Add proof facts.
}

impl InvokeTransactionV3Trait for RpcInvokeTransactionV3 {
Expand Down Expand Up @@ -628,6 +629,8 @@ impl From<RpcInvokeTransactionV3> for InvokeTransactionV3 {
fee_data_availability_mode: tx.fee_data_availability_mode,
paymaster_data: tx.paymaster_data,
account_deployment_data: tx.account_deployment_data,
// TODO(AvivG): Get from RpcInvokeTransactionV3 once supported.
proof_facts: vec![],
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions crates/starknet_api/src/test_utils/invoke.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ pub struct InvokeTxArgs {
pub nonce: Nonce,
pub only_query: bool,
pub tx_hash: TransactionHash,
// TODO(AvivG): add proof_facts for testing.
}

impl Default for InvokeTxArgs {
Expand Down Expand Up @@ -120,6 +121,8 @@ pub fn invoke_tx(invoke_args: InvokeTxArgs) -> InvokeTransaction {
fee_data_availability_mode: invoke_args.fee_data_availability_mode,
paymaster_data: invoke_args.paymaster_data,
account_deployment_data: invoke_args.account_deployment_data,
// TODO(AvivG): Get from invoke_args once supported.
proof_facts: vec![],
})
} else {
panic!("Unsupported transaction version: {:?}.", invoke_args.version)
Expand Down
2 changes: 2 additions & 0 deletions crates/starknet_api/src/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,8 @@ pub struct InvokeTransactionV3 {
pub fee_data_availability_mode: DataAvailabilityMode,
pub paymaster_data: PaymasterData,
pub account_deployment_data: AccountDeploymentData,
#[serde(default)]
pub proof_facts: Vec<Felt>,
}

impl TransactionHasher for InvokeTransactionV3 {
Expand Down
Loading