Merge pull request #78 from reown-com/enable-6492-verification

llbartekll · web-flow · commit d55f2bffe3a4 · 2025-01-10T15:15:50.000+08:00
Enable 6492 verification
diff --git a/Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Example/Shared/Signer/Signer.swift b/Example/Shared/Signer/Signer.swift
@@ -160,7 +160,7 @@ final class Signer {
                 var value: String
                 var data: String
             }
-            let params = try request.params.get([Tx].self).map { FfiTransaction(to: $0.to, value: $0.value, data: $0.data)}
+            let params = try request.params.get([Tx].self).map { Execution(to: $0.to, value: $0.value, data: $0.data)}
             let prepareSendTransactions = try await WalletKit.instance.prepareSendTransactions(params, ownerAccount: ownerAccount)
 
             let signer = ETHSigner(importAccount: importAccount)
@@ -179,7 +179,7 @@ final class Signer {
             }
 
             let transactions = calls.map {
-                FfiTransaction(
+                Execution(
                     to: $0.to!,
                     value: $0.value ?? "0",
                     data: $0.data ?? ""
diff --git a/Example/WalletApp/BusinessLayer/ChainAbstractionService.swift b/Example/WalletApp/BusinessLayer/ChainAbstractionService.swift
@@ -27,9 +27,9 @@ class ChainAbstractionService {
     }
 
     let privateKey: EthereumPrivateKey
-    private let routeResponseAvailable: RouteResponseAvailable
+    private let routeResponseAvailable: PrepareResponseAvailable
 
-    init(privateKey: EthereumPrivateKey, routeResponseAvailable: RouteResponseAvailable) {
+    init(privateKey: EthereumPrivateKey, routeResponseAvailable: PrepareResponseAvailable) {
         self.privateKey = privateKey
         self.routeResponseAvailable = routeResponseAvailable
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/CATransactionModal/CATransactionModule.swift b/Example/WalletApp/PresentationLayer/Wallet/CATransactionModal/CATransactionModule.swift
@@ -8,7 +8,7 @@ final class CATransactionModule {
         app: Application,
         sessionRequest: Request,
         importAccount: ImportAccount,
-        routeResponseAvailable: RouteResponseAvailable
+        routeResponseAvailable: PrepareResponseAvailable
     ) -> UIViewController {
         let router = CATransactionRouter(app: app)
         let presenter = CATransactionPresenter(sessionRequest: sessionRequest, importAccount: importAccount, routeResponseAvailable: routeResponseAvailable, router: router)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/CATransactionModal/CATransactionPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/CATransactionModal/CATransactionPresenter.swift
@@ -22,7 +22,7 @@ final class CATransactionPresenter: ObservableObject {
 
 
     private let sessionRequest: Request
-    private let routeResponseAvailable: RouteResponseAvailable
+    private let routeResponseAvailable: PrepareResponseAvailable
     let chainAbstractionService: ChainAbstractionService!
     var fundingFrom: [FundingMetadata] {
         return routeResponseAvailable.metadata.fundingFrom
@@ -42,7 +42,7 @@ final class CATransactionPresenter: ObservableObject {
     init(
         sessionRequest: Request,
         importAccount: ImportAccount,
-        routeResponseAvailable: RouteResponseAvailable,
+        routeResponseAvailable: PrepareResponseAvailable,
         router: CATransactionRouter
     ) {
         self.sessionRequest = sessionRequest
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift
@@ -42,7 +42,7 @@ final class MainRouter {
             .presentFullScreen(from: viewController, transparentBackground: true)
     }
 
-    func presentCATransaction(sessionRequest: Request, importAccount: ImportAccount, routeResponseAvailable: RouteResponseAvailable, context: VerifyContext?) {
+    func presentCATransaction(sessionRequest: Request, importAccount: ImportAccount, routeResponseAvailable: PrepareResponseAvailable, context: VerifyContext?) {
         CATransactionModule.create(app: app, sessionRequest: sessionRequest, importAccount: importAccount, routeResponseAvailable: routeResponseAvailable)
             .present(from: viewController)
     }
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ build_all:
 	set -o pipefail && env NSUnbufferedIO=YES \
 		xcodebuild \
 		-scheme "WalletConnect-Package" \
-		-destination "platform=iOS Simulator,name=iPhone 15,OS=17.5" \
+		-destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
 		-derivedDataPath DerivedDataCache \
 		-clonedSourcePackagesDirPath ../SourcePackagesCache \
 		RELAY_HOST='$(RELAY_HOST)' \
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -27,7 +27,7 @@ func buildYttriumWrapperTarget() -> Target {
             path: "Sources/YttriumWrapper"
         )
     } else {
-        dependencies.append(.package(url: "https://github.com/reown-com/yttrium", .exact("0.4.8")))
+        dependencies.append(.package(url: "https://github.com/reown-com/yttrium", .exact("0.5.1")))
         return .target(
             name: "YttriumWrapper",
             dependencies: [.product(name: "Yttrium", package: "yttrium")],
@@ -197,7 +197,7 @@ let package = Package(
             dependencies: ["WalletConnectPairing", "TestingUtils"]),
         .testTarget(
             name: "NotifyTests",
-            dependencies: ["WalletConnectNotify", "TestingUtils"]),
+            dependencies: ["WalletConnectNotify", "TestingUtils", "YttriumWrapper"]),
         .testTarget(
             name: "RelayerTests",
             dependencies: ["WalletConnectRelay", "WalletConnectUtils", "TestingUtils"]),
diff --git a/Sources/ReownWalletKit/SmartAccount/SafesManager.swift b/Sources/ReownWalletKit/SmartAccount/SafesManager.swift
@@ -34,15 +34,16 @@ class SafesManager {
         ))
         // use YttriumWrapper.Config.local() for local foundry node
 
-        let FfiAccountClientConfig = FfiAccountClientConfig(
-            ownerAddress: ownerAccount.address,
-            chainId: UInt64(ownerAccount.blockchain.reference)!,
-            config: pimlicoSepolia,
-            signerType: "PrivateKey",
-            safe: true,
-            privateKey: "ff89825a799afce0d5deaa079cdde227072ec3f62973951683ac8cc033092156")
-
-        let client = FfiAccountClient(config: FfiAccountClientConfig)
+//        let FfiAccountClientConfig = FfiAccountClientConfig(
+//            ownerAddress: ownerAccount.address,
+//            chainId: UInt64(ownerAccount.blockchain.reference)!,
+//            config: pimlicoSepolia,
+//            signerType: "PrivateKey",
+//            safe: true,
+//            privateKey: "ff89825a799afce0d5deaa079cdde227072ec3f62973951683ac8cc033092156")
+
+        let client = FfiAccountClient(owner: ownerAccount.address, chainId: UInt64(ownerAccount.blockchain.reference)!, config: pimlicoSepolia)
+//         FfiAccountClient(config: FfiAccountClientConfig)
 
 
         return client
diff --git a/Sources/ReownWalletKit/WalletKitClient.swift b/Sources/ReownWalletKit/WalletKitClient.swift
@@ -276,7 +276,7 @@ public class WalletKitClient {
 
     // MARK: Yttrium
     @available(*, message: "This method is experimental. Use with caution.")
-    public func prepareSendTransactions(_ transactions: [FfiTransaction], ownerAccount: Account) async throws -> PreparedSendTransaction {
+    public func prepareSendTransactions(_ transactions: [Execution], ownerAccount: Account) async throws -> PreparedSendTransaction {
         guard let smartAccountsManager = smartAccountsManager else {
             throw Errors.smartAccountNotEnabled
         }
@@ -285,7 +285,7 @@ public class WalletKitClient {
     }
 
     @available(*, message: "This method is experimental. Use with caution.")
-    public func doSendTransaction(signatures: [OwnerSignature], doSendTransactionParams: String, ownerAccount: Account) async throws -> String {
+    public func doSendTransaction(signatures: [OwnerSignature], doSendTransactionParams: DoSendTransactionParams, ownerAccount: Account) async throws -> String {
         guard let smartAccountsManager = smartAccountsManager else {
             throw Errors.smartAccountNotEnabled
         }
@@ -313,32 +313,32 @@ public class WalletKitClient {
         let client = smartAccountsManager.getOrCreateSafe(for: ownerAccount)
         return try await client.waitForUserOperationReceipt(userOperationHash: userOperationHash)
     }
-//
-//    public func prepareSignMessage(_ messageHash: String, ownerAccount: Account) async throws -> PreparedSignMessage {
-//        guard let smartAccountsManager = smartAccountsManager else {
-//            throw Errors.smartAccountNotEnabled
-//        }
-//        let client = smartAccountsManager.getOrCreateSafe(for: ownerAccount)
-//        return try await client.prepareSignMessage(messageHash)
-//    }
-//
-//    public func doSignMessage(_ signatures: [String], ownerAccount: Account) async throws -> PreparedSign {
-//        guard let smartAccountsManager = smartAccountsManager else {
-//            throw Errors.smartAccountNotEnabled
-//        }
-//        let client = smartAccountsManager.getOrCreateSafe(for: ownerAccount)
-//        let signature = try await client.doSignMessage(signatures)
-//        return signature
-//    }
-//
-//    public func finalizeSignMessage(_ signatures: [String], signStep3Params: String, ownerAccount: Account) async throws -> String {
-//        guard let smartAccountsManager = smartAccountsManager else {
-//            throw Errors.smartAccountNotEnabled
-//        }
-//        let client = smartAccountsManager.getOrCreateSafe(for: ownerAccount)
-//        let signature = try await client.finalizeSignMessage(signatures, signStep3Params: signStep3Params)
-//        return signature
-//    }
+
+    public func prepareSignMessage(_ messageHash: String, ownerAccount: Account) throws -> FfiPreparedSignature {
+        guard let smartAccountsManager = smartAccountsManager else {
+            throw Errors.smartAccountNotEnabled
+        }
+        let client = smartAccountsManager.getOrCreateSafe(for: ownerAccount)
+        return client.prepareSignMessage(messageHash: messageHash)
+    }
+
+    public func doSignMessage(_ signatures: [OwnerSignature], ownerAccount: Account) async throws -> SignOutputEnum {
+        guard let smartAccountsManager = smartAccountsManager else {
+            throw Errors.smartAccountNotEnabled
+        }
+        let client = smartAccountsManager.getOrCreateSafe(for: ownerAccount)
+        let signature = try await client.doSignMessage(signatures: signatures)
+        return signature
+    }
+
+    public func finalizeSignMessage(_ signatures: [OwnerSignature], signStep3Params: SignStep3Params, ownerAccount: Account) async throws -> String {
+        guard let smartAccountsManager = smartAccountsManager else {
+            throw Errors.smartAccountNotEnabled
+        }
+        let client = smartAccountsManager.getOrCreateSafe(for: ownerAccount)
+        let signature = try await client.finalizeSignMessage(signatures: signatures, signStep3Params: signStep3Params)
+        return signature
+    }
 
     @available(*, message: "This method is experimental. Use with caution.")
     public func status(orchestrationId: String) async throws -> StatusResponse {
@@ -369,7 +369,7 @@ public class WalletKitClient {
     }
 
     @available(*, message: "This method is experimental. Use with caution.")
-    public func getUiFields(routeResponse: RouteResponseAvailable, currency: Currency) async throws -> UiFields {
+    public func getUiFields(routeResponse: PrepareResponseAvailable, currency: Currency) async throws -> UiFields {
         guard let chainAbstractionClient = chainAbstractionClient else {
             throw Errors.chainAbstractionNotEnabled
         }
diff --git a/Sources/WalletConnectPairing/Services/Wallet/WalletPairService.swift b/Sources/WalletConnectPairing/Services/Wallet/WalletPairService.swift
@@ -106,7 +106,7 @@ extension WalletPairService {
 extension WalletPairService.Errors: LocalizedError {
     var errorDescription: String? {
         switch self {
-        case .noPendingRequestsForPairing(let topic):   return "No pending requests for pairing, topic: \(topic)"
+        case .noPendingRequestsForPairing(let topic):   return "No pending requests for pairing, topic: \(topic), Please try again with a new connection URI."
         case .networkNotConnected:              return "Pairing failed. You seem to be offline"
         }
     }
diff --git a/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift b/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
@@ -282,7 +282,8 @@ private extension ApproveEngine {
 
     func setupRequestSubscriptions() {
         pairingRegisterer.register(method: SessionProposeProtocolMethod.responseAutoReject())
-            .sink { [unowned self] (payload: RequestSubscriptionPayload<SessionType.ProposeParams>) in
+            .sink { [weak self] (payload: RequestSubscriptionPayload<SessionType.ProposeParams>) in
+                guard let self = self else { return }
                 guard let pairing = pairingStore.getPairing(forTopic: payload.topic) else { return }
                 let responseApproveMethod = SessionAuthenticatedProtocolMethod.responseApprove().method
                 if let methods = pairing.methods,
@@ -417,7 +418,8 @@ private extension ApproveEngine {
             return
         }
         
-        Task(priority: .high) {
+        Task(priority: .high) { [weak self] in
+            guard let self = self else {return}
             do {
                 let response: VerifyResponse
                 if let attestation = payload.attestation,
diff --git a/Sources/WalletConnectSign/WalletConnectError.swift b/Sources/WalletConnectSign/WalletConnectError.swift
@@ -11,7 +11,6 @@ enum WalletConnectError: Error {
     case invalidEvent
     case invalidUpdateExpiryValue
     case unauthorizedNonControllerCall
-    case pairingAlreadyExist
     case topicGenerationFailed
     case invalidPermissions // TODO: Refactor into actual cases
     case unsupportedNamespace(SignReasonCode)
@@ -49,8 +48,6 @@ extension WalletConnectError {
             return "Method must be called by a controller client."
         case .topicGenerationFailed:
             return "Failed to generate topic from random bytes."
-        case .pairingAlreadyExist:
-            return "Pairing already exist"
         case .invalidPermissions:
             return "Invalid permissions for call."
         case .unsupportedNamespace(let reason):
diff --git a/Sources/WalletConnectSigner/Verifier/MessageVerifier.swift b/Sources/WalletConnectSigner/Verifier/MessageVerifier.swift
@@ -1,17 +1,37 @@
 import Foundation
+import YttriumWrapper
 
 public struct MessageVerifier {
 
-    enum Errors: Error {
+    enum Errors: LocalizedError {
         case utf8EncodingFailed
+        case verificationFailed(message: String)
+
+        var errorDescription: String? {
+            switch self {
+            case .utf8EncodingFailed:
+                return "Failed to encode string using UTF-8."
+            case .verificationFailed(let message):
+                return "Verification failed: \(message)"
+            }
+        }
     }
 
     private let eip191Verifier: EIP191Verifier
     private let eip1271Verifier: EIP1271Verifier
+    private let crypto: CryptoProvider
+    private let projectId: String
 
-    init(eip191Verifier: EIP191Verifier, eip1271Verifier: EIP1271Verifier) {
+    init(
+        eip191Verifier: EIP191Verifier,
+        eip1271Verifier: EIP1271Verifier,
+        crypto: CryptoProvider,
+        projectId: String
+    ) {
         self.eip191Verifier = eip191Verifier
         self.eip1271Verifier = eip1271Verifier
+        self.crypto = crypto
+        self.projectId = projectId
     }
 
     public func verify(signature: CacaoSignature,
@@ -31,28 +51,7 @@ public struct MessageVerifier {
                        address: String,
                        chainId: String
     ) async throws {
-
-        guard let messageData = message.data(using: .utf8) else {
-            throw Errors.utf8EncodingFailed
-        }
-
-        let signatureData = Data(hex: signature.s)
-
-        switch signature.t {
-        case .eip191:
-            return try await eip191Verifier.verify(
-                signature: signatureData,
-                message: messageData.prefixed,
-                address: address
-            )
-        case .eip1271:
-            return try await eip1271Verifier.verify(
-                signature: signatureData,
-                message: messageData.prefixed,
-                address: address,
-                chainId: chainId
-            )
-        }
+        try await verifySignature(signature.s, message: message, address: address, chainId: chainId)
     }
 
     public func verify(signature: String,
@@ -85,13 +84,29 @@ public struct MessageVerifier {
             )
             return  // If 191 verification succeeds, we’re done
         } catch {
-            // If eip191 verification fails, try eip1271 verification
-            try await eip1271Verifier.verify(
-                signature: signatureData,
-                message: prefixedMessage,
+            // If eip191 verification fails, we’ll attempt 6492 verification
+        }
+
+        // Fallback to 6492 verification
+        print("i was called only once")
+        let rpcUrl = "https://rpc.walletconnect.com/v1?chainId=\(chainId)&projectId=\(projectId)"
+        let erc6492Client = Erc6492Client(rpcUrl: rpcUrl)
+        let messageHash = crypto.keccak256(prefixedMessage)
+
+        do {
+            let result = try await erc6492Client.verifySignature(
+                signature: signatureString,
                 address: address,
-                chainId: chainId
+                messageHash: messageHash.toHexString()
             )
+
+            if result == true {
+                return
+            } else {
+                throw Errors.verificationFailed(message: "Signature verification failed.")
+            }
+        } catch {
+            throw error
         }
     }
 }
diff --git a/Sources/WalletConnectSigner/Verifier/MessageVerifierFactory.swift b/Sources/WalletConnectSigner/Verifier/MessageVerifierFactory.swift
@@ -13,6 +13,7 @@ public struct MessageVerifierFactory {
     }
 
     public func create(projectId: String) -> MessageVerifier {
-        return MessageVerifier(eip191Verifier: EIP191Verifier(crypto: crypto), eip1271Verifier: EIP1271Verifier(projectId: projectId, httpClient: HTTPNetworkClient(host: "rpc.walletconnect.com"), crypto: crypto))
+
+        return MessageVerifier(eip191Verifier: EIP191Verifier(crypto: crypto), eip1271Verifier: EIP1271Verifier(projectId: projectId, httpClient: HTTPNetworkClient(host: "rpc.walletconnect.com"), crypto: crypto), crypto: crypto, projectId: projectId)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ class ChainAbstractionService {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`let privateKey: EthereumPrivateKey`
`30`		`- private let routeResponseAvailable: RouteResponseAvailable`
	`30`	`+ private let routeResponseAvailable: PrepareResponseAvailable`
`31`	`31`
`32`		`- init(privateKey: EthereumPrivateKey, routeResponseAvailable: RouteResponseAvailable) {`
	`32`	`+ init(privateKey: EthereumPrivateKey, routeResponseAvailable: PrepareResponseAvailable) {`
`33`	`33`	`self.privateKey = privateKey`
`34`	`34`	`self.routeResponseAvailable = routeResponseAvailable`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ final class MainRouter {`
`42`	`42`	`.presentFullScreen(from: viewController, transparentBackground: true)`
`43`	`43`	`}`
`44`	`44`
`45`		`- func presentCATransaction(sessionRequest: Request, importAccount: ImportAccount, routeResponseAvailable: RouteResponseAvailable, context: VerifyContext?) {`
	`45`	`+ func presentCATransaction(sessionRequest: Request, importAccount: ImportAccount, routeResponseAvailable: PrepareResponseAvailable, context: VerifyContext?) {`
`46`	`46`	`CATransactionModule.create(app: app, sessionRequest: sessionRequest, importAccount: importAccount, routeResponseAvailable: routeResponseAvailable)`
`47`	`47`	`.present(from: viewController)`
`48`	`48`	`}`