Merge pull request #711 from WalletConnect/develop

1.3.2

.env.Showcase

@@ -1,3 +1,4 @@
 SCHEME = "Showcase" 
 APP_IDENTIFIER = "com.walletconnect.chat" 
+MATCH_IDENTIFIERS = "com.walletconnect.chat"
 APPLE_ID = "1634760092"

.env.WalletApp

@@ -1,3 +1,4 @@
 SCHEME = "WalletApp" 
 APP_IDENTIFIER = "com.walletconnect.walletapp" 
+MATCH_IDENTIFIERS = "com.walletconnect.walletapp,com.walletconnect.walletapp.PNDecryptionService"
 APPLE_ID = "1667351690"

.github/workflows/release.yml

@@ -0,0 +1,42 @@
+name: release
+
+on:
+  schedule:
+    # Runs "Every Monday 10am CET"
+    - cron: '0 10 * * 1'
+
+  workflow_dispatch:
+
+jobs:
+  build:    
+    runs-on: macos-12
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup Xcode Version
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: 14.1
+
+    - uses: actions/cache@v2
+      with:
+        path: |
+          .build
+          SourcePackagesCache
+          DerivedDataCache
+        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+        restore-keys: |
+          ${{ runner.os }}-spm-
+
+    - name: Release
+      shell: bash
+      env: 
+        MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+        GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        GH_USER: ${{ secrets.GH_USER }}
+        APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+        APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
+        APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
+      run: |
+        make release_all APPLE_ID=${{ secrets.APPLE_ID }} TOKEN=$(echo -n $GH_USER:$GH_TOKEN | base64)

.gitignore

@@ -19,6 +19,7 @@ fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
 fastlane/README.md
+.env
 
 # Configuration
 Configuration.xcconfig
@@ -28,4 +29,5 @@ SourcePackagesCache
 DerivedDataCache
 
 # Artifacts
-*.ipa
+*.ipa
+*.zip

.swiftpm/xcode/xcshareddata/xcschemes/WalletConnectEcho.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1420"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WalletConnectEcho"
+               BuildableName = "WalletConnectEcho"
+               BlueprintName = "WalletConnectEcho"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "WalletConnectEcho"
+            BuildableName = "WalletConnectEcho"
+            BlueprintName = "WalletConnectEcho"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/IntegrationTests/Pairing/PairingTests.swift

