wip

Author: kariy

crates/rpc/rpc-server/src/cartridge/mod.rs

@@ -184,35 +184,6 @@ where
     ) -> Result<AddInvokeTransactionResponse, CartridgeApiError> {
         debug!(%contract_address, ?outside_execution, "Adding execute outside transaction.");
         self.on_cpu_blocking_task(move |this| async move {
-            let pm_address = this.controller_deployer_address;
-            let pm_private_key = this.controller_deployer_private_key;
-
-            // // ====================== CONTROLLER DEPLOYMENT ======================
-            // let state = this.state()?;
-            // let is_controller_deployed =
-            // state.class_hash_of_contract(contract_address)?.is_some();
-
-            // if !is_controller_deployed {
-            //     debug!(controller = %contract_address, "Controller not yet deployed");
-
-            //     let deploy_tx = craft_deploy_cartridge_controller_tx(
-            //         &this.api_client,
-            //         contract_address,
-            //         pm_address,
-            //         pm_private_key,
-            //         this.backend.chain_spec.id(),
-            //         this.nonce(pm_address)?.unwrap_or_default(),
-            //     )
-            //     .await?;
-
-            //     if let Some(tx) = deploy_tx {
-            //         debug!(controller = %contract_address, tx = format!("{:#x}", tx.hash),
-            // "Inserting Controller deployment transaction");         this.pool.
-            // add_transaction(tx).await?;         this.block_producer.force_mine();
-            //     }
-            // }
-            // // ===================================================================
-
             let entry_point_selector = outside_execution.selector();
             let mut calldata = outside_execution.as_felts();
             calldata.extend(signature.clone());

crates/rpc/rpc-server/src/middleware/cartridge.rs

@@ -48,16 +48,6 @@ where
     vrf_service: Option<VrfService>,
 }
 
-impl<Pool, PoolTx, PP, PF> ControllerDeployment<Pool, PP, PF>
-where
-    Pool: TransactionPool<Transaction = PoolTx> + Send + Sync + 'static,
-    PoolTx: From<BroadcastedTxWithChainId>,
-    PP: PendingBlockProvider,
-    PF: ProviderFactory,
-    <PF as ProviderFactory>::Provider: ProviderRO,
-{
-}
-
 #[derive(Debug, Clone)]
 pub struct ControllerDeploymentService<S, Pool, PP, PF>
 where
@@ -190,7 +180,7 @@ where
 
         // None means the address is not of a Controller
         if let Some(tx) = deploy_tx {
-            if let Err(e) = self.inner.starknet.add_invoke_tx(tx).await {
+            if let Err(e) = self.starknet.add_invoke_tx(tx).await {
                 return Err(CartridgeApiError::ControllerDeployment {
                     reason: format!("failed to submit deployment tx: {e}"),
                 });

crates/rpc/rpc-server/src/starknet/read.rs

@@ -180,72 +180,6 @@ where
             .with_account_validation(should_validate)
             .with_nonce_check(false);
 
-        // Hook the estimate fee to pre-deploy the controller contract
-        // and enhance UX on the client side.
-        // Refer to the `handle_cartridge_controller_deploy` function in `cartridge.rs`
-        // for more details.
-        #[cfg(feature = "cartridge")]
-        let transactions = if let Some(paymaster) = &self.inner.config.paymaster {
-            use std::sync::Arc;
-
-            let paymaster_address = paymaster.paymaster_address;
-            let paymaster_private_key = paymaster.paymaster_private_key;
-
-            let state =
-                self.storage().provider().latest().map(Arc::new).map_err(StarknetApiError::from)?;
-
-            let mut ctrl_deploy_txs = Vec::new();
-
-            // Check if any of the transactions are sent from an address associated with a Cartridge
-            // Controller account. If yes, we craft a Controller deployment transaction
-            // for each of the unique sender and push it at the beginning of the
-            // transaction list so that all the requested transactions are executed against a state
-            // with the Controller accounts deployed.
-
-            let paymaster_nonce = match self.nonce_at(block_id, paymaster_address).await {
-                Ok(nonce) => nonce,
-                Err(err) => match err {
-                    StarknetApiError::ContractNotFound => {
-                        return Err(StarknetApiError::unexpected(
-                            "Cartridge paymaster account doesn't exist",
-                        )
-                        .into());
-                    }
-                    _ => return Err(ErrorObjectOwned::from(err)),
-                },
-            };
-
-            for tx in &transactions {
-                let api = ::cartridge::CartridgeApiClient::new(paymaster.cartridge_api_url.clone());
-
-                let deploy_controller_tx =
-                    cartridge::get_controller_deploy_tx_if_controller_address(
-                        paymaster_address,
-                        paymaster_private_key,
-                        paymaster_nonce,
-                        tx,
-                        self.inner.chain_spec.id(),
-                        state.clone(),
-                        &api,
-                    )
-                    .await
-                    .map_err(StarknetApiError::from)?;
-
-                if let Some(tx) = deploy_controller_tx {
-                    ctrl_deploy_txs.push(tx);
-                }
-            }
-
-            if !ctrl_deploy_txs.is_empty() {
-                ctrl_deploy_txs.extend(transactions);
-                ctrl_deploy_txs
-            } else {
-                transactions
-            }
-        } else {
-            transactions
-        };
-
         let permit =
             self.inner.estimate_fee_permit.acquire().await.map_err(|e| {
                 StarknetApiError::unexpected(format!("Failed to acquire permit: {e}"))