From 7f57ca0c1767d02b31521a58dae50f3f48b5c628 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 16 Nov 2024 10:34:18 +1300 Subject: [PATCH] Migrate to zcash-light-client-ffi 0.11.0 --- .../xcshareddata/swiftpm/Package.resolved | 4 ++-- Package.resolved | 4 ++-- Package.swift | 2 +- .../ZcashLightClientKit/Rust/ZcashRustBackend.swift | 10 +++------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index cbec28d7..fc30895e 100644 --- a/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Example/ZcashLightClientSample/ZcashLightClientSample.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -176,8 +176,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Electric-Coin-Company/zcash-light-client-ffi", "state" : { - "revision" : "7029804dc30d33b689fb8da712c1172daf8e402e", - "version" : "0.10.2" + "revision" : "31a97a1478bc0354abdf208722b670f7fd3d9f8c", + "version" : "0.11.0" } } ], diff --git a/Package.resolved b/Package.resolved index 9ef0cd02..28067bd0 100644 --- a/Package.resolved +++ b/Package.resolved @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Electric-Coin-Company/zcash-light-client-ffi", "state" : { - "revision" : "7029804dc30d33b689fb8da712c1172daf8e402e", - "version" : "0.10.2" + "revision" : "31a97a1478bc0354abdf208722b670f7fd3d9f8c", + "version" : "0.11.0" } } ], diff --git a/Package.swift b/Package.swift index 66d1397e..f37641cc 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( dependencies: [ .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.23.0"), .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.3"), - .package(url: "https://github.com/Electric-Coin-Company/zcash-light-client-ffi", exact: "0.10.2") + .package(url: "https://github.com/Electric-Coin-Company/zcash-light-client-ffi", exact: "0.11.0") ], targets: [ .target( diff --git a/Sources/ZcashLightClientKit/Rust/ZcashRustBackend.swift b/Sources/ZcashLightClientKit/Rust/ZcashRustBackend.swift index 8049ee4d..99cdc668 100644 --- a/Sources/ZcashLightClientKit/Rust/ZcashRustBackend.swift +++ b/Sources/ZcashLightClientKit/Rust/ZcashRustBackend.swift @@ -27,7 +27,6 @@ enum RustLogging: String { struct ZcashRustBackend: ZcashRustBackendWelding { let minimumConfirmations: UInt32 = 10 let minimumShieldingConfirmations: UInt32 = 1 - let useZIP317Fees = true let dbData: (String, UInt) let fsBlockDbRoot: (String, UInt) @@ -162,8 +161,7 @@ struct ZcashRustBackend: ZcashRustBackendWelding { value, memo?.bytes, networkType.networkId, - minimumConfirmations, - useZIP317Fees + minimumConfirmations ) guard let proposal else { @@ -189,8 +187,7 @@ struct ZcashRustBackend: ZcashRustBackendWelding { account, [CChar](uri.utf8CString), networkType.networkId, - minimumConfirmations, - useZIP317Fees + minimumConfirmations ) guard let proposal else { @@ -763,8 +760,7 @@ struct ZcashRustBackend: ZcashRustBackendWelding { UInt64(shieldingThreshold.amount), transparentReceiver.map { [CChar]($0.utf8CString) }, networkType.networkId, - minimumShieldingConfirmations, - useZIP317Fees + minimumShieldingConfirmations ) guard let proposal else {