From 7ecdd1cce16401df5d77e05de320ac8672542aa1 Mon Sep 17 00:00:00 2001 From: ruijialin Date: Fri, 6 Dec 2024 11:26:55 -0500 Subject: [PATCH] upgrade wc to Reown --- .github/dependabot.yml | 2 - .../walletconnectv2/WalletConnectService.ts | 11 +- .../ios/AvaxWallet.xcodeproj/project.pbxproj | 156 ++++----- packages/core-mobile/ios/Podfile.lock | 8 - packages/core-mobile/package.json | 5 +- ...etconnect+react-native-compat+2.11.0.patch | 25 -- packages/core-mobile/polyfills/index.js | 1 - yarn.lock | 311 ++++++++++-------- 8 files changed, 258 insertions(+), 261 deletions(-) delete mode 100644 packages/core-mobile/patches/@walletconnect+react-native-compat+2.11.0.patch diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f02e1d5f4..8ef1f5c85 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,10 +18,8 @@ updates: - dependency-name: "@react-native/babel-preset" - dependency-name: "react-native-reanimated" - dependency-name: "react-native-mmkv" # we're currently on 2.12.2 which is the latest version compatible with react-native 0.73.7 - - dependency-name: "@walletconnect/react-native-compat" - dependency-name: "@walletconnect/types" - dependency-name: "@walletconnect/utils" - - dependency-name: "@walletconnect/web3wallet" - dependency-name: "@avalabs/*" - dependency-name: "ethers" # we should be using ethers 6.8.1 (please refer to dependencies_resolutions.md) - dependency-name: "web3" # we should be using web3 1.7.5 (please refer to dependencies_resolutions.md) diff --git a/packages/core-mobile/app/services/walletconnectv2/WalletConnectService.ts b/packages/core-mobile/app/services/walletconnectv2/WalletConnectService.ts index e8f833343..e3f415d2c 100644 --- a/packages/core-mobile/app/services/walletconnectv2/WalletConnectService.ts +++ b/packages/core-mobile/app/services/walletconnectv2/WalletConnectService.ts @@ -1,6 +1,7 @@ import { Core } from '@walletconnect/core' import { EngineTypes, SessionTypes } from '@walletconnect/types' -import { IWeb3Wallet, Web3Wallet } from '@walletconnect/web3wallet' +import { IWalletKit, WalletKit } from '@reown/walletkit' + import { getSdkError } from '@walletconnect/utils' import Config from 'react-native-config' import { RpcError } from '@avalabs/vm-module-types' @@ -39,14 +40,14 @@ if (!Config.WALLET_CONNECT_PROJECT_ID) { class WalletConnectService implements WalletConnectServiceInterface { constructor(private walletConnectProjectId: string) {} - #client: IWeb3Wallet | undefined + #client: IWalletKit | undefined - private get client(): IWeb3Wallet { + private get client(): IWalletKit { assertNotUndefined(this.#client) return this.#client } - private set client(client: IWeb3Wallet) { + private set client(client: IWalletKit) { this.#client = client } @@ -61,7 +62,7 @@ class WalletConnectService implements WalletConnectServiceInterface { projectId: this.walletConnectProjectId }) - this.client = await Web3Wallet.init({ + this.client = await WalletKit.init({ core, metadata: CLIENT_METADATA }) diff --git a/packages/core-mobile/ios/AvaxWallet.xcodeproj/project.pbxproj b/packages/core-mobile/ios/AvaxWallet.xcodeproj/project.pbxproj index 144f711aa..951e3e45e 100644 --- a/packages/core-mobile/ios/AvaxWallet.xcodeproj/project.pbxproj +++ b/packages/core-mobile/ios/AvaxWallet.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 501C50832C35C63800DAFF77 /* core_send.wav in Resources */ = {isa = PBXBuildFile; fileRef = 501C50822C35C63800DAFF77 /* core_send.wav */; }; 5084807F2C3C3E78008762B2 /* core_send.wav in Resources */ = {isa = PBXBuildFile; fileRef = 501C50822C35C63800DAFF77 /* core_send.wav */; }; - 6C25E0BD63D10BFA52C4F482 /* libPods-common-AvaxWallet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9DB754F7AA8AF2B8562CD5CE /* libPods-common-AvaxWallet.a */; }; 815E55482C94A396000F8E0F /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 815E55472C94A396000F8E0F /* NotificationService.swift */; }; 815E55532C989231000F8E0F /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 815E55472C94A396000F8E0F /* NotificationService.swift */; }; 81ACC3932BD1B2860089FEBA /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81ACC3922BD1B2860089FEBA /* BootSplash.storyboard */; }; @@ -44,8 +43,9 @@ 8EACAADC2BD84A3300A987BA /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 8EACAADA2BD84A3300A987BA /* PrivacyInfo.xcprivacy */; }; 8EE9988B28B537A40088DE7C /* InfoRelease.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8EE9988A28B537A40088DE7C /* InfoRelease.plist */; }; 8EE9988C28B537A40088DE7C /* InfoRelease.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8EE9988A28B537A40088DE7C /* InfoRelease.plist */; }; - 8F8F28F150E3852D82C46F49 /* libPods-common-AvaxWalletInternal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB64E2EA8BE4173E8D0EB4B6 /* libPods-common-AvaxWalletInternal.a */; }; A96E77CAD2ABB49A6ACACD2C /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 762C9EF0EF8C043AB7880CD7 /* ExpoModulesProvider.swift */; }; + C1CB5585DDACDF13F7B4A355 /* libPods-common-AvaxWallet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F87DA3BE900242BC83741257 /* libPods-common-AvaxWallet.a */; }; + C2DC8A2807C36DFE0BFF0520 /* libPods-common-AvaxWalletInternal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 304A7488E6D0B71E73FAD24A /* libPods-common-AvaxWalletInternal.a */; }; C7062D69B313585A64C52506 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 743FA70F1387A05E00866EBF /* ExpoModulesProvider.swift */; }; /* End PBXBuildFile section */ @@ -132,8 +132,11 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = AvaxWallet/Info.plist; sourceTree = ""; }; 2793FCC827461B9C00B0719A /* AvaxWallet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = AvaxWallet.entitlements; path = AvaxWallet/AvaxWallet.entitlements; sourceTree = ""; }; 27981BC628AECFB200672611 /* AvaxWalletRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = AvaxWalletRelease.entitlements; path = AvaxWallet/AvaxWalletRelease.entitlements; sourceTree = ""; }; - 3DE558FF49E888A0002110D6 /* Pods-common-AvaxWallet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWallet.release.xcconfig"; path = "Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet.release.xcconfig"; sourceTree = ""; }; + 2C5B5E7D3C6A33A198324A73 /* Pods-common-AvaxWalletInternal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWalletInternal.release.xcconfig"; path = "Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal.release.xcconfig"; sourceTree = ""; }; + 304A7488E6D0B71E73FAD24A /* libPods-common-AvaxWalletInternal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-common-AvaxWalletInternal.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 501C50822C35C63800DAFF77 /* core_send.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = core_send.wav; sourceTree = ""; }; + 659278F1AA86EBEA21508CE5 /* Pods-common-AvaxWallet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWallet.release.xcconfig"; path = "Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet.release.xcconfig"; sourceTree = ""; }; + 697B58F8BD672087EA40A6C2 /* Pods-common-AvaxWallet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWallet.debug.xcconfig"; path = "Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet.debug.xcconfig"; sourceTree = ""; }; 743FA70F1387A05E00866EBF /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-common-AvaxWalletInternal/ExpoModulesProvider.swift"; sourceTree = ""; }; 762C9EF0EF8C043AB7880CD7 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-common-AvaxWallet/ExpoModulesProvider.swift"; sourceTree = ""; }; 815E550F2C92071A000F8E0F /* NotificationServiceExtensionInternal.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationServiceExtensionInternal.appex; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -158,12 +161,9 @@ 8EA3A01128EF82E100F753C2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 8EACAADA2BD84A3300A987BA /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 8EE9988A28B537A40088DE7C /* InfoRelease.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = InfoRelease.plist; path = AvaxWallet/InfoRelease.plist; sourceTree = ""; }; - 984A40DE1A2D0F4F517B2F17 /* Pods-common-AvaxWalletInternal.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWalletInternal.debug.xcconfig"; path = "Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal.debug.xcconfig"; sourceTree = ""; }; - 9DB754F7AA8AF2B8562CD5CE /* libPods-common-AvaxWallet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-common-AvaxWallet.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A1F9CA7DF4E8ED1A314A6B67 /* Pods-common-AvaxWallet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWallet.debug.xcconfig"; path = "Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet.debug.xcconfig"; sourceTree = ""; }; - B3C883B7AAD6C29EC0B9BD41 /* Pods-common-AvaxWalletInternal.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWalletInternal.release.xcconfig"; path = "Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal.release.xcconfig"; sourceTree = ""; }; + 97AB271C8FD637330C22C88B /* Pods-common-AvaxWalletInternal.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-common-AvaxWalletInternal.debug.xcconfig"; path = "Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - FB64E2EA8BE4173E8D0EB4B6 /* libPods-common-AvaxWalletInternal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-common-AvaxWalletInternal.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + F87DA3BE900242BC83741257 /* libPods-common-AvaxWallet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-common-AvaxWallet.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -171,7 +171,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6C25E0BD63D10BFA52C4F482 /* libPods-common-AvaxWallet.a in Frameworks */, + C1CB5585DDACDF13F7B4A355 /* libPods-common-AvaxWallet.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -193,7 +193,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8F8F28F150E3852D82C46F49 /* libPods-common-AvaxWalletInternal.a in Frameworks */, + C2DC8A2807C36DFE0BFF0520 /* libPods-common-AvaxWalletInternal.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -256,8 +256,8 @@ children = ( 8E83528A28F09E0900880FD3 /* OpenSSL.xcframework */, ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 9DB754F7AA8AF2B8562CD5CE /* libPods-common-AvaxWallet.a */, - FB64E2EA8BE4173E8D0EB4B6 /* libPods-common-AvaxWalletInternal.a */, + F87DA3BE900242BC83741257 /* libPods-common-AvaxWallet.a */, + 304A7488E6D0B71E73FAD24A /* libPods-common-AvaxWalletInternal.a */, ); name = Frameworks; sourceTree = ""; @@ -363,10 +363,10 @@ F8B72680A82297B40C47D111 /* Pods */ = { isa = PBXGroup; children = ( - A1F9CA7DF4E8ED1A314A6B67 /* Pods-common-AvaxWallet.debug.xcconfig */, - 3DE558FF49E888A0002110D6 /* Pods-common-AvaxWallet.release.xcconfig */, - 984A40DE1A2D0F4F517B2F17 /* Pods-common-AvaxWalletInternal.debug.xcconfig */, - B3C883B7AAD6C29EC0B9BD41 /* Pods-common-AvaxWalletInternal.release.xcconfig */, + 697B58F8BD672087EA40A6C2 /* Pods-common-AvaxWallet.debug.xcconfig */, + 659278F1AA86EBEA21508CE5 /* Pods-common-AvaxWallet.release.xcconfig */, + 97AB271C8FD637330C22C88B /* Pods-common-AvaxWalletInternal.debug.xcconfig */, + 2C5B5E7D3C6A33A198324A73 /* Pods-common-AvaxWalletInternal.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -378,7 +378,7 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "AvaxWallet" */; buildPhases = ( - D1F246C111DE32162BC170CD /* [CP] Check Pods Manifest.lock */, + 2B8CB804A34B6B4F19B47CDE /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, EFFA1F3CA157F5BDAB10C843 /* [Expo] Configure project */, 13B07F871A680F5B00A75B9A /* Sources */, @@ -386,9 +386,9 @@ 13B07F8C1A680F5B00A75B9A /* Frameworks */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, B4F48A60165B43B3BD16ACAF /* Upload Debug Symbols to Sentry */, - 4E13BB7D23ED7A30EF091D06 /* [CP] Embed Pods Frameworks */, - 51AA1C033C0CE7089D03C1C0 /* [CP] Copy Pods Resources */, 8E3793782CA2790500D3A9B4 /* Embed Foundation Extensions */, + 885709289025CB5D63C44517 /* [CP] Embed Pods Frameworks */, + B9FF033946FC3982968370FA /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -439,7 +439,7 @@ isa = PBXNativeTarget; buildConfigurationList = 8E858A6328AFD47300236EF2 /* Build configuration list for PBXNativeTarget "AvaxWalletInternal" */; buildPhases = ( - 3F4749475E4EBD11AF6A6F00 /* [CP] Check Pods Manifest.lock */, + 589A471A19994272BE3D2FE3 /* [CP] Check Pods Manifest.lock */, 8E858A5428AFD47300236EF2 /* Start Packager */, 7C608EFDA163D625CE80CBE7 /* [Expo] Configure project */, 8E858A5528AFD47300236EF2 /* Sources */, @@ -447,10 +447,10 @@ 8E858A5928AFD47300236EF2 /* Resources */, 8E858A6028AFD47300236EF2 /* Bundle React Native code and images */, 8E858A6828B3F10F00236EF2 /* Upload Debug Symbols to Sentry */, - 619EB25865247DEF0BD88A4A /* [CP] Embed Pods Frameworks */, - B0B14020D273105B1D82A417 /* [CP] Copy Pods Resources */, 815E551A2C92071A000F8E0F /* Embed Foundation Extensions */, 815E551D2C92197B000F8E0F /* CopyFiles */, + 0E581F34410E185E3A1CB4B3 /* [CP] Embed Pods Frameworks */, + 0F912A47AA75A6BE904008DB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -580,77 +580,82 @@ shellPath = /bin/sh; shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT \\\"/bin/sh ../node_modules/@sentry/react-native/scripts/sentry-xcode.sh $REACT_NATIVE_XCODE\\\"\"\n"; }; - 3F4749475E4EBD11AF6A6F00 /* [CP] Check Pods Manifest.lock */ = { + 0E581F34410E185E3A1CB4B3 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-common-AvaxWalletInternal-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 4E13BB7D23ED7A30EF091D06 /* [CP] Embed Pods Frameworks */ = { + 0F912A47AA75A6BE904008DB /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 51AA1C033C0CE7089D03C1C0 /* [CP] Copy Pods Resources */ = { + 2B8CB804A34B6B4F19B47CDE /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-resources-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Copy Pods Resources"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-common-AvaxWallet-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-resources.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 619EB25865247DEF0BD88A4A /* [CP] Embed Pods Frameworks */ = { + 589A471A19994272BE3D2FE3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-common-AvaxWalletInternal-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-frameworks.sh\"\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; 7C608EFDA163D625CE80CBE7 /* [Expo] Configure project */ = { @@ -672,6 +677,23 @@ shellPath = /bin/sh; shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-common-AvaxWalletInternal/expo-configure-project.sh\"\n"; }; + 885709289025CB5D63C44517 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 8E858A5428AFD47300236EF2 /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -723,23 +745,6 @@ shellPath = /bin/sh; shellScript = "export SENTRY_PROPERTIES=sentry.properties\n../node_modules/@sentry/cli/bin/sentry-cli upload-dsym\n"; }; - B0B14020D273105B1D82A417 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWalletInternal/Pods-common-AvaxWalletInternal-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; B4F48A60165B43B3BD16ACAF /* Upload Debug Symbols to Sentry */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -754,26 +759,21 @@ shellPath = /bin/sh; shellScript = "export SENTRY_PROPERTIES=sentry.properties\n../node_modules/@sentry/cli/bin/sentry-cli upload-dsym\n"; }; - D1F246C111DE32162BC170CD /* [CP] Check Pods Manifest.lock */ = { + B9FF033946FC3982968370FA /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-common-AvaxWallet-checkManifestLockResult.txt", + "${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-common-AvaxWallet/Pods-common-AvaxWallet-resources.sh\"\n"; showEnvVarsInLog = 0; }; EFFA1F3CA157F5BDAB10C843 /* [Expo] Configure project */ = { @@ -886,7 +886,7 @@ /* Begin XCBuildConfiguration section */ 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A1F9CA7DF4E8ED1A314A6B67 /* Pods-common-AvaxWallet.debug.xcconfig */; + baseConfigurationReference = 697B58F8BD672087EA40A6C2 /* Pods-common-AvaxWallet.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; @@ -930,7 +930,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3DE558FF49E888A0002110D6 /* Pods-common-AvaxWallet.release.xcconfig */; + baseConfigurationReference = 659278F1AA86EBEA21508CE5 /* Pods-common-AvaxWallet.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++17"; @@ -1323,7 +1323,7 @@ }; 8E858A6428AFD47300236EF2 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 984A40DE1A2D0F4F517B2F17 /* Pods-common-AvaxWalletInternal.debug.xcconfig */; + baseConfigurationReference = 97AB271C8FD637330C22C88B /* Pods-common-AvaxWalletInternal.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Internal"; @@ -1360,7 +1360,7 @@ }; 8E858A6528AFD47300236EF2 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B3C883B7AAD6C29EC0B9BD41 /* Pods-common-AvaxWalletInternal.release.xcconfig */; + baseConfigurationReference = 2C5B5E7D3C6A33A198324A73 /* Pods-common-AvaxWalletInternal.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Internal"; diff --git a/packages/core-mobile/ios/Podfile.lock b/packages/core-mobile/ios/Podfile.lock index ff9aef2e8..01bc58b3e 100644 --- a/packages/core-mobile/ios/Podfile.lock +++ b/packages/core-mobile/ios/Podfile.lock @@ -1032,10 +1032,6 @@ PODS: - React-Core - react-native-camera/RN (4.2.1): - React-Core - - react-native-compat (2.11.0): - - glog - - RCT-Folly (= 2022.05.16.00) - - React-Core - react-native-config (1.5.3): - react-native-config/App (= 1.5.3) - react-native-config/App (1.5.3): @@ -1392,7 +1388,6 @@ DEPENDENCIES: - react-native-aes (from `../node_modules/react-native-aes-crypto`) - "react-native-blur (from `../node_modules/@react-native-community/blur`)" - react-native-camera (from `../node_modules/react-native-camera`) - - "react-native-compat (from `../node_modules/@walletconnect/react-native-compat`)" - react-native-config (from `../node_modules/react-native-config`) - "react-native-menu (from `../node_modules/@react-native-menu/menu`)" - react-native-mmkv (from `../node_modules/react-native-mmkv`) @@ -1584,8 +1579,6 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/blur" react-native-camera: :path: "../node_modules/react-native-camera" - react-native-compat: - :path: "../node_modules/@walletconnect/react-native-compat" react-native-config: :path: "../node_modules/react-native-config" react-native-menu: @@ -1793,7 +1786,6 @@ SPEC CHECKSUMS: react-native-aes: c6e4e3ffcff410535e31e161fca95d50e608d4ee react-native-blur: 4568dd93d1d82748c180df8beb2d929c97b13b47 react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f - react-native-compat: 5a5b7a043bec932a7814dc35f0649712bc10324e react-native-config: 8f7283449bbb048902f4e764affbbf24504454af react-native-menu: c30eb7a85d7b04d51945f61ea8a8986ed366ac5c react-native-mmkv: 1fdc81aa70c1aba09370718e6a63a09cbbbac8d2 diff --git a/packages/core-mobile/package.json b/packages/core-mobile/package.json index 4dccb66fb..f80a9377e 100644 --- a/packages/core-mobile/package.json +++ b/packages/core-mobile/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@avalabs/avalanche-module": "0.11.12", - "@avalabs/avalanchejs": "4.1.0-alpha.25", + "@avalabs/avalanchejs": "4.1.2-alpha.1", "@avalabs/bitcoin-module": "0.11.12", "@avalabs/bridge-unified": "3.1.1", "@avalabs/core-bridge-sdk": "3.1.0-alpha.19", @@ -72,6 +72,7 @@ "@react-navigation/native-stack": "6.11.0", "@react-navigation/stack": "6.4.1", "@reduxjs/toolkit": "1.8.1", + "@reown/walletkit": "^1.0.0", "@sentry/react-native": "5.33.2", "@shopify/flash-list": "1.7.1", "@shopify/react-native-performance": "4.1.2", @@ -80,10 +81,8 @@ "@tanstack/react-query": "5.59.8", "@tanstack/react-query-persist-client": "5.59.6", "@tradle/react-native-http": "2.0.1", - "@walletconnect/react-native-compat": "2.11.0", "@walletconnect/types": "2.11.0", "@walletconnect/utils": "2.11.0", - "@walletconnect/web3wallet": "1.10.0", "@zodios/core": "10.9.6", "assert": "2.1.0", "asyncstorage-down": "4.2.0", diff --git a/packages/core-mobile/patches/@walletconnect+react-native-compat+2.11.0.patch b/packages/core-mobile/patches/@walletconnect+react-native-compat+2.11.0.patch deleted file mode 100644 index 92c263232..000000000 --- a/packages/core-mobile/patches/@walletconnect+react-native-compat+2.11.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/node_modules/@walletconnect/react-native-compat/index.js b/node_modules/@walletconnect/react-native-compat/index.js -index 9ae7d20..6a7a34e 100644 ---- a/node_modules/@walletconnect/react-native-compat/index.js -+++ b/node_modules/@walletconnect/react-native-compat/index.js -@@ -4,15 +4,15 @@ import { getApplicationModule } from "./module"; - import "fast-text-encoding"; - - // Polyfill crypto.getRandomvalues --import "react-native-get-random-values"; -+// import "react-native-get-random-values"; - - // Polyfill URL() --import "react-native-url-polyfill/auto"; -+// import "react-native-url-polyfill/auto"; - - // Polyfill Buffer --if (typeof Buffer === "undefined") { -- global.Buffer = require("buffer").Buffer; --} -+// if (typeof Buffer === "undefined") { -+// global.Buffer = require("buffer").Buffer; -+// } - - if (typeof global?.Linking === "undefined") { - try { diff --git a/packages/core-mobile/polyfills/index.js b/packages/core-mobile/polyfills/index.js index a21379149..562dc1150 100644 --- a/packages/core-mobile/polyfills/index.js +++ b/packages/core-mobile/polyfills/index.js @@ -1,7 +1,6 @@ import './promise' import 'react-native-gesture-handler' import 'react-native-quick-crypto' // to override the global.crypto object -import '@walletconnect/react-native-compat' import 'react-native-url-polyfill/auto' import '../shim' import './read_as_array_buffer_shim' diff --git a/yarn.lock b/yarn.lock index b61c2b1fb..6cb774ba2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -95,6 +95,19 @@ __metadata: languageName: node linkType: hard +"@avalabs/avalanchejs@npm:4.1.2-alpha.1": + version: 4.1.2-alpha.1 + resolution: "@avalabs/avalanchejs@npm:4.1.2-alpha.1" + dependencies: + "@noble/curves": 1.3.0 + "@noble/hashes": 1.3.3 + "@noble/secp256k1": 2.0.0 + "@scure/base": 1.1.5 + micro-eth-signer: 0.7.2 + checksum: 148c9a988f196e91f850806aab14842c30b1c9d5c46ab55348d52bbdca5e59d07ea7ebc8d9800fadb42dc9a7d134e5487aa3c71608b418bf1168dcbfbaa7b24e + languageName: node + linkType: hard + "@avalabs/bitcoin-module@npm:0.11.12": version: 0.11.12 resolution: "@avalabs/bitcoin-module@npm:0.11.12" @@ -177,7 +190,7 @@ __metadata: resolution: "@avalabs/core-mobile@workspace:packages/core-mobile" dependencies: "@avalabs/avalanche-module": 0.11.12 - "@avalabs/avalanchejs": 4.1.0-alpha.25 + "@avalabs/avalanchejs": 4.1.2-alpha.1 "@avalabs/bitcoin-module": 0.11.12 "@avalabs/bridge-unified": 3.1.1 "@avalabs/core-bridge-sdk": 3.1.0-alpha.19 @@ -243,6 +256,7 @@ __metadata: "@react-navigation/native-stack": 6.11.0 "@react-navigation/stack": 6.4.1 "@reduxjs/toolkit": 1.8.1 + "@reown/walletkit": ^1.0.0 "@rushstack/eslint-patch": 1.10.4 "@sentry/react-native": 5.33.2 "@shopify/flash-list": 1.7.1 @@ -270,10 +284,8 @@ __metadata: "@types/react-dom": 18.3.0 "@types/react-test-renderer": 18.3.0 "@types/semver": 7.5.4 - "@walletconnect/react-native-compat": 2.11.0 "@walletconnect/types": 2.11.0 "@walletconnect/utils": 2.11.0 - "@walletconnect/web3wallet": 1.10.0 "@welldone-software/why-did-you-render": 8.0.3 "@zodios/core": 10.9.6 assert: 2.1.0 @@ -4873,7 +4885,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/hash@npm:^5.7.0": +"@ethersproject/hash@npm:5.7.0, @ethersproject/hash@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/hash@npm:5.7.0" dependencies: @@ -4960,7 +4972,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/transactions@npm:^5.6.2, @ethersproject/transactions@npm:^5.7.0": +"@ethersproject/transactions@npm:5.7.0, @ethersproject/transactions@npm:^5.6.2, @ethersproject/transactions@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/transactions@npm:5.7.0" dependencies: @@ -9368,6 +9380,21 @@ __metadata: languageName: node linkType: hard +"@reown/walletkit@npm:^1.0.0": + version: 1.1.1 + resolution: "@reown/walletkit@npm:1.1.1" + dependencies: + "@walletconnect/core": 2.17.1 + "@walletconnect/jsonrpc-provider": 1.0.14 + "@walletconnect/jsonrpc-utils": 1.0.8 + "@walletconnect/logger": 2.1.2 + "@walletconnect/sign-client": 2.17.1 + "@walletconnect/types": 2.17.1 + "@walletconnect/utils": 2.17.1 + checksum: 30499034bd6b1a4e6fd357243f3395cda4c22211f90c86f783207485de33e953db36d938b32b25fb45f038376de4c2932e9026cc199016caab4fb8d7842a641d + languageName: node + linkType: hard + "@rtsao/scc@npm:^1.1.0": version: 1.1.0 resolution: "@rtsao/scc@npm:1.1.0" @@ -10050,7 +10077,7 @@ __metadata: languageName: node linkType: hard -"@stablelib/random@npm:^1.0.1, @stablelib/random@npm:^1.0.2": +"@stablelib/random@npm:1.0.2, @stablelib/random@npm:^1.0.1, @stablelib/random@npm:^1.0.2": version: 1.0.2 resolution: "@stablelib/random@npm:1.0.2" dependencies: @@ -10060,7 +10087,7 @@ __metadata: languageName: node linkType: hard -"@stablelib/sha256@npm:1.0.1, @stablelib/sha256@npm:^1.0.1": +"@stablelib/sha256@npm:1.0.1": version: 1.0.1 resolution: "@stablelib/sha256@npm:1.0.1" dependencies: @@ -10089,7 +10116,7 @@ __metadata: languageName: node linkType: hard -"@stablelib/x25519@npm:^1.0.3": +"@stablelib/x25519@npm:1.0.3, @stablelib/x25519@npm:^1.0.3": version: 1.0.3 resolution: "@stablelib/x25519@npm:1.0.3" dependencies: @@ -11970,49 +11997,28 @@ __metadata: languageName: node linkType: hard -"@walletconnect/auth-client@npm:2.1.2": - version: 2.1.2 - resolution: "@walletconnect/auth-client@npm:2.1.2" +"@walletconnect/core@npm:2.17.1": + version: 2.17.1 + resolution: "@walletconnect/core@npm:2.17.1" dependencies: - "@ethersproject/hash": ^5.7.0 - "@ethersproject/transactions": ^5.7.0 - "@stablelib/random": ^1.0.2 - "@stablelib/sha256": ^1.0.1 - "@walletconnect/core": ^2.10.1 - "@walletconnect/events": ^1.0.1 - "@walletconnect/heartbeat": ^1.2.1 - "@walletconnect/jsonrpc-utils": ^1.0.8 - "@walletconnect/logger": ^2.0.1 - "@walletconnect/time": ^1.0.2 - "@walletconnect/utils": ^2.10.1 - events: ^3.3.0 - isomorphic-unfetch: ^3.1.0 - checksum: 717af88945ae098cf7f1c3d8e381578bf3f9ad75817ef2c267d9f3965741870bc282d78ae7d5d8ce440be1b3dabdd4ddf078b79cdac66955784d2d016e2280f4 - languageName: node - linkType: hard - -"@walletconnect/core@npm:2.11.0, @walletconnect/core@npm:^2.10.1": - version: 2.11.0 - resolution: "@walletconnect/core@npm:2.11.0" - dependencies: - "@walletconnect/heartbeat": 1.2.1 - "@walletconnect/jsonrpc-provider": 1.0.13 - "@walletconnect/jsonrpc-types": 1.0.3 + "@walletconnect/heartbeat": 1.2.2 + "@walletconnect/jsonrpc-provider": 1.0.14 + "@walletconnect/jsonrpc-types": 1.0.4 "@walletconnect/jsonrpc-utils": 1.0.8 "@walletconnect/jsonrpc-ws-connection": 1.0.14 - "@walletconnect/keyvaluestorage": ^1.1.1 - "@walletconnect/logger": ^2.0.1 - "@walletconnect/relay-api": ^1.0.9 - "@walletconnect/relay-auth": ^1.0.4 - "@walletconnect/safe-json": ^1.0.2 - "@walletconnect/time": ^1.0.2 - "@walletconnect/types": 2.11.0 - "@walletconnect/utils": 2.11.0 - events: ^3.3.0 - isomorphic-unfetch: 3.1.0 + "@walletconnect/keyvaluestorage": 1.1.1 + "@walletconnect/logger": 2.1.2 + "@walletconnect/relay-api": 1.0.11 + "@walletconnect/relay-auth": 1.0.4 + "@walletconnect/safe-json": 1.0.2 + "@walletconnect/time": 1.0.2 + "@walletconnect/types": 2.17.1 + "@walletconnect/utils": 2.17.1 + "@walletconnect/window-getters": 1.0.1 + events: 3.3.0 lodash.isequal: 4.5.0 - uint8arrays: ^3.1.0 - checksum: 419eff78df347eb5d5c51c2dbf60e3246b5dda00afdd77279795a89627285839cb769e1115e751026756d37e26e6bd708452170ded08be074d64256afd8a8663 + uint8arrays: 3.1.0 + checksum: 41fae7cfe91e012881eae3e1214ab626ad119bfdf33866f97ee423011efca828d673bb9496dce5f5f9d71c0997ca46c4c2bc7c3c53ca1aa6580494de945743cb languageName: node linkType: hard @@ -12025,7 +12031,7 @@ __metadata: languageName: node linkType: hard -"@walletconnect/events@npm:^1.0.1": +"@walletconnect/events@npm:1.0.1, @walletconnect/events@npm:^1.0.1": version: 1.0.1 resolution: "@walletconnect/events@npm:1.0.1" dependencies: @@ -12035,7 +12041,7 @@ __metadata: languageName: node linkType: hard -"@walletconnect/heartbeat@npm:1.2.1, @walletconnect/heartbeat@npm:^1.2.1": +"@walletconnect/heartbeat@npm:1.2.1": version: 1.2.1 resolution: "@walletconnect/heartbeat@npm:1.2.1" dependencies: @@ -12046,14 +12052,25 @@ __metadata: languageName: node linkType: hard -"@walletconnect/jsonrpc-provider@npm:1.0.13": - version: 1.0.13 - resolution: "@walletconnect/jsonrpc-provider@npm:1.0.13" +"@walletconnect/heartbeat@npm:1.2.2": + version: 1.2.2 + resolution: "@walletconnect/heartbeat@npm:1.2.2" + dependencies: + "@walletconnect/events": ^1.0.1 + "@walletconnect/time": ^1.0.2 + events: ^3.3.0 + checksum: 720341f24dae64acc836015d694b4337a0d1cbc628a3f6ee556771278465cae61366fb0e5af93f9823b06a6f4e23013f3986d6dad2a58c2db4b7c991a73c646d + languageName: node + linkType: hard + +"@walletconnect/jsonrpc-provider@npm:1.0.14": + version: 1.0.14 + resolution: "@walletconnect/jsonrpc-provider@npm:1.0.14" dependencies: "@walletconnect/jsonrpc-utils": ^1.0.8 "@walletconnect/safe-json": ^1.0.2 - tslib: 1.14.1 - checksum: 497dfdd9f988432f171bc98336f3583c679059f0a166f95d6e51c8e1937c17abd9a5fd3aadfcebf6964bae14edd1e05fb0453e370d6e3bbc7ff4919fcad7c478 + events: ^3.3.0 + checksum: db8f931f93285520c51939603108f5cfe2a90a651d12744766d14471db3a488d2964ece5bfedc6cc93832ecd008cd37e7e1b1a950d9ef3385106ee052b936573 languageName: node linkType: hard @@ -12067,6 +12084,16 @@ __metadata: languageName: node linkType: hard +"@walletconnect/jsonrpc-types@npm:1.0.4": + version: 1.0.4 + resolution: "@walletconnect/jsonrpc-types@npm:1.0.4" + dependencies: + events: ^3.3.0 + keyvaluestorage-interface: ^1.0.0 + checksum: 99ea5f9f3b0c5892ff874de87dee62cf4fc345124177db1e6e5eaf48b85e2ea3833f0157beca43c51047444938e8eda6362fa8069b33e11d39e1050e7ef6e821 + languageName: node + linkType: hard + "@walletconnect/jsonrpc-utils@npm:1.0.8, @walletconnect/jsonrpc-utils@npm:^1.0.6, @walletconnect/jsonrpc-utils@npm:^1.0.8": version: 1.0.8 resolution: "@walletconnect/jsonrpc-utils@npm:1.0.8" @@ -12090,7 +12117,7 @@ __metadata: languageName: node linkType: hard -"@walletconnect/keyvaluestorage@npm:^1.1.1": +"@walletconnect/keyvaluestorage@npm:1.1.1, @walletconnect/keyvaluestorage@npm:^1.1.1": version: 1.1.1 resolution: "@walletconnect/keyvaluestorage@npm:1.1.1" dependencies: @@ -12106,46 +12133,26 @@ __metadata: languageName: node linkType: hard -"@walletconnect/logger@npm:2.0.1, @walletconnect/logger@npm:^2.0.1": - version: 2.0.1 - resolution: "@walletconnect/logger@npm:2.0.1" +"@walletconnect/logger@npm:2.1.2, @walletconnect/logger@npm:^2.0.1": + version: 2.1.2 + resolution: "@walletconnect/logger@npm:2.1.2" dependencies: + "@walletconnect/safe-json": ^1.0.2 pino: 7.11.0 - tslib: 1.14.1 - checksum: b686679d176d5d22a3441d93e71be2652e6c447682a6d6f014baf7c2d9dcd23b93e2f434d4410e33cc532d068333f6b3c1d899aeb0d6f60cc296ed17f57b0c2c + checksum: a2bb88b76d95ec5a95279dcc919f1d044d17be8fdda98a01665a607561b445bb56f2245a280933fb19aa7d41d41b688d0ffdb434ac56c46163ad2eb5338f389a languageName: node linkType: hard -"@walletconnect/react-native-compat@npm:2.11.0": - version: 2.11.0 - resolution: "@walletconnect/react-native-compat@npm:2.11.0" - dependencies: - events: 3.3.0 - fast-text-encoding: ^1.0.6 - react-native-url-polyfill: ^2.0.0 - peerDependencies: - "@react-native-async-storage/async-storage": "*" - "@react-native-community/netinfo": "*" - expo-application: "*" - react-native-get-random-values: "*" - peerDependenciesMeta: - expo-application: - optional: true - checksum: fea0720cfc3bb0479eb02dd4baeb49b2a311b99d3ca95108e47cade3e21bb95394b27bbf05a96e42acd135e4a1530858f092baf13a7dffdb652e3800cf699838 - languageName: node - linkType: hard - -"@walletconnect/relay-api@npm:^1.0.9": - version: 1.0.9 - resolution: "@walletconnect/relay-api@npm:1.0.9" +"@walletconnect/relay-api@npm:1.0.11, @walletconnect/relay-api@npm:^1.0.9": + version: 1.0.11 + resolution: "@walletconnect/relay-api@npm:1.0.11" dependencies: "@walletconnect/jsonrpc-types": ^1.0.2 - tslib: 1.14.1 - checksum: 5870579b6552f1ce7351878f1acb8386b0c11288c64d39133c7cee5040feeb7ccf9114228d97a59749d60366ad107b097d656407d534567c24f5d3878ea6e246 + checksum: 9fcddf055de01c04b9fa59035e8c6e31d523743c848d266f528009048aeadaa1b4d9b544bdcb6928e7a69f738d5f0352d1cdebbaa34b1346b937942cb5f6f144 languageName: node linkType: hard -"@walletconnect/relay-auth@npm:^1.0.4": +"@walletconnect/relay-auth@npm:1.0.4": version: 1.0.4 resolution: "@walletconnect/relay-auth@npm:1.0.4" dependencies: @@ -12159,7 +12166,7 @@ __metadata: languageName: node linkType: hard -"@walletconnect/safe-json@npm:^1.0.1, @walletconnect/safe-json@npm:^1.0.2": +"@walletconnect/safe-json@npm:1.0.2, @walletconnect/safe-json@npm:^1.0.1, @walletconnect/safe-json@npm:^1.0.2": version: 1.0.2 resolution: "@walletconnect/safe-json@npm:1.0.2" dependencies: @@ -12168,24 +12175,24 @@ __metadata: languageName: node linkType: hard -"@walletconnect/sign-client@npm:2.11.0": - version: 2.11.0 - resolution: "@walletconnect/sign-client@npm:2.11.0" +"@walletconnect/sign-client@npm:2.17.1": + version: 2.17.1 + resolution: "@walletconnect/sign-client@npm:2.17.1" dependencies: - "@walletconnect/core": 2.11.0 - "@walletconnect/events": ^1.0.1 - "@walletconnect/heartbeat": 1.2.1 + "@walletconnect/core": 2.17.1 + "@walletconnect/events": 1.0.1 + "@walletconnect/heartbeat": 1.2.2 "@walletconnect/jsonrpc-utils": 1.0.8 - "@walletconnect/logger": ^2.0.1 - "@walletconnect/time": ^1.0.2 - "@walletconnect/types": 2.11.0 - "@walletconnect/utils": 2.11.0 - events: ^3.3.0 - checksum: 89230cf4ca95f9feb06104cc8097340e345b2b21257d45acf16729342ddcf5248bbf05097343b21e4dbebfa4fbacb6fe067099ee6127169a6b464563985d4716 + "@walletconnect/logger": 2.1.2 + "@walletconnect/time": 1.0.2 + "@walletconnect/types": 2.17.1 + "@walletconnect/utils": 2.17.1 + events: 3.3.0 + checksum: 055a0aa0d176592dec27d096244635b938c098c2f46ea8616c9e7f3fbfa27ecf68b19593c0576e91a74d49b1ced4da83f94813914e3e34eaad175ab96ba49e15 languageName: node linkType: hard -"@walletconnect/time@npm:^1.0.2": +"@walletconnect/time@npm:1.0.2, @walletconnect/time@npm:^1.0.2": version: 1.0.2 resolution: "@walletconnect/time@npm:1.0.2" dependencies: @@ -12208,7 +12215,21 @@ __metadata: languageName: node linkType: hard -"@walletconnect/utils@npm:2.11.0, @walletconnect/utils@npm:^2.10.1": +"@walletconnect/types@npm:2.17.1": + version: 2.17.1 + resolution: "@walletconnect/types@npm:2.17.1" + dependencies: + "@walletconnect/events": 1.0.1 + "@walletconnect/heartbeat": 1.2.2 + "@walletconnect/jsonrpc-types": 1.0.4 + "@walletconnect/keyvaluestorage": 1.1.1 + "@walletconnect/logger": 2.1.2 + events: 3.3.0 + checksum: 1cf6be908e825ba5b2a292a228f3223c32041fb5c76de6bac1aa3a898f702f917bf500bd6edca8b3e7bcc9303643a114680b7ce29cdefd82c0702e52ba0b3cf1 + languageName: node + linkType: hard + +"@walletconnect/utils@npm:2.11.0": version: 2.11.0 resolution: "@walletconnect/utils@npm:2.11.0" dependencies: @@ -12230,23 +12251,35 @@ __metadata: languageName: node linkType: hard -"@walletconnect/web3wallet@npm:1.10.0": - version: 1.10.0 - resolution: "@walletconnect/web3wallet@npm:1.10.0" +"@walletconnect/utils@npm:2.17.1": + version: 2.17.1 + resolution: "@walletconnect/utils@npm:2.17.1" dependencies: - "@walletconnect/auth-client": 2.1.2 - "@walletconnect/core": 2.11.0 - "@walletconnect/jsonrpc-provider": 1.0.13 + "@ethersproject/hash": 5.7.0 + "@ethersproject/transactions": 5.7.0 + "@stablelib/chacha20poly1305": 1.0.1 + "@stablelib/hkdf": 1.0.1 + "@stablelib/random": 1.0.2 + "@stablelib/sha256": 1.0.1 + "@stablelib/x25519": 1.0.3 "@walletconnect/jsonrpc-utils": 1.0.8 - "@walletconnect/logger": 2.0.1 - "@walletconnect/sign-client": 2.11.0 - "@walletconnect/types": 2.11.0 - "@walletconnect/utils": 2.11.0 - checksum: f0f57b05d5f53d03837f59d44077e304f70af72fa45e9fd273f8db753f28febf6db78162950ce4c63cf4ab90bb11863f9e0c6d25a8013e9ac3e96d12637c7db0 + "@walletconnect/keyvaluestorage": 1.1.1 + "@walletconnect/relay-api": 1.0.11 + "@walletconnect/relay-auth": 1.0.4 + "@walletconnect/safe-json": 1.0.2 + "@walletconnect/time": 1.0.2 + "@walletconnect/types": 2.17.1 + "@walletconnect/window-getters": 1.0.1 + "@walletconnect/window-metadata": 1.0.1 + detect-browser: 5.3.0 + elliptic: 6.5.7 + query-string: 7.1.3 + uint8arrays: 3.1.0 + checksum: 0e2c4c911308e198b0757914536f85464782c3abeab8caaa4e3516354c4f56b40bc83f44f427e0fa1a1b58730d4e30e9f59d310fc4fcead65b7ed92602d59f54 languageName: node linkType: hard -"@walletconnect/window-getters@npm:^1.0.1": +"@walletconnect/window-getters@npm:1.0.1, @walletconnect/window-getters@npm:^1.0.1": version: 1.0.1 resolution: "@walletconnect/window-getters@npm:1.0.1" dependencies: @@ -12255,7 +12288,7 @@ __metadata: languageName: node linkType: hard -"@walletconnect/window-metadata@npm:^1.0.1": +"@walletconnect/window-metadata@npm:1.0.1, @walletconnect/window-metadata@npm:^1.0.1": version: 1.0.1 resolution: "@walletconnect/window-metadata@npm:1.0.1" dependencies: @@ -16357,6 +16390,21 @@ __metadata: languageName: node linkType: hard +"elliptic@npm:6.5.7": + version: 6.5.7 + resolution: "elliptic@npm:6.5.7" + dependencies: + bn.js: ^4.11.9 + brorand: ^1.1.0 + hash.js: ^1.0.0 + hmac-drbg: ^1.0.1 + inherits: ^2.0.4 + minimalistic-assert: ^1.0.1 + minimalistic-crypto-utils: ^1.0.1 + checksum: af0ffddffdbc2fea4eeec74388cd73e62ed5a0eac6711568fb28071566319785df529c968b0bf1250ba4bc628e074b2d64c54a633e034aa6f0c6b152ceb49ab8 + languageName: node + linkType: hard + "emittery@npm:^0.13.1": version: 0.13.1 resolution: "emittery@npm:0.13.1" @@ -17957,13 +18005,6 @@ __metadata: languageName: node linkType: hard -"fast-text-encoding@npm:^1.0.6": - version: 1.0.6 - resolution: "fast-text-encoding@npm:1.0.6" - checksum: 9d58f694314b3283e785bf61954902536da228607ad246905e30256f9ab8331f780ac987e7222c9f5eafd04168d07e12b8054c85cedb76a2c05af0e82387a903 - languageName: node - linkType: hard - "fast-xml-parser@npm:^4.0.12, fast-xml-parser@npm:^4.2.4": version: 4.3.5 resolution: "fast-xml-parser@npm:4.3.5" @@ -20587,16 +20628,6 @@ __metadata: languageName: node linkType: hard -"isomorphic-unfetch@npm:3.1.0, isomorphic-unfetch@npm:^3.1.0": - version: 3.1.0 - resolution: "isomorphic-unfetch@npm:3.1.0" - dependencies: - node-fetch: ^2.6.1 - unfetch: ^4.2.0 - checksum: 82b92fe4ec2823a81ab0fc0d11bd94d710e6f9a940d56b3cba31896d4345ec9ffc7949f4ff31ebcae84f6b95f7ebf3474c4c7452b834eb4078ea3f2c37e459c5 - languageName: node - linkType: hard - "isows@npm:1.0.4": version: 1.0.4 resolution: "isows@npm:1.0.4" @@ -26548,7 +26579,7 @@ __metadata: languageName: node linkType: hard -"react-native-url-polyfill@npm:2.0.0, react-native-url-polyfill@npm:^2.0.0": +"react-native-url-polyfill@npm:2.0.0": version: 2.0.0 resolution: "react-native-url-polyfill@npm:2.0.0" dependencies: @@ -26595,7 +26626,7 @@ react-native-webview@ava-labs/react-native-webview: peerDependencies: react: "*" react-native: "*" - checksum: 871333b155b3899238428ee071c7cce31f668ba2e4ef70f08c14432c76fad42f0a2d460ca278d6d5149e632e83f544c77555937a0d6cf7e9d726f7d6b06c1d0b + checksum: 6e268fad7aa8b8e56fd28cc95f94f35a33fdac4cec0085ae71a766d092760e3f9af35218706113ff7ae99a74baabc5112d32005dce9e66bdf4fda676fad9aa4e languageName: node linkType: hard @@ -30008,6 +30039,15 @@ react-native-webview@ava-labs/react-native-webview: languageName: node linkType: hard +"uint8arrays@npm:3.1.0": + version: 3.1.0 + resolution: "uint8arrays@npm:3.1.0" + dependencies: + multiformats: ^9.4.2 + checksum: 77fe0c8644417a849f5cfc0e5a5308c65e3b779a56f816dd27b8f60f7fac1ac7626f57c9abacec77d147beb5da8401b86438b1591d93cae7f7511a3211cc01b3 + languageName: node + linkType: hard + "uint8arrays@npm:^3.0.0, uint8arrays@npm:^3.1.0": version: 3.1.1 resolution: "uint8arrays@npm:3.1.1" @@ -30084,13 +30124,6 @@ react-native-webview@ava-labs/react-native-webview: languageName: node linkType: hard -"unfetch@npm:^4.2.0": - version: 4.2.0 - resolution: "unfetch@npm:4.2.0" - checksum: 6a4b2557e1d921eaa80c4425ce27a404945ec26491ed06e62598f333996a91a44c7908cb26dc7c2746d735762b13276cf4aa41829b4c8f438dde63add3045d7a - languageName: node - linkType: hard - "unicode-canonical-property-names-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"