Merge pull request #70 from reown-com/chore/uniff

Chore: chain abstraction integration
reown-com · Dec 19, 2024 · 297b460 · 297b460
2 parents 8fa8497 + e8a5b17
commit 297b460
Show file tree

Hide file tree

Showing 61 changed files with 2,007 additions and 357 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/ReownWalletKit.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/ReownWalletKit.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <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
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </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 = "ReownWalletKit"
+            BuildableName = "ReownWalletKit"
+            BlueprintName = "ReownWalletKit"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Configuration.xcconfig b/Configuration.xcconfig
@@ -23,12 +23,9 @@ EXPLORER_HOST = explorer-api.walletconnect.com
 
 // MIXPANEL_TOKEN = MIXPANEL_TOKEN
 
-// pimloco bundler url including api key
-// PIMLICO_BUNDLER_URL = PIMLICO_BUNDLER_URL
+// pimloco api key
+// PIMLICO_API_KEY = PIMLICO_API_KEY
 
 // BUNDLE_ID_PRESENT_PROJECT_ID = BUNDLE_ID_PRESENT_PROJECT_ID
 
 // BUNDLE_ID_NOT_PRESENT_PROJECT_ID = BUNDLE_ID_NOT_PRESENT_PROJECT_ID
-
-// rpc url
-// RPC_URL = RPC_URL
diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
diff --git a/Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -91,6 +91,24 @@
           "version": "3.1.2"
         }
       },
+      {
+        "package": "swift-atomics",
+        "repositoryURL": "https://github.com/apple/swift-atomics.git",
+        "state": {
+          "branch": null,
+          "revision": "cd142fd2f64be2100422d658e7411e39489da985",
+          "version": "1.2.0"
+        }
+      },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections.git",
+        "state": {
+          "branch": null,
+          "revision": "671108c96644956dddcd89dd59c203dcdb36cec7",
+          "version": "1.1.4"
+        }
+      },
       {
         "package": "SwiftDocCPlugin",
         "repositoryURL": "https://github.com/apple/swift-docc-plugin",
@@ -110,12 +128,57 @@
         }
       },
       {
-        "package": "swift-dotenv",
-        "repositoryURL": "https://github.com/thebarndog/swift-dotenv.git",
+        "package": "swift-http-types",
+        "repositoryURL": "https://github.com/apple/swift-http-types",
         "state": {
           "branch": null,
-          "revision": "f6e7ca817d35eeccb20b62c87ee75963b01b29dc",
-          "version": "2.0.1"
+          "revision": "ef18d829e8b92d731ad27bb81583edd2094d1ce3",
+          "version": "1.3.1"
+        }
+      },
+      {
+        "package": "swift-nio",
+        "repositoryURL": "https://github.com/apple/swift-nio.git",
+        "state": {
+          "branch": null,
+          "revision": "914081701062b11e3bb9e21accc379822621995e",
+          "version": "2.76.1"
+        }
+      },
+      {
+        "package": "swift-nio-extras",
+        "repositoryURL": "https://github.com/apple/swift-nio-extras.git",
+        "state": {
+          "branch": null,
+          "revision": "2e9746cfc57554f70b650b021b6ae4738abef3e6",
+          "version": "1.24.1"
+        }
+      },
+      {
+        "package": "swift-nio-http2",
+        "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
+        "state": {
+          "branch": null,
+          "revision": "eaa71bb6ae082eee5a07407b1ad0cbd8f48f9dca",
+          "version": "1.34.1"
+        }
+      },
+      {
+        "package": "swift-nio-ssl",
+        "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
+        "state": {
+          "branch": null,
+          "revision": "c7e95421334b1068490b5d41314a50e70bab23d1",
+          "version": "2.29.0"
+        }
+      },
+      {
+        "package": "swift-nio-transport-services",
+        "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
+        "state": {
+          "branch": null,
+          "revision": "bbd5e63cf949b7db0c9edaf7a21e141c52afe214",
+          "version": "1.23.0"
         }
       },
       {
@@ -127,6 +190,15 @@
           "version": "1.0.3"
         }
       },
