apollo_protobuf: split InvokeV3 to InvokeV3WithProof and InvokeV3WithoutProof

Author: avivg-starkware

crates/apollo_protobuf/src/converters/rpc_transaction.rs

@@ -112,29 +112,34 @@ impl From<RpcDeployAccountTransactionV3> for protobuf::DeployAccountV3 {
     }
 }
 
-impl TryFrom<protobuf::InvokeV3> for RpcInvokeTransactionV3 {
+impl TryFrom<protobuf::InvokeV3WithProof> for RpcInvokeTransactionV3 {
     type Error = ProtobufConversionError;
-    fn try_from(mut value: protobuf::InvokeV3) -> Result<Self, Self::Error> {
+    fn try_from(mut value: protobuf::InvokeV3WithProof) -> Result<Self, Self::Error> {
         // Extract proof first, since `starknet_api::transaction::InvokeTransactionV3` does not
         // carry a `proof` field.
         let proof = Proof::from(std::mem::take(&mut value.proof));
 
-        let snapi_invoke: InvokeTransactionV3 = value.try_into()?;
+        let snapi_invoke: InvokeTransactionV3 = value
+            .invoke
+            .ok_or(ProtobufConversionError::MissingField {
+                field_description: "InvokeV3WithProof::invoke",
+            })?
+            .try_into()?;
 
         // This conversion can fail only if the resource_bounds are not AllResources.
         Ok(Self { proof, ..snapi_invoke.try_into().map_err(|_| DEPRECATED_RESOURCE_BOUNDS_ERROR)? })
     }
 }
 
-impl From<RpcInvokeTransactionV3> for protobuf::InvokeV3 {
+impl From<RpcInvokeTransactionV3> for protobuf::InvokeV3WithProof {
     fn from(mut value: RpcInvokeTransactionV3) -> Self {
         // Extract proof first, since `starknet_api::transaction::InvokeTransactionV3` does not
         // carry a `proof` field.
         let proof = Arc::unwrap_or_clone(std::mem::take(&mut value.proof).0);
 
         let snapi_invoke: InvokeTransactionV3 = value.into();
 
-        Self { proof, ..snapi_invoke.into() }
+        Self { invoke: Some(snapi_invoke.into()), proof }
     }
 }
 

crates/apollo_protobuf/src/converters/transaction.rs

@@ -695,8 +695,6 @@ impl From<InvokeTransactionV3> for protobuf::InvokeV3 {
                 .iter()
                 .map(|proof_fact| (*proof_fact).into())
                 .collect(),
-            // TODO(AvivG): Understand in what flow this is used. Is info lost?
-            proof: vec![],
         }
     }
 }

crates/apollo_protobuf/src/proto/p2p/proto/consensus/consensus.proto

@@ -10,7 +10,7 @@ message ConsensusTransaction {
     oneof txn {
         DeclareV3WithClass declare_v3     = 1;
         DeployAccountV3 deploy_account_v3 = 2;
-        InvokeV3 invoke_v3                = 3;
+        InvokeV3WithProof invoke_v3       = 3;
         L1HandlerV0 l1_handler            = 4;
     }
     Hash transaction_hash = 5;

crates/apollo_protobuf/src/proto/p2p/proto/mempool/transaction.proto

@@ -13,7 +13,7 @@ message MempoolTransaction {
     oneof txn {
         DeclareV3WithClass declare_v3 = 1;
         DeployAccountV3 deploy_account_v3 = 2;
-        InvokeV3 invoke_v3 = 3;
+        InvokeV3WithProof invoke_v3 = 3;
     }
     Hash transaction_hash = 4;
 }

crates/apollo_protobuf/src/proto/p2p/proto/transaction.proto

@@ -49,6 +49,7 @@ message DeclareV3WithClass {
 
 
 // see https://external.integration.starknet.io/feeder_gateway/get_transaction?transactionHash=0x41906f1c314cca5f43170ea75d3b1904196a10101190d2b12a41cc61cfd17c
+// An invoke V3 transaction without client-side proof (only contains proof_facts).
 message InvokeV3 {
     Address sender = 1;
     AccountSignature signature = 2;
@@ -61,7 +62,13 @@ message InvokeV3 {
     VolitionDomain fee_data_availability_mode = 9;
     Felt252 nonce = 10;
     repeated Felt252 proof_facts = 11;
-    repeated uint32 proof = 12;
+}
+
+// An invoke V3 transaction with client-side proof.
+// Used in consensus and mempool contexts where proof is included.
+message InvokeV3WithProof {
+    InvokeV3 invoke = 1;
+    repeated uint32 proof = 2;
 }
 
 // see https://external.integration.starknet.io/feeder_gateway/get_transaction?transactionHash=0x29fd7881f14380842414cdfdd8d6c0b1f2174f8916edcfeb1ede1eb26ac3ef0

crates/apollo_protobuf/src/protobuf/protoc_output.rs

@@ -82,7 +82,17 @@ pub struct BlockProof {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Fin {}
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    PartialEq,
+    Eq,
+    Hash,
+    PartialOrd,
+    Ord,
+    ::prost::Enumeration
+)]
 #[repr(i32)]
 pub enum L1DataAvailabilityMode {
     Calldata = 0,
@@ -280,6 +290,7 @@ pub struct DeclareV3WithClass {
     pub class: ::core::option::Option<Cairo1Class>,
 }
 /// see <https://external.integration.starknet.io/feeder_gateway/get_transaction?transactionHash=0x41906f1c314cca5f43170ea75d3b1904196a10101190d2b12a41cc61cfd17c>
+/// An invoke V3 transaction without client-side proof (only contains proof_facts).
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct InvokeV3 {
@@ -305,7 +316,15 @@ pub struct InvokeV3 {
     pub nonce: ::core::option::Option<Felt252>,
     #[prost(message, repeated, tag = "11")]
     pub proof_facts: ::prost::alloc::vec::Vec<Felt252>,
-    #[prost(uint32, repeated, tag = "12")]
+}
+/// An invoke V3 transaction with client-side proof.
+/// Used in consensus and mempool contexts where proof is included.
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct InvokeV3WithProof {
+    #[prost(message, optional, tag = "1")]
+    pub invoke: ::core::option::Option<InvokeV3>,
+    #[prost(uint32, repeated, tag = "2")]
     pub proof: ::prost::alloc::vec::Vec<u32>,
 }
 /// see <https://external.integration.starknet.io/feeder_gateway/get_transaction?transactionHash=0x29fd7881f14380842414cdfdd8d6c0b1f2174f8916edcfeb1ede1eb26ac3ef0>
@@ -353,7 +372,7 @@ pub mod consensus_transaction {
         #[prost(message, tag = "2")]
         DeployAccountV3(super::DeployAccountV3),
         #[prost(message, tag = "3")]
-        InvokeV3(super::InvokeV3),
+        InvokeV3(super::InvokeV3WithProof),
         #[prost(message, tag = "4")]
         L1Handler(super::L1HandlerV0),
     }
@@ -950,7 +969,7 @@ pub mod mempool_transaction {
         #[prost(message, tag = "2")]
         DeployAccountV3(super::DeployAccountV3),
         #[prost(message, tag = "3")]
-        InvokeV3(super::InvokeV3),
+        InvokeV3(super::InvokeV3WithProof),
     }
 }
 #[allow(clippy::derive_partial_eq_without_eq)]