rebase changes

Author: raul-oliveira

__tests__/template/transaction/executor.test.ts

@@ -593,7 +593,6 @@ const ShuffleExecutorTest = async executor => {
 };
 
 const ChargeableInputsTest = async executor => {
-  const ctx = new TxTemplateContext(getDefaultLogger(), DEBUG);
   const interpreter = {
     getTokenDetails: jest.fn().mockResolvedValue(mockFeeTokenDetails),
     getTx: jest.fn().mockReturnValue(
@@ -613,6 +612,7 @@ const ChargeableInputsTest = async executor => {
       })
     ),
   };
+  const ctx = new TxTemplateContext(interpreter, getDefaultLogger(), DEBUG);
 
   // Add two non-authority inputs from the same transaction
   const ins1 = RawInputInstruction.parse({ type: 'input/raw', index: 0, txId });
@@ -633,11 +633,11 @@ const ChargeableInputsTest = async executor => {
 };
 
 const ChargeableOutputsTest = async executor => {
-  const ctx = new TxTemplateContext(getDefaultLogger(), DEBUG);
   const interpreter = {
     getNetwork: jest.fn().mockReturnValue(new Network('testnet')),
     getTokenDetails: jest.fn().mockResolvedValue(mockFeeTokenDetails),
   };
+  const ctx = new TxTemplateContext(interpreter, getDefaultLogger(), DEBUG);
 
   // Add three token outputs
   const ins1 = TokenOutputInstruction.parse({

src/template/transaction/context.ts

@@ -59,9 +59,9 @@ export class TokenBalance {
   }
 
   calculateFee(): bigint {
-    let fee = 0;
+    let fee = 0n;
     if (this.chargeableOutputs > 0) {
-      fee += this.chargeableOutputs * FEE_PER_OUTPUT;
+      fee += BigInt(this.chargeableOutputs) * FEE_PER_OUTPUT;
     } else if (this.chargeableInputs > 0) {
       fee += FEE_PER_OUTPUT;
     }

src/template/transaction/executor.ts

@@ -31,10 +31,9 @@ import {
   TokenOutputInstruction,
   TxTemplateInstruction,
   UtxoSelectInstruction,
-  FeeInstruction,
   getVariable,
 } from './instructions';
-import { TokenBalance, TxTemplateContext } from './context';
+import { TxTemplateContext } from './context';
 import { ITxTemplateInterpreter, IGetUtxosOptions } from './types';
 import Input from '../../models/input';
 import Output from '../../models/output';
@@ -149,7 +148,7 @@ export async function execRawInputInstruction(
   // Find the original transaction from the input
   const origTx = await interpreter.getTx(txId);
   // Add balance to the ctx.balance
-  await ctx.balance.addBalanceFromUtxo(interpreter, origTx, index);
+  await ctx.balance.addBalanceFromUtxo(origTx, index);
 
   const input = new Input(txId, index);
   ctx.addInputs(position, input);
@@ -285,11 +284,11 @@ export async function execRawOutputInstruction(
     tokenData = ctx.addToken(token);
     if (authority) {
       ctx.log(`Creating authority output`);
-      await ctx.balance.addOutputAuthority(_interpreter, 1, token, authority);
+      await ctx.balance.addOutputAuthority(1, token, authority);
     } else {
       ctx.log(`Creating token output`);
       if (amount) {
-        await ctx.balance.addOutput(_interpreter, amount, token);
+        await ctx.balance.addOutput(amount, token);
       }
     }
   }
@@ -345,7 +344,7 @@ export async function execDataOutputInstruction(
     ctx.log(`Using token(${token})`);
     // Add token to tokens array
     tokenData = ctx.addToken(token);
-    await ctx.balance.addOutput(_interpreter, 1n, token);
+    await ctx.balance.addOutput(1n, token);
   }
 
   const dataScript = new ScriptData(data);
@@ -391,7 +390,7 @@ export async function execTokenOutputInstruction(
     ctx.log(`Using token(${token})`);
     // Add token to tokens array
     tokenData = ctx.addToken(token);
-    await ctx.balance.addOutput(interpreter, amount, token);
+    await ctx.balance.addOutput(amount, token);
   }
 
   const script = createOutputScriptFromAddress(address, interpreter.getNetwork());
@@ -450,7 +449,7 @@ export async function execAuthorityOutputInstruction(
     // Add token to tokens array
     tokenData = ctx.addToken(token);
     // Add balance to the ctx.balance
-    await ctx.balance.addOutputAuthority(interpreter, count, token, authority);
+    await ctx.balance.addOutputAuthority(count, token, authority);
   }
 
   let amount: OutputValueType | undefined = 0n;
@@ -670,7 +669,7 @@ export async function execCompleteTxInstruction(
       ctx.log(`Creating ${count} mint outputs / ${tokenUid}`);
       // Need to create a token output
       // Add balance to the ctx.balance
-      await ctx.balance.addOutputAuthority(interpreter, count, tokenUid, 'mint');
+      await ctx.balance.addOutputAuthority(count, tokenUid, 'mint');
 
       // Creates an output with the value of the outstanding balance
       const output = new Output(TOKEN_MINT_MASK, changeScript, {
@@ -697,7 +696,7 @@ export async function execCompleteTxInstruction(
       // First, update balance
       for (const input of inputs) {
         const origTx = await interpreter.getTx(input.hash);
-        await ctx.balance.addBalanceFromUtxo(interpreter, origTx, input.index);
+        await ctx.balance.addBalanceFromUtxo(origTx, input.index);
       }
 
       // Then add inputs to context
@@ -709,7 +708,7 @@ export async function execCompleteTxInstruction(
       ctx.log(`Creating ${count} melt outputs / ${tokenUid}`);
       // Need to create a token output
       // Add balance to the ctx.balance
-      await ctx.balance.addOutputAuthority(interpreter, count, tokenUid, 'melt');
+      await ctx.balance.addOutputAuthority(count, tokenUid, 'melt');
 
       // Creates an output with the value of the outstanding balance
       const output = new Output(TOKEN_MELT_MASK, changeScript, {
@@ -736,7 +735,7 @@ export async function execCompleteTxInstruction(
       // First, update balance
       for (const input of inputs) {
         const origTx = await interpreter.getTx(input.hash);
-        await ctx.balance.addBalanceFromUtxo(interpreter, origTx, input.index);
+        await ctx.balance.addBalanceFromUtxo(origTx, input.index);
       }
 
       // Then add inputs to context

src/template/transaction/interpreter.ts

@@ -207,7 +207,7 @@ export class WalletTxTemplateInterpreter implements ITxTemplateInterpreter {
         context.tokenSymbol,
         context.inputs,
         context.outputs,
-        { signalBits: context.signalBits, headers, tokenInfoVersion: context.tokenVersion }
+        { signalBits: context.signalBits, headers, tokenVersion: context.tokenVersion }
       );
     }
     throw new Error('Unsupported Version byte provided');

src/template/transaction/utils.ts

@@ -36,7 +36,7 @@ export async function selectTokens(
     inputs.push(new Input(utxo.txId, utxo.index));
     // Update the balance
     const origTx = await interpreter.getTx(utxo.txId);
-    await ctx.balance.addBalanceFromUtxo(interpreter, origTx, utxo.index);
+    await ctx.balance.addBalanceFromUtxo(origTx, utxo.index);
   }
 
   // Then add inputs to context
@@ -50,7 +50,7 @@ export async function selectTokens(
     const tokenData = ctx.addToken(token);
     const script = createOutputScriptFromAddress(changeAddress, interpreter.getNetwork());
     const output = new Output(changeAmount, script, { tokenData });
-    await ctx.balance.addOutput(interpreter, changeAmount, token);
+    await ctx.balance.addOutput(changeAmount, token);
     ctx.addOutputs(-1, output);
   }
 }
@@ -76,7 +76,7 @@ export async function selectAuthorities(
     inputs.push(new Input(utxo.txId, utxo.index));
     // Update the balance
     const origTx = await interpreter.getTx(utxo.txId);
-    await ctx.balance.addBalanceFromUtxo(interpreter, origTx, utxo.index);
+    await ctx.balance.addBalanceFromUtxo(origTx, utxo.index);
   }
 
   // Then add inputs to context