+      {
+        "package": "swift-system",
+        "repositoryURL": "https://github.com/apple/swift-system.git",
+        "state": {
+          "branch": null,
+          "revision": "c8a44d836fe7913603e246acab7c528c2e780168",
+          "version": "1.4.0"
+        }
+      },
       {
         "package": "SwiftImageReadWrite",
         "repositoryURL": "https://github.com/dagronf/SwiftImageReadWrite",
@@ -183,20 +255,29 @@
       },
       {
         "package": "Web3",
-        "repositoryURL": "https://github.com/WalletConnect/Web3.swift",
+        "repositoryURL": "https://github.com/Boilertalk/Web3.swift",
+        "state": {
+          "branch": null,
+          "revision": "b85187ddf230a10b04fa8574c44980f3369ddff5",
+          "version": "0.8.8"
+        }
+      },
+      {
+        "package": "websocket-kit",
+        "repositoryURL": "https://github.com/vapor/websocket-kit",
         "state": {
           "branch": null,
-          "revision": "569255adcfff0b37e4cb8004aea29d0e2d6266df",
-          "version": "1.0.2"
+          "revision": "4232d34efa49f633ba61afde365d3896fc7f8740",
+          "version": "2.15.0"
         }
       },
       {
-        "package": "yttrium",
-        "repositoryURL": "https://github.com/WalletConnect/yttrium",
+        "package": "Yttrium",
+        "repositoryURL": "https://github.com/reown-com/yttrium",
         "state": {
           "branch": null,
-          "revision": "25902d941b10495d50c17491863747bb3ae6500e",
-          "version": "0.1.1"
+          "revision": "533e9bacce2c7a45b1f9b3705726d03f2a37be4e",
+          "version": "0.4.8"
         }
       }
     ]

diff --git a/Example/IntegrationTests/Auth/Signer/CacaoSignerTests.swift b/Example/IntegrationTests/Auth/Signer/CacaoSignerTests.swift
@@ -57,6 +57,11 @@ class CacaoSignerTest: XCTestCase {
     }
 
     func testCacaoVerify() async throws {
-        try await verifier.verify(signature: signature, message: message, address: "0x15bca56b6e2728aec2532df9d436bd1600e86688", chainId: "eip155:1")
+        do {
+            try await verifier.verify(signature: signature, message: message, address: "0x15bca56b6e2728aec2532df9d436bd1600e86688", chainId: "eip155:1")
+        } catch {
+            print(error)
+            throw error
+        }
     }
 }
diff --git a/Example/IntegrationTests/XPlatform/Web3Wallet/XPlatformW3WTests.swift b/Example/IntegrationTests/XPlatform/Web3Wallet/XPlatformW3WTests.swift
@@ -65,7 +65,9 @@ final class XPlatformW3WTests: XCTestCase {
         walletKitClient = WalletKitClientFactory.create(
             signClient: signClient,
             pairingClient: pairingClient,
-            pushClient: PushClientMock())
+            pushClient: PushClientMock(),
+            config: WalletKit.Config(crypto: DefaultCryptoProvider(), pimlicoApiKey: nil),
+            projectId: InputConfig.projectId)
     }
 
     func testSessionSettle() async throws {

diff --git a/Example/Shared/InputConfig.swift b/Example/Shared/InputConfig.swift
@@ -17,12 +17,8 @@ struct InputConfig {
         return config(for: "MIXPANEL_TOKEN")
     }
 
-    static var pimlicoBundlerUrl: String? {
-        return config(for: "PIMLICO_BUNDLER_URL")
-    }
-
-    static var rpcUrl: String? {
-        return config(for: "RPC_URL")
+    static var pimlicoApiKey: String? {
+        return config(for: "PIMLICO_API_KEY")
     }
 
     private static func config(for key: String) -> String? {

diff --git a/Example/Shared/Signer/ETHSigner.swift b/Example/Shared/Signer/ETHSigner.swift
@@ -65,7 +65,7 @@ struct ETHSigner {
     func sendTransaction(_ params: AnyCodable) throws -> AnyCodable {
         let params = try params.get([EthereumTransaction].self)
         var transaction = params[0]
-        transaction.gas = EthereumQuantity(quantity: BigUInt("1234"))
+//        transaction.gas = EthereumQuantity(quantity: BigUInt("1234"))
         transaction.nonce = EthereumQuantity(quantity: BigUInt("0"))
         transaction.gasPrice = EthereumQuantity(quantity: BigUInt(0))
         print(transaction.description)