Merge pull request #1077 from WalletConnect/develop

1.7.2
WalletConnect · Sep 7, 2023 · 1a07a37 · 1a07a37
2 parents bd2e5b6 + 284d345
commit 1a07a37
Show file tree

Hide file tree

Showing 26 changed files with 160 additions and 119 deletions.
diff --git a/Example/IntegrationTests/Auth/AuthTests.swift b/Example/IntegrationTests/Auth/AuthTests.swift
@@ -76,7 +76,7 @@ final class AuthTests: XCTestCase {
         let uri = try! await appPairingClient.create()
         try! await appAuthClient.request(RequestParams.stub(), topic: uri.topic)
 
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
         walletAuthClient.authRequestPublisher.sink { _ in
             requestExpectation.fulfill()
         }.store(in: &publishers)
@@ -88,7 +88,7 @@ final class AuthTests: XCTestCase {
         let uri = try! await appPairingClient.create()
         try! await appAuthClient.request(RequestParams.stub(), topic: uri.topic)
 
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
         walletAuthClient.authRequestPublisher.sink { [unowned self] request in
             Task(priority: .high) {
                 let signerFactory = DefaultSignerFactory()
@@ -126,7 +126,7 @@ final class AuthTests: XCTestCase {
             resources: nil
         ), topic: uri.topic)
 
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
         walletAuthClient.authRequestPublisher.sink { [unowned self] request in
             Task(priority: .high) {
                 let signature = CacaoSignature(t: .eip1271, s: eip1271Signature)
@@ -147,7 +147,7 @@ final class AuthTests: XCTestCase {
         let uri = try! await appPairingClient.create()
         try! await appAuthClient.request(RequestParams.stub(), topic: uri.topic)
 
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
         walletAuthClient.authRequestPublisher.sink { [unowned self] request in
             Task(priority: .high) {
                 let signature = CacaoSignature(t: .eip1271, s: eip1271Signature)
@@ -168,7 +168,7 @@ final class AuthTests: XCTestCase {
         let uri = try! await appPairingClient.create()
         try! await appAuthClient.request(RequestParams.stub(), topic: uri.topic)
 
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
         walletAuthClient.authRequestPublisher.sink { [unowned self] request in
             Task(priority: .high) {
                 try! await walletAuthClient.reject(requestId: request.0.id)
@@ -189,7 +189,7 @@ final class AuthTests: XCTestCase {
         let uri = try! await appPairingClient.create()
         try! await appAuthClient.request(RequestParams.stub(), topic: uri.topic)
 
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
         walletAuthClient.authRequestPublisher.sink { [unowned self] request in
             Task(priority: .high) {
                 let invalidSignature = "438effc459956b57fcd9f3dac6c675f9cee88abf21acab7305e8e32aa0303a883b06dcbd956279a7a2ca21ffa882ff55cc22e8ab8ec0f3fe90ab45f306938cfa1b"

diff --git a/Example/IntegrationTests/Pairing/PairingTests.swift b/Example/IntegrationTests/Pairing/PairingTests.swift
@@ -110,7 +110,7 @@ final class PairingTests: XCTestCase {
         let expectation = expectation(description: "expects ping response")
         makeWalletClients()
         let uri = try! await appPairingClient.create()
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
         try! await walletPairingClient.ping(topic: uri.topic)
         walletPairingClient.pingResponsePublisher
             .sink { topic in
@@ -131,7 +131,7 @@ final class PairingTests: XCTestCase {
 
         let uri = try! await appPairingClient.create()
 
-        try! await walletPairingClient.pair(uri: uri)
+        try? await walletPairingClient.pair(uri: uri)
 
         try! await appAuthClient.request(RequestParams.stub(), topic: uri.topic)
 

diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
@@ -20,18 +20,14 @@ final class SessionProposalInteractor {
         let supportedChains = [Blockchain("eip155:1")!, Blockchain("eip155:137")!]
         let supportedAccounts = [Account(blockchain: Blockchain("eip155:1")!, address: ETHSigner.address)!, Account(blockchain: Blockchain("eip155:137")!, address: ETHSigner.address)!]
         */
-        do {
-            let sessionNamespaces = try AutoNamespaces.build(
-                sessionProposal: proposal,
-                chains: Array(supportedChains),
-                methods: Array(supportedMethods),
-                events: Array(supportedEvents),
-                accounts: supportedAccounts
-            )
-            try await Web3Wallet.instance.approve(proposalId: proposal.id, namespaces: sessionNamespaces, sessionProperties: proposal.sessionProperties)
-        } catch {
-            print(error)
-        }
+        let sessionNamespaces = try AutoNamespaces.build(
+            sessionProposal: proposal,
+            chains: Array(supportedChains),
+            methods: Array(supportedMethods),
+            events: Array(supportedEvents),
+            accounts: supportedAccounts
+        )
+        try await Web3Wallet.instance.approve(proposalId: proposal.id, namespaces: sessionNamespaces, sessionProperties: proposal.sessionProperties)
     }
 
     func reject(proposal: Session.Proposal) async throws {

diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalPresenter.swift
@@ -11,6 +11,9 @@ final class SessionProposalPresenter: ObservableObject {
     let sessionProposal: Session.Proposal
     let verified: Bool?
 
+    @Published var showError = false
+    @Published var errorMessage = "Error"
+
     private var disposeBag = Set<AnyCancellable>()
 
     init(
@@ -30,14 +33,24 @@ final class SessionProposalPresenter: ObservableObject {
 
     @MainActor
     func onApprove() async throws {
-        try await interactor.approve(proposal: sessionProposal, account: importAccount.account)
-        router.dismiss()
+        do {
+            try await interactor.approve(proposal: sessionProposal, account: importAccount.account)
+            router.dismiss()
+        } catch {
+            errorMessage = error.localizedDescription
+            showError.toggle()
+        }
     }
 
     @MainActor
     func onReject() async throws {
-        try await interactor.reject(proposal: sessionProposal)
-        router.dismiss()
+        do {
+            try await interactor.reject(proposal: sessionProposal)
+            router.dismiss()
+        } catch {
+            errorMessage = error.localizedDescription
+            showError.toggle()
+        }
     }
 }
 

diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalView.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalView.swift
@@ -146,6 +146,9 @@ struct SessionProposalView: View {
                 Spacer()
             }
         }
+        .alert(presenter.errorMessage, isPresented: $presenter.showError) {
+            Button("OK", role: .cancel) {}
+        }
         .edgesIgnoringSafeArea(.all)
     }
     //private func sessionProposalView(chain: String) -> some View {

diff --git a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletPresenter.swift
@@ -40,12 +40,7 @@ final class WalletPresenter: ObservableObject {
     func onAppear() {
         showPairingLoading = app.requestSent
         removePairingIndicator()
-
-        let proposals = interactor.getPendingProposals()
-        if let proposal = proposals.last {
-            router.present(sessionProposal: proposal.proposal, importAccount: importAccount, sessionContext: proposal.context)
-        }
-
+
         let pendingRequests = interactor.getPendingRequests()
         if let request = pendingRequests.first(where: { $0.context != nil }) {
             router.present(sessionRequest: request.request, importAccount: importAccount, sessionContext: request.context)

diff --git a/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift b/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift
@@ -31,7 +31,7 @@ final class Web3InboxViewController: UIViewController {
     }
 
     @objc func refreshTapped() {
-        webView?.reload()
+        Web3Inbox.instance.reload()
     }
 
     @objc func getUrlPressed(_ sender: UIBarItem) {

diff --git a/Sources/Auth/AuthClientFactory.swift b/Sources/Auth/AuthClientFactory.swift
@@ -48,7 +48,7 @@ public struct AuthClientFactory {
         let appRespondSubscriber = AppRespondSubscriber(networkingInteractor: networkingClient, logger: logger, rpcHistory: history, signatureVerifier: signatureVerifier, pairingRegisterer: pairingRegisterer, messageFormatter: messageFormatter)
         let walletErrorResponder = WalletErrorResponder(networkingInteractor: networkingClient, logger: logger, kms: kms, rpcHistory: history)
         let walletRequestSubscriber = WalletRequestSubscriber(networkingInteractor: networkingClient, logger: logger, kms: kms, walletErrorResponder: walletErrorResponder, pairingRegisterer: pairingRegisterer, verifyClient: verifyClient, verifyContextStore: verifyContextStore)
-        let walletRespondService = WalletRespondService(networkingInteractor: networkingClient, logger: logger, kms: kms, rpcHistory: history, verifyContextStore: verifyContextStore, walletErrorResponder: walletErrorResponder)
+        let walletRespondService = WalletRespondService(networkingInteractor: networkingClient, logger: logger, kms: kms, rpcHistory: history, verifyContextStore: verifyContextStore, walletErrorResponder: walletErrorResponder, pairingRegisterer: pairingRegisterer)
         let pendingRequestsProvider = PendingRequestsProvider(rpcHistory: history, verifyContextStore: verifyContextStore)
 
         return AuthClient(

diff --git a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
@@ -37,10 +37,7 @@ class WalletRequestSubscriber {
             .sink { [unowned self] (payload: RequestSubscriptionPayload<AuthRequestParams>) in
                 logger.debug("WalletRequestSubscriber: Received request")
 
-                pairingRegisterer.activate(
-                    pairingTopic: payload.topic,
-                    peerMetadata: payload.request.requester.metadata
-                )
+                pairingRegisterer.setReceived(pairingTopic: payload.topic)
 
                 let request = AuthRequest(id: payload.id, topic: payload.topic, payload: payload.request.payloadParams)
 

diff --git a/Sources/Auth/Services/Wallet/WalletRespondService.swift b/Sources/Auth/Services/Wallet/WalletRespondService.swift
@@ -11,19 +11,24 @@ actor WalletRespondService {
     private let verifyContextStore: CodableStore<VerifyContext>
     private let logger: ConsoleLogging
     private let walletErrorResponder: WalletErrorResponder
+    private let pairingRegisterer: PairingRegisterer
 
-    init(networkingInteractor: NetworkInteracting,
-         logger: ConsoleLogging,
-         kms: KeyManagementService,
-         rpcHistory: RPCHistory,
-         verifyContextStore: CodableStore<VerifyContext>,
-         walletErrorResponder: WalletErrorResponder) {
+    init(
+        networkingInteractor: NetworkInteracting,
+        logger: ConsoleLogging,
+        kms: KeyManagementService,
+        rpcHistory: RPCHistory,
+        verifyContextStore: CodableStore<VerifyContext>,
+        walletErrorResponder: WalletErrorResponder,
+        pairingRegisterer: PairingRegisterer
+    ) {
         self.networkingInteractor = networkingInteractor
         self.logger = logger
         self.kms = kms
         self.rpcHistory = rpcHistory
         self.verifyContextStore = verifyContextStore
         self.walletErrorResponder = walletErrorResponder
+        self.pairingRegisterer = pairingRegisterer
     }
 
     func respond(requestId: RPCID, signature: CacaoSignature, account: Account) async throws {
@@ -34,10 +39,16 @@ actor WalletRespondService {
 
         let header = CacaoHeader(t: "eip4361")
         let payload = try authRequestParams.payloadParams.cacaoPayload(address: account.address)
-        let responseParams =  AuthResponseParams(h: header, p: payload, s: signature)
+        let responseParams = AuthResponseParams(h: header, p: payload, s: signature)
 
         let response = RPCResponse(id: requestId, result: responseParams)
         try await networkingInteractor.respond(topic: topic, response: response, protocolMethod: AuthRequestProtocolMethod(), envelopeType: .type1(pubKey: keys.publicKey.rawRepresentation))
+
+        pairingRegisterer.activate(
+            pairingTopic: topic,
+            peerMetadata: authRequestParams.requester.metadata
+        )
+
         verifyContextStore.delete(forKey: requestId.string)
     }
 

diff --git a/Sources/WalletConnectNetworking/NetworkInteracting.swift b/Sources/WalletConnectNetworking/NetworkInteracting.swift
@@ -13,7 +13,8 @@ public protocol NetworkInteracting {
     func respond(topic: String, response: RPCResponse, protocolMethod: ProtocolMethod, envelopeType: Envelope.EnvelopeType) async throws
     func respondSuccess(topic: String, requestId: RPCID, protocolMethod: ProtocolMethod, envelopeType: Envelope.EnvelopeType) async throws
     func respondError(topic: String, requestId: RPCID, protocolMethod: ProtocolMethod, reason: Reason, envelopeType: Envelope.EnvelopeType) async throws
-
+    func handleHistoryRequest(topic: String, request: RPCRequest)
+
     func requestSubscription<Request: Codable>(
         on request: ProtocolMethod
     ) -> AnyPublisher<RequestSubscriptionPayload<Request>, Never>

diff --git a/Sources/WalletConnectNetworking/NetworkingInteractor.swift b/Sources/WalletConnectNetworking/NetworkingInteractor.swift
@@ -162,6 +162,10 @@ public class NetworkingInteractor: NetworkInteracting {
             logger.debug("Networking Interactor - Received unknown object type from networking relay")
         }
     }
+
+    public func handleHistoryRequest(topic: String, request: RPCRequest) {
+        requestPublisherSubject.send((topic, request, Data(), Date(), nil))
+    }
 
     private func handleRequest(topic: String, request: RPCRequest, decryptedPayload: Data, publishedAt: Date, derivedTopic: String?) {
         do {

diff --git a/Sources/WalletConnectNotify/Types/Payload/NotifyDeleteResponsePayload.swift b/Sources/WalletConnectNotify/Types/Payload/NotifyDeleteResponsePayload.swift
@@ -7,8 +7,6 @@ struct NotifyDeleteResponsePayload: JWTClaimsCodable {
         let iat: UInt64
         /// Timestamp when JWT must expire
         let exp: UInt64
-        /// Key server URL
-        let ksu: String
         /// Description of action intent. Must be equal to `notify_delete_response`
         let act: String?
 
@@ -38,25 +36,11 @@ struct NotifyDeleteResponsePayload: JWTClaimsCodable {
         }
     }
 
-    let keyserver: URL
     let selfPubKey: DIDKey
     let subscriptionHash: String
     let app: String
 
-    init(
-        keyserver: URL,
-        selfPubKey: DIDKey,
-        subscriptionHash: String,
-        app: String
-    ) {
-        self.keyserver = keyserver
-        self.selfPubKey = selfPubKey
-        self.subscriptionHash = subscriptionHash
-        self.app = app
-    }
-
     init(claims: Claims) throws {
-        self.keyserver = try claims.ksu.asURL()
         self.selfPubKey = try DIDKey(did: claims.aud)
         self.subscriptionHash = claims.sub
         self.app = claims.app
@@ -66,7 +50,6 @@ struct NotifyDeleteResponsePayload: JWTClaimsCodable {
         return Claims(
             iat: defaultIat(),
             exp: expiry(days: 1),
-            ksu: keyserver.absoluteString,
             act: Claims.action,
             iss: iss,
             aud: selfPubKey.did(variant: .ED25519),

diff --git a/Sources/WalletConnectNotify/Types/Payload/NotifyMessagePayload.swift b/Sources/WalletConnectNotify/Types/Payload/NotifyMessagePayload.swift
@@ -7,8 +7,6 @@ struct NotifyMessagePayload: JWTClaimsCodable {
         let iat: UInt64
         /// Timestamp when JWT must expire
         let exp: UInt64
-        /// Key server URL
-        let ksu: String
         /// Action intent (must be `notify_message`)
         let act: String?
 
@@ -41,31 +39,13 @@ struct NotifyMessagePayload: JWTClaimsCodable {
     }
 
     let castServerPubKey: DIDKey
-    let keyserver: URL
     let account: Account
     let subscriptionId: String
     let app: String
     let message: NotifyMessage
 
-    init(
-        castServerPubKey: DIDKey,
-        keyserver: URL,
-        account: Account,
-        subscriptionId: String,
-        app: String,
-        message: NotifyMessage
-    ) {
-        self.castServerPubKey = castServerPubKey
-        self.keyserver = keyserver
-        self.account = account
-        self.subscriptionId = subscriptionId
-        self.app = app
-        self.message = message
-    }
-
     init(claims: Claims) throws {
         self.castServerPubKey = try DIDKey(did: claims.iss)
-        self.keyserver = try claims.ksu.asURL()
         self.account = try DIDPKH(did: claims.aud).account
         self.subscriptionId = claims.sub
         self.app = claims.app
@@ -76,7 +56,6 @@ struct NotifyMessagePayload: JWTClaimsCodable {
         return Claims(
             iat: defaultIat(),
             exp: expiry(days: 1),
-            ksu: keyserver.absoluteString,
             act: Claims.action,
             iss: castServerPubKey.multibase(variant: .ED25519),
             aud: account.did,

diff --git a/Sources/WalletConnectNotify/Types/Payload/NotifySubscriptionResponsePayload.swift b/Sources/WalletConnectNotify/Types/Payload/NotifySubscriptionResponsePayload.swift
@@ -7,8 +7,6 @@ struct NotifySubscriptionResponsePayload: JWTClaimsCodable {
         let iat: UInt64
         /// timestamp when jwt must expire
         let exp: UInt64
-        /// Key server URL
-        let ksu: String
         /// Description of action intent. Must be equal to "notify_subscription_response"
         let act: String?
 
@@ -38,13 +36,11 @@ struct NotifySubscriptionResponsePayload: JWTClaimsCodable {
         }
     }
 
-    let keyserver: URL
     let selfPubKey: DIDKey
     let publicKey: DIDKey
     let app: String
 
     init(claims: Claims) throws {
-        self.keyserver = try claims.ksu.asURL()
         self.selfPubKey = try DIDKey(did: claims.aud)
         self.publicKey = try DIDKey(did: claims.sub)
         self.app = claims.app
@@ -54,7 +50,6 @@ struct NotifySubscriptionResponsePayload: JWTClaimsCodable {
         return Claims(
             iat: defaultIat(),
             exp: expiry(days: 1),
-            ksu: keyserver.absoluteString,
             act: Claims.action,
             iss: iss,
             aud: selfPubKey.did(variant: .ED25519),