Merge pull request #48 from reown-com/develop

1.0.5

.swiftpm/xcode/xcshareddata/xcschemes/WalletConnect-Package.xcscheme

@@ -482,6 +482,90 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WalletConnectModal"
+               BuildableName = "WalletConnectModal"
+               BlueprintName = "WalletConnectModal"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "WalletConnectNotify"
+               BuildableName = "WalletConnectNotify"
+               BlueprintName = "WalletConnectNotify"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "YttriumWrapper"
+               BuildableName = "YttriumWrapper"
+               BlueprintName = "YttriumWrapper"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ReownAppKitUI"
+               BuildableName = "ReownAppKitUI"
+               BlueprintName = "ReownAppKitUI"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ReownRouter"
+               BuildableName = "ReownRouter"
+               BlueprintName = "ReownRouter"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "ReownWalletKit"
+               BuildableName = "ReownWalletKit"
+               BlueprintName = "ReownWalletKit"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -606,6 +690,16 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EventsTests"
+               BuildableName = "EventsTests"
+               BlueprintName = "EventsTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Configuration.xcconfig

@@ -22,3 +22,9 @@ EXPLORER_HOST = explorer-api.walletconnect.com
 // WALLETAPP_SENTRY_DSN = WALLETAPP_SENTRY_DSN
 
 // MIXPANEL_TOKEN = MIXPANEL_TOKEN
+
+// pimloco bundler url including api key
+// PIMLICO_BUNDLER_URL = PIMLICO_BUNDLER_URL
+
+// rpc url
+// RPC_URL = RPC_URL

Example/DApp/AppDelegate.swift

@@ -5,6 +5,7 @@ import WalletConnectSign
 class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
+
         return true
     }
 

Example/DApp/Modules/Sign/SessionAccount/SessionAccountInteractor.swift

@@ -6,7 +6,10 @@ import WalletConnectSign
 struct AccountDetails {
     let chain: String
     let methods: [String]
-    let account: String
+    let address: String
+    var account: String {
+        "\(chain):\(address)"
+    }
 }
 
 

Example/DApp/Modules/Sign/SessionAccount/SessionAccountPresenter.swift

@@ -70,7 +70,7 @@ final class SessionAccountPresenter: ObservableObject {
     }
 
     func copyUri() {
-        UIPasteboard.general.string = sessionAccount.account
+        UIPasteboard.general.string = sessionAccount.address
     }
 }
 
