Merge 39eaf9e into 2180c04

WalletConnect · Apr 5, 2023 · 45e1e93 · 45e1e93
2 parents 2180c04 + 39eaf9e
commit 45e1e93
Show file tree

Hide file tree

Showing 42 changed files with 299 additions and 127 deletions.
diff --git a/Example/DApp/Sign/Accounts/AccountsViewController.swift b/Example/DApp/Sign/Accounts/AccountsViewController.swift
@@ -66,10 +66,10 @@ final class AccountsViewController: UIViewController, UITableViewDataSource, UIT
         let account = session.namespaces.values.first!.accounts.first!
 
         Task(priority: .high){ try! await Push.dapp.request(account: account, topic: session.pairingTopic)}
-        Push.dapp.responsePublisher.sink { (id: RPCID, result: Result<PushSubscription, PushError>) in
+        Push.dapp.responsePublisher.sink { (id: RPCID, result: Result<PushSubscriptionResult, PushError>) in
             switch result {
-            case .success(let subscription):
-                self.pushSubscription = subscription
+            case .success(let subscriptionResult):
+                self.pushSubscription = subscriptionResult.pushSubscription
             case .failure(let error):
                 print(error)
             }

diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
@@ -84,6 +84,7 @@
 		84D2A66628A4F51E0088AE09 /* AuthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D2A66528A4F51E0088AE09 /* AuthTests.swift */; };
 		84DB38F32983CDAE00BFEE37 /* PushRegisterer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DB38F22983CDAE00BFEE37 /* PushRegisterer.swift */; };
 		84DDB4ED28ABB663003D66ED /* WalletConnectAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 84DDB4EC28ABB663003D66ED /* WalletConnectAuth */; };
+		84E0582229D6DA9B00E359B1 /* EthKeyStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E0582129D6DA9B00E359B1 /* EthKeyStore.swift */; };
 		84E6B84A29787A8000428BAF /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E6B84929787A8000428BAF /* NotificationService.swift */; };
 		84E6B84E29787A8000428BAF /* PNDecryptionService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 84E6B84729787A8000428BAF /* PNDecryptionService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		84E6B85429787AAE00428BAF /* WalletConnectPush in Frameworks */ = {isa = PBXBuildFile; productRef = 84E6B85329787AAE00428BAF /* WalletConnectPush */; };
@@ -444,6 +445,7 @@
 		84DB38F029828A7C00BFEE37 /* WalletApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WalletApp.entitlements; sourceTree = "<group>"; };
 		84DB38F129828A7F00BFEE37 /* PNDecryptionService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PNDecryptionService.entitlements; sourceTree = "<group>"; };
 		84DB38F22983CDAE00BFEE37 /* PushRegisterer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushRegisterer.swift; sourceTree = "<group>"; };
+		84E0582129D6DA9B00E359B1 /* EthKeyStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthKeyStore.swift; sourceTree = "<group>"; };
 		84E6B84729787A8000428BAF /* PNDecryptionService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = PNDecryptionService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		84E6B84929787A8000428BAF /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		84E6B84B29787A8000428BAF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1718,6 +1720,7 @@
 				C56EE27F293F5757004840D1 /* AppDelegate.swift */,
 				C56EE281293F5757004840D1 /* SceneDelegate.swift */,
 				84DB38F22983CDAE00BFEE37 /* PushRegisterer.swift */,
+				84E0582129D6DA9B00E359B1 /* EthKeyStore.swift */,
 			);
 			path = ApplicationLayer;
 			sourceTree = "<group>";
@@ -2452,6 +2455,7 @@
 				C56EE2A3293F6BAF004840D1 /* UIPasteboardWrapper.swift in Sources */,
 				C5B2F6F629705293000DBA0E /* SessionRequestModule.swift in Sources */,
 				C56EE24E293F566D004840D1 /* WalletInteractor.swift in Sources */,
+				84E0582229D6DA9B00E359B1 /* EthKeyStore.swift in Sources */,
 				C55D34AF2965FB750004314A /* SessionProposalPresenter.swift in Sources */,
 				C5F32A302954816100A6476E /* ConnectionDetailsInteractor.swift in Sources */,
 				847BD1E8298A806800076C90 /* NotificationsView.swift in Sources */,

