fix compilation issues

Author: remybar

crates/cartridge/src/paymaster/layer.rs

@@ -121,7 +121,6 @@ where
         let params = request.params();
 
         if params.is_object() {
-            println!("params is object: {:?}", params);
             match params.parse() {
                 Ok(p) => Some(p),
                 Err(..) => {
@@ -130,7 +129,6 @@ where
                 }
             }
         } else {
-            println!("params is sequence: {:?}", params);
             let mut seq = params.sequence();
 
             let address_result: Result<ContractAddress, _> = seq.next();
@@ -153,6 +151,24 @@ where
         }
     }
 
+    fn build_new_outside_execution_request<'a>(
+        request: &Request<'a>,
+        address: ContractAddress,
+        outside_execution: OutsideExecution,
+        signature: Vec<Felt>,
+    ) -> Request<'a> {
+        let mut new_request = request.clone();
+
+        let mut new_params = jsonrpsee::core::params::ArrayParams::new();
+        new_params.insert(address).unwrap();
+        new_params.insert(outside_execution).unwrap();
+        new_params.insert(signature).unwrap();
+
+        let new_params = new_params.to_rpc_params().unwrap();
+        new_request.params = new_params.map(Cow::Owned);
+        new_request
+    }
+
     /// Build a new estimate fee request with the updated transactions.
     fn build_new_estimate_fee_request<'a>(
         request: &Request<'a>,
@@ -233,7 +249,7 @@ where
                             trace!(
                                 target: "cartridge",
                                 nb_of_extra_txs = nb_of_extra_txs,
-                                nb_of_estimate_fees = estimate_fees.len(),
+                                    nb_of_estimate_fees = estimate_fees.len(),
                                 "Removing extra transactions from estimate fees response",
                             );
 
@@ -281,17 +297,12 @@ where
                 };
 
                 if let Some((outside_execution, signature)) = updated_tx {
-                    let mut new_request = request.clone();
-                    let new_params = {
-                        let mut params = jsonrpsee::core::params::ArrayParams::new();
-                        params.insert(controller_address).unwrap();
-                        params.insert(outside_execution).unwrap();
-                        params.insert(signature).unwrap();
-                        params
-                    };
-
-                    let params = new_params.to_rpc_params().unwrap();
-                    new_request.params = params.map(Cow::Owned);
+                    let new_request = Self::build_new_outside_execution_request(
+                        &request,
+                        controller_address,
+                        outside_execution,
+                        signature,
+                    );
 
                     trace!(target: "cartridge", "Call outside_execution endpoint with the updated transaction");
                     return service.call(new_request).await;

crates/cartridge/src/paymaster/mod.rs

@@ -61,14 +61,15 @@ use starknet::signers::{LocalWallet, Signer, SigningKey};
 use starknet_crypto::pedersen_hash;
 use tracing::{debug, trace};
 
+use crate::utils::get_execute_from_outside_call;
+
 pub mod layer;
 
 #[cfg(test)]
 mod tests;
 
 use crate::rpc::types::{
-    Call as OutsideExecutionCall, NonceChannel, OutsideExecution, OutsideExecutionV2,
-    OutsideExecutionV3,
+    Call as OutsideExecutionCall, NonceChannel, OutsideExecution, OutsideExecutionV3,
 };
 use crate::utils::encode_calls;
 use crate::vrf::{VrfContext, CARTRIDGE_VRF_CLASS_HASH, CARTRIDGE_VRF_SALT};

crates/cartridge/src/rpc/mod.rs

@@ -2,7 +2,6 @@ use std::future::Future;
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use cainome::cairo_serde::CairoSerde;
 use jsonrpsee::core::{async_trait, RpcResult};
 use katana_core::backend::storage::ProviderRO;
 use katana_core::backend::Backend;
@@ -19,7 +18,6 @@ use katana_provider::ProviderFactory;
 use katana_rpc_api::error::starknet::StarknetApiError;
 use katana_rpc_types::broadcasted::AddInvokeTransactionResponse;
 use katana_tasks::{Result as TaskResult, TaskSpawner};
-use starknet::macros::selector;
 use starknet::signers::{LocalWallet, Signer, SigningKey};
 use tracing::debug;
 use types::OutsideExecution;
@@ -29,8 +27,7 @@ pub mod types;
 
 pub use api::*;
 
-use crate::rpc::types::Call;
-use crate::utils::encode_calls;
+use crate::utils::{encode_calls, get_execute_from_outside_call};
 
 #[allow(missing_debug_implementations)]
 pub struct CartridgeApi<EF: ExecutorFactory, PF: ProviderFactory> {

crates/cartridge/src/utils.rs

@@ -1,6 +1,8 @@
-use katana_primitives::Felt;
+use cainome::cairo_serde::CairoSerde;
+use katana_primitives::{ContractAddress, Felt};
+use starknet::macros::selector;
 
-use crate::rpc::types::Call;
+use crate::rpc::types::{Call, OutsideExecution};
 
 /// Encodes the given calls into a vector of Felt values (New encoding, cairo 1),
 /// since controller accounts are Cairo 1 contracts.