Remove old transaction builder and remove related occurrances in tests

Author: rkalis

packages/cashscript/README.md

@@ -43,11 +43,23 @@ Using the CashScript SDK, you can import contract artifact files, create new ins
   console.log('contract address:', contract.address);
   console.log('contract balance:', await contract.getBalance());
 
-  // Call the spend function with the owner's signature
-  // And use it to send 0. 000 100 00 BCH back to the contract's address
-  const txDetails = await contract.functions
-    .spend(pk, new SignatureTemplate(keypair))
-    .to(contract.address, 10000)
+  const transactionBuilder = new TransactionBuilder({ provider });
+  const contractUtxos = await contract.getUtxos();
+
+  const sendAmount = 10_000n;
+  const destinationAddress = '... some address ...';
+
+  // Calculate the change amount, accounting for a miner fee of 1000 satoshis
+  const changeAmount = contractUtxos[0].satoshis - sendAmount - 1000n;
+
+  // Construct a transaction with the transaction builder
+  const txDetails = await transactionBuilder
+    // Add a contract input that spends from the contract using the 'spend' function
+    .addInput(contractUtxos[0], contract.unlock.spend(pk, new SignatureTemplate(keypair)))
+    // Add an output that sends 0. 000 100 00 BCH back to the destination address
+    .addOutput({ to: destinationAddress, amount: sendAmount })
+    // Add a change output that sends the change back to the contract's address
+    .addOutput({ to: contract.address, amount: changeAmount })
     .send();
 
   console.log(txDetails);

packages/cashscript/src/Contract.ts

@@ -10,9 +10,8 @@ import {
   Script,
   scriptToBytecode,
 } from '@cashscript/utils';
-import { Transaction } from './Transaction.js';
 import {
-  ConstructorArgument, encodeFunctionArgument, encodeConstructorArguments, encodeFunctionArguments, FunctionArgument,
+  ConstructorArgument, encodeFunctionArgument, encodeConstructorArguments, FunctionArgument,
 } from './Argument.js';
 import {
   Unlocker, ContractOptions, GenerateUnlockingBytecodeOptions, Utxo, AddressType, ContractUnlocker,
@@ -29,12 +28,10 @@ export class Contract<
   TArtifact extends Artifact = Artifact,
   TResolved extends {
     constructorInputs: ConstructorArgument[];
-    functions: Record<string, any>;
     unlock: Record<string, any>;
   }
   = {
     constructorInputs: ParamsToTuple<TArtifact['constructorInputs']>;
-    functions: AbiToFunctionMap<TArtifact['abi'], Transaction>;
     unlock: AbiToFunctionMap<TArtifact['abi'], Unlocker>;
   },
 > {
@@ -44,10 +41,7 @@ export class Contract<
   bytecode: string;
   bytesize: number;
   opcount: number;
-
-  functions: TResolved['functions'];
   unlock: TResolved['unlock'];
-
   redeemScript: Script;
   public provider: NetworkProvider;
   public addressType: AddressType;
@@ -79,21 +73,7 @@ export class Contract<
 
     this.redeemScript = generateRedeemScript(asmToScript(this.artifact.bytecode), this.encodedConstructorArgs);
 
-    // Populate the functions object with the contract's functions
-    // (with a special case for single function, which has no "function selector")
-    this.functions = {};
-    if (artifact.abi.length === 1) {
-      const f = artifact.abi[0];
-      // @ts-ignore TODO: see if we can use generics to make TypeScript happy
-      this.functions[f.name] = this.createFunction(f);
-    } else {
-      artifact.abi.forEach((f, i) => {
-        // @ts-ignore TODO: see if we can use generics to make TypeScript happy
-        this.functions[f.name] = this.createFunction(f, i);
-      });
-    }
-
-    // Populate the functions object with the contract's functions
+    // Populate the 'unlock' object with the contract's functions
     // (with a special case for single function, which has no "function selector")
     this.unlock = {};
     if (artifact.abi.length === 1) {
@@ -124,27 +104,6 @@ export class Contract<
     return this.provider.getUtxos(this.address);
   }
 
-  private createFunction(abiFunction: AbiFunction, selector?: number): ContractFunction {
-    return (...args: FunctionArgument[]) => {
-      if (abiFunction.inputs.length !== args.length) {
-        throw new Error(`Incorrect number of arguments passed to function ${abiFunction.name}. Expected ${abiFunction.inputs.length} arguments (${abiFunction.inputs.map((input) => input.type)}) but got ${args.length}`);
-      }
-
-      // Encode passed args (this also performs type checking)
-      const encodedArgs = encodeFunctionArguments(abiFunction, args);
-
-      const unlocker = this.createUnlocker(abiFunction, selector)(...args);
-
-      return new Transaction(
-        this,
-        unlocker,
-        abiFunction,
-        encodedArgs,
-        selector,
-      );
-    };
-  }
-
   private createUnlocker(abiFunction: AbiFunction, selector?: number): ContractFunctionUnlocker {
     return (...args: FunctionArgument[]) => {
       if (abiFunction.inputs.length !== args.length) {
@@ -179,5 +138,4 @@ export class Contract<
   }
 }
 
-export type ContractFunction = (...args: FunctionArgument[]) => Transaction;
 type ContractFunctionUnlocker = (...args: FunctionArgument[]) => ContractUnlocker;