circlefin · superandydong · Dec 20, 2024 · Dec 20, 2024
diff --git a/CircleModularWalletsCore/Resources/CircleModularWalletsCore.h b/CircleModularWalletsCore/Resources/CircleModularWalletsCore.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Resources/Info.plist b/CircleModularWalletsCore/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleName</key>

diff --git a/CircleModularWalletsCore/Sources/APIs/Bundler/BundlerRpcApi.swift b/CircleModularWalletsCore/Sources/APIs/Bundler/BundlerRpcApi.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/APIs/Bundler/BundlerRpcReqResp.swift b/CircleModularWalletsCore/Sources/APIs/Bundler/BundlerRpcReqResp.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/APIs/Modular/ModularRpcApi.swift b/CircleModularWalletsCore/Sources/APIs/Modular/ModularRpcApi.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/APIs/Modular/ModularRpcReqResp.swift b/CircleModularWalletsCore/Sources/APIs/Modular/ModularRpcReqResp.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -20,6 +20,7 @@ import Foundation
 
 public struct CreateWalletRequest: Encodable {
     let scaConfiguration: ScaConfiguration
+    let metadata: Metadata
 }
 
 public struct CreateWalletResponse: Decodable {
@@ -78,3 +79,7 @@ struct ScaConfiguration: Codable {
         }
     }
 }
+
+struct Metadata: Codable {
+    let name: String?
+}
diff --git a/CircleModularWalletsCore/Sources/APIs/Paymaster/PaymasterRpcApi.swift b/CircleModularWalletsCore/Sources/APIs/Paymaster/PaymasterRpcApi.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/APIs/Paymaster/PaymasterRpcReqResp.swift b/CircleModularWalletsCore/Sources/APIs/Paymaster/PaymasterRpcReqResp.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/APIs/Public/PublicRpcApi.swift b/CircleModularWalletsCore/Sources/APIs/Public/PublicRpcApi.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -57,7 +57,7 @@ protocol PublicRpcApi {
     /// - Returns: EstimateFeesPerGasResult
     func estimateFeesPerGas(transport: Transport, feeValuesType: FeeValuesType) async throws -> EstimateFeesPerGasResult
 
-    /** Returns the current price of gas (in wei) */
+    /// Returns the current price of gas (in wei)
     func getGasPrice(transport: Transport) async throws -> BigInt
 }
 

diff --git a/CircleModularWalletsCore/Sources/APIs/Public/PublicRpcReqResp.swift b/CircleModularWalletsCore/Sources/APIs/Public/PublicRpcReqResp.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/APIs/Rp/RpRpcApi.swift b/CircleModularWalletsCore/Sources/APIs/Rp/RpRpcApi.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/APIs/Rp/RpRpcReqResp.swift b/CircleModularWalletsCore/Sources/APIs/Rp/RpRpcReqResp.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Accounts/Account.swift b/CircleModularWalletsCore/Sources/Accounts/Account.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/...urces/Accounts/CirclePasskeyAccount.swift → ...Sources/Accounts/CircleSmartAccount.swift b/...urces/Accounts/CirclePasskeyAccount.swift → ...Sources/Accounts/CircleSmartAccount.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -21,18 +21,21 @@ import BigInt
 import Web3Core
 import web3swift
 
