Merge pull request #572 from WalletConnect/develop

1.0.5
WalletConnect · Nov 8, 2022 · 02b3b8f · 02b3b8f
2 parents 7ccf26c + c2dc00e
commit 02b3b8f
Show file tree

Hide file tree

Showing 146 changed files with 268 additions and 362 deletions.
diff --git a/.github/scripts/set-user-agent.sh b/.github/scripts/set-user-agent.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+printf '\nset user agent\n\n'
+
+FILE=Sources/WalletConnectRelay/PackageConfig.json
+
+if [ -f "$FILE" ];
+then
+    printf '\ncurrent user agent:\n'
+    cat "$FILE"
+    printf '\nsetting user agent... \n'
+    echo "{\"version\": \"$PACKAGE_VERSION\"}" > "$FILE"
+    printf '\nuser agent set for:\n'
+    cat "$FILE"
+
+else
+
+printf '\nError setting PACKAGE_VERSION\n\n'
+
+fi
+
diff --git a/.github/workflows/set-user-agent.yml b/.github/workflows/set-user-agent.yml
@@ -0,0 +1,27 @@
+# This workflow sets the package version for user agent
+# when pull request to main branch is opened
+# it takes pull request name
+# and automatically commit it as a package version
+# pull request name should always be a version of a new release
+
+name: set-user-agent
+
+on:
+  pull_request:
+    branches: [ main ]
+env:
+  PACKAGE_VERSION: ${{ github.event.pull_request.title }}
+
+jobs:
+  set-user-agent:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set User Agent
+        shell: bash
+        run: ./.github/scripts/set-user-agent.sh
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Set User Agent
+
diff --git a/Package.swift b/Package.swift
@@ -38,24 +38,25 @@ let package = Package(
     targets: [
         .target(
             name: "WalletConnectSign",
-            dependencies: ["WalletConnectNetworking", "WalletConnectPairing"],
+            dependencies: ["WalletConnectPairing"],
             path: "Sources/WalletConnectSign"),
         .target(
             name: "WalletConnectChat",
             dependencies: ["WalletConnectNetworking"],
             path: "Sources/Chat"),
         .target(
             name: "Auth",
-            dependencies: ["WalletConnectPairing", "WalletConnectNetworking", .product(name: "Web3", package: "Web3.swift")],
+            dependencies: ["WalletConnectPairing", .product(name: "Web3", package: "Web3.swift")],
             path: "Sources/Auth"),
         .target(
             name: "WalletConnectPush",
-            dependencies: ["WalletConnectPairing", "WalletConnectNetworking"],
+            dependencies: ["WalletConnectPairing"],
             path: "Sources/WalletConnectPush"),
         .target(
             name: "WalletConnectRelay",
-            dependencies: ["WalletConnectUtils", "WalletConnectKMS"],
-            path: "Sources/WalletConnectRelay"),
+            dependencies: ["WalletConnectKMS"],
+            path: "Sources/WalletConnectRelay",
+            resources: [.copy("PackageConfig.json")]),
         .target(
             name: "WalletConnectKMS",
             dependencies: ["WalletConnectUtils"],
@@ -65,7 +66,7 @@ let package = Package(
             dependencies: ["WalletConnectNetworking"]),
         .target(
             name: "WalletConnectUtils",
-            dependencies: ["Commons", "JSONRPC"]),
+            dependencies: ["JSONRPC"]),
         .target(
             name: "JSONRPC",
             dependencies: ["Commons"]),
@@ -74,7 +75,7 @@ let package = Package(
             dependencies: []),
         .target(
             name: "WalletConnectNetworking",
-            dependencies: ["JSONRPC", "WalletConnectKMS", "WalletConnectRelay", "WalletConnectUtils"]),
+            dependencies: ["WalletConnectRelay"]),
         .target(
             name: "WalletConnectRouter",
             dependencies: []),
