Merge pull request #2 from thirdweb-dev/joaquim/iaw

Support IAW auth tokens for EOA signing

Author: joaquim-verges

Cargo.lock

@@ -1,3 +1,3 @@
 [workspace]
-members = ["aa-core", "core", "executors", "server", "thirdweb-core", "twmq"]
+members = ["aa-types", "aa-core", "core", "executors", "server", "thirdweb-core", "twmq"]
 resolver = "2"

Cargo.toml

@@ -6,6 +6,7 @@ edition = "2024"
 [dependencies]
 alloy = { version = "1.0.8", features = ["serde"] }
 tokio = "1.44.2"
+engine-aa-types = { path = "../aa-types" }
 engine-core = { path = "../core" }
 vault-types = { version = "0.1.0", git = "ssh://[email protected]/thirdweb-dev/vault.git", branch = "main" }
 vault-sdk = { version = "0.1.0", git = "ssh://[email protected]/thirdweb-dev/vault.git", branch = "main" }

aa-core/Cargo.toml

@@ -6,12 +6,13 @@ use alloy::{
     providers::Provider,
     rpc::types::{PackedUserOperation, UserOperation},
 };
+use engine_aa_types::VersionedUserOp;
 use engine_core::{
     chain::Chain,
     credentials::SigningCredential,
     error::{AlloyRpcErrorToEngineError, EngineError},
     execution_options::aa::{EntrypointAndFactoryDetails, EntrypointVersion},
-    userop::{UserOpSigner, UserOpSignerParams, UserOpVersion},
+    userop::{UserOpSigner, UserOpSignerParams},
 };
 
 pub struct UserOpBuilderConfig<'a, C: Chain> {
@@ -40,7 +41,7 @@ impl<'a, C: Chain> UserOpBuilder<'a, C> {
         Self { config }
     }
 
-    pub async fn build(self) -> Result<UserOpVersion, EngineError> {
+    pub async fn build(self) -> Result<VersionedUserOp, EngineError> {
         let mut userop = match self.config.entrypoint_and_factory.version {
             EntrypointVersion::V0_6 => UserOpBuilderV0_6::new(&self.config).build().await?,
             EntrypointVersion::V0_7 => UserOpBuilderV0_7::new(&self.config).build().await?,
@@ -61,10 +62,10 @@ impl<'a, C: Chain> UserOpBuilder<'a, C> {
             .await?;
 
         match &mut userop {
-            UserOpVersion::V0_6(userop) => {
+            VersionedUserOp::V0_6(userop) => {
                 userop.signature = signature;
             }
-            UserOpVersion::V0_7(userop) => {
+            VersionedUserOp::V0_7(userop) => {
                 userop.signature = signature;
             }
         }
@@ -114,7 +115,7 @@ impl<'a, C: Chain> UserOpBuilderV0_6<'a, C> {
         }
     }
 
-    async fn build(mut self) -> Result<UserOpVersion, EngineError> {
+    async fn build(mut self) -> Result<VersionedUserOp, EngineError> {
         let prices = self
             .chain
             .provider()
@@ -153,7 +154,7 @@ impl<'a, C: Chain> UserOpBuilderV0_6<'a, C> {
                     .chain
                     .bundler_client()
                     .estimate_user_op_gas(
-                        &UserOpVersion::V0_6(self.userop.clone()),
+                        &VersionedUserOp::V0_6(self.userop.clone()),
                         self.entrypoint,
                         None,
                     )
@@ -172,7 +173,7 @@ impl<'a, C: Chain> UserOpBuilderV0_6<'a, C> {
         self.userop.verification_gas_limit = verification_gas_limit;
         self.userop.pre_verification_gas = pre_verification_gas;
 
-        Ok(UserOpVersion::V0_6(self.userop))
+        Ok(VersionedUserOp::V0_6(self.userop))
     }
 }
 
@@ -219,7 +220,7 @@ impl<'a, C: Chain> UserOpBuilderV0_7<'a, C> {
         }
     }
 
-    async fn build(mut self) -> Result<UserOpVersion, EngineError> {
+    async fn build(mut self) -> Result<VersionedUserOp, EngineError> {
         // Get gas prices, same as v0.6
         let prices = self
             .chain
@@ -272,7 +273,7 @@ impl<'a, C: Chain> UserOpBuilderV0_7<'a, C> {
                     .chain
                     .bundler_client()
                     .estimate_user_op_gas(
-                        &UserOpVersion::V0_7(self.userop.clone()),
+                        &VersionedUserOp::V0_7(self.userop.clone()),
                         self.entrypoint,
                         None,
                     )
@@ -300,6 +301,6 @@ impl<'a, C: Chain> UserOpBuilderV0_7<'a, C> {
         self.userop.paymaster_verification_gas_limit = Some(paymaster_verification_gas_limit);
         self.userop.paymaster_post_op_gas_limit = Some(paymaster_post_op_gas_limit);
 
-        Ok(UserOpVersion::V0_7(self.userop))
+        Ok(VersionedUserOp::V0_7(self.userop))
     }
 }

aa-core/src/userop/builder.rs

@@ -0,0 +1,12 @@
+[package]
+name = "engine-aa-types"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+alloy = { version = "1.0.8", features = ["serde"] }
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.140"
+thiserror = "2.0.12"
+schemars = "0.8.22"
+utoipa = "5.4.0"

aa-types/Cargo.toml

@@ -0,0 +1,3 @@
+pub mod userop;
+
+pub use userop::*;