apollo_integration_tests: add txs with proof

Author: einat-starkware

crates/apollo_integration_tests/src/integration_test_manager.rs

@@ -623,13 +623,25 @@ impl IntegrationTestManager {
         n_invoke_txs: usize,
         n_l1_handler_txs: usize,
         wait_for_block: BlockNumber,
+    ) {
+        self.send_txs_and_verify_with_proofs(n_invoke_txs, 0, n_l1_handler_txs, wait_for_block)
+            .await;
+    }
+
+    #[instrument(skip(self))]
+    pub async fn send_txs_and_verify_with_proofs(
+        &mut self,
+        n_invoke_txs: usize,
+        n_invoke_txs_with_proof: usize,
+        n_l1_handler_txs: usize,
+        wait_for_block: BlockNumber,
     ) {
         info!(
-            "Sending {} invoke + {} l1handler txs and waiting for block {}.",
-            n_invoke_txs, n_l1_handler_txs, wait_for_block
+            "Sending {} invoke + {} invoke with proof + {} l1handler txs and waiting for block {}.",
+            n_invoke_txs, n_invoke_txs_with_proof, n_l1_handler_txs, wait_for_block
         );
         self.test_and_verify(
-            ConsensusTxs { n_invoke_txs, n_l1_handler_txs },
+            ConsensusTxs { n_invoke_txs, n_invoke_txs_with_proof, n_l1_handler_txs },
             DEFAULT_SENDER_ACCOUNT,
             wait_for_block,
         )

crates/apollo_integration_tests/src/sequencer_simulator_utils.rs

@@ -102,7 +102,8 @@ impl SequencerSimulator {
             self.send_txs(
                 tx_generator,
                 &ConsensusTxs {
-                    n_invoke_txs: N_TXS,
+                    n_invoke_txs: N_TXS / 2,
+                    n_invoke_txs_with_proof: N_TXS / 2,
                     // TODO(Arni): Add non-zero value.
                     n_l1_handler_txs: 0,
                 },

crates/apollo_integration_tests/src/utils.rs

@@ -75,7 +75,7 @@ use starknet_api::block::BlockNumber;
 use starknet_api::core::{ChainId, ContractAddress};
 use starknet_api::execution_resources::GasAmount;
 use starknet_api::rpc_transaction::RpcTransaction;
-use starknet_api::transaction::fields::ContractAddressSalt;
+use starknet_api::transaction::fields::{ContractAddressSalt, Proof, ProofFacts};
 use starknet_api::transaction::{L1HandlerTransaction, TransactionHash, TransactionHasher};
 use starknet_types_core::felt::Felt;
 use tokio::task::JoinHandle;
@@ -110,6 +110,7 @@ pub trait TestScenario {
 
 pub struct ConsensusTxs {
     pub n_invoke_txs: usize,
+    pub n_invoke_txs_with_proof: usize,
     pub n_l1_handler_txs: usize,
 }
 
@@ -120,14 +121,20 @@ impl TestScenario for ConsensusTxs {
         account_id: AccountId,
     ) -> (Vec<RpcTransaction>, Vec<L1HandlerTransaction>) {
         const SHOULD_REVERT: bool = false;
+        let mut invoke_txs = create_invoke_txs(tx_generator, account_id, self.n_invoke_txs);
+        invoke_txs.extend(create_invoke_txs_with_proof(
+            tx_generator,
+            account_id,
+            self.n_invoke_txs_with_proof,
+        ));
         (
-            create_invoke_txs(tx_generator, account_id, self.n_invoke_txs),
+            invoke_txs,
             create_l1_to_l2_messages_args(tx_generator, self.n_l1_handler_txs, SHOULD_REVERT),
         )
     }
 
     fn n_txs(&self) -> usize {
-        self.n_invoke_txs + self.n_l1_handler_txs
+        self.n_invoke_txs + self.n_invoke_txs_with_proof + self.n_l1_handler_txs
     }
 }
 
@@ -527,6 +534,23 @@ pub fn create_invoke_txs(
         .collect()
 }
 
+pub fn create_invoke_txs_with_proof(
+    tx_generator: &mut MultiAccountTransactionGenerator,
+    account_id: AccountId,
+    n_txs: usize,
+) -> Vec<RpcTransaction> {
+    (0..n_txs)
+        .map(|_| {
+            tx_generator.account_with_id_mut(account_id).generate_trivial_rpc_invoke_tx_with_proof(
+                1,
+                // TODO(Avi): use valid proof facts and proof.
+                ProofFacts::snos_proof_facts_for_testing(),
+                Proof::proof_for_testing(),
+            )
+        })
+        .collect()
+}
+
 pub fn create_l1_to_l2_messages_args(
     tx_generator: &mut MultiAccountTransactionGenerator,
     n_txs: usize,
@@ -622,6 +646,7 @@ pub fn create_gateway_config(
         validate_resource_bounds: validate_non_zero_resource_bounds,
         max_calldata_length: 19,
         max_signature_length: 2,
+        allow_client_side_proving: true,
         ..Default::default()
     };
     let stateful_tx_validator_config = StatefulTransactionValidatorConfig {

crates/mempool_test_utils/src/starknet_api_test_utils.rs

@@ -403,6 +403,24 @@ impl AccountTransactionGenerator {
         rpc_invoke_tx(self.build_invoke_tx_args().tip(Tip(tip)).calldata(calldata))
     }
 
+    /// Generates a trivial invoke transaction with proof facts and proof for client-side proving.
+    pub fn generate_trivial_rpc_invoke_tx_with_proof(
+        &mut self,
+        tip: u64,
+        proof_facts: ProofFacts,
+        proof: Proof,
+    ) -> RpcTransaction {
+        let test_contract = FeatureContract::TestContract(self.account.cairo_version());
+        let calldata = create_trivial_calldata(test_contract.get_instance_address(0));
+        rpc_invoke_tx(
+            self.build_invoke_tx_args()
+                .tip(Tip(tip))
+                .calldata(calldata)
+                .proof_facts(proof_facts)
+                .proof(proof),
+        )
+    }
+
     fn generate_nested_call_invoke_tx(
         &mut self,
         outer_test_contract: &FeatureContract,

crates/starknet_api/src/test_utils/invoke.rs

@@ -227,4 +227,14 @@ impl InvokeTxArgs {
         self.nonce = nonce;
         self
     }
+
+    pub fn proof_facts(mut self, proof_facts: ProofFacts) -> Self {
+        self.proof_facts = proof_facts;
+        self
+    }
+
+    pub fn proof(mut self, proof: Proof) -> Self {
+        self.proof = proof;
+        self
+    }
 }