Add Zatoshi to TransactionEncoder

Electric-Coin-Company · Sep 1, 2022 · 666b287 · 666b287
1 parent c06450b
commit 666b287
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Sources/ZcashLightClientKit/Transaction/PersistentTransactionManager.swift b/Sources/ZcashLightClientKit/Transaction/PersistentTransactionManager.swift
@@ -112,7 +112,7 @@ class PersistentTransactionManager: OutboundTransactionManager {
             do {
                 let encodedTransaction = try self.encoder.createTransaction(
                     spendingKey: spendingKey,
-                    zatoshi: pendingTransaction.intValue,
+                    zatoshi: pendingTransaction.value,
                     to: pendingTransaction.toAddress,
                     memo: pendingTransaction.memo?.asZcashTransactionMemo(),
                     from: pendingTransaction.accountIndex

diff --git a/Sources/ZcashLightClientKit/Transaction/TransactionEncoder.swift b/Sources/ZcashLightClientKit/Transaction/TransactionEncoder.swift
@@ -26,15 +26,15 @@ protocol TransactionEncoder {
     ///
     /// - Parameters:
     /// - Parameter spendingKey: a `SaplingExtendedSpendingKey` containing the spending key
-    /// - Parameter zatoshi: the amount to send in zatoshis
+    /// - Parameter zatoshi: the amount to send in `Zatoshi`
     /// - Parameter to: string containing the recipient address
     /// - Parameter memo: string containing the memo (optional)
     /// - Parameter accountIndex: index of the account that will be used to send the funds
     ///
     /// - Throws: a TransactionEncoderError
     func createTransaction(
         spendingKey: SaplingExtendedSpendingKey,
-        zatoshi: Int,
+        zatoshi: Zatoshi,
         to address: String,
         memo: String?,
         from accountIndex: Int
@@ -48,15 +48,15 @@ protocol TransactionEncoder {
     ///
     /// - Parameters:
     /// - Parameter spendingKey: a `SaplingExtendedSpendingKey` containing the spending key
-    /// - Parameter zatoshi: the amount to send in zatoshis
+    /// - Parameter zatoshi: the amount to send in `Zatoshi`
     /// - Parameter to: string containing the recipient address
     /// - Parameter memo: string containing the memo (optional)
     /// - Parameter accountIndex: index of the account that will be used to send the funds
     /// - Parameter result: a non escaping closure that receives a Result containing either an EncodedTransaction or a /// TransactionEncoderError
     // swiftlint:disable:next function_parameter_count
     func createTransaction(
         spendingKey: SaplingExtendedSpendingKey,
-        zatoshi: Int,
+        zatoshi: Zatoshi,
         to address: String,
         memo: String?,
         from accountIndex: Int,

diff --git a/Sources/ZcashLightClientKit/Transaction/WalletTransactionEncoder.swift b/Sources/ZcashLightClientKit/Transaction/WalletTransactionEncoder.swift
@@ -51,7 +51,7 @@ class WalletTransactionEncoder: TransactionEncoder {
 
     func createTransaction(
         spendingKey: SaplingExtendedSpendingKey,
-        zatoshi: Int,
+        zatoshi: Zatoshi,
         to address: String,
         memo: String?,
         from accountIndex: Int
@@ -81,7 +81,7 @@ class WalletTransactionEncoder: TransactionEncoder {
     // swiftlint:disable:next function_parameter_count
     func createTransaction(
         spendingKey: SaplingExtendedSpendingKey,
-        zatoshi: Int,
+        zatoshi: Zatoshi,
         to address: String,
         memo: String?,
         from accountIndex: Int,
@@ -109,7 +109,7 @@ class WalletTransactionEncoder: TransactionEncoder {
 
     func createSpend(
         spendingKey: SaplingExtendedSpendingKey,
-        zatoshi: Int,
+        zatoshi: Zatoshi,
         to address: String,
         memo: String?,
         from accountIndex: Int
@@ -123,7 +123,7 @@ class WalletTransactionEncoder: TransactionEncoder {
             account: Int32(accountIndex),
             extsk: spendingKey.stringEncoded,
             to: address,
-            value: Int64(zatoshi),
+            value: zatoshi.amount,
             memo: memo,
             spendParamsPath: self.spendParamsURL.path,
             outputParamsPath: self.outputParamsURL.path,