type update (keep-starknet-strange#26)

* type update * update SingleOwnerAccount to Arc * update types with Arc * fix clippy error
karnotxyz · Sep 18, 2024 · 91057c0 · 91057c0
1 parent f6c35c3
commit 91057c0
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 39 deletions.
diff --git a/crates/l3/appchain-core-contract-client/src/clients/mod.rs b/crates/l3/appchain-core-contract-client/src/clients/mod.rs
@@ -5,36 +5,36 @@ use starknet_core::types::Felt;
 
 use appchain_utils::LocalWalletSignerMiddleware;
 
-pub struct StarknetCoreContractClient<'a> {
-    operator: Operator<'a>,
-    messaging: Messaging<'a>,
-    core_contract: CoreContract<'a>,
+pub struct StarknetCoreContractClient {
+    operator: Operator,
+    messaging: Messaging,
+    core_contract: CoreContract,
 }
 
-impl<'a> StarknetCoreContractClient<'a> {
-    pub fn new(address: Felt, signer: &'a LocalWalletSignerMiddleware) -> Self {
+impl StarknetCoreContractClient {
+    pub fn new(address: Felt, signer: LocalWalletSignerMiddleware) -> Self {
         Self {
-            operator: Operator::new(address, signer),
-            messaging: Messaging::new(address, signer),
+            operator: Operator::new(address, signer.clone()),
+            messaging: Messaging::new(address, signer.clone()),
             core_contract: CoreContract::new(address, signer),
         }
     }
 }
 
-impl<'a> AsRef<Operator<'a>> for StarknetCoreContractClient<'a> {
-    fn as_ref(&self) -> &Operator<'a> {
+impl AsRef<Operator> for StarknetCoreContractClient {
+    fn as_ref(&self) -> &Operator {
         &self.operator
     }
 }
 
-impl<'a> AsRef<Messaging<'a>> for StarknetCoreContractClient<'a> {
-    fn as_ref(&self) -> &Messaging<'a> {
+impl AsRef<Messaging> for StarknetCoreContractClient {
+    fn as_ref(&self) -> &Messaging {
         &self.messaging
     }
 }
 
-impl<'a> AsRef<CoreContract<'a>> for StarknetCoreContractClient<'a> {
-    fn as_ref(&self) -> &CoreContract<'a> {
+impl AsRef<CoreContract> for StarknetCoreContractClient {
+    fn as_ref(&self) -> &CoreContract {
         &self.core_contract
     }
 }
diff --git a/crates/l3/appchain-core-contract-client/src/interfaces/core_contract.rs b/crates/l3/appchain-core-contract-client/src/interfaces/core_contract.rs
@@ -3,13 +3,13 @@ use appchain_utils::LocalWalletSignerMiddleware;
 use color_eyre::Result;
 use starknet_core::types::{Felt, InvokeTransactionResult};
 
-pub struct CoreContract<'a> {
-    signer: &'a LocalWalletSignerMiddleware,
+pub struct CoreContract {
+    signer: LocalWalletSignerMiddleware,
     address: Felt,
 }
 
-impl<'a> CoreContract<'a> {
-    pub fn new(address: Felt, signer: &'a LocalWalletSignerMiddleware) -> Self {
+impl CoreContract {
+    pub fn new(address: Felt, signer: LocalWalletSignerMiddleware) -> Self {
         Self { signer, address }
     }
 
@@ -24,6 +24,6 @@ impl<'a> CoreContract<'a> {
         calldata.push(onchain_data_hash);
         calldata.push(onchain_data_size);
 
-        invoke_contract(self.signer, self.address, "update_state", calldata).await
+        invoke_contract(&self.signer, self.address, "update_state", calldata).await
     }
 }
diff --git a/crates/l3/appchain-core-contract-client/src/interfaces/messaging.rs b/crates/l3/appchain-core-contract-client/src/interfaces/messaging.rs
@@ -3,13 +3,13 @@ use appchain_utils::LocalWalletSignerMiddleware;
 use color_eyre::Result;
 use starknet_core::types::{Felt, InvokeTransactionResult};
 
-pub struct Messaging<'a> {
-    signer: &'a LocalWalletSignerMiddleware,
+pub struct Messaging {
+    signer: LocalWalletSignerMiddleware,
     address: Felt,
 }
 
-impl<'a> Messaging<'a> {
-    pub fn new(address: Felt, signer: &'a LocalWalletSignerMiddleware) -> Self {
+impl Messaging {
+    pub fn new(address: Felt, signer: LocalWalletSignerMiddleware) -> Self {
         Self { signer, address }
     }
 
@@ -25,7 +25,7 @@ impl<'a> Messaging<'a> {
         calldata.extend(payload);
 
         invoke_contract(
-            self.signer,
+            &self.signer,
             self.address,
             "send_message_to_appchain",
             calldata,
@@ -43,7 +43,7 @@ impl<'a> Messaging<'a> {
         calldata.extend(payload);
 
         invoke_contract(
-            self.signer,
+            &self.signer,
             self.address,
             "consume_message_from_appchain",
             calldata,
@@ -65,7 +65,7 @@ impl<'a> Messaging<'a> {
         calldata.extend(payload);
 
         invoke_contract(
-            self.signer,
+            &self.signer,
             self.address,
             "start_message_cancellation",
             calldata,
@@ -86,6 +86,6 @@ impl<'a> Messaging<'a> {
         calldata.push(nonce);
         calldata.extend(payload);
 
-        invoke_contract(self.signer, self.address, "cancel_message", calldata).await
+        invoke_contract(&self.signer, self.address, "cancel_message", calldata).await
     }
 }
diff --git a/crates/l3/appchain-core-contract-client/src/interfaces/operator.rs b/crates/l3/appchain-core-contract-client/src/interfaces/operator.rs
@@ -5,13 +5,13 @@ use starknet_accounts::ConnectedAccount;
 use starknet_core::types::{Felt, InvokeTransactionResult};
 use starknet_providers::jsonrpc::{HttpTransport, JsonRpcClient};
 
-pub struct Operator<'a> {
-    signer: &'a LocalWalletSignerMiddleware,
+pub struct Operator {
+    signer: LocalWalletSignerMiddleware,
     address: Felt,
 }
 
-impl<'a> Operator<'a> {
-    pub fn new(address: Felt, signer: &'a LocalWalletSignerMiddleware) -> Self {
+impl Operator {
+    pub fn new(address: Felt, signer: LocalWalletSignerMiddleware) -> Self {
         Self { signer, address }
     }
 
@@ -21,7 +21,7 @@ impl<'a> Operator<'a> {
 
     pub async fn register_operator(&self, new_operator: Felt) -> Result<InvokeTransactionResult> {
         invoke_contract(
-            self.signer,
+            &self.signer,
             self.address,
             "register_operator",
             vec![new_operator],
@@ -34,7 +34,7 @@ impl<'a> Operator<'a> {
         removed_operator: Felt,
     ) -> Result<InvokeTransactionResult> {
         invoke_contract(
-            self.signer,
+            &self.signer,
             self.address,
             "unregister_operator",
             vec![removed_operator],
@@ -58,7 +58,7 @@ impl<'a> Operator<'a> {
         config_hash: Felt,
     ) -> Result<InvokeTransactionResult> {
         invoke_contract(
-            self.signer,
+            &self.signer,
             self.address,
             "set_program_info",
             vec![program_hash, config_hash],
@@ -81,7 +81,7 @@ impl<'a> Operator<'a> {
         facts_registry: Felt,
     ) -> Result<InvokeTransactionResult> {
         invoke_contract(
-            self.signer,
+            &self.signer,
             self.address,
             "set_facts_registry",
             vec![facts_registry],

diff --git a/crates/l3/appchain-core-contract-client/src/lib.rs b/crates/l3/appchain-core-contract-client/src/lib.rs
@@ -10,12 +10,12 @@ use std::path::Path;
 // TODO: check for proxy contract implementation
 
 pub async fn deploy_starknet_core_contract<'a>(
-    signer: &'a LocalWalletSignerMiddleware,
+    signer: LocalWalletSignerMiddleware,
     path_to_sierra: &Path,
     path_to_casm: &Path,
-) -> Result<StarknetCoreContractClient<'a>> {
+) -> Result<StarknetCoreContractClient> {
     let contract_address =
-        deploy_contract(signer, path_to_sierra, path_to_casm, NO_CONSTRUCTOR_ARG).await?;
+        deploy_contract(&signer, path_to_sierra, path_to_casm, NO_CONSTRUCTOR_ARG).await?;
 
     Ok(StarknetCoreContractClient::new(contract_address, signer))
 }
diff --git a/crates/l3/appchain-utils/src/lib.rs b/crates/l3/appchain-utils/src/lib.rs
@@ -1,5 +1,7 @@
 pub mod errors;
 
+use std::sync::Arc;
+
 use color_eyre::{eyre::eyre, Result};
 use starknet_accounts::{Account, Call, ExecutionV1, SingleOwnerAccount};
 use starknet_contract::ContractFactory;
@@ -13,7 +15,7 @@ use starknet_signers::LocalWallet;
 use std::path::Path;
 
 pub type LocalWalletSignerMiddleware =
-    SingleOwnerAccount<JsonRpcClient<HttpTransport>, LocalWallet>;
+    Arc<SingleOwnerAccount<Arc<JsonRpcClient<HttpTransport>>, LocalWallet>>;
 
 type RpcAccount<'a> = SingleOwnerAccount<&'a JsonRpcClient<HttpTransport>, LocalWallet>;
 pub type TransactionExecution<'a> = ExecutionV1<'a, RpcAccount<'a>>;