Skip to content

Commit 8139998

Browse files
ruixhuangruixhuang
authored
Merge pull request #14 from dydxprotocol/features/reown
Deprecate WalletConnect and update to Reown
2 parents 04308a3 + 068c4b7 commit 8139998

File tree

8 files changed

+76
-97
lines changed

8 files changed

+76
-97
lines changed

‎ios/dydx/dydx.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 21 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/dydx/dydxCartera/dydxCartera.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@
4545
02446C5D2EA6983C00AF6FF5 /* Web3 in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C5C2EA6983C00AF6FF5 /* Web3 */; };
4646
02446C602EA6988900AF6FF5 /* TweetNacl in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C5F2EA6988900AF6FF5 /* TweetNacl */; };
4747
02446C632EA699BB00AF6FF5 /* SolanaSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C622EA699BB00AF6FF5 /* SolanaSwift */; };
48-
02446C662EA69A5600AF6FF5 /* WalletConnect in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C652EA69A5600AF6FF5 /* WalletConnect */; };
49-
02446C682EA69A5600AF6FF5 /* WalletConnectIdentity in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C672EA69A5600AF6FF5 /* WalletConnectIdentity */; };
50-
02446C6A2EA69A5600AF6FF5 /* WalletConnectModal in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C692EA69A5600AF6FF5 /* WalletConnectModal */; };
51-
02446C6C2EA69A5600AF6FF5 /* WalletConnectNetworking in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C6B2EA69A5600AF6FF5 /* WalletConnectNetworking */; };
52-
02446C6E2EA69A5600AF6FF5 /* WalletConnectNotify in Frameworks */ = {isa = PBXBuildFile; productRef = 02446C6D2EA69A5600AF6FF5 /* WalletConnectNotify */; };
48+
02446C792EA6CA8B00AF6FF5 /* SolanaSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 02886C762D84B766005EF461 /* SolanaSwift */; };
49+
02446E5B2EA6E11600AF6FF5 /* ReownAppKit in Frameworks */ = {isa = PBXBuildFile; productRef = 02446E5A2EA6E11600AF6FF5 /* ReownAppKit */; };
50+
02446E5D2EA6E11600AF6FF5 /* WalletConnect in Frameworks */ = {isa = PBXBuildFile; productRef = 02446E5C2EA6E11600AF6FF5 /* WalletConnect */; };
5351
0274248429E74CA5004C89AE /* Parser+Eth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0274248329E74CA5004C89AE /* Parser+Eth.swift */; };
5452
0274248729E76718004C89AE /* EthConversions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0274248629E76718004C89AE /* EthConversions.swift */; };
5553
0274248929E78576004C89AE /* ERC20Token.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0274248829E78576004C89AE /* ERC20Token.swift */; };
@@ -255,22 +253,20 @@
255253
isa = PBXFrameworksBuildPhase;
256254
buildActionMask = 2147483647;
257255
files = (
256+
02446E5D2EA6E11600AF6FF5 /* WalletConnect in Frameworks */,
257+
02446C792EA6CA8B00AF6FF5 /* SolanaSwift in Frameworks */,
258258
02446C5A2EA697FB00AF6FF5 /* CoinbaseWalletSDK in Frameworks */,
259259
02446C602EA6988900AF6FF5 /* TweetNacl in Frameworks */,
260-
02446C682EA69A5600AF6FF5 /* WalletConnectIdentity in Frameworks */,
261260
023F7F0D2AD09732006CC4CD /* ParticlesKit.framework in Frameworks */,
262261
023F7F082AD09725006CC4CD /* Utilities.framework in Frameworks */,
263262
380B90E0F0184BA5387AC70A /* Pods_iOS_dydxCartera.framework in Frameworks */,
264263
0294C8912D7930EB00F62FB5 /* Base58Swift in Frameworks */,
264+
02446E5B2EA6E11600AF6FF5 /* ReownAppKit in Frameworks */,
265265
02844D7D2DC187EF006F51CE /* Privy in Frameworks */,
266-
02446C6A2EA69A5600AF6FF5 /* WalletConnectModal in Frameworks */,
267266
02446C4D2EA6974E00AF6FF5 /* Starscream in Frameworks */,
268-
02446C662EA69A5600AF6FF5 /* WalletConnect in Frameworks */,
269267
02446C632EA699BB00AF6FF5 /* SolanaSwift in Frameworks */,
270268
02446C5D2EA6983C00AF6FF5 /* Web3 in Frameworks */,
271269
02446C502EA6976400AF6FF5 /* CryptoSwift in Frameworks */,
272-
02446C6C2EA69A5600AF6FF5 /* WalletConnectNetworking in Frameworks */,
273-
02446C6E2EA69A5600AF6FF5 /* WalletConnectNotify in Frameworks */,
274270
);
275271
runOnlyForDeploymentPostprocessing = 0;
276272
};
@@ -621,11 +617,8 @@
621617
02446C5C2EA6983C00AF6FF5 /* Web3 */,
622618
02446C5F2EA6988900AF6FF5 /* TweetNacl */,
623619
02446C622EA699BB00AF6FF5 /* SolanaSwift */,
624-
02446C652EA69A5600AF6FF5 /* WalletConnect */,
625-
02446C672EA69A5600AF6FF5 /* WalletConnectIdentity */,
626-
02446C692EA69A5600AF6FF5 /* WalletConnectModal */,
627-
02446C6B2EA69A5600AF6FF5 /* WalletConnectNetworking */,
628-
02446C6D2EA69A5600AF6FF5 /* WalletConnectNotify */,
620+
02446E5A2EA6E11600AF6FF5 /* ReownAppKit */,
621+
02446E5C2EA6E11600AF6FF5 /* WalletConnect */,
629622
);
630623
productName = dydxCartera;
631624
productReference = 02439C8B29B03E8A00A083FE /* dydxCartera.framework */;
@@ -686,7 +679,7 @@
686679
02446C5B2EA6983C00AF6FF5 /* XCRemoteSwiftPackageReference "Web3" */,
687680
02446C5E2EA6988800AF6FF5 /* XCRemoteSwiftPackageReference "tweetnacl-swiftwrap" */,
688681
02446C612EA699BB00AF6FF5 /* XCRemoteSwiftPackageReference "solana-swift" */,
689-
02446C642EA69A5600AF6FF5 /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */,
682+
02446E592EA6E11600AF6FF5 /* XCRemoteSwiftPackageReference "reown-swift" */,
690683
);
691684
preferredProjectObjectVersion = 77;
692685
productRefGroup = 02439C8C29B03E8A00A083FE /* Products */;
@@ -1266,8 +1259,8 @@
12661259
isa = XCRemoteSwiftPackageReference;
12671260
repositoryURL = "https://github.com/coinbase/wallet-mobile-sdk";
12681261
requirement = {
1269-
branch = 1.0.5;
1270-
kind = branch;
1262+
kind = upToNextMajorVersion;
1263+
minimumVersion = 1.0.0;
12711264
};
12721265
};
12731266
02446C5B2EA6983C00AF6FF5 /* XCRemoteSwiftPackageReference "Web3" */ = {
@@ -1294,12 +1287,12 @@
12941287
kind = branch;
12951288
};
12961289
};
1297-
02446C642EA69A5600AF6FF5 /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */ = {
1290+
02446E592EA6E11600AF6FF5 /* XCRemoteSwiftPackageReference "reown-swift" */ = {
12981291
isa = XCRemoteSwiftPackageReference;
1299-
repositoryURL = "https://github.com/dydxprotocol/WalletConnectSwiftV2.git";
1292+
repositoryURL = "https://github.com/reown-com/reown-swift";
13001293
requirement = {
1301-
branch = develop;
1302-
kind = branch;
1294+
kind = upToNextMajorVersion;
1295+
minimumVersion = 1.7.3;
13031296
};
13041297
};
13051298
02844D7B2DC187EF006F51CE /* XCRemoteSwiftPackageReference "privy-ios" */ = {
@@ -1351,34 +1344,15 @@
13511344
package = 02446C612EA699BB00AF6FF5 /* XCRemoteSwiftPackageReference "solana-swift" */;
13521345
productName = SolanaSwift;
13531346
};
1354-
02446C652EA69A5600AF6FF5 /* WalletConnect */ = {
1355-
isa = XCSwiftPackageProductDependency;
1356-
package = 02446C642EA69A5600AF6FF5 /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
1357-
productName = WalletConnect;
1358-
};
1359-
02446C672EA69A5600AF6FF5 /* WalletConnectIdentity */ = {
1360-
isa = XCSwiftPackageProductDependency;
1361-
package = 02446C642EA69A5600AF6FF5 /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
1362-
productName = WalletConnectIdentity;
1363-
};
1364-
02446C692EA69A5600AF6FF5 /* WalletConnectModal */ = {
1365-
isa = XCSwiftPackageProductDependency;
1366-
package = 02446C642EA69A5600AF6FF5 /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
1367-
productName = WalletConnectModal;
1368-
};
1369-
02446C6B2EA69A5600AF6FF5 /* WalletConnectNetworking */ = {
1347+
02446E5A2EA6E11600AF6FF5 /* ReownAppKit */ = {
13701348
isa = XCSwiftPackageProductDependency;
1371-
package = 02446C642EA69A5600AF6FF5 /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
1372-
productName = WalletConnectNetworking;
1349+
package = 02446E592EA6E11600AF6FF5 /* XCRemoteSwiftPackageReference "reown-swift" */;
1350+
productName = ReownAppKit;
13731351
};
1374-
02446C6D2EA69A5600AF6FF5 /* WalletConnectNotify */ = {
1352+
02446E5C2EA6E11600AF6FF5 /* WalletConnect */ = {
13751353
isa = XCSwiftPackageProductDependency;
1376-
package = 02446C642EA69A5600AF6FF5 /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
1377-
productName = WalletConnectNotify;
1378-
};
1379-
02669B922AD872A300A756AA /* Cartera */ = {
1380-
isa = XCSwiftPackageProductDependency;
1381-
productName = Cartera;
1354+
package = 02446E592EA6E11600AF6FF5 /* XCRemoteSwiftPackageReference "reown-swift" */;
1355+
productName = WalletConnect;
13821356
};
13831357
02844D7C2DC187EF006F51CE /* Privy */ = {
13841358
isa = XCSwiftPackageProductDependency;
@@ -1389,27 +1363,11 @@
13891363
isa = XCSwiftPackageProductDependency;
13901364
productName = SolanaSwift;
13911365
};
1392-
0294C5FF2D790BD900F62FB5 /* Cartera */ = {
1393-
isa = XCSwiftPackageProductDependency;
1394-
productName = Cartera;
1395-
};
1396-
0294C6022D790C3C00F62FB5 /* Cartera */ = {
1397-
isa = XCSwiftPackageProductDependency;
1398-
productName = Cartera;
1399-
};
14001366
0294C8902D7930EB00F62FB5 /* Base58Swift */ = {
14011367
isa = XCSwiftPackageProductDependency;
14021368
package = 0294C88F2D7930EB00F62FB5 /* XCRemoteSwiftPackageReference "Base58Swift" */;
14031369
productName = Base58Swift;
14041370
};
1405-
029E51A22D08966E005D4DC5 /* Cartera */ = {
1406-
isa = XCSwiftPackageProductDependency;
1407-
productName = Cartera;
1408-
};
1409-
02A50EE02E3424E20086ED2C /* Cartera */ = {
1410-
isa = XCSwiftPackageProductDependency;
1411-
productName = Cartera;
1412-
};
14131371
/* End XCSwiftPackageProductDependency section */
14141372
};
14151373
rootObject = 02439C8229B03E8A00A083FE /* Project object */;

‎ios/dydx/dydxCartera/dydxCartera/Cartera/CarteraConfig.swift‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import Foundation
99
import CoinbaseWalletSDK
1010
import UIKit
11-
import WalletConnectSign
12-
import WalletConnectModal
11+
import ReownAppKit
1312
import Utilities
1413

1514
public enum WalletConnectionType: Hashable {
@@ -183,12 +182,17 @@ public struct CarteraConfig: SingletonProtocol {
183182

184183
Sign.configure(crypto: DefaultCryptoProvider())
185184

186-
WalletConnectModal.configure(
185+
AppKit.configure(
187186
projectId: walletConnectV2Config.projectId,
188187
metadata: metadata,
188+
crypto: DefaultCryptoProvider(),
189+
authRequestParams: nil,
190+
includeWebWallets: false,
189191
recommendedWalletIds: wcModalWallets,
192+
includedWalletIds: wcModalWallets,
190193
excludedWalletIds: [
191-
]
194+
],
195+
coinbaseEnabled: false // we manage Coinbase ourselves
192196
)
193197
}
194198

‎ios/dydx/dydxCartera/dydxCartera/Cartera/Utilities/DefaultSocketFactory.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99
import Starscream
10-
import WalletConnectRelay
10+
import ReownAppKit
1111

1212
extension Starscream.WebSocket: @retroactive WebSocketConnecting { }
1313

‎ios/dydx/dydxCartera/dydxCartera/Cartera/WalletProvider/Providers/DefaultCryptoProvider.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Foundation
22
import Web3
33
import CryptoSwift
4-
import WalletConnectSigner
4+
import ReownAppKit
55

66
struct DefaultCryptoProvider: CryptoProvider {
77

‎ios/dydx/dydxCartera/dydxCartera/Cartera/WalletProvider/Providers/WalletConnectV2Provider.swift‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77

88
import BigInt
99
import CryptoKit
10-
import WalletConnectSign
1110
import UIKit
1211
import Combine
13-
import WalletConnectModal
1412
import Utilities
13+
@preconcurrency import ReownAppKit
1514

1615
final class WalletConnectV2Provider: NSObject, WalletOperationProviderProtocol {
1716
private var backgroundTaskId: UIBackgroundTaskIdentifier = .invalid
@@ -114,7 +113,7 @@ final class WalletConnectV2Provider: NSObject, WalletOperationProviderProtocol {
114113
connectCompletions.append(completion)
115114

116115
if request.useModal {
117-
WalletConnectModal.present()
116+
AppKit.present()
118117
}
119118
}
120119

@@ -187,7 +186,7 @@ final class WalletConnectV2Provider: NSObject, WalletOperationProviderProtocol {
187186
if success {
188187
self?.reallySign(typedDataProvider: typedDataProvider,
189188
accountAddress: request.address,
190-
chainId: request.chainId) { [weak self] signed, error in
189+
chainId: request.chainId) { signed, error in
191190
LocalAuthenticator.shared?.paused = false
192191
completion(signed, error)
193192
}
@@ -223,7 +222,7 @@ final class WalletConnectV2Provider: NSObject, WalletOperationProviderProtocol {
223222
if success {
224223
self?.reallySend(transaction: transaction,
225224
accountAddress: request.walletRequest.address,
226-
chainId: request.walletRequest.chainId) { [weak self] response, error in
225+
chainId: request.walletRequest.chainId) { response, error in
227226
LocalAuthenticator.shared?.paused = false
228227
completion(response, error)
229228
}

‎ios/dydx/dydxCartera/dydxCartera/Cartera/WalletProvider/Providers/WalletSegueProvider.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ private extension Action {
263263
maxFeePerGas: nil,
264264
maxPriorityFeePerGas: nil,
265265
gasLimit: nil,
266-
chainId: chainIdText)
266+
chainId: chainIdText,
267+
actionSource: nil)
267268
)
268269
} else {
269270
return nil

0 commit comments

Comments
 (0)