Merge branch 'develop' into #17-engine-responses

WalletConnect · Feb 10, 2022 · 5e7694a · 5e7694a
2 parents eed465c + 35c010d
commit 5e7694a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 12 deletions.
diff --git a/Sources/WalletConnect/Account.swift b/Sources/WalletConnect/Account.swift
@@ -13,13 +13,13 @@
 public struct Account: Equatable, Hashable {
 
     /// A blockchain namespace. Usually describes an ecosystem or standard.
-    public var namespace: String
+    public let namespace: String
 
     /// A reference string that identifies a blockchain within a given namespace.
-    public var reference: String
+    public let reference: String
 
     /// The account's address specific to the blockchain.
-    public var address: String
+    public let address: String
 
     /// The CAIP-2 blockchain identifier of the account.
     public var blockchainIdentifier: String {
@@ -45,9 +45,28 @@ public struct Account: Equatable, Hashable {
     public init?(_ string: String) {
         guard String.conformsToCAIP10(string) else { return nil }
         let splits = string.split(separator: ":")
-        self.namespace = String(splits[0])
-        self.reference = String(splits[1])
-        self.address = String(splits[2])
+        self.init(namespace: String(splits[0]), reference: String(splits[1]), address: String(splits[2]))
+    }
+
+    /**
+     Creates an account instance from a chain ID and an address.
+
+     This initializer returns nil if the `chainIdentifier` parameter doesn't represent a valid chain id in conformance with
+     [CAIP-2](https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-2.md) or if the `address` format is invalid.
+     */
+    public init?(chainIdentifier: String, address: String) {
+        self.init("\(chainIdentifier):\(address)")
+    }
+
+    /**
+     Creates an account instance directly from the base components.
+
+     This initializer bypass any checks to CAIP conformance, make sure to pass valid values as parameters.
+     */
+    public init(namespace: String, reference: String, address: String) {
+        self.namespace = namespace
+        self.reference = reference
+        self.address = address
     }
 }
 

diff --git a/Sources/WalletConnect/WalletConnectClient.swift b/Sources/WalletConnect/WalletConnectClient.swift
@@ -155,11 +155,6 @@ public final class WalletConnectClient {
     ///   - accounts: Set of accounts that will be allowed to be used by the session after the update.
     public func update(topic: String, accounts: Set<Account>) throws {
         try sessionEngine.update(topic: topic, accounts: Set(accounts.map { $0.absoluteString }))
-//        do {
-//            try sessionEngine.update(topic: topic, accounts: accounts)
-//        } catch {
-//            print("Error on session update call: \(error)")
-//        }
     }
 
     /// For the responder to upgrade session permissions

diff --git a/Tests/WalletConnectTests/AccountTests.swift b/Tests/WalletConnectTests/AccountTests.swift
@@ -3,7 +3,7 @@ import XCTest
 
 final class AccountTests: XCTestCase {
 
-    func testInit() {
+    func testInitFromString() {
         // Valid accounts
         XCTAssertNotNil(Account("std:0:0"))
         XCTAssertNotNil(Account("chainstd:8c3444cf8970a9e41a706fab93e7a6c4:6d9b0b4b9994e8a6afbd3dc3ed983cd51c755afb27cd1dc7825ef59c134a39f7"))
@@ -14,6 +14,24 @@ final class AccountTests: XCTestCase {
         XCTAssertNil(Account("st:0:0"))
     }
 
+    func testInitFromChainAndAddress() {
+        // Valid accounts
+        XCTAssertNotNil(Account(chainIdentifier: "std:0", address: "0"))
+        XCTAssertNotNil(Account(chainIdentifier: "chainstd:8c3444cf8970a9e41a706fab93e7a6c4", address: "6d9b0b4b9994e8a6afbd3dc3ed983cd51c755afb27cd1dc7825ef59c134a39f7"))
+
+        // Invalid accounts
+        XCTAssertNil(Account(chainIdentifier: "std:0", address: ""))
+        XCTAssertNil(Account(chainIdentifier: "std", address: "0"))
+    }
+
+    func testInitCAIP10Conformance() {
+        XCTAssertTrue(Account(namespace: "std", reference: "0", address: "0").isCAIP10Conformant)
+
+        XCTAssertFalse(Account(namespace: "st", reference: "0", address: "0").isCAIP10Conformant)
+        XCTAssertFalse(Account(namespace: "std", reference: "", address: "0").isCAIP10Conformant)
+        XCTAssertFalse(Account(namespace: "std", reference: "0", address: "").isCAIP10Conformant)
+    }
+
     func testBlockchainIdentifier() {
         let account = Account("eip155:1:0xab16a96d359ec26a11e2c2b3d8f8b8942d5bfcdb")!
         XCTAssertEqual(account.blockchainIdentifier, "eip155:1")