@@ -98,7 +99,7 @@ let package = Package(
             dependencies: ["WalletConnectKMS", "WalletConnectUtils", "TestingUtils"]),
         .target(
             name: "TestingUtils",
-            dependencies: ["WalletConnectPairing", "WalletConnectNetworking"],
+            dependencies: ["WalletConnectPairing"],
             path: "Tests/TestingUtils"),
         .testTarget(
             name: "WalletConnectUtilsTests",

diff --git a/Sources/Auth/Auth.swift b/Sources/Auth/Auth.swift
@@ -1,6 +1,4 @@
 import Foundation
-import WalletConnectNetworking
-import WalletConnectPairing
 import Combine
 
 /// Auth instatnce wrapper

diff --git a/Sources/Auth/AuthClient.swift b/Sources/Auth/AuthClient.swift
@@ -1,8 +1,5 @@
 import Foundation
 import Combine
-import WalletConnectUtils
-import WalletConnectPairing
-import WalletConnectRelay
 
 /// WalletConnect Auth Client
 ///

diff --git a/Sources/Auth/AuthClientFactory.swift b/Sources/Auth/AuthClientFactory.swift
@@ -1,9 +1,4 @@
 import Foundation
-import WalletConnectRelay
-import WalletConnectUtils
-import WalletConnectKMS
-import WalletConnectPairing
-import WalletConnectNetworking
 
 public struct AuthClientFactory {
 

diff --git a/Sources/Auth/AuthImports.swift b/Sources/Auth/AuthImports.swift
@@ -0,0 +1,3 @@
+#if !CocoaPods
+@_exported import WalletConnectPairing
+#endif
diff --git a/Sources/Auth/AuthProtocolMethod.swift b/Sources/Auth/AuthProtocolMethod.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectNetworking
 
 struct AuthRequestProtocolMethod: ProtocolMethod {
     let method: String = "wc_authRequest"

diff --git a/Sources/Auth/Services/App/AppPairService.swift b/Sources/Auth/Services/App/AppPairService.swift
diff --git a/Sources/Auth/Services/App/AppRequestService.swift b/Sources/Auth/Services/App/AppRequestService.swift
@@ -1,8 +1,4 @@
 import Foundation
-import JSONRPC
-import WalletConnectNetworking
-import WalletConnectUtils
-import WalletConnectKMS
 
 actor AppRequestService {
     private let networkingInteractor: NetworkInteracting

diff --git a/Sources/Auth/Services/App/AppRespondSubscriber.swift b/Sources/Auth/Services/App/AppRespondSubscriber.swift
@@ -1,9 +1,5 @@
 import Foundation
 import Combine
-import JSONRPC
-import WalletConnectNetworking
-import WalletConnectUtils
-import WalletConnectPairing
 
 class AppRespondSubscriber {
     private let networkingInteractor: NetworkInteracting

diff --git a/Sources/Auth/Services/Common/SIWEMessageFormatter.swift b/Sources/Auth/Services/Common/SIWEMessageFormatter.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectUtils
 
 protocol SIWEMessageFormatting {
     func formatMessage(from authPayload: AuthPayload, address: String) -> String?

diff --git a/Sources/Auth/Services/Signer/DIDPKH.swift b/Sources/Auth/Services/Signer/DIDPKH.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectUtils
 
 struct DIDPKH {
     static let didPrefix: String = "did:pkh"

diff --git a/Sources/Auth/Services/Signer/EIP1271/EIP1271Verifier.swift b/Sources/Auth/Services/Signer/EIP1271/EIP1271Verifier.swift
@@ -1,7 +1,4 @@
 import Foundation
-import JSONRPC
-import WalletConnectNetworking
-import WalletConnectUtils
 
 actor EIP1271Verifier {
     private let projectId: String

diff --git a/Sources/Auth/Services/Signer/EIP1271/RPCService.swift b/Sources/Auth/Services/Signer/EIP1271/RPCService.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectNetworking
 
 struct RPCService: HTTPService {
     let data: Data

diff --git a/Sources/Auth/Services/Signer/MessageSignerFactory.swift b/Sources/Auth/Services/Signer/MessageSignerFactory.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectNetworking
 
 public struct MessageSignerFactory {
 

diff --git a/Sources/Auth/Services/Wallet/PendingRequestsProvider.swift b/Sources/Auth/Services/Wallet/PendingRequestsProvider.swift
@@ -1,6 +1,4 @@
 import Foundation
-import JSONRPC
-import WalletConnectUtils
 
 class PendingRequestsProvider {
     private let rpcHistory: RPCHistory

diff --git a/Sources/Auth/Services/Wallet/WalletErrorResponder.swift b/Sources/Auth/Services/Wallet/WalletErrorResponder.swift
@@ -1,8 +1,4 @@
 import Foundation
-import JSONRPC
-import WalletConnectNetworking
-import WalletConnectUtils
-import WalletConnectKMS
 
 actor WalletErrorResponder {
     enum Errors: Error {

diff --git a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
@@ -1,10 +1,5 @@
 import Foundation
 import Combine
-import JSONRPC
-import WalletConnectNetworking
-import WalletConnectUtils
-import WalletConnectKMS
-import WalletConnectPairing
 
 class WalletRequestSubscriber {
     private let networkingInteractor: NetworkInteracting

diff --git a/Sources/Auth/Services/Wallet/WalletRespondService.swift b/Sources/Auth/Services/Wallet/WalletRespondService.swift
@@ -1,8 +1,4 @@
 import Foundation
-import JSONRPC
-import WalletConnectKMS
-import WalletConnectUtils
-import WalletConnectNetworking
 
 actor WalletRespondService {
     enum Errors: Error {

diff --git a/Sources/Auth/Types/Aliases/Account.swift b/Sources/Auth/Types/Aliases/Account.swift
diff --git a/Sources/Auth/Types/Aliases/AppMetadata.swift b/Sources/Auth/Types/Aliases/AppMetadata.swift
diff --git a/Sources/Auth/Types/Aliases/Pairing.swift b/Sources/Auth/Types/Aliases/Pairing.swift
diff --git a/Sources/Auth/Types/Aliases/RPCID.swift b/Sources/Auth/Types/Aliases/RPCID.swift
diff --git a/Sources/Auth/Types/Aliases/WalletConnectURI.swift b/Sources/Auth/Types/Aliases/WalletConnectURI.swift
diff --git a/Sources/Auth/Types/Errors/AuthError.swift b/Sources/Auth/Types/Errors/AuthError.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectNetworking
 
 /// Authentication error
 public enum AuthError: Codable, Equatable, Error {

diff --git a/Sources/Auth/Types/ProtocolRPCParams/AuthRequestParams.swift b/Sources/Auth/Types/ProtocolRPCParams/AuthRequestParams.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectUtils
 
 /// wc_authRequest RPC method request param
 struct AuthRequestParams: Codable, Equatable {

diff --git a/Sources/Auth/Types/ProtocolRPCParams/AuthResponseParams.swift b/Sources/Auth/Types/ProtocolRPCParams/AuthResponseParams.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectUtils
 
 /// wc_authRequest RPC method respond param
 typealias AuthResponseParams = Cacao
diff --git a/Sources/Auth/Types/RelayProtocolOptions.swift b/Sources/Auth/Types/RelayProtocolOptions.swift
diff --git a/Sources/Chat/ChatClient.swift b/Sources/Chat/ChatClient.swift
@@ -1,8 +1,4 @@
 import Foundation
-import WalletConnectUtils
-import WalletConnectKMS
-import WalletConnectRelay
-import WalletConnectNetworking
 import Combine
 
 public class ChatClient {

diff --git a/Sources/Chat/ChatClientFactory.swift b/Sources/Chat/ChatClientFactory.swift
@@ -1,8 +1,4 @@
 import Foundation
-import WalletConnectRelay
-import WalletConnectUtils
-import WalletConnectKMS
-import WalletConnectNetworking
 
 public struct ChatClientFactory {
 

diff --git a/Sources/Chat/ChatImports.swift b/Sources/Chat/ChatImports.swift
@@ -0,0 +1,3 @@
+#if !CocoaPods
+@_exported import WalletConnectNetworking
+#endif
diff --git a/Sources/Chat/Database.swift b/Sources/Chat/Database.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectUtils
 
 class Database<Element> where Element: Codable {
 

diff --git a/Sources/Chat/HTTPServices/RegisterService.swift b/Sources/Chat/HTTPServices/RegisterService.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectNetworking
 
 struct RegisterService: HTTPService {
 

diff --git a/Sources/Chat/HTTPServices/ResolveService.swift b/Sources/Chat/HTTPServices/ResolveService.swift
@@ -1,6 +1,4 @@
 import Foundation
-import WalletConnectNetworking
-import WalletConnectUtils
 
 struct ResolveService: HTTPService {
 

diff --git a/Sources/Chat/ProtocolServices/Common/MessagingService.swift b/Sources/Chat/ProtocolServices/Common/MessagingService.swift
@@ -1,8 +1,5 @@
 import Foundation
 import Combine
-import JSONRPC
-import WalletConnectUtils
-import WalletConnectNetworking
 
 class MessagingService {
     enum Errors: Error {

diff --git a/Sources/Chat/ProtocolServices/Common/ResubscriptionService.swift b/Sources/Chat/ProtocolServices/Common/ResubscriptionService.swift
@@ -1,8 +1,5 @@
 import Foundation
 import Combine
-import WalletConnectRelay
-import WalletConnectUtils
-import WalletConnectNetworking
 
 class ResubscriptionService {
     private let networkingInteractor: NetworkInteracting

diff --git a/Sources/Chat/ProtocolServices/Invitee/InvitationHandlingService.swift b/Sources/Chat/ProtocolServices/Invitee/InvitationHandlingService.swift
@@ -1,10 +1,5 @@
 import Foundation
 import Combine
-import JSONRPC
-import WalletConnectKMS
-import WalletConnectUtils
-import WalletConnectRelay
-import WalletConnectNetworking
 
 class InvitationHandlingService {
     enum Error: Swift.Error {

diff --git a/Sources/Chat/ProtocolServices/Invitee/RegistryService.swift b/Sources/Chat/ProtocolServices/Invitee/RegistryService.swift
@@ -1,7 +1,4 @@
 import Foundation
-import WalletConnectUtils
-import WalletConnectKMS
-import WalletConnectNetworking
 
 actor RegistryService {
     let networkingInteractor: NetworkInteracting

diff --git a/Sources/Chat/ProtocolServices/Inviter/InviteService.swift b/Sources/Chat/ProtocolServices/Inviter/InviteService.swift
@@ -1,9 +1,5 @@
 import Foundation
 import Combine
-import JSONRPC
-import WalletConnectKMS
-import WalletConnectUtils
-import WalletConnectNetworking
 
 class InviteService {
     private var publishers = [AnyCancellable]()