feat: clean up system for types rs

Author: rayyan224

crates/account-abstraction-core/core/src/entrypoints/mod.rs

@@ -1,2 +1,3 @@
 pub mod v06;
 pub mod v07;
+pub mod version;

crates/account-abstraction-core/core/src/entrypoints/v06.rs

@@ -1,4 +1,4 @@
-use alloy_primitives::U256;
+use alloy_primitives::{U256, ChainId};
 use alloy_rpc_types::erc4337;
 use alloy_sol_types::{SolValue, sol};
 sol! {
@@ -43,10 +43,10 @@ impl From<erc4337::UserOperation> for UserOperationPackedForHash {
     }
 }
 
-pub fn hash_user_operation_v06(
+pub fn hash_user_operation(
     user_operation: &erc4337::UserOperation,
     entry_point: alloy_primitives::Address,
-    chain_id: i32,
+    chain_id: ChainId,
 ) -> alloy_primitives::B256 {
     let packed = UserOperationPackedForHash::from(user_operation.clone());
     let encoded = UserOperationHashEncoded {
@@ -82,7 +82,7 @@ mod tests {
         };
 
         let hash =
-            hash_user_operation_v06(&userOpWithZeroedInitCode, entry_point_address_v0_6, chainId);
+            hash_user_operation(&userOpWithZeroedInitCode, entry_point_address_v0_6, chainId);
         assert_eq!(
             hash,
             b256!("dca97c3b49558ab360659f6ead939773be8bf26631e61bb17045bb70dc983b2d")
@@ -113,7 +113,7 @@ mod tests {
             signature: bytes!("da0929f527cded8d0a1eaf2e8861d7f7e2d8160b7b13942f99dd367df4473a"),
         };
 
-        let hash = hash_user_operation_v06(
+        let hash = hash_user_operation(
             &userOpWithNonZeroedInitCode,
             entry_point_address_v0_6,
             chainId,

crates/account-abstraction-core/core/src/entrypoints/v07.rs

@@ -1,4 +1,4 @@
-use alloy_primitives::{Address, FixedBytes, U256};
+use alloy_primitives::{Address, FixedBytes, U256, ChainId};
 use alloy_primitives::{Bytes, keccak256};
 use alloy_rpc_types::erc4337;
 use alloy_sol_types::{SolValue, sol};
@@ -68,7 +68,7 @@ impl From<erc4337::PackedUserOperation> for PackedUserOperation {
             let mut paymaster_and_data = paymaster.to_vec();
             paymaster_and_data.extend_from_slice(&pvgl);
             paymaster_and_data.extend_from_slice(&pogl);
-            paymaster_and_data.extend_from_slice(&uo.paymaster_data.clone().unwrap());
+            paymaster_and_data.extend_from_slice(&uo.paymaster_data.unwrap());
             Bytes::from(paymaster_and_data)
         } else {
             Bytes::new()
@@ -96,7 +96,7 @@ fn pack_u256_pair_to_bytes32(high: U256, low: U256) -> FixedBytes<32> {
 fn hash_packed_user_operation(
     puo: &PackedUserOperation,
     entry_point: Address,
-    chain_id: i32,
+    chain_id: u64,
 ) -> FixedBytes<32> {
     let hash_init_code = alloy_primitives::keccak256(&puo.initCode);
     let hash_call_data = alloy_primitives::keccak256(&puo.callData);
@@ -124,10 +124,10 @@ fn hash_packed_user_operation(
     keccak256(encoded.abi_encode())
 }
 
-pub fn hash_user_operation_v07(
+pub fn hash_user_operation(
     user_operation: &erc4337::PackedUserOperation,
     entry_point: Address,
-    chain_id: i32,
+    chain_id: ChainId,
 ) -> FixedBytes<32> {
     let packed = PackedUserOperation::from(user_operation.clone());
     hash_packed_user_operation(&packed, entry_point, chain_id)
@@ -138,7 +138,6 @@ mod test {
     use super::*;
     use alloy_primitives::{Bytes, U256};
     use alloy_primitives::{address, b256, bytes, uint};
-    use alloy_sol_types::{SolValue, sol};
 
     #[test]
     fn test_hash() {

crates/account-abstraction-core/core/src/entrypoints/version.rs

@@ -0,0 +1,32 @@
+use alloy_primitives::{Address, B256, U256, address, keccak256};
+
+
+#[derive(Debug, Clone)]
+pub enum EntryPointVersion {
+    V06,
+    V07,
+}
+
+impl EntryPointVersion {
+    pub const V06_ADDRESS: Address = address!("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789");
+    pub const V07_ADDRESS: Address = address!("0x0000000071727De22E5E9d8BAf0edAc6f37da032");
+}
+
+#[derive(Debug)]
+pub struct UnknownEntryPointAddress {
+    pub address: Address,
+}
+
+impl TryFrom<Address> for EntryPointVersion {
+    type Error = UnknownEntryPointAddress;
+
+    fn try_from(addr: Address) -> Result<Self, Self::Error> {
+        if addr == Self::V06_ADDRESS {
+            Ok(EntryPointVersion::V06)
+        } else if addr == Self::V07_ADDRESS {
+            Ok(EntryPointVersion::V07)
+        } else {
+            Err(UnknownEntryPointAddress { address: addr })
+        }
+    }
+}

crates/account-abstraction-core/core/src/types.rs

@@ -1,5 +1,5 @@
-use crate::entrypoints;
-use alloy_primitives::{Address, B256, U256, address, keccak256};
+use crate::entrypoints::{version::EntryPointVersion, v06, v07};
+use alloy_primitives::{Address, B256, U256, ChainId};
 use alloy_rpc_types::erc4337;
 pub use alloy_rpc_types::erc4337::SendUserOperationResponse;
 use anyhow::Result;
@@ -11,69 +11,29 @@ pub enum VersionedUserOperation {
     UserOperation(erc4337::UserOperation),
     PackedUserOperation(erc4337::PackedUserOperation),
 }
-
-#[derive(Debug, Clone)]
-pub enum EntryPointVersion {
-    V06,
-    V07,
-}
-
-impl EntryPointVersion {
-    pub const V06_ADDRESS: Address = address!("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789");
-    pub const V07_ADDRESS: Address = address!("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789");
-}
-
-#[derive(Debug)]
-pub struct UnknownEntryPointAddress {
-    pub address: Address,
-}
-
-impl TryFrom<Address> for EntryPointVersion {
-    type Error = UnknownEntryPointAddress;
-
-    fn try_from(addr: Address) -> Result<Self, Self::Error> {
-        if addr == Self::V06_ADDRESS {
-            Ok(EntryPointVersion::V06)
-        } else if addr == Self::V07_ADDRESS {
-            Ok(EntryPointVersion::V07)
-        } else {
-            Err(UnknownEntryPointAddress { address: addr })
-        }
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
-
 pub struct UserOperationRequest {
     pub user_operation: VersionedUserOperation,
     pub entry_point: Address,
-    pub chain_id: i32,
+    pub chain_id: ChainId,
 }
 
 impl UserOperationRequest {
     pub fn hash(&self) -> Result<B256> {
-        let entry_point_version = EntryPointVersion::try_from(self.entry_point);
-        if entry_point_version.is_err() {
-            return Err(anyhow::anyhow!(
-                "Unknown entry point version: {:#x}",
-                self.entry_point
-            ));
+        let entry_point_version = EntryPointVersion::try_from(self.entry_point)
+        .map_err(|_| anyhow::anyhow!("Unknown entry point version: {:#x}", self.entry_point))?;
+
+    match (&self.user_operation, entry_point_version) {
+        (VersionedUserOperation::UserOperation(op), EntryPointVersion::V06) => {
+            Ok(v06::hash_user_operation(op, self.entry_point, self.chain_id))
         }
-        match (&self.user_operation, entry_point_version) {
-            (VersionedUserOperation::UserOperation(user_operation), Ok(EntryPointVersion::V06)) => {
-                Ok(entrypoints::v06::hash_user_operation_v06(user_operation, self.entry_point, self.chain_id))
-            }
-            (
-                VersionedUserOperation::PackedUserOperation(user_operation),
-                Ok(EntryPointVersion::V07),
-            ) => Ok(entrypoints::v07::hash_user_operation_v07(user_operation, self.entry_point, self.chain_id)),
-            _ => {
-                return Err(anyhow::anyhow!(
-                    "Unknown entry point version: {:#x}",
-                    self.entry_point
-                ));
-            }
+        (VersionedUserOperation::PackedUserOperation(op), EntryPointVersion::V07) => {
+            Ok(v07::hash_user_operation(op, self.entry_point, self.chain_id))
         }
+        _ => Err(anyhow::anyhow!(
+            "Mismatched operation type and entry point version"
+        )),
+    }
     }
 }