Merge branch 'develop' of github.com:WalletConnect/WalletConnectSwift…

…V2 into requests-life-cycle
WalletConnect · Aug 27, 2024 · 0cc1ec8 · 0cc1ec8
2 parents 086116a + 0bc1bae
commit 0cc1ec8
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/Sources/WalletConnectRelay/PackageConfig.json b/Sources/WalletConnectRelay/PackageConfig.json
@@ -1 +1 @@
-{"version": "1.19.6"}
+{"version": "1.20.0"}
diff --git a/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift b/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
@@ -159,7 +159,19 @@ final class ApproveEngine {
 
         do {
             let session: WCSession = try await settleRequestTask
+            eventsClient.saveTraceEvent(SessionApproveExecutionTraceEvents.sessionSettleSuccess)
+            logger.debug("Session settle request has been successfully processed")
+
+            do {
+                _ = try await proposeResponseTask
+                eventsClient.saveTraceEvent(SessionApproveExecutionTraceEvents.responseApproveSent)
+            } catch {
+                eventsClient.saveTraceEvent(ApproveSessionTraceErrorEvents.sessionSettleFailure)
+                throw error
+            }
+
             sessionStore.setSession(session)
+
             Task {
                 removePairing(pairingTopic: pairingTopic)
             }

diff --git a/Sources/WalletConnectVerify/VerifyContextFactory.swift b/Sources/WalletConnectVerify/VerifyContextFactory.swift
@@ -1,7 +1,15 @@
-
 import Foundation
 
 class VerifyContextFactory {
+
+    private func ensureUrlHasScheme(_ urlString: String) -> String {
+        if urlString.hasPrefix("http://") || urlString.hasPrefix("https://") {
+            return urlString
+        } else {
+            return "https://" + urlString
+        }
+    }
+
     public func createVerifyContext(origin: String?, domain: String, isScam: Bool?, isVerified: Bool?) -> VerifyContext {
 
         guard isScam != true else {
@@ -19,7 +27,11 @@ class VerifyContextFactory {
             )
         }
 
-        if let origin, let originUrl = URL(string: origin), let domainUrl = URL(string: domain) {
+        // Ensure both origin and domain have a scheme
+        let originWithScheme = origin.map { ensureUrlHasScheme($0) }
+        let domainWithScheme = ensureUrlHasScheme(domain)
+
+        if let originWithScheme, let originUrl = URL(string: originWithScheme), let domainUrl = URL(string: domainWithScheme) {
             return VerifyContext(
                 origin: origin,
                 validation: (originUrl.host == domainUrl.host) ? .valid : .invalid

diff --git a/Tests/VerifyTests/VerifyContextFactoryTests.swift b/Tests/VerifyTests/VerifyContextFactoryTests.swift
@@ -49,6 +49,16 @@ class VerifyContextFactoryTests: XCTestCase {
         XCTAssertEqual(contextWithFalseVerification.validation, .scam)
     }
 
+    func testValidOriginAndDomainWithoutScheme() {
+        let context = factory.createVerifyContext(origin: "https://dev.lab.web3modal.com", domain: "dev.lab.web3modal.com", isScam: false, isVerified: nil)
+        XCTAssertEqual(context.validation, .valid)
+    }
+
+    func testInvalidOriginAndDomainWithoutScheme() {
+        let context = factory.createVerifyContext(origin: "https://dev.lab.web3modal.com", domain: "different.com", isScam: false, isVerified: nil)
+        XCTAssertEqual(context.validation, .invalid)
+    }
+
     // tests for createVerifyContextForLinkMode
 
     func testValidUniversalLink() {