-public func toCircleSmartAccount<A: Account>(client: Client,
-                                   owner: A,
-                                   version: String = "") async throws -> CircleSmartAccount<A> where A.T == SignResult {
-    try await .init(client: client, owner: owner)
+public func toCircleSmartAccount<A: Account>(
+    client: Client,
+    owner: A,
+    version: String = "circle_6900_v1"
+) async throws -> CircleSmartAccount<A> where A.T == SignResult {
+    try await .init(client: client, owner: owner, version: version)
 }
 
 public class CircleSmartAccount<A: Account>: SmartAccount where A.T == SignResult {
     public let client: Client
     public let entryPoint: EntryPoint
     let owner: A
     let wallet: Wallet
-    var deployed: Bool = false
+    private var deployed: Bool = false
+    private let nonceManager = NonceManager(source: NonceManagerSourceImpl())
 
     init(client: Client, owner: A, wallet: Wallet, entryPoint: EntryPoint = .v07) {
         self.client = client
@@ -41,32 +44,21 @@ public class CircleSmartAccount<A: Account>: SmartAccount where A.T == SignResul
         self.entryPoint = entryPoint
     }
 
-    convenience init(client: Client, owner: A) async throws {
+    convenience init(client: Client, owner: A, version: String) async throws {
         guard let buidlTransport = client.transport as? ModularTransport else {
             throw BaseError(shortMessage: "The property client.transport is not the ModularTransport")
         }
         guard let webAuthnAccount = owner as? WebAuthnAccount else {
             throw BaseError(shortMessage: "The property owner is not the WebAuthnAccount")
         }
 
-        let (publicKeyX, publicKeyY) = Self.extractXYFromCOSE(webAuthnAccount.credential.publicKey)
-        let request = CreateWalletRequest(
-            scaConfiguration: ScaConfiguration(
-                initialOwnershipConfiguration: .init(
-                    ownershipContractAddress: nil,
-                    weightedMultiSig: .init(
-                        owners: nil,
-                        webauthnOwners: [.init(publicKeyX: publicKeyX.description,
-                                               publicKeyY: publicKeyY.description,
-                                               weight: PUBLIC_KEY_OWN_WEIGHT)],
-                        thresholdWeight: THRESHOLD_WEIGHT)
-                ),
-                scaCore: "circle_6900_v1",
-                initCode: nil)
+        let wallet = try await Self.createWallet(
+            transport: buidlTransport,
+            hexPublicKey: webAuthnAccount.credential.publicKey,
+            version: version,
+            name: webAuthnAccount.credential.userName
         )
 
-        let wallet = try await buidlTransport.circleGetAddress(transport: buidlTransport, req: request)
-
         self.init(client: client, owner: owner, wallet: wallet)
     }
 
@@ -118,9 +110,20 @@ public class CircleSmartAccount<A: Account>: SmartAccount where A.T == SignResul
     }
 
     public func getNonce(key: BigInt?) async throws -> BigInt {
-        return try await Utils.getNonce(transport: client.transport,
-                                        address: getAddress(),
-                                        entryPoint: entryPoint)
+        let _key = key ?? nonceManager.consume(
+            params: FunctionParameters(address: getAddress(),
+                                       chainId: client.chain.chainId)
+        )
+
+        guard _key >= BigInt(0) else {
+            throw BaseError(shortMessage: "Cannot convert negative BigInt(\(_key) to BigUInt")
+        }
+
+        let nonce = try await Utils.getNonce(transport: client.transport,
+                                             address: getAddress(),
+                                             entryPoint: entryPoint,
+                                             key: BigUInt(_key))
+        return nonce
     }
 
     public func getStubSignature<T: UserOperation>(userOp: T) -> String {
@@ -248,6 +251,34 @@ extension CircleSmartAccount: PublicRpcApi {
 
     // MARK: Internal Usage
 
+    static func createWallet(
+        transport: ModularTransport,
+        hexPublicKey: String,
+        version: String,
+        name: String? = nil
+    ) async throws -> Wallet {
+        let (publicKeyX, publicKeyY) = Self.extractXYFromCOSE(hexPublicKey)
+        let request = CreateWalletRequest(
+            scaConfiguration: ScaConfiguration(
+                initialOwnershipConfiguration: .init(
+                    ownershipContractAddress: nil,
+                    weightedMultiSig: .init(
+                        owners: nil,
+                        webauthnOwners: [.init(publicKeyX: publicKeyX.description,
+                                               publicKeyY: publicKeyY.description,
+                                               weight: PUBLIC_KEY_OWN_WEIGHT)],
+                        thresholdWeight: THRESHOLD_WEIGHT)
+                ),
+                scaCore: version,
+                initCode: nil),
+            metadata: .init(name: name)
+        )
+
+        let wallet = try await transport.circleGetAddress(transport: transport, req: request)
+
+        return wallet
+    }
+
     private func isDeployed() async -> Bool {
         if deployed { return true }
         do {

diff --git a/CircleModularWalletsCore/Sources/Accounts/SmartAccount.swift b/CircleModularWalletsCore/Sources/Accounts/SmartAccount.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Accounts/WebAuthnAccount.swift b/CircleModularWalletsCore/Sources/Accounts/WebAuthnAccount.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Accounts/WebAuthnCredential.swift b/CircleModularWalletsCore/Sources/Accounts/WebAuthnCredential.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -67,6 +67,9 @@ public struct WebAuthnCredential: RpRpcApi {
     /// Relying party identifier
     public let rpId: String
 
+    /// User name
+    public var userName: String? = nil
+
     static func register(transport: Transport,
                          userName: String) async throws -> WebAuthnCredential {
         do {
@@ -101,7 +104,8 @@ public struct WebAuthnCredential: RpRpcApi {
             return WebAuthnCredential(id: credential.id,
                                       publicKey: serializedPublicKey,
                                       raw: credential,
-                                      rpId: option.relyingParty.id)
+                                      rpId: option.relyingParty.id,
+                                      userName: userName)
         } catch let error as BaseError {
             throw error
         } catch {

diff --git a/CircleModularWalletsCore/Sources/Chains/Chain.swift b/CircleModularWalletsCore/Sources/Chains/Chain.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Chains/Mainnet.swift b/CircleModularWalletsCore/Sources/Chains/Mainnet.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+//  Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 //  SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Chains/Sepolia.swift b/CircleModularWalletsCore/Sources/Chains/Sepolia.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+//  Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 //  SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Clients/BundlerClient.swift b/CircleModularWalletsCore/Sources/Clients/BundlerClient.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Clients/Client.swift b/CircleModularWalletsCore/Sources/Clients/Client.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Clients/PaymasterClient.swift b/CircleModularWalletsCore/Sources/Clients/PaymasterClient.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Errors/BaseError.swift b/CircleModularWalletsCore/Sources/Errors/BaseError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Errors/BundlerErrors.swift b/CircleModularWalletsCore/Sources/Errors/BundlerErrors.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Errors/Internal/CommonError.swift b/CircleModularWalletsCore/Sources/Errors/Internal/CommonError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Errors/Internal/HttpError.swift b/CircleModularWalletsCore/Sources/Errors/Internal/HttpError.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Errors/RequestErrors.swift b/CircleModularWalletsCore/Sources/Errors/RequestErrors.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Errors/RpcErrors.swift b/CircleModularWalletsCore/Sources/Errors/RpcErrors.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Errors/UserOperationErrors.swift b/CircleModularWalletsCore/Sources/Errors/UserOperationErrors.swift
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+// Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

diff --git a/CircleModularWalletsCore/Sources/Helpers/ABIConstants.swift b/CircleModularWalletsCore/Sources/Helpers/ABIConstants.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2024, Circle Internet Group, Inc. All rights reserved.
+//  Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
 //
 //  SPDX-License-Identifier: Apache-2.0
 //