#226 Rename Auth package to Sign (#232)

* Renamed package and base directories * Renamed imports to WalletConnectSign * Renamed client and delegate * Renamed Auth type to Sign * Fixed a log typo * Removed auth reference from build scheme Co-authored-by: André Vants
WalletConnect · May 25, 2022 · 7b4d7af · 7b4d7af
1 parent fd3fa06
commit 7b4d7af
Show file tree

Hide file tree

Showing 96 changed files with 257 additions and 112 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/WalletConnect.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/WalletConnect.xcscheme
@@ -98,9 +98,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectAuth"
-               BuildableName = "WalletConnectAuth"
-               BlueprintName = "WalletConnectAuth"
+               BlueprintIdentifier = "WalletConnectRelay"
+               BuildableName = "WalletConnectRelay"
+               BlueprintName = "WalletConnectRelay"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -112,9 +112,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "WalletConnectRelay"
-               BuildableName = "WalletConnectRelay"
-               BlueprintName = "WalletConnectRelay"
+               BlueprintIdentifier = "WalletConnectSign"
+               BuildableName = "WalletConnectSign"
+               BlueprintName = "WalletConnectSign"
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
@@ -176,6 +176,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WalletConnectSignTests"
+               BuildableName = "WalletConnectSignTests"
+               BlueprintName = "WalletConnectSignTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

diff --git a/Example/DApp/ Accounts/AccountsViewController.swift b/Example/DApp/ Accounts/AccountsViewController.swift
@@ -1,5 +1,5 @@
 import UIKit
