Skip to content

Commit 6d99888

Browse files
llbartekllllbartekll
authored
Merge pull request #1318 from WalletConnect/develop
1.15.0
2 parents 8fb703b + 8b6aac5 commit 6d99888

File tree

47 files changed

+506
-998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+506
-998
lines changed

‎Example/DApp/Assets.xcassets/solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ.imageset/Contents.json renamed to ‎Example/DApp/Assets.xcassets/solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp.imageset/Contents.json

File renamed without changes.

‎Example/DApp/Assets.xcassets/solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ.imageset/solana (1).png renamed to ‎Example/DApp/Assets.xcassets/solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp.imageset/solana (1).png

File renamed without changes.

‎Example/DApp/Modules/Sign/SignInteractor.swift

+12-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ enum Proposal {
66
static let requiredNamespaces: [String: ProposalNamespace] = [
77
"eip155": ProposalNamespace(
88
chains: [
9-
Blockchain("eip155:1")!,
10-
Blockchain("eip155:137")!
9+
Blockchain("eip155:1")!
1110
],
1211
methods: [
1312
"eth_sendTransaction",
@@ -20,12 +19,22 @@ enum Proposal {
2019
static let optionalNamespaces: [String: ProposalNamespace] = [
2120
"solana": ProposalNamespace(
2221
chains: [
23-
Blockchain("solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ")!
22+
Blockchain("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp")!
2423
],
2524
methods: [
2625
"solana_signMessage",
2726
"solana_signTransaction"
2827
], events: []
28+
),
29+
"eip155": ProposalNamespace(
30+
chains: [
31+
Blockchain("eip155:137")!
32+
],
33+
methods: [
34+
"eth_sendTransaction",
35+
"personal_sign",
36+
"eth_signTypedData"
37+
], events: []
2938
)
3039
]
3140
}

‎Example/DApp/Modules/Sign/SignPresenter.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class SignPresenter: ObservableObject {
1616
let chains = [
1717
Chain(name: "Ethereum", id: "eip155:1"),
1818
Chain(name: "Polygon", id: "eip155:137"),
19-
Chain(name: "Solana", id: "solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ")
19+
Chain(name: "Solana", id: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp")
2020
]
2121

2222
private let interactor: SignInteractor
@@ -98,7 +98,7 @@ final class SignPresenter: ObservableObject {
9898
Task {
9999
do {
100100
ActivityIndicatorManager.shared.start()
101-
let uri = try await Sign.instance.authenticate(.stub(methods: nil))
101+
let uri = try await Sign.instance.authenticate(.stub(methods: ["personal_sign"]))
102102
walletConnectUri = uri
103103
ActivityIndicatorManager.shared.stop()
104104
router.presentNewPairing(walletConnectUri: walletConnectUri!)

‎Example/ExampleApp.xcodeproj/IntegrationTests.xctestplan

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"ChatTests",
5959
"ENSResolverTests",
6060
"HistoryTests",
61-
"SignClientTests\/testEIP1271SessionAuthenticated()",
6261
"SyncDerivationServiceTests",
6362
"SyncTests"
6463
],

‎Example/ExampleApp.xcodeproj/project.pbxproj

+5-31
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
767DC83528997F8E00080FA9 /* EthSendTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 767DC83428997F8E00080FA9 /* EthSendTransaction.swift */; };
11-
7694A5262874296A0001257E /* RegistryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7694A5252874296A0001257E /* RegistryTests.swift */; };
1211
842B1D132B988BC5007F1EF8 /* Web3Modal in Frameworks */ = {isa = PBXBuildFile; productRef = 842B1D122B988BC5007F1EF8 /* Web3Modal */; };
1312
842B1D152B988BC5007F1EF8 /* Web3ModalUI in Frameworks */ = {isa = PBXBuildFile; productRef = 842B1D142B988BC5007F1EF8 /* Web3ModalUI */; };
1413
842B1D172B988BF0007F1EF8 /* Web3ModalUI in Frameworks */ = {isa = PBXBuildFile; productRef = 842B1D162B988BF0007F1EF8 /* Web3ModalUI */; };
@@ -56,7 +55,6 @@
5655
84CE642B27981DF000142511 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84CE642927981DF000142511 /* LaunchScreen.storyboard */; };
5756
84CEC64628D89D6B00D081A8 /* PairingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CEC64528D89D6B00D081A8 /* PairingTests.swift */; };
5857
84D093EB2B4EA6CB005B1925 /* ActivityIndicatorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D093EA2B4EA6CB005B1925 /* ActivityIndicatorManager.swift */; };
59-
84D2A66628A4F51E0088AE09 /* AuthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D2A66528A4F51E0088AE09 /* AuthTests.swift */; };
6058
84DB38F32983CDAE00BFEE37 /* PushRegisterer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DB38F22983CDAE00BFEE37 /* PushRegisterer.swift */; };
6159
84E6B84A29787A8000428BAF /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E6B84929787A8000428BAF /* NotificationService.swift */; };
6260
84E6B84E29787A8000428BAF /* PNDecryptionService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 84E6B84729787A8000428BAF /* PNDecryptionService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -211,7 +209,6 @@
211209
A5E03DFD286465D100888481 /* Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03DFC286465D100888481 /* Stubs.swift */; };
212210
A5E03DFF2864662500888481 /* WalletConnect in Frameworks */ = {isa = PBXBuildFile; productRef = A5E03DFE2864662500888481 /* WalletConnect */; };
213211
A5E03E01286466EA00888481 /* WalletConnectChat in Frameworks */ = {isa = PBXBuildFile; productRef = A5E03E00286466EA00888481 /* WalletConnectChat */; };
214-
A5E03E03286466F400888481 /* ChatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03E02286466F400888481 /* ChatTests.swift */; };
215212
A5E03E1128646F8000888481 /* KeychainStorageMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03E1028646F8000888481 /* KeychainStorageMock.swift */; };
216213
A5E22D1A2840C62A00E36487 /* Engine.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D192840C62A00E36487 /* Engine.swift */; };
217214
A5E22D1C2840C85D00E36487 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D1B2840C85D00E36487 /* App.swift */; };
@@ -397,7 +394,6 @@
397394
764E1D5526F8DADE00A1FB15 /* WalletConnectSwiftV2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = WalletConnectSwiftV2; path = ..; sourceTree = "<group>"; };
398395
764E1D5626F8DB6000A1FB15 /* WalletConnectSwiftV2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = WalletConnectSwiftV2; path = ..; sourceTree = "<group>"; };
399396
767DC83428997F8E00080FA9 /* EthSendTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthSendTransaction.swift; sourceTree = "<group>"; };
400-
7694A5252874296A0001257E /* RegistryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistryTests.swift; sourceTree = "<group>"; };
401397
84310D04298BC980000C15B6 /* MainInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainInteractor.swift; sourceTree = "<group>"; };
402398
8439CB88293F658E00F2F2E2 /* PushMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushMessage.swift; sourceTree = "<group>"; };
403399
844749F329B9E5B9005F520B /* RelayIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RelayIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -438,7 +434,6 @@
438434
84CE6453279FFE1100142511 /* Wallet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Wallet.entitlements; sourceTree = "<group>"; };
439435
84CEC64528D89D6B00D081A8 /* PairingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PairingTests.swift; sourceTree = "<group>"; };
440436
84D093EA2B4EA6CB005B1925 /* ActivityIndicatorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityIndicatorManager.swift; sourceTree = "<group>"; };
441-
84D2A66528A4F51E0088AE09 /* AuthTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthTests.swift; sourceTree = "<group>"; };
442437
84D72FC62B4692770057EAF3 /* DApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DApp.entitlements; sourceTree = "<group>"; };
443438
84DB38F029828A7C00BFEE37 /* WalletApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WalletApp.entitlements; sourceTree = "<group>"; };
444439
84DB38F129828A7F00BFEE37 /* PNDecryptionService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PNDecryptionService.entitlements; sourceTree = "<group>"; };
@@ -569,7 +564,6 @@
569564
A5E03DED286464DB00888481 /* IntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
570565
A5E03DF9286465C700888481 /* SignClientTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignClientTests.swift; sourceTree = "<group>"; };
571566
A5E03DFC286465D100888481 /* Stubs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stubs.swift; sourceTree = "<group>"; };
572-
A5E03E02286466F400888481 /* ChatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatTests.swift; sourceTree = "<group>"; };
573567
A5E03E1028646F8000888481 /* KeychainStorageMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainStorageMock.swift; sourceTree = "<group>"; };
574568
A5E22D192840C62A00E36487 /* Engine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Engine.swift; sourceTree = "<group>"; };
575569
A5E22D1B2840C85D00E36487 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
@@ -981,7 +975,6 @@
981975
children = (
982976
A58A1ECA29BF457800A82A20 /* ENS */,
983977
A54195992934BFDD0035AD19 /* Signer */,
984-
84D2A66528A4F51E0088AE09 /* AuthTests.swift */,
985978
);
986979
path = Auth;
987980
sourceTree = "<group>";
@@ -1462,21 +1455,11 @@
14621455
84CEC64728D8A98900D081A8 /* Pairing */,
14631456
A5E03E0A28646A8A00888481 /* Stubs */,
14641457
A5E03E0928646A8100888481 /* Sign */,
1465-
A5E03E0828646A7B00888481 /* Chat */,
14661458
84D2A66728A4F5260088AE09 /* Auth */,
14671459
);
14681460
path = IntegrationTests;
14691461
sourceTree = "<group>";
14701462
};
1471-
A5E03E0828646A7B00888481 /* Chat */ = {
1472-
isa = PBXGroup;
1473-
children = (
1474-
A5E03E02286466F400888481 /* ChatTests.swift */,
1475-
7694A5252874296A0001257E /* RegistryTests.swift */,
1476-
);
1477-
path = Chat;
1478-
sourceTree = "<group>";
1479-
};
14801463
A5E03E0928646A8100888481 /* Sign */ = {
14811464
isa = PBXGroup;
14821465
children = (
@@ -2414,12 +2397,9 @@
24142397
A541959E2934BFEF0035AD19 /* CacaoSignerTests.swift in Sources */,
24152398
A59CF4F6292F83D50031A42F /* DefaultSignerFactory.swift in Sources */,
24162399
847F08012A25DBFF00B2A5A4 /* XPlatformW3WTests.swift in Sources */,
2417-
A5E03E03286466F400888481 /* ChatTests.swift in Sources */,
24182400
849D7A93292E2169006A2BD4 /* NotifyTests.swift in Sources */,
24192401
845B8D8C2934B36C0084A966 /* Account.swift in Sources */,
2420-
84D2A66628A4F51E0088AE09 /* AuthTests.swift in Sources */,
24212402
84FE684628ACDB4700C893FF /* RequestParams.swift in Sources */,
2422-
7694A5262874296A0001257E /* RegistryTests.swift in Sources */,
24232403
A541959F2934BFEF0035AD19 /* SignerTests.swift in Sources */,
24242404
A58A1ECC29BF458600A82A20 /* ENSResolverTests.swift in Sources */,
24252405
A5E03DFA286465C700888481 /* SignClientTests.swift in Sources */,
@@ -2897,11 +2877,9 @@
28972877
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
28982878
CODE_SIGN_ENTITLEMENTS = PNDecryptionService/PNDecryptionServiceRelease.entitlements;
28992879
CODE_SIGN_IDENTITY = "Apple Development";
2900-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
2901-
CODE_SIGN_STYLE = Manual;
2880+
CODE_SIGN_STYLE = Automatic;
29022881
CURRENT_PROJECT_VERSION = 7;
2903-
DEVELOPMENT_TEAM = "";
2904-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
2882+
DEVELOPMENT_TEAM = W5R8AG9K22;
29052883
GENERATE_INFOPLIST_FILE = YES;
29062884
INFOPLIST_FILE = PNDecryptionService/Info.plist;
29072885
INFOPLIST_KEY_CFBundleDisplayName = PNDecryptionService;
@@ -2916,7 +2894,6 @@
29162894
PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp.PNDecryptionService;
29172895
PRODUCT_NAME = "$(TARGET_NAME)";
29182896
PROVISIONING_PROFILE_SPECIFIER = "";
2919-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.walletapp.PNDecryptionService";
29202897
SKIP_INSTALL = YES;
29212898
SWIFT_EMIT_LOC_STRINGS = YES;
29222899
SWIFT_VERSION = 5.0;
@@ -3115,12 +3092,10 @@
31153092
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
31163093
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
31173094
CODE_SIGN_ENTITLEMENTS = WalletApp/WalletAppRelease.entitlements;
3118-
CODE_SIGN_IDENTITY = "Apple Distribution";
3119-
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
3120-
CODE_SIGN_STYLE = Manual;
3095+
CODE_SIGN_IDENTITY = "Apple Development";
3096+
CODE_SIGN_STYLE = Automatic;
31213097
CURRENT_PROJECT_VERSION = 7;
3122-
DEVELOPMENT_TEAM = "";
3123-
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
3098+
DEVELOPMENT_TEAM = W5R8AG9K22;
31243099
ENABLE_PREVIEWS = YES;
31253100
GENERATE_INFOPLIST_FILE = YES;
31263101
INFOPLIST_FILE = WalletApp/Other/Info.plist;
@@ -3139,7 +3114,6 @@
31393114
PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp;
31403115
PRODUCT_NAME = "$(TARGET_NAME)";
31413116
PROVISIONING_PROFILE_SPECIFIER = "";
3142-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.walletapp";
31433117
SWIFT_EMIT_LOC_STRINGS = YES;
31443118
SWIFT_VERSION = 5.0;
31453119
TARGETED_DEVICE_FAMILY = "1,2";

0 commit comments

Comments
 (0)