From 39c56e275e6d3f83f66567b8b5c883aef8d0ba00 Mon Sep 17 00:00:00 2001 From: Lukas Korba Date: Mon, 2 Sep 2024 13:37:30 +0200 Subject: [PATCH] [#1340] Sync fails after Delete Zashi - Attempts to fix it --- modules/Package.swift | 61 ++++++++++--------- .../xcshareddata/swiftpm/Package.resolved | 20 +++--- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/modules/Package.swift b/modules/Package.swift index 14157cc72..9f9cdbaae 100644 --- a/modules/Package.swift +++ b/modules/Package.swift @@ -83,7 +83,8 @@ let package = Package( .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"), .package(url: "https://github.com/pointfreeco/swift-url-routing", from: "0.6.2"), .package(url: "https://github.com/zcash-hackworks/MnemonicSwift", from: "2.2.4"), - .package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.2.1"), +// .package(url: "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", from: "2.2.1"), + .package(url: "https://github.com/LukasKorba/ZcashLightClientKit", branch: "1482-Fix-the-wipe-function"), .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "10.27.0") ], targets: [ @@ -109,7 +110,7 @@ let package = Package( "UIComponents", "Utils", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/AddressDetails" ), @@ -154,7 +155,7 @@ let package = Package( "WalletStorage", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/BalanceBreakdown" ), @@ -164,7 +165,7 @@ let package = Package( "Generated", "Utils", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/BalanceFormatter" ), @@ -201,7 +202,7 @@ let package = Package( "FileManager", "Utils", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/DatabaseFiles" ), @@ -218,7 +219,7 @@ let package = Package( "DerivationTool", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), .product(name: "URLRouting", package: "swift-url-routing"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/Deeplink" ), @@ -230,7 +231,7 @@ let package = Package( "UIComponents", "Utils", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/DeleteWallet" ), @@ -239,7 +240,7 @@ let package = Package( dependencies: [ "Utils", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/DerivationTool" ), @@ -257,7 +258,7 @@ let package = Package( "UserPreferencesStorage", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/ExchangeRate" ), @@ -268,7 +269,7 @@ let package = Package( "LogsHandler", "Utils", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/ExportLogs" ), @@ -316,7 +317,7 @@ let package = Package( "WalletStatusPanel", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/Home" ), @@ -331,7 +332,7 @@ let package = Package( "WalletStorage", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/ImportWallet" ), @@ -397,7 +398,7 @@ let package = Package( "SecurityWarning", "UIComponents", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/OnboardingFlow" ), @@ -458,7 +459,7 @@ let package = Package( "Utils", "WalletStorage", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/RecoveryPhraseDisplay" ), @@ -515,7 +516,7 @@ let package = Package( "Welcome", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/Root" ), @@ -527,7 +528,7 @@ let package = Package( "SendFlow", "TransactionList", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/Sandbox" ), @@ -542,7 +543,7 @@ let package = Package( "Utils", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/Scan" ), @@ -553,7 +554,7 @@ let package = Package( "Models", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/SDKSynchronizer" ), @@ -601,7 +602,7 @@ let package = Package( "WalletStorage", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/SendConfirmation" ), @@ -621,7 +622,7 @@ let package = Package( "WalletBalances", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/SendFlow" ), @@ -634,7 +635,7 @@ let package = Package( "UserPreferencesStorage", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/ServerSetup" ), @@ -657,7 +658,7 @@ let package = Package( "SupportDataGenerator", "UIComponents", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/Settings" ), @@ -707,7 +708,7 @@ let package = Package( "UIComponents", "UserPreferencesStorage", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/Tabs" ), @@ -723,7 +724,7 @@ let package = Package( "Utils", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/TransactionList" ), @@ -747,7 +748,7 @@ let package = Package( dependencies: [ "DerivationTool", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/URIParser" ), @@ -763,14 +764,14 @@ let package = Package( dependencies: [ "UserDefaults", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/UserPreferencesStorage" ), .target( name: "Utils", dependencies: [ - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"), + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"), .product(name: "CasePaths", package: "swift-case-paths"), .product(name: "ComposableArchitecture", package: "swift-composable-architecture") ], @@ -788,7 +789,7 @@ let package = Package( "Utils", "ZcashSDKEnvironment", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Features/WalletBalances" ), @@ -818,7 +819,7 @@ let package = Package( "MnemonicClient", "Models", .product(name: "ComposableArchitecture", package: "swift-composable-architecture"), - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk") + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit") ], path: "Sources/Dependencies/WalletStorage" ), @@ -855,7 +856,7 @@ let package = Package( "Generated", "UserDefaults", "UserPreferencesStorage", - .product(name: "ZcashLightClientKit", package: "zcash-swift-wallet-sdk"), + .product(name: "ZcashLightClientKit", package: "ZcashLightClientKit"), .product(name: "ComposableArchitecture", package: "swift-composable-architecture") ], path: "Sources/Dependencies/ZcashSDKEnvironment" diff --git a/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 78d61c9c6..1b8193b30 100644 --- a/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/secant.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -185,8 +185,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-composable-architecture", "state" : { - "revision" : "b432441cbc11a38c678312bad1a01138a7cd64e0", - "version" : "1.13.0" + "revision" : "121b6080697b5457ac63e37d2f2d97cf5acd999a", + "version" : "1.13.1" } }, { @@ -221,8 +221,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-dependencies", "state" : { - "revision" : "d7472be6b3c89251ce4c0db07d32405b43426781", - "version" : "1.3.7" + "revision" : "21660b042cd8fd0bdd45cc39050cacd4e91a63a4", + "version" : "1.3.8" } }, { @@ -257,8 +257,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-navigation", "state" : { - "revision" : "339ba3e305dc727b5baa6ddb476430a842167d4e", - "version" : "2.0.5" + "revision" : "70321c441d51b0b893c3abbf79687f550a027fde", + "version" : "2.0.6" } }, { @@ -379,12 +379,12 @@ } }, { - "identity" : "zcash-swift-wallet-sdk", + "identity" : "zcashlightclientkit", "kind" : "remoteSourceControl", - "location" : "https://github.com/Electric-Coin-Company/zcash-swift-wallet-sdk", + "location" : "https://github.com/LukasKorba/ZcashLightClientKit", "state" : { - "revision" : "ff70d8924c241ce11cf0c458af96e1967f56e19d", - "version" : "2.2.1" + "branch" : "1482-Fix-the-wipe-function", + "revision" : "6896e405210410ffc579b15a9fa9bfb41af33f67" } } ],