fix: correct TransactionSigner not being used through ITransactionSigner interface.

Author: metalurgical

Sources/BitcoinCore/Classes/Core/BitcoinCoreBuilder.swift

@@ -32,6 +32,7 @@ public class BitcoinCoreBuilder {
     private var storage: IStorage?
     private var checkpoint: Checkpoint?
     private var apiSyncStateManager: ApiSyncStateManager?
+    private var signer: ITransactionSigner?
 
     @discardableResult public func set(extendedKey: HDExtendedKey?) -> BitcoinCoreBuilder {
         self.extendedKey = extendedKey
@@ -42,6 +43,11 @@ public class BitcoinCoreBuilder {
         self.watchAddressPublicKey = watchAddressPublicKey
         return self
     }
+    
+    public func set(signer: ITransactionSigner?) -> BitcoinCoreBuilder {
+        self.signer = signer
+        return self
+    }
 
     public func set(network: INetwork) -> BitcoinCoreBuilder {
         self.network = network
@@ -305,8 +311,8 @@ public class BitcoinCoreBuilder {
             let outputSetter = OutputSetter(outputSorterFactory: transactionDataSorterFactory, factory: factory)
             let inputSetter = InputSetter(unspentOutputSelector: unspentOutputSelector, transactionSizeCalculator: transactionSizeCalculatorInstance, addressConverter: addressConverter, publicKeyManager: publicKeyManager, factory: factory, pluginManager: pluginManager, dustCalculator: dustCalculatorInstance, changeScriptType: purpose.scriptType, inputSorterFactory: transactionDataSorterFactory)
             let lockTimeSetter = LockTimeSetter(storage: storage)
-            let transactionSigner = TransactionSigner(ecdsaInputSigner: ecdsaInputSigner, schnorrInputSigner: schnorrInputSigner)
-            let transactionBuilder = TransactionBuilder(recipientSetter: recipientSetter, inputSetter: inputSetter, lockTimeSetter: lockTimeSetter, outputSetter: outputSetter, signer: transactionSigner)
+            //let transactionSigner = TransactionSigner(ecdsaInputSigner: ecdsaInputSigner, schnorrInputSigner: schnorrInputSigner)
+            let transactionBuilder = TransactionBuilder(recipientSetter: recipientSetter, inputSetter: inputSetter, lockTimeSetter: lockTimeSetter, outputSetter: outputSetter, signer: self.signer ?? TransactionSigner(ecdsaInputSigner: ecdsaInputSigner, schnorrInputSigner: schnorrInputSigner))
             transactionFeeCalculator = TransactionFeeCalculator(recipientSetter: recipientSetter, inputSetter: inputSetter, addressConverter: addressConverter, publicKeyManager: publicKeyManager, changeScriptType: purpose.scriptType)
             let transactionSendTimer = TransactionSendTimer(interval: 60)
             let transactionSenderInstance = TransactionSender(transactionSyncer: pendingTransactionSyncer, initialBlockDownload: initialDownload, peerManager: peerManager, storage: storage, timer: transactionSendTimer, logger: logger)
@@ -317,7 +323,7 @@ public class BitcoinCoreBuilder {
 
             transactionSendTimer.delegate = transactionSender
 
-            transactionCreator = TransactionCreator(transactionBuilder: transactionBuilder, transactionProcessor: pendingTransactionProcessor, transactionSender: transactionSenderInstance, bloomFilterManager: bloomFilterManager)
+            transactionCreator = TransactionCreator(transactionBuilder: transactionBuilder, transactionProcessor: pendingTransactionProcessor, transactionSender: transactionSenderInstance, bloomFilterManager: bloomFilterManager, signer: self.signer ?? TransactionSigner(ecdsaInputSigner: ecdsaInputSigner, schnorrInputSigner: schnorrInputSigner))
         }
         let mempoolTransactions = MempoolTransactions(transactionSyncer: pendingTransactionSyncer, transactionSender: transactionSender)
 

Sources/BitcoinCore/Classes/Core/Protocols.swift

@@ -379,8 +379,8 @@ public protocol ITransactionCreator {
 }
 
 protocol ITransactionBuilder {
-    func buildTransaction(toAddress: String, value: Int, feeRate: Int, senderPay: Bool, sortType: TransactionDataSortType, unspentOutputs: [UnspentOutput]?, pluginData: [UInt8: IPluginData]) throws -> FullTransaction
-    func buildTransaction(from: UnspentOutput, toAddress: String, feeRate: Int, sortType: TransactionDataSortType) throws -> FullTransaction
+    func buildTransaction(toAddress: String, value: Int, feeRate: Int, senderPay: Bool, sortType: TransactionDataSortType, unspentOutputs: [UnspentOutput]?, pluginData: [UInt8: IPluginData], signer: ITransactionSigner) throws -> FullTransaction
+    func buildTransaction(from: UnspentOutput, toAddress: String, feeRate: Int, sortType: TransactionDataSortType, signer: ITransactionSigner) throws -> FullTransaction
 }
 
 protocol ITransactionFeeCalculator {
@@ -648,7 +648,7 @@ protocol ILockTimeSetter {
     func setLockTime(to mutableTransaction: MutableTransaction)
 }
 
-protocol ITransactionSigner {
+public protocol ITransactionSigner {
     func sign(mutableTransaction: MutableTransaction) throws
 }
 

Sources/BitcoinCore/Classes/Transactions/Builder/TransactionBuilder.swift

@@ -3,19 +3,19 @@ class TransactionBuilder {
     private let inputSetter: IInputSetter
     private let lockTimeSetter: ILockTimeSetter
     private let outputSetter: IOutputSetter
-    private let signer: TransactionSigner
+    // private let signer: ITransactionSigner
 
-    init(recipientSetter: IRecipientSetter, inputSetter: IInputSetter, lockTimeSetter: ILockTimeSetter, outputSetter: IOutputSetter, signer: TransactionSigner) {
+    init(recipientSetter: IRecipientSetter, inputSetter: IInputSetter, lockTimeSetter: ILockTimeSetter, outputSetter: IOutputSetter, signer: ITransactionSigner) {
         self.recipientSetter = recipientSetter
         self.inputSetter = inputSetter
         self.lockTimeSetter = lockTimeSetter
         self.outputSetter = outputSetter
-        self.signer = signer
+        // self.signer = signer
     }
 }
 
 extension TransactionBuilder: ITransactionBuilder {
-    func buildTransaction(toAddress: String, value: Int, feeRate: Int, senderPay: Bool, sortType: TransactionDataSortType, unspentOutputs: [UnspentOutput]?, pluginData: [UInt8: IPluginData]) throws -> FullTransaction {
+    func buildTransaction(toAddress: String, value: Int, feeRate: Int, senderPay: Bool, sortType: TransactionDataSortType, unspentOutputs: [UnspentOutput]?, pluginData: [UInt8: IPluginData], signer: ITransactionSigner) throws -> FullTransaction {
         let mutableTransaction = MutableTransaction()
 
         try recipientSetter.setRecipient(to: mutableTransaction, toAddress: toAddress, value: value, pluginData: pluginData, skipChecks: false)
@@ -28,7 +28,7 @@ extension TransactionBuilder: ITransactionBuilder {
         return mutableTransaction.build()
     }
 
-    func buildTransaction(from unspentOutput: UnspentOutput, toAddress: String, feeRate: Int, sortType: TransactionDataSortType) throws -> FullTransaction {
+    func buildTransaction(from unspentOutput: UnspentOutput, toAddress: String, feeRate: Int, sortType: TransactionDataSortType, signer: ITransactionSigner) throws -> FullTransaction {
         let mutableTransaction = MutableTransaction(outgoing: false)
 
         try recipientSetter.setRecipient(to: mutableTransaction, toAddress: toAddress, value: unspentOutput.output.value, pluginData: [:], skipChecks: false)

Sources/BitcoinCore/Classes/Transactions/TransactionCreator.swift

@@ -9,12 +9,14 @@ class TransactionCreator {
     private let transactionProcessor: IPendingTransactionProcessor
     private let transactionSender: ITransactionSender
     private let bloomFilterManager: IBloomFilterManager
+    private let signer: ITransactionSigner
 
-    init(transactionBuilder: ITransactionBuilder, transactionProcessor: IPendingTransactionProcessor, transactionSender: ITransactionSender, bloomFilterManager: IBloomFilterManager) {
+    init(transactionBuilder: ITransactionBuilder, transactionProcessor: IPendingTransactionProcessor, transactionSender: ITransactionSender, bloomFilterManager: IBloomFilterManager, signer: ITransactionSigner) {
         self.transactionBuilder = transactionBuilder
         self.transactionProcessor = transactionProcessor
         self.transactionSender = transactionSender
         self.bloomFilterManager = bloomFilterManager
+        self.signer = signer
     }
 
     private func processAndSend(transaction: FullTransaction) throws {
@@ -39,15 +41,16 @@ extension TransactionCreator: ITransactionCreator {
             senderPay: senderPay,
             sortType: sortType,
             unspentOutputs: unspentOutputs,
-            pluginData: pluginData
+            pluginData: pluginData,
+            signer: signer
         )
 
         try processAndSend(transaction: transaction)
         return transaction
     }
 
     func create(from unspentOutput: UnspentOutput, to address: String, feeRate: Int, sortType: TransactionDataSortType) throws -> FullTransaction {
-        let transaction = try transactionBuilder.buildTransaction(from: unspentOutput, toAddress: address, feeRate: feeRate, sortType: sortType)
+        let transaction = try transactionBuilder.buildTransaction(from: unspentOutput, toAddress: address, feeRate: feeRate, sortType: sortType, signer: self.signer)
 
         try processAndSend(transaction: transaction)
         return transaction
@@ -61,7 +64,8 @@ extension TransactionCreator: ITransactionCreator {
             senderPay: senderPay,
             sortType: sortType,
             unspentOutputs: unspentOutputs,
-            pluginData: pluginData
+            pluginData: pluginData,
+            signer: self.signer
         )
 
         return TransactionSerializer.serialize(transaction: transaction)