Add validateOutput call to TransactionBuilder

Author: rkalis

packages/cashscript/src/Transaction.ts

@@ -30,7 +30,7 @@ import {
   getTxSizeWithoutInputs,
   getPreimageSize,
   buildError,
-  validateRecipient,
+  validateOutput,
   utxoComparator,
   calculateDust,
   getOutputSize,
@@ -100,7 +100,7 @@ export class Transaction {
     }
 
     if (Array.isArray(toOrOutputs) && amount === undefined) {
-      toOrOutputs.forEach(validateRecipient);
+      toOrOutputs.forEach(validateOutput);
       this.outputs = this.outputs.concat(toOrOutputs);
       return this;
     }

packages/cashscript/src/TransactionBuilder.ts

@@ -12,7 +12,12 @@ import {
   isUnlockableUtxo,
 } from './interfaces.js';
 import { NetworkProvider } from './network/index.js';
-import { buildError, cashScriptOutputToLibauthOutput, createOpReturnOutput } from './utils.js';
+import {
+  buildError,
+  cashScriptOutputToLibauthOutput,
+  createOpReturnOutput,
+  validateOutput,
+} from './utils.js';
 
 export interface TransactionBuilderOptions {
   provider: NetworkProvider;
@@ -60,11 +65,11 @@ export class TransactionBuilder {
   }
 
   addOutput(output: Output): this {
-    this.outputs.push(output);
-    return this;
+    return this.addOutputs([output]);
   }
 
   addOutputs(outputs: Output[]): this {
+    outputs.forEach(validateOutput);
     this.outputs = this.outputs.concat(outputs);
     return this;
   }

packages/cashscript/src/utils.ts

@@ -26,7 +26,6 @@ import {
   Utxo,
   Output,
   Network,
-  Recipient,
   LibauthOutput,
 } from './interfaces.js';
 import { VERSION_SIZE, LOCKTIME_SIZE } from './constants.js';
@@ -41,21 +40,23 @@ import {
 } from './Errors.js';
 
 // ////////// PARAMETER VALIDATION ////////////////////////////////////////////
-export function validateRecipient(recipient: Recipient): void {
-  const minimumAmount = calculateDust(recipient);
-  if (recipient.amount < minimumAmount) {
-    throw new OutputSatoshisTooSmallError(recipient.amount, BigInt(minimumAmount));
+export function validateOutput(output: Output): void {
+  if (typeof output.to !== 'string') return;
+
+  const minimumAmount = calculateDust(output);
+  if (output.amount < minimumAmount) {
+    throw new OutputSatoshisTooSmallError(output.amount, BigInt(minimumAmount));
   }
 
-  if (recipient.token) {
-    if (!isTokenAddress(recipient.to)) {
-      throw new TokensToNonTokenAddressError(recipient.to);
+  if (output.token) {
+    if (!isTokenAddress(output.to)) {
+      throw new TokensToNonTokenAddressError(output.to);
     }
   }
 }
 
-export function calculateDust(recipient: Recipient): number {
-  const outputSize = getOutputSize(recipient);
+export function calculateDust(output: Output): number {
+  const outputSize = getOutputSize(output);
   // Formula used to calculate the minimum allowed output
   const dustAmount = 444 + outputSize * 3;
   return dustAmount;