Merge pull request #1 from thirdweb-dev/pb/utoipa

clean and merge local changes

Author: d4mr

Cargo.lock

@@ -18,6 +18,7 @@ sol! {
     #[sol(rpc)]
     contract AccountFactoryContract {
         function getAddress(address _adminSigner, bytes _data) view returns (address);
+        function accountImplementation() external view returns (address);
     }
 }
 
@@ -42,4 +43,17 @@ impl<C: Chain> AccountFactory for ChainedAccountFactory<'_, C> {
 
         Ok(predicted_address)
     }
+
+    async fn implementation_address(&self) -> Result<Address, EngineError> {
+        let account_factory_contract =
+            AccountFactoryContract::new(self.factory_address, self.chain.provider().clone());
+
+        let predicted_address = account_factory_contract
+            .accountImplementation()
+            .call()
+            .await
+            .map_err(|e| e.to_engine_error(self.chain.chain_id(), Some(self.factory_address)))?;
+
+        Ok(predicted_address)
+    }
 }

aa-core/src/account_factory/chained.rs

@@ -66,6 +66,11 @@ impl AccountFactory for DefaultAccountFactory {
         let address = SyncAccountFactory::predict_address_sync(self, signer, salt_data);
         std::future::ready(Ok(address))
     }
+
+    fn implementation_address(&self) -> impl Future<Output = Result<Address, EngineError>> {
+        // Use the sync implementation but return as a ready future
+        std::future::ready(Ok(self.implementation_address))
+    }
 }
 
 #[cfg(test)]

aa-core/src/account_factory/default.rs

@@ -42,6 +42,8 @@ pub trait AccountFactory {
         }
         .abi_encode()
     }
+
+    fn implementation_address(&self) -> impl Future<Output = Result<Address, EngineError>> + Send;
 }
 
 /// A factory that can use either implementation based on the provided addresses
@@ -69,6 +71,13 @@ impl<'a, C: Chain> AccountFactory for SmartAccountFactory<'a, C> {
             Self::Chained(factory) => factory.predict_address(signer, salt_data).await,
         }
     }
+
+    async fn implementation_address(&self) -> Result<Address, EngineError> {
+        match self {
+            Self::Default(factory) => factory.implementation_address().await,
+            Self::Chained(factory) => factory.implementation_address().await,
+        }
+    }
 }
 
 /// Get the appropriate account factory based on the factory address

aa-core/src/account_factory/mod.rs

@@ -1,3 +1,4 @@
 pub mod account_factory;
+pub mod signer;
 pub mod smart_account;
 pub mod userop;