feat: guardian recovery

Author: jackpooleyml

packages/erc4337-contracts

@@ -40,6 +40,9 @@ enum Commands {
 
         #[arg(long)]
         session_validator_address: String,
+
+        #[arg(long)]
+        guardian_executor_address: String,
     },
 }
 
@@ -53,6 +56,7 @@ async fn handle_command(command: Commands) -> eyre::Result<()> {
             webauthn_validator_address,
             eoa_validator_address,
             session_validator_address,
+            guardian_executor_address,
         } => {
             let config = CoreConfig::new(
                 rpc_url.parse()?,
@@ -68,6 +72,7 @@ async fn handle_command(command: Commands) -> eyre::Result<()> {
                     webauthn_validator_address,
                     eoa_validator_address,
                     session_validator_address.to_string(),
+                    guardian_executor_address.to_string(),
                 )?,
             );
 

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-cli/src/lib.rs

@@ -9,6 +9,7 @@ pub struct Contracts {
     pub webauthn_validator: Address,
     pub eoa_validator: Address,
     pub session_validator: Address,
+    pub guardian_executor: Address,
 }
 
 impl Contracts {
@@ -18,13 +19,15 @@ impl Contracts {
         webauthn_validator: Address,
         eoa_validator: Address,
         session_validator: Address,
+        guardian_executor: Address,
     ) -> Self {
         Self {
             entry_point,
             account_factory,
             webauthn_validator,
             eoa_validator,
             session_validator,
+            guardian_executor,
         }
     }
 
@@ -34,6 +37,7 @@ impl Contracts {
         webauthn_validator: String,
         eoa_validator: String,
         session_validator: String,
+        guardian_executor: String,
     ) -> Result<Self> {
         Ok(Self::new(
             entry_point.parse::<Address>().map_err(|e| {
@@ -51,6 +55,9 @@ impl Contracts {
             session_validator.parse::<Address>().map_err(|e| {
                 ZkSyncSsoError::InvalidConfiguration(e.to_string())
             })?,
+            guardian_executor.parse::<Address>().map_err(|e| {
+                ZkSyncSsoError::InvalidConfiguration(e.to_string())
+            })?,
         ))
     }
 }

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/config/contracts.rs

@@ -1,10 +1,8 @@
 pub mod account;
 pub mod bundler;
-pub mod client;
 pub mod entry_point;
 pub mod paymaster;
 pub mod send_call;
-pub mod signature;
 pub mod signer;
 pub mod transaction;
 pub mod user_operation;

packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337.rs

@@ -1,25 +1,4 @@
-pub mod add_module;
 pub mod calls;
-pub mod module_installed;
+pub mod module;
 
-use alloy::sol;
-
-sol!(
-    #[sol(rpc)]
-    #[derive(Debug, Default)]
-    #[allow(missing_docs)]
-    IERC7579Account,
-    "../../../../../../packages/erc4337-contracts/out/IERC7579Account.sol/IERC7579Account.json"
-);
-
-sol! {
-    #[sol(rpc)]
-    #[derive(Debug, Default)]
-    struct Execution {
-        address target;
-        uint256 value;
-        bytes data;
-    }
-
-    function execute(bytes32 mode, bytes memory execution);
-}
+mod contract;