@@ -69,7 +69,7 @@ final class PairingTests: XCTestCase {
         let (pairingClient, networkingInteractor, keychain, keyValueStorage) = makeClientDependencies(prefix: prefix)
         let pushLogger = ConsoleLogger(suffix: prefix + " [Push]", loggingLevel: .debug)
         walletPairingClient = pairingClient
-        let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com")
+        let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com", environment: .sandbox)
         walletPushClient = WalletPushClientFactory.create(logger: pushLogger,
                                                           keyValueStorage: keyValueStorage,
                                                           keychainStorage: keychain,

Example/IntegrationTests/Push/PushTests.swift

@@ -69,7 +69,7 @@ final class PushTests: XCTestCase {
         let (pairingClient, networkingInteractor, keychain, keyValueStorage) = makeClientDependencies(prefix: prefix)
         let pushLogger = ConsoleLogger(suffix: prefix + " [Push]", loggingLevel: .debug)
         walletPairingClient = pairingClient
-        let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com")
+        let echoClient = EchoClientFactory.create(projectId: "", clientId: "", echoHost: "echo.walletconnect.com", environment: .sandbox)
         walletPushClient = WalletPushClientFactory.create(logger: pushLogger,
                                                           keyValueStorage: keyValueStorage,
                                                           keychainStorage: keychain,

Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift

@@ -15,8 +15,7 @@ struct ThirdPartyConfigurator: Configurator {
         )
 
         Web3Wallet.configure(metadata: metadata, signerFactory: DefaultSignerFactory())
-        Push.configure()
-
+        Push.configure(environment: BuildConfiguration.shared.apnsEnvironment)
     }
 
 }

Example/WalletApp/Common/BuildConfiguration.swift

@@ -0,0 +1,27 @@
+import Foundation
+import WalletConnectPush
+
+class BuildConfiguration {
+    enum Environment: String {
+        case debug = "Debug"
+        case release = "Release"
+    }
+
+    static let shared = BuildConfiguration()
+
+    var environment: Environment
+
+    var apnsEnvironment: APNSEnvironment {
+        switch environment {
+        case .debug:
+            return .sandbox
+        case .release:
+            return .production
+        }
+    }
+
+    init() {
+        let currentConfiguration = Bundle.main.object(forInfoDictionaryKey: "CONFIGURATION") as! String
+        environment = Environment(rawValue: currentConfiguration)!
+    }
+}

Example/WalletApp/Other/Info.plist

@@ -28,8 +28,10 @@
 	</dict>
 	<key>PROJECT_ID</key>
 	<string>$(PROJECT_ID)</string>
-	<key>NSCameraUsageDescription</key>
-	<string>Camera access for scanning QR code</string>
+	<key>SIMULATOR_IDENTIFIER</key>
+	<string>$(SIMULATOR_IDENTIFIER)</string>
+	<key>CONFIGURATION</key>
+	<string>$(CONFIGURATION)</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -47,7 +49,9 @@
 			</array>
 		</dict>
 	</dict>
-	<key>SIMULATOR_IDENTIFIER</key>
-	<string>$(SIMULATOR_IDENTIFIER)</string>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>remote-notification</string>
+	</array>
 </dict>
 </plist>

Example/WalletApp/PresentationLayer/Wallet/Main/MainInteractor.swift

@@ -0,0 +1,15 @@
+import Combine
+import Web3Wallet
+import WalletConnectPush
+import Foundation
+
+final class MainInteractor {
+
+    var sessionProposalPublisher: AnyPublisher<Session.Proposal, Never> {
+        return Web3Wallet.instance.sessionProposalPublisher
+    }
+
+    var pushRequestPublisher: AnyPublisher<(id: RPCID, account: Account, metadata: AppMetadata), Never> {
+        return Push.wallet.requestPublisher
+    }
+}

Example/WalletApp/PresentationLayer/Wallet/Main/MainModule.swift

@@ -0,0 +1,17 @@
+import SwiftUI
+
+final class MainModule {
+
+    @discardableResult
+    static func create(app: Application) -> UIViewController {
+        let router = MainRouter(app: app)
+        let interactor = MainInteractor()
+        let presenter = MainPresenter(router: router, interactor: interactor)
+        let viewController = MainViewController(presenter: presenter)
+
+        router.viewController = viewController
+
+        return viewController
+    }
+
+}

Example/WalletApp/PresentationLayer/Wallet/Main/MainPresenter.swift

@@ -0,0 +1,48 @@
+import UIKit
+import Combine
+
+final class MainPresenter {
+
+    private let interactor: MainInteractor
+    private let router: MainRouter
+    private var disposeBag = Set<AnyCancellable>()
+
+    var tabs: [TabPage] {
+        return TabPage.allCases
+    }
+
+    var viewControllers: [UIViewController] {
+        return [
+            router.walletViewController(),
+            router.notificationsViewController(),
+        ]
+    }
+
+    init(router: MainRouter,
+         interactor: MainInteractor) {
+        defer {
+            setupInitialState()
+        }
+        self.router = router
+        self.interactor = interactor
+    }
+}
+
+// MARK: - Private functions
+extension MainPresenter {
+    private func setupInitialState() {
+        interactor.pushRequestPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] request in
+                self?.router.present(pushRequest: request)
+            }.store(in: &disposeBag)
+
+        interactor.sessionProposalPublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] proposal in
+                self?.router.present(proposal: proposal)
+            }
+            .store(in: &disposeBag)
+    }
+}
+

Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift

@@ -0,0 +1,33 @@
+import UIKit
+import WalletConnectPush
+import Web3Wallet
+final class MainRouter {
+
+    weak var viewController: UIViewController!
+
+    private let app: Application
+
+    func walletViewController() -> UIViewController {
+        return WalletModule.create(app: app)
+            .wrapToNavigationController()
+    }
+
+    func present(proposal: Session.Proposal) {
+        SessionProposalModule.create(app: app, proposal: proposal)
+            .presentFullScreen(from: viewController, transparentBackground: true)
+    }
+
+    func notificationsViewController() -> UIViewController {
+        return NotificationsModule.create(app: app)
+            .wrapToNavigationController()
+    }
+
+    func present(pushRequest: PushRequest) {
+        PushRequestModule.create(app: app, pushRequest: pushRequest)
+            .presentFullScreen(from: viewController, transparentBackground: true)
+    }
+
+    init(app: Application) {
+        self.app = app
+    }
+}

Example/WalletApp/PresentationLayer/Wallet/Main/MainViewController.swift

@@ -0,0 +1,38 @@
+import UIKit
+
+final class MainViewController: UITabBarController {
+
+    private let presenter: MainPresenter
+
+    init(presenter: MainPresenter) {
+        self.presenter = presenter
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        setupTabs()
+    }
+
+    private func setupTabs() {
+        let viewControllers = presenter.viewControllers
+
+        for (index, viewController) in viewControllers.enumerated() {
+            let model = presenter.tabs[index]
+            let item = UITabBarItem()
+            item.title = model.title
+            item.image = model.icon
+            item.isEnabled = TabPage.enabledTabs.contains(model)
+            viewController.tabBarItem = item
+            viewController.view.backgroundColor = .w_background
+        }
+
+        self.viewControllers = viewControllers
+        self.selectedIndex = TabPage.selectedIndex
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}