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

Pairing expiry reduction #1401

Merged
merged 18 commits into from
Aug 19, 2024
Merged

Pairing expiry reduction #1401

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1410f82
remove pairing ping
llbartekll Aug 14, 2024
dd06d99
savepoint
llbartekll Aug 14, 2024
ca7e74f
savepoint
llbartekll Aug 14, 2024
99b86e5
update integration tests
llbartekll Aug 14, 2024
9210715
remove pairing on response
llbartekll Aug 14, 2024
50dbd36
upgrade packages
llbartekll Aug 16, 2024
67d1f51
fix wc modal build
llbartekll Aug 16, 2024
b95bf11
savepoint
llbartekll Aug 16, 2024
62648e7
remove pairing on auth response
llbartekll Aug 16, 2024
5eb9b22
remove pairing or auth response
llbartekll Aug 16, 2024
a669143
fix auth build
llbartekll Aug 16, 2024
fca72e1
remove auth
llbartekll Aug 16, 2024
8b20fd2
remove irrelevant test
llbartekll Aug 16, 2024
47c69d2
remove irrelevant tests
llbartekll Aug 16, 2024
25bc298
fix sign tests
llbartekll Aug 16, 2024
2674ef4
fix test
llbartekll Aug 16, 2024
12f24ea
fix modal tests
llbartekll Aug 16, 2024
34e0bac
remove comment
llbartekll Aug 19, 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
9 changes: 0 additions & 9 deletions Example/DApp/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
mobileLink: "wcflutterwallet://",
linkMode: "https://lab.web3modal.com/walletkit_flutter"
),
.init(
id: "flutter-sample-internal",
name: "Flutter Sample Wallet Internal",
homepage: "https://walletconnect.com/",
imageUrl: "https://avatars.githubusercontent.com/u/37784886?s=200&v=4",
order: 1,
mobileLink: "wcflutterwallet-internal://",
linkMode: "https://lab.web3modal.com/walletkit_flutter_internal"
),
]
)

Expand Down
16 changes: 2 additions & 14 deletions Example/ExampleApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
84CE642127981DED00142511 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84CE642027981DED00142511 /* SceneDelegate.swift */; };
84CE642827981DF000142511 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 84CE642727981DF000142511 /* Assets.xcassets */; };
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 */; };
84DB38F32983CDAE00BFEE37 /* PushRegisterer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84DB38F22983CDAE00BFEE37 /* PushRegisterer.swift */; };
84E6B84A29787A8000428BAF /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E6B84929787A8000428BAF /* NotificationService.swift */; };
Expand Down Expand Up @@ -438,7 +437,6 @@
84CE642A27981DF000142511 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
84CE642C27981DF000142511 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
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>"; };
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>"; };
Expand Down Expand Up @@ -977,14 +975,6 @@
path = DApp;
sourceTree = "<group>";
};
84CEC64728D8A98900D081A8 /* Pairing */ = {
isa = PBXGroup;
children = (
84CEC64528D89D6B00D081A8 /* PairingTests.swift */,
);
path = Pairing;
sourceTree = "<group>";
};
84D2A66728A4F5260088AE09 /* Auth */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1457,7 +1447,6 @@
children = (
847F07FE2A25DBC700B2A5A4 /* XPlatform */,
849D7A91292E2115006A2BD4 /* Push */,
84CEC64728D8A98900D081A8 /* Pairing */,
A5E03E0A28646A8A00888481 /* Stubs */,
A5E03E0928646A8100888481 /* Sign */,
84D2A66728A4F5260088AE09 /* Auth */,
Expand Down Expand Up @@ -2396,7 +2385,6 @@
files = (
A51606F92A2F47BD00CACB92 /* DefaultBIP44Provider.swift in Sources */,
A5A0843E29D2F624000B9B17 /* DefaultCryptoProvider.swift in Sources */,
84CEC64628D89D6B00D081A8 /* PairingTests.swift in Sources */,
767DC83528997F8E00080FA9 /* EthSendTransaction.swift in Sources */,
8439CB89293F658E00F2F2E2 /* PushMessage.swift in Sources */,
A518B31428E33A6500A2CE93 /* InputConfig.swift in Sources */,
Expand Down Expand Up @@ -3277,8 +3265,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/WalletConnect/web3modal-swift";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.0.0;
branch = "pairing-expiry";
kind = branch;
Comment on lines +3268 to +3269
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to merge this?

Copy link
Contributor Author

@llbartekll llbartekll Aug 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, until we don't have a monorepo I need to reference to updated appkit

};
};
A5434021291E6A270068F706 /* XCRemoteSwiftPackageReference "solana-swift" */ = {
Expand Down
18 changes: 9 additions & 9 deletions Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/attaswift/BigInt.git",
"state": {
"branch": null,
"revision": "0ed110f7555c34ff468e72e1686e59721f2b0da6",
"version": "5.3.0"
"revision": "793a7fac0bfc318e85994bf6900652e827aef33e",
"version": "5.4.1"
}
},
{
"package": "CryptoSwift",
"repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
"state": {
"branch": null,
"revision": "7892a123f7e8d0fe62f9f03728b17bbd4f94df5c",
"version": "1.8.1"
"revision": "678d442c6f7828def400a70ae15968aef67ef52d",
"version": "1.8.3"
}
},
{
Expand All @@ -33,7 +33,7 @@
"repositoryURL": "https://github.com/mixpanel/mixpanel-swift",
"state": {
"branch": "master",
"revision": "9438b4a5f76bf2108b09f8fed1abbad8f353e1a2",
"revision": "61ce9b40817466fb1334db1d7a582fbaf616ab4c",
"version": null
}
},
Expand Down Expand Up @@ -69,8 +69,8 @@
"repositoryURL": "https://github.com/getsentry/sentry-cocoa.git",
"state": {
"branch": null,
"revision": "38f4f70d07117b9f958a76b1bff278c2f29ffe0e",
"version": "8.21.0"
"revision": "d2ced2d961b34573ebd2ea0567a2f1408e90f0ae",
"version": "8.34.0"
}
},
{
Expand Down Expand Up @@ -185,8 +185,8 @@
"package": "swift-web3modal",
"repositoryURL": "https://github.com/WalletConnect/web3modal-swift",
"state": {
"branch": null,
"revision": "25abd7e5471f21d662400f9763948fbf97c60c97",
"branch": "pairing-expiry",
"revision": "3088a08a43c490c24f1dfb1b858a67de089feef6",
"version": null
}
}
Expand Down
86 changes: 0 additions & 86 deletions Example/IntegrationTests/Pairing/PairingTests.swift
View file
Open in desktop

This file was deleted.

Loading
Loading