UTXO signing secret deduplication (#1135)

* UTXO signing secret deduplication * UTXO signing secret deduplication adjustments * UTXO signing secret deduplication adjustments 2
tatumio · Oct 30, 2024 · 3515554 · 3515554
1 parent 1b44570
commit 3515554
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tatumio",
-  "version": "2.2.86",
+  "version": "2.2.87",
   "license": "MIT",
   "repository": "https://github.com/tatumio/tatum-js",
   "scripts": {

diff --git a/packages/blockchain/doge/src/lib/doge.sdk.tx.ts b/packages/blockchain/doge/src/lib/doge.sdk.tx.ts
@@ -51,7 +51,7 @@ export const dogeTransactions = (
         transaction.to(item.address, amount)
       }
 
-      const privateKeysToSign = []
+      const privateKeysToSign = new Set<string>()
       if ('fromUTXO' in body) {
         for (const item of body.fromUTXO) {
           const satoshis = amountUtils.toSatoshis(item.value)
@@ -64,8 +64,8 @@ export const dogeTransactions = (
               satoshis,
             }),
           ])
-          if ('signatureId' in item) privateKeysToSign.push(item.signatureId)
-          else if ('privateKey' in item) privateKeysToSign.push(item.privateKey)
+          if ('signatureId' in item) privateKeysToSign.add(item.signatureId)
+          else if ('privateKey' in item) privateKeysToSign.add(item.privateKey)
         }
       } else if ('fromAddress' in body) {
         for (const item of body.fromAddress) {
@@ -88,10 +88,9 @@ export const dogeTransactions = (
                 satoshis,
               }),
             ])
-
-            if ('signatureId' in item) privateKeysToSign.push(item.signatureId)
-            else if ('privateKey' in item) privateKeysToSign.push(item.privateKey)
           }
+          if ('signatureId' in item) privateKeysToSign.add(item.signatureId)
+          else if ('privateKey' in item) privateKeysToSign.add(item.privateKey)
         }
       }
 
@@ -110,9 +109,9 @@ export const dogeTransactions = (
         return JSON.stringify(transaction)
       }
 
-      for (const pk of privateKeysToSign) {
+      privateKeysToSign.forEach((pk) => {
         transaction.sign(PrivateKey.fromWIF(pk))
-      }
+      })
 
       return transaction.serialize()
     } catch (e: any) {

diff --git a/packages/shared/blockchain/btc-based/src/lib/nested/btc-based.tx.ts b/packages/shared/blockchain/btc-based/src/lib/nested/btc-based.tx.ts
@@ -129,7 +129,7 @@ export const btcBasedTransactions = (
     transaction: BtcBasedTransaction,
     body: BtcFromAddressTypes | LtcFromAddressTypes,
     options: BtcBasedTxOptions,
-  ): Promise<Array<string>> => {
+  ): Promise<Set<string>> => {
     if (body.fromAddress.length === 0 && !options.skipAllChecks) {
       throw new BtcBasedSdkError(SdkErrorCode.BTC_BASED_NO_INPUTS)
     }
@@ -140,7 +140,7 @@ export const btcBasedTransactions = (
       totalOutputs += item.satoshis
     }
     try {
-      const privateKeysToSign = []
+      const privateKeysToSign = new Set<string>()
 
       for (const item of body.fromAddress) {
         if (totalInputs >= totalOutputs) {
@@ -162,10 +162,9 @@ export const btcBasedTransactions = (
               satoshis: amountUtils.toSatoshis(utxo.value),
             }),
           ])
-
-          if ('signatureId' in item) privateKeysToSign.push(item.signatureId)
-          else if ('privateKey' in item) privateKeysToSign.push(item.privateKey)
         }
+        if ('signatureId' in item) privateKeysToSign.add(item.signatureId)
+        else if ('privateKey' in item) privateKeysToSign.add(item.privateKey)
       }
 
       return privateKeysToSign
@@ -205,13 +204,13 @@ export const btcBasedTransactions = (
     transaction: Transaction,
     body: BtcFromUtxoTypes | LtcFromUtxoTypes,
     options: BtcBasedTxOptions,
-  ): Promise<Array<string>> => {
+  ): Promise<Set<string>> => {
     if (body.fromUTXO.length === 0 && !options.skipAllChecks) {
       throw new BtcBasedSdkError(SdkErrorCode.BTC_BASED_NO_INPUTS)
     }
 
     try {
-      const privateKeysToSign = []
+      const privateKeysToSign = new Set<string>()
       const utxos: BtcUTXO[] = []
 
       const filteredUtxos = await getUtxoBatch(getChain(options), body)
@@ -233,8 +232,8 @@ export const btcBasedTransactions = (
           }),
         ])
 
-        if ('signatureId' in utxoItem) privateKeysToSign.push(utxoItem.signatureId)
-        else if ('privateKey' in utxoItem) privateKeysToSign.push(utxoItem.privateKey)
+        if ('signatureId' in utxoItem) privateKeysToSign.add(utxoItem.signatureId)
+        else if ('privateKey' in utxoItem) privateKeysToSign.add(utxoItem.privateKey)
       }
 
       if (!options.skipAllChecks) {
@@ -325,7 +324,7 @@ export const btcBasedTransactions = (
   ): Promise<string> {
     try {
       const tx: BtcBasedTransaction = new createTransaction()
-      let privateKeysToSign: string[] = []
+      let privateKeysToSign = new Set<string>()
 
       if (body.changeAddress) {
         tx.change(body.changeAddress)
@@ -359,7 +358,7 @@ export const btcBasedTransactions = (
         }
       }
 
-      new Set(privateKeysToSign).forEach((key) => {
+      privateKeysToSign.forEach((key) => {
         tx.sign(new createPrivateKey(key))
       })