-import WalletConnectAuth
+import WalletConnectSign
 
 struct AccountDetails {
     let chain: String
@@ -53,7 +53,7 @@ final class AccountsViewController: UIViewController, UITableViewDataSource, UIT
     private func disconnect() {
         Task {
             do {
-                try await Auth.instance.disconnect(topic: session.topic, reason: Reason(code: 0, message: "disconnect"))
+                try await Sign.instance.disconnect(topic: session.topic, reason: Reason(code: 0, message: "disconnect"))
                 DispatchQueue.main.async { [weak self] in
                     self?.onDisconnect?()
                 }

diff --git a/Example/DApp/AccountRequest/AccountRequestViewController.swift b/Example/DApp/AccountRequest/AccountRequestViewController.swift
@@ -2,7 +2,7 @@
 
 import Foundation
 import UIKit
-import WalletConnectAuth
+import WalletConnectSign
 import WalletConnectUtils
 
 class AccountRequestViewController: UIViewController, UITableViewDelegate, UITableViewDataSource  {
@@ -60,7 +60,7 @@ class AccountRequestViewController: UIViewController, UITableViewDelegate, UITab
         let request = Request(topic: session.topic, method: method, params: requestParams, chainId: Blockchain(chainId)!)
         Task {
             do {
-                try await Auth.instance.request(params: request)
+                try await Sign.instance.request(params: request)
                 DispatchQueue.main.async { [weak self] in
                     self?.presentConfirmationAlert()
                 }

diff --git a/Example/DApp/Connect/ConnectViewController.swift b/Example/DApp/Connect/ConnectViewController.swift
@@ -1,11 +1,11 @@
 
 import Foundation
 import UIKit
-import WalletConnectAuth
+import WalletConnectSign
 
 class ConnectViewController: UIViewController, UITableViewDataSource, UITableViewDelegate {
     let uriString: String
-    let activePairings: [Pairing] = Auth.instance.getSettledPairings()
+    let activePairings: [Pairing] = Sign.instance.getSettledPairings()
     let segmentedControl = UISegmentedControl(items: ["Pairings", "New Pairing"])
 
     init(uri: String) {
@@ -99,7 +99,7 @@ class ConnectViewController: UIViewController, UITableViewDataSource, UITableVie
         let methods: Set<String> = ["eth_sendTransaction", "personal_sign", "eth_signTypedData"]
         let namespaces: [String: ProposalNamespace] = ["eip155": ProposalNamespace(chains: blockchains, methods: methods, events: [], extensions: nil)]
         Task {
-            _ = try await Auth.instance.connect(requiredNamespaces: namespaces, topic: pairingTopic)
+            _ = try await Sign.instance.connect(requiredNamespaces: namespaces, topic: pairingTopic)
             connectWithExampleWallet()
         }
     }

diff --git a/Example/DApp/ResponseViewController.swift b/Example/DApp/ResponseViewController.swift
@@ -1,6 +1,6 @@
 
 import Foundation
-import WalletConnectAuth
+import WalletConnectSign
 import UIKit
 
 class ResponseViewController: UIViewController {
@@ -24,7 +24,7 @@ class ResponseViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        let record = Auth.instance.getSessionRequestRecord(id: response.result.id)!
+        let record = Sign.instance.getSessionRequestRecord(id: response.result.id)!
         switch response.result {
         case  .response(let response):
             responseView.nameLabel.text = "Received Response\n\(record.request.method)"

diff --git a/Example/DApp/SceneDelegate.swift b/Example/DApp/SceneDelegate.swift
@@ -1,6 +1,6 @@
 
 import UIKit
-import WalletConnectAuth
+import WalletConnectSign
 import Combine
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
@@ -20,19 +20,19 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             description: "a description",
             url: "wallet.connect",
             icons: ["https://avatars.githubusercontent.com/u/37784886"])
-        Auth.configure(Auth.Config(metadata: metadata, projectId: "8ba9ee138960775e5231b70cc5ef1c3a"))
-        Auth.instance.sessionDeletePublisher
+        Sign.configure(Sign.Config(metadata: metadata, projectId: "8ba9ee138960775e5231b70cc5ef1c3a"))
+        Sign.instance.sessionDeletePublisher
             .receive(on: DispatchQueue.main)
             .sink { [unowned self] _ in
                 showSelectChainScreen()
             }.store(in: &publishers)
 
-        Auth.instance.sessionResponsePublisher.sink { [unowned self] response in
+        Sign.instance.sessionResponsePublisher.sink { [unowned self] response in
             presentResponse(for: response)
         }.store(in: &publishers)
 
 
-        if let session = Auth.instance.getSessions().first {
+        if let session = Sign.instance.getSessions().first {
             showAccountsScreen(session)
         } else {
             showSelectChainScreen()

diff --git a/Example/DApp/SelectChain/SelectChainViewController.swift b/Example/DApp/SelectChain/SelectChainViewController.swift
@@ -1,7 +1,7 @@
 
 
 import Foundation
-import WalletConnectAuth
+import WalletConnectSign
 import UIKit
 import Combine
 
@@ -23,7 +23,7 @@ class SelectChainViewController: UIViewController, UITableViewDataSource {
         navigationItem.title = "Available Chains"
         selectChainView.tableView.dataSource = self
         selectChainView.connectButton.addTarget(self, action: #selector(connect), for: .touchUpInside)
-        Auth.instance.sessionSettlePublisher.sink {[unowned self] session in
+        Sign.instance.sessionSettlePublisher.sink {[unowned self] session in
             onSessionSettled?(session)
         }.store(in: &publishers)
     }
@@ -39,7 +39,7 @@ class SelectChainViewController: UIViewController, UITableViewDataSource {
         let blockchains: Set<Blockchain> = [Blockchain("eip155:1")!, Blockchain("eip155:137")!]
         let namespaces: [String: ProposalNamespace] = ["eip155": ProposalNamespace(chains: blockchains, methods: methods, events: [], extensions: nil)]
         Task {
-            let uri = try await Auth.instance.connect(requiredNamespaces: namespaces)
+            let uri = try await Sign.instance.connect(requiredNamespaces: namespaces)
             showConnectScreen(uriString: uri!)
         }
     }

diff --git a/Example/ExampleApp/Request/RequestViewController.swift b/Example/ExampleApp/Request/RequestViewController.swift
@@ -1,7 +1,7 @@
 
 import Foundation
 import UIKit
-import WalletConnectAuth
+import WalletConnectSign
 import Web3
 
 class RequestViewController: UIViewController {

diff --git a/Example/ExampleApp/SceneDelegate.swift b/Example/ExampleApp/SceneDelegate.swift
@@ -1,5 +1,5 @@
 import UIKit
-import WalletConnectAuth
+import WalletConnectSign
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
@@ -12,7 +12,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             description: "wallet description",
             url: "example.wallet",
             icons: ["https://avatars.githubusercontent.com/u/37784886"])
-        Auth.configure(Auth.Config(metadata: metadata, projectId: "8ba9ee138960775e5231b70cc5ef1c3a"))
+        Sign.configure(Sign.Config(metadata: metadata, projectId: "8ba9ee138960775e5231b70cc5ef1c3a"))
 
         guard let windowScene = (scene as? UIWindowScene) else { return }
         window = UIWindow(windowScene: windowScene)
@@ -30,7 +30,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         vc.onClientConnected = {
             Task {
                 do {
-                    try await Auth.instance.pair(uri: wcUri)
+                    try await Sign.instance.pair(uri: wcUri)
                 } catch {
                     print(error)
                 }

diff --git a/Example/ExampleApp/SessionDetails/SessionDetailView.swift b/Example/ExampleApp/SessionDetails/SessionDetailView.swift
@@ -1,5 +1,5 @@
 import SwiftUI
-import WalletConnectAuth
+import WalletConnectSign
 
 struct SessionDetailView: View {
 

diff --git a/Example/ExampleApp/SessionDetails/SessionDetailViewController.swift b/Example/ExampleApp/SessionDetails/SessionDetailViewController.swift
@@ -1,13 +1,13 @@
 import UIKit
 import SwiftUI
-import WalletConnectAuth
+import WalletConnectSign
 import WalletConnectUtils
 
 final class SessionDetailViewController: UIHostingController<SessionDetailView> {
 
     private let viewModel: SessionDetailViewModel
 
-    init(session: Session, client: Auth) {
+    init(session: Session, client: Sign) {
         self.viewModel = SessionDetailViewModel(session: session, client: client)
         super.init(rootView: SessionDetailView(viewModel: viewModel))
 
@@ -25,11 +25,11 @@ final class SessionDetailViewController: UIHostingController<SessionDetailView>
         viewController.onSign = { [unowned self] in
             let result = Signer.signEth(request: request)
             let response = JSONRPCResponse<AnyCodable>(id: request.id, result: result)
-            Auth.instance.respond(topic: request.topic, response: .response(response))
+            Sign.instance.respond(topic: request.topic, response: .response(response))
             reload()
         }
         viewController.onReject = { [unowned self] in
-            Auth.instance.respond(
+            Sign.instance.respond(
                 topic: request.topic,
                 response: .error(JSONRPCErrorResponse(
                     id: request.id,

diff --git a/Example/ExampleApp/SessionDetails/SessionDetailViewModel.swift b/Example/ExampleApp/SessionDetails/SessionDetailViewModel.swift
@@ -1,11 +1,11 @@
 import Foundation
 import Combine
-import WalletConnectAuth
+import WalletConnectSign
 
 @MainActor
 final class SessionDetailViewModel: ObservableObject {
     private let session: Session
-    private let client: Auth
+    private let client: Sign
 
     enum Fields {
         case accounts
@@ -16,7 +16,7 @@ final class SessionDetailViewModel: ObservableObject {
 
     @Published var namespaces: [String: SessionNamespace]
 
-    init(session: Session, client: Auth) {
+    init(session: Session, client: Sign) {
         self.session = session
         self.client = client
         self.namespaces = session.namespaces