@@ -128,17 +128,17 @@ extension SessionAccountPresenter.Errors: LocalizedError {
 // MARK: - Transaction Stub
 private enum Stub {
     struct Transaction: Codable {
-        let from, to, data, gas: String
+        let from, to, data, gasLimit: String
         let gasPrice, value, nonce: String
     }
 
     static let tx = [Transaction(from: "0x9b2055d370f73ec7d8a03e965129118dc8f5bf83",
                                 to: "0x9b2055d370f73ec7d8a03e965129118dc8f5bf83",
-                                data: "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675",
-                                gas: "0x76c0",
-                                gasPrice: "0x9184e72a000",
-                                value: "0x9184e72a",
-                                nonce: "0x117")]
+                                data: "0x",
+                                gasLimit: "0x5208",
+                                gasPrice: "0x013e3d2ed4",
+                                value: "0x00",
+                                nonce: "0x09")]
     static let eth_signTypedData = """
 {
 "types": {

Example/DApp/Modules/Sign/SessionAccount/SessionAccountView.swift

@@ -16,7 +16,7 @@ struct SessionAccountView: View {
                 ScrollView {
                     VStack(spacing: 12) {
                         networkView(title: String(presenter.sessionAccount.chain.split(separator: ":").first ?? ""))
-                        accountView(address: presenter.sessionAccount.account)
+                        accountView(address: presenter.sessionAccount.address)
                         methodsView(methods: presenter.sessionAccount.methods)
 
                         Spacer()

Example/DApp/Modules/Sign/SignPresenter.swift

@@ -160,6 +160,13 @@ extension SignPresenter {
             }
             .store(in: &subscriptions)
 
+        Sign.instance.sessionSettlePublisher
+            .receive(on: DispatchQueue.main)
+            .sink { [unowned self] _ in
+                self.getSession()
+            }
+            .store(in: &subscriptions)
+
         Sign.instance.authResponsePublisher
             .receive(on: DispatchQueue.main)
             .sink { [unowned self] response in
@@ -218,7 +225,7 @@ extension SignPresenter {
                         AccountDetails(
                             chain: account.blockchainIdentifier,
                             methods: Array(namespace.methods),
-                            account: account.address
+                            address: account.address
                         )
                     )
                 }

Example/DApp/Modules/Sign/SignView.swift

@@ -84,7 +84,7 @@ struct SignView: View {
                         .padding(12)
                     } else {
                         VStack {
-                            ForEach(presenter.accountsDetails, id: \.chain) { account in
+                            ForEach(presenter.accountsDetails, id: \.account) { account in
                                 Button {
                                     presenter.presentSessionAccount(sessionAccount: account)
                                 } label: {

Example/ExampleApp.xcodeproj/project.pbxproj

@@ -38,7 +38,9 @@
 		84474A0129B9EB74005F520B /* Starscream in Frameworks */ = {isa = PBXBuildFile; productRef = 84474A0029B9EB74005F520B /* Starscream */; };
 		84474A0229B9ECA2005F520B /* DefaultSocketFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5629AEF2877F73000094373 /* DefaultSocketFactory.swift */; };
 		8448F1D427E4726F0000B866 /* WalletConnect in Frameworks */ = {isa = PBXBuildFile; productRef = 8448F1D327E4726F0000B866 /* WalletConnect */; };
+		8454EF0A2C9421B600B5529E /* SmartAccountManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8454EF092C9421B600B5529E /* SmartAccountManager.swift */; };
 		845B8D8C2934B36C0084A966 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845B8D8B2934B36C0084A966 /* Account.swift */; };
+		846CA5C82CB901F8005E8C15 /* Yttrium in Frameworks */ = {isa = PBXBuildFile; productRef = 846CA5C72CB901F8005E8C15 /* Yttrium */; };
 		846E359F2C00654F00E63DF4 /* ConfigModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846E359E2C00654F00E63DF4 /* ConfigModule.swift */; };
 		846E35A22C0065AD00E63DF4 /* ConfigRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846E35A12C0065AD00E63DF4 /* ConfigRouter.swift */; };
 		846E35A42C0065B600E63DF4 /* ConfigPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846E35A32C0065B600E63DF4 /* ConfigPresenter.swift */; };
@@ -47,6 +49,7 @@
 		84733CD32C1C2A4B001B2850 /* AlertPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84AEC2502B4D42C100E27A5B /* AlertPresenter.swift */; };
 		84733CD42C1C2C24001B2850 /* ProfilingService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50B6A372B06697B00162B01 /* ProfilingService.swift */; };
 		84733CD52C1C2CEB001B2850 /* InputConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = C56EE25D293F56D6004840D1 /* InputConfig.swift */; };
+		84733CDA2C258BDB001B2850 /* SmartAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84733CD92C258BDB001B2850 /* SmartAccount.swift */; };
 		847BD1D62989492500076C90 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847BD1D12989492500076C90 /* MainViewController.swift */; };
 		847BD1D82989492500076C90 /* MainModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847BD1D32989492500076C90 /* MainModule.swift */; };
 		847BD1D92989492500076C90 /* MainPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 847BD1D42989492500076C90 /* MainPresenter.swift */; };
@@ -339,6 +342,7 @@
 		844511C92C8BA69D00A6A86C /* AppKitLab.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AppKitLab.entitlements; sourceTree = "<group>"; };
 		844749F329B9E5B9005F520B /* RelayIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RelayIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		844749F529B9E5B9005F520B /* RelayClientEndToEndTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelayClientEndToEndTests.swift; sourceTree = "<group>"; };
+		8454EF092C9421B600B5529E /* SmartAccountManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartAccountManager.swift; sourceTree = "<group>"; };
 		845AA7D929BA1EBA00F33739 /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; name = IntegrationTests.xctestplan; path = ExampleApp.xcodeproj/IntegrationTests.xctestplan; sourceTree = "<group>"; };
 		845AA7DC29BB424800F33739 /* SmokeTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = SmokeTests.xctestplan; sourceTree = "<group>"; };
 		845B8D8B2934B36C0084A966 /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
@@ -347,6 +351,7 @@
 		846E35A32C0065B600E63DF4 /* ConfigPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigPresenter.swift; sourceTree = "<group>"; };
 		846E35A52C0065C100E63DF4 /* ConfigView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfigView.swift; sourceTree = "<group>"; };
 		846E35A72C006C5600E63DF4 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
+		84733CD92C258BDB001B2850 /* SmartAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartAccount.swift; sourceTree = "<group>"; };
 		847BD1D12989492500076C90 /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		847BD1D32989492500076C90 /* MainModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainModule.swift; sourceTree = "<group>"; };
 		847BD1D42989492500076C90 /* MainPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainPresenter.swift; sourceTree = "<group>"; };
@@ -629,6 +634,7 @@
 				A5B6C0F52A6EAB2800927332 /* WalletConnectNotify in Frameworks */,
 				84943C7D2A9BA328007EBAC2 /* Mixpanel in Frameworks */,
 				8421447F2C81863A004FF494 /* ReownWalletKit in Frameworks */,
+				846CA5C82CB901F8005E8C15 /* Yttrium in Frameworks */,
 				8421447D2C80A544004FF494 /* ReownAppKitUI in Frameworks */,
 				84CA52172C88965C0069BB33 /* ReownRouter in Frameworks */,
 			);
@@ -1008,6 +1014,8 @@
 			isa = PBXGroup;
 			children = (
 				A5D610CC2AB3592F00C20083 /* ListingsSertice */,
+				84733CD92C258BDB001B2850 /* SmartAccount.swift */,
+				8454EF092C9421B600B5529E /* SmartAccountManager.swift */,
 			);
 			path = BusinessLayer;
 			sourceTree = "<group>";
@@ -1630,6 +1638,7 @@
 				8421447C2C80A544004FF494 /* ReownAppKitUI */,
 				8421447E2C81863A004FF494 /* ReownWalletKit */,
 				84CA52162C88965C0069BB33 /* ReownRouter */,
+				846CA5C72CB901F8005E8C15 /* Yttrium */,
 			);
 			productName = ChatWallet;
 			productReference = C56EE21B293F55ED004840D1 /* WalletApp.app */;
@@ -1708,6 +1717,7 @@
 				84943C792A9BA206007EBAC2 /* XCRemoteSwiftPackageReference "mixpanel-swift" */,
 				84AEC2522B4D43CD00E27A5B /* XCRemoteSwiftPackageReference "SwiftMessages" */,
 				844511B82C8B6BC800A6A86C /* XCRemoteSwiftPackageReference "atlantis" */,
+				846CA5C62CB901BC005E8C15 /* XCRemoteSwiftPackageReference "yttrium" */,
 			);
 			productRefGroup = 764E1D3D26F8D3FC00A1FB15 /* Products */;
 			projectDirPath = "";
@@ -1989,6 +1999,7 @@
 				C5B2F6F729705293000DBA0E /* SessionRequestRouter.swift in Sources */,
 				C56EE24F293F566D004840D1 /* WalletView.swift in Sources */,
 				C55D34B22965FB750004314A /* SessionProposalView.swift in Sources */,
+				84733CDA2C258BDB001B2850 /* SmartAccount.swift in Sources */,
 				C56EE248293F566D004840D1 /* ScanQR.swift in Sources */,
 				847BD1EB298A87AB00076C90 /* SubscriptionsViewModel.swift in Sources */,
 				C55D349B2965BC2F0004314A /* TagsView.swift in Sources */,
@@ -2020,6 +2031,7 @@
 				847BD1E5298A806800076C90 /* NotificationsPresenter.swift in Sources */,
 				A50D53C12ABA055700A4FD8B /* NotifyPreferencesModule.swift in Sources */,
 				A50B6A382B06697B00162B01 /* ProfilingService.swift in Sources */,
+				8454EF0A2C9421B600B5529E /* SmartAccountManager.swift in Sources */,
 				A5B4F7C52ABB20AE0099AF7C /* SubscriptionRouter.swift in Sources */,
 				C55D3496295DFA750004314A /* WelcomeInteractor.swift in Sources */,
 				C5B2F6FC297055B0000DBA0E /* SOLSigner.swift in Sources */,
@@ -2564,6 +2576,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = WalletApp/Other/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "";
 				INFOPLIST_KEY_NSCameraUsageDescription = "Camera access for scanning QR code";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -2602,6 +2615,7 @@
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = WalletApp/Other/Info.plist;
+				INFOPLIST_KEY_LSApplicationCategoryType = "";
 				INFOPLIST_KEY_NSCameraUsageDescription = "Camera access for scanning QR code";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -2755,6 +2769,14 @@
 				minimumVersion = 1.24.0;
 			};
 		};
+		846CA5C62CB901BC005E8C15 /* XCRemoteSwiftPackageReference "yttrium" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/WalletConnect/yttrium";
+			requirement = {
+				kind = upToNextMinorVersion;
+				minimumVersion = 0.1.0;
+			};
+		};
 		84943C792A9BA206007EBAC2 /* XCRemoteSwiftPackageReference "mixpanel-swift" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/mixpanel/mixpanel-swift";
@@ -2880,6 +2902,11 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = WalletConnect;
 		};
+		846CA5C72CB901F8005E8C15 /* Yttrium */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 846CA5C62CB901BC005E8C15 /* XCRemoteSwiftPackageReference "yttrium" */;
+			productName = Yttrium;
+		};
 		8486EDD22B4F2EA6008E53C3 /* SwiftMessages */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 84AEC2522B4D43CD00E27A5B /* XCRemoteSwiftPackageReference "SwiftMessages" */;