From 7ef7f3214b78f8e03841dc66cb89b3aa4984d8cd Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Thu, 13 Jun 2024 05:04:14 +0100 Subject: [PATCH 1/4] Update core --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 9034a953..857f928e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 9034a953458f3fd93f6dd4b6dfea54ae2121197d +Subproject commit 857f928e522607ef112c88e50695012044dae4a4 From 722d8db2f2fcb82c648b1fe2890dfa45afaa85f9 Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Thu, 13 Jun 2024 05:09:09 +0100 Subject: [PATCH 2/4] Add ethereum ChainStake --- Gem/Stake/Services/StakeService.swift | 2 +- Packages/Primitives/Sources/ChainStake.swift | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gem/Stake/Services/StakeService.swift b/Gem/Stake/Services/StakeService.swift index 1c834fa5..62b27cbc 100644 --- a/Gem/Stake/Services/StakeService.swift +++ b/Gem/Stake/Services/StakeService.swift @@ -41,7 +41,7 @@ struct StakeService { return id case .smartChain: return StakeHub.address - case .none: + case .ethereum, .none: fatalError() } } diff --git a/Packages/Primitives/Sources/ChainStake.swift b/Packages/Primitives/Sources/ChainStake.swift index 942bfdfb..9f540b53 100644 --- a/Packages/Primitives/Sources/ChainStake.swift +++ b/Packages/Primitives/Sources/ChainStake.swift @@ -13,4 +13,5 @@ public enum StakeChain: String, Codable, CaseIterable, Equatable { case solana case sui case smartChain = "smartchain" + case ethereum } From 9b87f10d02242b88116984e06b6b19cd5d2d7d64 Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Thu, 13 Jun 2024 05:10:53 +0100 Subject: [PATCH 3/4] Fix var warning --- Gem/Settings/Navigation/NetworkSelectorNavigationStack.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gem/Settings/Navigation/NetworkSelectorNavigationStack.swift b/Gem/Settings/Navigation/NetworkSelectorNavigationStack.swift index acea54fa..26fbc690 100644 --- a/Gem/Settings/Navigation/NetworkSelectorNavigationStack.swift +++ b/Gem/Settings/Navigation/NetworkSelectorNavigationStack.swift @@ -59,7 +59,7 @@ extension NetworkSelectorNavigationStack { // MARK: - Previews #Preview { - var mockChains = Chain.allCases + let mockChains = Chain.allCases @State var selectedChain: Chain = .smartChain @State var isPresenting: Bool = false From 7c703e1c13a8633710db0eab36fea0d4fe7fff83 Mon Sep 17 00:00:00 2001 From: gemcoder21 <104884878+gemcoder21@users.noreply.github.com> Date: Thu, 13 Jun 2024 05:15:34 +0100 Subject: [PATCH 4/4] Fix SPM .exactItem warning --- Packages/WalletConnector/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/WalletConnector/Package.swift b/Packages/WalletConnector/Package.swift index c4573268..096eea9c 100644 --- a/Packages/WalletConnector/Package.swift +++ b/Packages/WalletConnector/Package.swift @@ -13,8 +13,8 @@ let package = Package( ], dependencies: [ .package(name: "Primitives", path: "../Primitives"), - .package(url: "https://github.com/WalletConnect/WalletConnectSwiftV2", .exactItem(Version(stringLiteral: "1.18.8"))), - .package(url: "https://github.com/daltoniam/Starscream.git", .exactItem(Version(stringLiteral: "3.1.2"))), + .package(url: "https://github.com/WalletConnect/WalletConnectSwiftV2", exact: Version(stringLiteral: "1.18.8")), + .package(url: "https://github.com/daltoniam/Starscream.git", exact: Version(stringLiteral: "3.1.2")), .package(name: "Gemstone", path: "../Gemstone"), .package(name: "GemstonePrimitives", path: "../GemstonePrimitives"), ],