Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.15.0 #1318

Merged
merged 29 commits into from
Mar 13, 2024
Merged

1.15.0 #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5384070
add notify recap
llbartekll Feb 27, 2024
15f96c2
savepoint
llbartekll Feb 27, 2024
57b8eb9
savepoint
llbartekll Feb 27, 2024
47746a8
update capbox
llbartekll Mar 8, 2024
e955c39
Merge branch 'develop' of github.com:WalletConnect/WalletConnectSwift…
llbartekll Mar 8, 2024
343942e
add recap merging service
llbartekll Mar 10, 2024
207e41d
Add SiweMessageFormatter
llbartekll Mar 10, 2024
83b4b86
update siwe formatting
llbartekll Mar 10, 2024
a640357
fix sign build
llbartekll Mar 10, 2024
d5e5fa2
savepoint
llbartekll Mar 10, 2024
50dbfb5
savepoint
llbartekll Mar 10, 2024
bdf280d
fix notify tests
llbartekll Mar 10, 2024
7c8f162
savepoint
llbartekll Mar 11, 2024
d52a986
savepoint
llbartekll Mar 11, 2024
5bcb2e8
fix recap
llbartekll Mar 11, 2024
1b1cb91
savepoint
llbartekll Mar 11, 2024
3e02607
fix missing resources in siwe
llbartekll Mar 11, 2024
2d45e2d
fix recap encoding issue
llbartekll Mar 12, 2024
febad38
savepoint
llbartekll Mar 12, 2024
a585102
savepoint
llbartekll Mar 12, 2024
fcb0c26
savepoint
llbartekll Mar 12, 2024
87209e0
fix auth build
llbartekll Mar 12, 2024
f5c67e6
remove unused files
llbartekll Mar 12, 2024
5b1563a
fix signclient tests
llbartekll Mar 12, 2024
21ca876
update solana caip
llbartekll Mar 12, 2024
453eaca
remove trash
llbartekll Mar 12, 2024
4da0bd9
fix siwe fallback
llbartekll Mar 13, 2024
aa20997
Merge pull request #1317 from WalletConnect/capbox
llbartekll Mar 13, 2024
8b6aac5
Set User Agent
llbartekll Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...GspuhpqLDx6wiyjNtZ.imageset/Contents.json → ...JdTREpY1vzqKqZKvdp.imageset/Contents.json
View file
Open in desktop
File renamed without changes.
0 ...spuhpqLDx6wiyjNtZ.imageset/solana (1).png → ...dTREpY1vzqKqZKvdp.imageset/solana (1).png
View file
Open in desktop
File renamed without changes
15 changes: 12 additions & 3 deletions Example/DApp/Modules/Sign/SignInteractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ enum Proposal {
static let requiredNamespaces: [String: ProposalNamespace] = [
"eip155": ProposalNamespace(
chains: [
Blockchain("eip155:1")!,
Blockchain("eip155:137")!
Blockchain("eip155:1")!
],
methods: [
"eth_sendTransaction",
Expand All @@ -20,12 +19,22 @@ enum Proposal {
static let optionalNamespaces: [String: ProposalNamespace] = [
"solana": ProposalNamespace(
chains: [
Blockchain("solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ")!
Blockchain("solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp")!
],
methods: [
"solana_signMessage",
"solana_signTransaction"
], events: []
),
"eip155": ProposalNamespace(
chains: [
Blockchain("eip155:137")!
],
methods: [
"eth_sendTransaction",
"personal_sign",
"eth_signTypedData"
], events: []
)
]
}
Expand Down
4 changes: 2 additions & 2 deletions Example/DApp/Modules/Sign/SignPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ final class SignPresenter: ObservableObject {
let chains = [
Chain(name: "Ethereum", id: "eip155:1"),
Chain(name: "Polygon", id: "eip155:137"),
Chain(name: "Solana", id: "solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ")
Chain(name: "Solana", id: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp")
]

private let interactor: SignInteractor
Expand Down Expand Up @@ -98,7 +98,7 @@ final class SignPresenter: ObservableObject {
Task {
do {
ActivityIndicatorManager.shared.start()
let uri = try await Sign.instance.authenticate(.stub(methods: nil))
let uri = try await Sign.instance.authenticate(.stub(methods: ["personal_sign"]))
walletConnectUri = uri
ActivityIndicatorManager.shared.stop()
router.presentNewPairing(walletConnectUri: walletConnectUri!)
Expand Down
1 change: 0 additions & 1 deletion Example/ExampleApp.xcodeproj/IntegrationTests.xctestplan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"ChatTests",
"ENSResolverTests",
"HistoryTests",
"SignClientTests\/testEIP1271SessionAuthenticated()",
"SyncDerivationServiceTests",
"SyncTests"
],
Expand Down
36 changes: 5 additions & 31 deletions Example/ExampleApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
767DC83528997F8E00080FA9 /* EthSendTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 767DC83428997F8E00080FA9 /* EthSendTransaction.swift */; };
7694A5262874296A0001257E /* RegistryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7694A5252874296A0001257E /* RegistryTests.swift */; };
842B1D132B988BC5007F1EF8 /* Web3Modal in Frameworks */ = {isa = PBXBuildFile; productRef = 842B1D122B988BC5007F1EF8 /* Web3Modal */; };
842B1D152B988BC5007F1EF8 /* Web3ModalUI in Frameworks */ = {isa = PBXBuildFile; productRef = 842B1D142B988BC5007F1EF8 /* Web3ModalUI */; };
842B1D172B988BF0007F1EF8 /* Web3ModalUI in Frameworks */ = {isa = PBXBuildFile; productRef = 842B1D162B988BF0007F1EF8 /* Web3ModalUI */; };
Expand Down Expand Up @@ -56,7 +55,6 @@
84CE642B27981DF000142511 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84CE642927981DF000142511 /* LaunchScreen.storyboard */; };
84CEC64628D89D6B00D081A8 /* PairingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CEC64528D89D6B00D081A8 /* PairingTests.swift */; };
84D093EB2B4EA6CB005B1925 /* ActivityIndicatorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D093EA2B4EA6CB005B1925 /* ActivityIndicatorManager.swift */; };
84D2A66628A4F51E0088AE09 /* AuthTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84D2A66528A4F51E0088AE09 /* AuthTests.swift */; };
84DB38F32983CDAE00BFEE37 /* PushRegisterer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DB38F22983CDAE00BFEE37 /* PushRegisterer.swift */; };
84E6B84A29787A8000428BAF /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E6B84929787A8000428BAF /* NotificationService.swift */; };
84E6B84E29787A8000428BAF /* PNDecryptionService.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 84E6B84729787A8000428BAF /* PNDecryptionService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -211,7 +209,6 @@
A5E03DFD286465D100888481 /* Stubs.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03DFC286465D100888481 /* Stubs.swift */; };
A5E03DFF2864662500888481 /* WalletConnect in Frameworks */ = {isa = PBXBuildFile; productRef = A5E03DFE2864662500888481 /* WalletConnect */; };
A5E03E01286466EA00888481 /* WalletConnectChat in Frameworks */ = {isa = PBXBuildFile; productRef = A5E03E00286466EA00888481 /* WalletConnectChat */; };
A5E03E03286466F400888481 /* ChatTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03E02286466F400888481 /* ChatTests.swift */; };
A5E03E1128646F8000888481 /* KeychainStorageMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E03E1028646F8000888481 /* KeychainStorageMock.swift */; };
A5E22D1A2840C62A00E36487 /* Engine.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D192840C62A00E36487 /* Engine.swift */; };
A5E22D1C2840C85D00E36487 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E22D1B2840C85D00E36487 /* App.swift */; };
Expand Down Expand Up @@ -397,7 +394,6 @@
764E1D5526F8DADE00A1FB15 /* WalletConnectSwiftV2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = WalletConnectSwiftV2; path = ..; sourceTree = "<group>"; };
764E1D5626F8DB6000A1FB15 /* WalletConnectSwiftV2 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = WalletConnectSwiftV2; path = ..; sourceTree = "<group>"; };
767DC83428997F8E00080FA9 /* EthSendTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthSendTransaction.swift; sourceTree = "<group>"; };
7694A5252874296A0001257E /* RegistryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistryTests.swift; sourceTree = "<group>"; };
84310D04298BC980000C15B6 /* MainInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainInteractor.swift; sourceTree = "<group>"; };
8439CB88293F658E00F2F2E2 /* PushMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushMessage.swift; sourceTree = "<group>"; };
844749F329B9E5B9005F520B /* RelayIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RelayIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -438,7 +434,6 @@
84CE6453279FFE1100142511 /* Wallet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Wallet.entitlements; sourceTree = "<group>"; };
84CEC64528D89D6B00D081A8 /* PairingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PairingTests.swift; sourceTree = "<group>"; };
84D093EA2B4EA6CB005B1925 /* ActivityIndicatorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityIndicatorManager.swift; sourceTree = "<group>"; };
84D2A66528A4F51E0088AE09 /* AuthTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthTests.swift; sourceTree = "<group>"; };
84D72FC62B4692770057EAF3 /* DApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DApp.entitlements; sourceTree = "<group>"; };
84DB38F029828A7C00BFEE37 /* WalletApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WalletApp.entitlements; sourceTree = "<group>"; };
84DB38F129828A7F00BFEE37 /* PNDecryptionService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PNDecryptionService.entitlements; sourceTree = "<group>"; };
Expand Down Expand Up @@ -569,7 +564,6 @@
A5E03DED286464DB00888481 /* IntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = IntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
A5E03DF9286465C700888481 /* SignClientTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignClientTests.swift; sourceTree = "<group>"; };
A5E03DFC286465D100888481 /* Stubs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stubs.swift; sourceTree = "<group>"; };
A5E03E02286466F400888481 /* ChatTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatTests.swift; sourceTree = "<group>"; };
A5E03E1028646F8000888481 /* KeychainStorageMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeychainStorageMock.swift; sourceTree = "<group>"; };
A5E22D192840C62A00E36487 /* Engine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Engine.swift; sourceTree = "<group>"; };
A5E22D1B2840C85D00E36487 /* App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = App.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -981,7 +975,6 @@
children = (
A58A1ECA29BF457800A82A20 /* ENS */,
A54195992934BFDD0035AD19 /* Signer */,
84D2A66528A4F51E0088AE09 /* AuthTests.swift */,
);
path = Auth;
sourceTree = "<group>";
Expand Down Expand Up @@ -1462,21 +1455,11 @@
84CEC64728D8A98900D081A8 /* Pairing */,
A5E03E0A28646A8A00888481 /* Stubs */,
A5E03E0928646A8100888481 /* Sign */,
A5E03E0828646A7B00888481 /* Chat */,
84D2A66728A4F5260088AE09 /* Auth */,
);
path = IntegrationTests;
sourceTree = "<group>";
};
A5E03E0828646A7B00888481 /* Chat */ = {
isa = PBXGroup;
children = (
A5E03E02286466F400888481 /* ChatTests.swift */,
7694A5252874296A0001257E /* RegistryTests.swift */,
);
path = Chat;
sourceTree = "<group>";
};
A5E03E0928646A8100888481 /* Sign */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2414,12 +2397,9 @@
A541959E2934BFEF0035AD19 /* CacaoSignerTests.swift in Sources */,
A59CF4F6292F83D50031A42F /* DefaultSignerFactory.swift in Sources */,
847F08012A25DBFF00B2A5A4 /* XPlatformW3WTests.swift in Sources */,
A5E03E03286466F400888481 /* ChatTests.swift in Sources */,
849D7A93292E2169006A2BD4 /* NotifyTests.swift in Sources */,
845B8D8C2934B36C0084A966 /* Account.swift in Sources */,
84D2A66628A4F51E0088AE09 /* AuthTests.swift in Sources */,
84FE684628ACDB4700C893FF /* RequestParams.swift in Sources */,
7694A5262874296A0001257E /* RegistryTests.swift in Sources */,
A541959F2934BFEF0035AD19 /* SignerTests.swift in Sources */,
A58A1ECC29BF458600A82A20 /* ENSResolverTests.swift in Sources */,
A5E03DFA286465C700888481 /* SignClientTests.swift in Sources */,
Expand Down Expand Up @@ -2897,11 +2877,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = PNDecryptionService/PNDecryptionServiceRelease.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
DEVELOPMENT_TEAM = W5R8AG9K22;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = PNDecryptionService/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = PNDecryptionService;
Expand All @@ -2916,7 +2894,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp.PNDecryptionService;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.walletapp.PNDecryptionService";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -3115,12 +3092,10 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_ENTITLEMENTS = WalletApp/WalletAppRelease.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
DEVELOPMENT_TEAM = W5R8AG9K22;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = WalletApp/Other/Info.plist;
Expand All @@ -3139,7 +3114,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.walletapp";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
Loading
Loading