diff --git a/Example/ExampleApp/Shared/Signer/ETHSigner.swift b/Example/ExampleApp/Shared/Signer/ETHSigner.swift
@@ -11,7 +11,7 @@ struct ETHSigner {
     }
 
     private static let privateKey: EthereumPrivateKey = {
-        return try! EthereumPrivateKey(hexPrivateKey: "0xe56da0e170b5e09a8bb8f1b693392c7d56c3739a9c75740fbc558a2877868540")
+        return EthKeyStore.shared.privateKey
     }()
 
     static func personalSign(_ params: AnyCodable) -> AnyCodable {

diff --git a/Example/IntegrationTests/Pairing/PairingTests.swift b/Example/IntegrationTests/Pairing/PairingTests.swift
@@ -70,7 +70,9 @@ final class PairingTests: XCTestCase {
         let pushLogger = ConsoleLogger(suffix: prefix + " [Push]", loggingLevel: .debug)
         walletPairingClient = pairingClient
         let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com", environment: .sandbox)
-        walletPushClient = WalletPushClientFactory.create(logger: pushLogger,
+        let keyserverURL = URL(string: "https://keys.walletconnect.com")!
+        walletPushClient = WalletPushClientFactory.create(keyserverURL: keyserverURL,
+                                                          logger: pushLogger,
                                                           keyValueStorage: keyValueStorage,
                                                           keychainStorage: keychain,
                                                           groupKeychainStorage: KeychainStorageMock(),

diff --git a/Example/IntegrationTests/Push/PushTests.swift b/Example/IntegrationTests/Push/PushTests.swift
@@ -8,6 +8,8 @@ import WalletConnectNetworking
 import WalletConnectEcho
 @testable import WalletConnectPush
 @testable import WalletConnectPairing
+import WalletConnectIdentity
+import WalletConnectSigner
 
 final class PushTests: XCTestCase {
 
@@ -70,7 +72,9 @@ final class PushTests: XCTestCase {
         let pushLogger = ConsoleLogger(suffix: prefix + " [Push]", loggingLevel: .debug)
         walletPairingClient = pairingClient
         let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com", environment: .sandbox)
-        walletPushClient = WalletPushClientFactory.create(logger: pushLogger,
+        let keyserverURL = URL(string: "https://keys.walletconnect.com")!
+        walletPushClient = WalletPushClientFactory.create(keyserverURL: keyserverURL,
+                                                          logger: pushLogger,
                                                           keyValueStorage: keyValueStorage,
                                                           keychainStorage: keychain,
                                                           groupKeychainStorage: KeychainStorageMock(),
@@ -106,8 +110,7 @@ final class PushTests: XCTestCase {
         try! await dappPushClient.request(account: Account.stub(), topic: uri.topic)
 
         walletPushClient.requestPublisher.sink { [unowned self] (id, _, _) in
-
-            Task(priority: .high) { try! await walletPushClient.approve(id: id) }
+            Task(priority: .high) { try! await walletPushClient.approve(id: id, onSign: sign) }
         }.store(in: &publishers)
 
         dappPushClient.responsePublisher.sink { (_, result) in
@@ -153,16 +156,16 @@ final class PushTests: XCTestCase {
         try! await dappPushClient.request(account: Account.stub(), topic: uri.topic)
 
         walletPushClient.requestPublisher.sink { [unowned self] (id, _, _) in
-            Task(priority: .high) { try! await walletPushClient.approve(id: id) }
+            Task(priority: .high) { try! await walletPushClient.approve(id: id, onSign: sign) }
         }.store(in: &publishers)
 
         dappPushClient.responsePublisher.sink { [unowned self] (_, result) in
-            guard case .success(let subscription) = result else {
+            guard case .success(let result) = result else {
                 XCTFail()
                 return
             }
-            pushSubscription = subscription
-            Task(priority: .userInitiated) { try! await dappPushClient.notify(topic: subscription.topic, message: pushMessage) }
+            pushSubscription = result.pushSubscription
+            Task(priority: .userInitiated) { try! await dappPushClient.notify(topic: result.pushSubscription.topic, message: pushMessage) }
         }.store(in: &publishers)
 
         walletPushClient.pushMessagePublisher.sink { [unowned self] receivedPushMessageRecord in
@@ -185,16 +188,16 @@ final class PushTests: XCTestCase {
         var subscriptionTopic: String!
 
         walletPushClient.requestPublisher.sink { [unowned self] (id, _, _) in
-            Task(priority: .high) { try! await walletPushClient.approve(id: id) }
+            Task(priority: .high) { try! await walletPushClient.approve(id: id, onSign: sign) }
         }.store(in: &publishers)
 
         dappPushClient.responsePublisher.sink { [unowned self] (_, result) in
-            guard case .success(let subscription) = result else {
+            guard case .success(let result) = result else {
                 XCTFail()
                 return
             }
-            subscriptionTopic = subscription.topic
-            Task(priority: .userInitiated) { try! await walletPushClient.deleteSubscription(topic: subscription.topic)}
+            subscriptionTopic = result.pushSubscription.topic
+            Task(priority: .userInitiated) { try! await walletPushClient.deleteSubscription(topic: result.pushSubscription.topic)}
         }.store(in: &publishers)
 
         dappPushClient.deleteSubscriptionPublisher.sink { topic in
@@ -212,16 +215,16 @@ final class PushTests: XCTestCase {
         var subscriptionTopic: String!
 
         walletPushClient.requestPublisher.sink { [unowned self] (id, _, _) in
-            Task(priority: .high) { try! await walletPushClient.approve(id: id) }
+            Task(priority: .high) { try! await walletPushClient.approve(id: id, onSign: sign) }
         }.store(in: &publishers)
 
         dappPushClient.responsePublisher.sink { [unowned self] (_, result) in
-            guard case .success(let subscription) = result else {
+            guard case .success(let result) = result else {
                 XCTFail()
                 return
             }
-            subscriptionTopic = subscription.topic
-            Task(priority: .userInitiated) { try! await dappPushClient.delete(topic: subscription.topic)}
+            subscriptionTopic = result.pushSubscription.topic
+            Task(priority: .userInitiated) { try! await dappPushClient.delete(topic: result.pushSubscription.topic)}
         }.store(in: &publishers)
 
         walletPushClient.deleteSubscriptionPublisher.sink { topic in
@@ -230,4 +233,10 @@ final class PushTests: XCTestCase {
         }.store(in: &publishers)
         wait(for: [expectation], timeout: InputConfig.defaultTimeout)
     }
+
+    private func sign(_ message: String) -> SigningResult {
+        let privateKey = Data(hex: "305c6cde3846927892cd32762f6120539f3ec74c9e3a16b9b798b1e85351ae2a")
+        let signer = MessageSignerFactory(signerFactory: DefaultSignerFactory()).create(projectId: InputConfig.projectId)
+        return .signed(try! signer.sign(message: message, privateKey: privateKey, type: .eip191))
+    }
 }
diff --git a/Example/IntegrationTests/Stubs/Account.swift b/Example/IntegrationTests/Stubs/Account.swift
@@ -3,6 +3,6 @@ import WalletConnectUtils
 
 extension Account {
     static func stub() -> Account {
-        return Account(chainIdentifier: "eip155:1", address: "0x724d0D2DaD3fbB0C168f947B87Fa5DBe36F1A8bf")!
+        return Account(chainIdentifier: "eip155:1", address: "0x15bca56b6e2728aec2532df9d436bd1600e86688")!
     }
 }
diff --git a/Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift b/Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift
@@ -19,3 +19,5 @@ struct ThirdPartyConfigurator: Configurator {
     }
 
 }
+
+
diff --git a/Example/WalletApp/ApplicationLayer/EthKeyStore.swift b/Example/WalletApp/ApplicationLayer/EthKeyStore.swift
@@ -0,0 +1,25 @@
+import Web3
+import Foundation
+
+class EthKeyStore {
+    private let defaultsKey = "eth_prv_key"
+    static let shared = EthKeyStore()
+    let privateKey: EthereumPrivateKey
+
+    var address: String {
+        return privateKey.address.hex(eip55: false)
+    }
+
+    var privateKeyRaw: Data {
+        return Data(privateKey.rawPrivateKey)
+    }
+
+    private init() {
+        if let privateKeyRaw = UserDefaults.standard.data(forKey: defaultsKey) {
+            self.privateKey = try! EthereumPrivateKey(privateKeyRaw)
+        } else {
+            self.privateKey = try! EthereumPrivateKey()
+            UserDefaults.standard.set(privateKeyRaw, forKey: defaultsKey)
+        }
+    }
+}
diff --git a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestInteractor.swift
@@ -3,10 +3,12 @@ import Web3Wallet
 
 final class AuthRequestInteractor {
     private let signer = MessageSignerFactory(signerFactory: DefaultSignerFactory()).create()
-    private let account = Account("eip155:1:0xe5EeF1368781911d265fDB6946613dA61915a501")!
+    private var account: Account {
+        Account(blockchain: Blockchain("eip155:1")!, address: EthKeyStore.shared.address)!
+    }
 
     func approve(request: AuthRequest) async throws {
-        let privateKey = Data(hex: "e56da0e170b5e09a8bb8f1b693392c7d56c3739a9c75740fbc558a2877868540")
+        let privateKey = EthKeyStore.shared.privateKeyRaw
         let signature = try signer.sign(
             payload: request.payload.cacaoPayload(address: account.address),
             privateKey: privateKey,

diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushRequest/PushRequestInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/PushRequest/PushRequestInteractor.swift
@@ -3,10 +3,17 @@ import WalletConnectPush
 
 final class PushRequestInteractor {
     func approve(pushRequest: PushRequest) async throws {
-        try await Push.wallet.approve(id: pushRequest.id)        
+        try await Push.wallet.approve(id: pushRequest.id, onSign: onSing(_:))
     }
 
     func reject(pushRequest: PushRequest) async throws {
         try await Push.wallet.reject(id: pushRequest.id)
     }
+
+    func onSing(_ message: String) async -> SigningResult {
+        let privateKey = EthKeyStore.shared.privateKeyRaw
+        let signer = MessageSignerFactory(signerFactory: DefaultSignerFactory()).create()
+        let signature = try! signer.sign(message: message, privateKey: privateKey, type: .eip191)
+        return .signed(signature)
+    }
 }
diff --git a/Package.swift b/Package.swift
@@ -64,7 +64,7 @@ let package = Package(
             path: "Sources/Web3Wallet"),
         .target(
             name: "WalletConnectPush",
-            dependencies: ["WalletConnectPairing", "WalletConnectEcho", "WalletConnectNetworking"],
+            dependencies: ["WalletConnectPairing", "WalletConnectEcho", "WalletConnectNetworking", "WalletConnectIdentity"],
             path: "Sources/WalletConnectPush"),
         .target(
             name: "WalletConnectEcho",

diff --git a/Sources/Chat/ProtocolServices/Common/MessagingService.swift b/Sources/Chat/ProtocolServices/Common/MessagingService.swift
@@ -58,8 +58,8 @@ private extension MessagingService {
                 logger.debug("Received Receipt response")
 
                 guard
-                    let (message, _) = try? MessagePayload.decode(from: payload.request),
-                    let (receipt, _) = try? ReceiptPayload.decode(from: payload.response)
+                    let (message, _) = try? MessagePayload.decodeAndVerify(from: payload.request),
+                    let (receipt, _) = try? ReceiptPayload.decodeAndVerify(from: payload.response)
                 else { fatalError() /* TODO: Handle error */ }
 
                 let newMessage = Message(
@@ -79,7 +79,7 @@ private extension MessagingService {
 
                 logger.debug("Received Message Request")
 
-                guard let (message, messageClaims) = try? MessagePayload.decode(from: payload.request)
+                guard let (message, messageClaims) = try? MessagePayload.decodeAndVerify(from: payload.request)
                 else { fatalError() /* TODO: Handle error */ }
 
                 Task(priority: .high) {

diff --git a/Sources/Chat/ProtocolServices/Invitee/InvitationHandlingService.swift b/Sources/Chat/ProtocolServices/Invitee/InvitationHandlingService.swift
@@ -108,7 +108,7 @@ private extension InvitationHandlingService {
             .sink { [unowned self] (payload: RequestSubscriptionPayload<InvitePayload.Wrapper>) in
                 logger.debug("Did receive an invite")
 
-                guard let (invite, claims) = try? InvitePayload.decode(from: payload.request)
+                guard let (invite, claims) = try? InvitePayload.decodeAndVerify(from: payload.request)
                 else { fatalError() /* TODO: Handle error */ }
 
                 Task(priority: .high) {

diff --git a/Sources/Chat/ProtocolServices/Inviter/InviteService.swift b/Sources/Chat/ProtocolServices/Inviter/InviteService.swift
@@ -86,8 +86,8 @@ private extension InviteService {
                 logger.debug("Invite has been accepted")
 
                 guard
-                    let (invite, _) = try? InvitePayload.decode(from: payload.request),
-                    let (accept, _) = try? AcceptPayload.decode(from: payload.response)
+                    let (invite, _) = try? InvitePayload.decodeAndVerify(from: payload.request),
+                    let (accept, _) = try? AcceptPayload.decodeAndVerify(from: payload.response)
                 else { fatalError() /* TODO: Handle error */ }
 
                 Task(priority: .high) {

diff --git a/Sources/WalletConnectJWT/JWTDecodable.swift b/Sources/WalletConnectJWT/JWTDecodable.swift
@@ -23,7 +23,7 @@ public protocol JWTClaimsCodable {
 
 extension JWTClaimsCodable {
 
-    public static func decode(from wrapper: Wrapper) throws -> (Self, Claims) {
+    public static func decodeAndVerify(from wrapper: Wrapper) throws -> (Self, Claims) {
         let jwt = try JWT<Claims>(string: wrapper.jwtString)
 
         let publicKey = try DIDKey(did: jwt.claims.iss)

diff --git a/Sources/WalletConnectKMS/Serialiser/Serializer.swift b/Sources/WalletConnectKMS/Serialiser/Serializer.swift
@@ -40,11 +40,12 @@ public class Serializer: Serializing {
     ///   - topic: Topic that is associated with a symetric key for decrypting particular codable object
     ///   - encodedEnvelope: Envelope to deserialize and decrypt
     /// - Returns: Deserialized object
-    public func deserialize<T: Codable>(topic: String, encodedEnvelope: String) throws -> T {
+    public func deserialize<T: Codable>(topic: String, encodedEnvelope: String) throws -> (T, derivedTopic: String?) {
         let envelope = try Envelope(encodedEnvelope)
         switch envelope.type {
         case .type0:
-            return try handleType0Envelope(topic, envelope)
+            let deserialisedType: T = try handleType0Envelope(topic, envelope)
+            return (deserialisedType, nil)
         case .type1(let peerPubKey):
             return try handleType1Envelope(topic, peerPubKey: peerPubKey, sealbox: envelope.sealbox)
         }
@@ -58,15 +59,15 @@ public class Serializer: Serializing {
         }
     }
 
-    private func handleType1Envelope<T: Codable>(_ topic: String, peerPubKey: Data, sealbox: Data) throws -> T {
+    private func handleType1Envelope<T: Codable>(_ topic: String, peerPubKey: Data, sealbox: Data) throws -> (T, String) {
         guard let selfPubKey = kms.getPublicKey(for: topic)
         else { throw Errors.publicKeyForTopicNotFound }
 
         let agreementKeys = try kms.performKeyAgreement(selfPublicKey: selfPubKey, peerPublicKey: peerPubKey.toHexString())
         let decodedType: T = try decode(sealbox: sealbox, symmetricKey: agreementKeys.sharedKey.rawRepresentation)
-        let newTopic = agreementKeys.derivedTopic()
-        try kms.setAgreementSecret(agreementKeys, topic: newTopic)
-        return decodedType
+        let derivedTopic = agreementKeys.derivedTopic()
+        try kms.setAgreementSecret(agreementKeys, topic: derivedTopic)
+        return (decodedType, derivedTopic)
     }
 
     private func decode<T: Codable>(sealbox: Data, symmetricKey: Data) throws -> T {

diff --git a/Sources/WalletConnectKMS/Serialiser/Serializing.swift b/Sources/WalletConnectKMS/Serialiser/Serializing.swift
@@ -2,11 +2,13 @@ import Foundation
 
 public protocol Serializing {
     func serialize(topic: String, encodable: Encodable, envelopeType: Envelope.EnvelopeType) throws -> String
-    func deserialize<T: Codable>(topic: String, encodedEnvelope: String) throws -> T
+    /// - derivedTopic: topic derived from symmetric key as a result of key exchange if peers has sent envelope(type1) prefixed with it's public key
+    func deserialize<T: Codable>(topic: String, encodedEnvelope: String) throws -> (T, derivedTopic: String?)
 }
 
 public extension Serializing {
-    func tryDeserialize<T: Codable>(topic: String, encodedEnvelope: String) -> T? {
+    /// - derivedTopic: topic derived from symmetric key as a result of key exchange if peers has sent envelope(type1) prefixed with it's public key
+    func tryDeserialize<T: Codable>(topic: String, encodedEnvelope: String) -> (T, derivedTopic: String?)? {
         return try? deserialize(topic: topic, encodedEnvelope: encodedEnvelope)
     }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,5 @@ struct ThirdPartyConfigurator: Configurator {
		}

		}