@vbyte/btc-dev 1.0.7 → 1.0.8

package/dist/types/class.d.ts

@@ -1,6 +1,6 @@
 import type { LocktimeData, SequenceData } from './meta.js';
 import type { TxOutput, TxOutputType, TxSize, TxValue } from './txdata.js';
-import type { WitnessSize, WitnessType, WitnessVersion } from './witness.js';
+import type { WitnessData, WitnessVersion } from './witness.js';
 export interface LocktimeField {
     hex: string;
     data: LocktimeData | null;
@@ -27,16 +27,6 @@ export interface TransactionData {
     vin: TransactionInputData[];
     vout: TransactionOutputData[];
 }
-export interface WitnessField {
-    annex: string | null;
-    cblock: string | null;
-    params: string[];
-    script: ScriptField | null;
-    size: WitnessSize;
-    stack: string[];
-    type: WitnessType;
-    version: WitnessVersion;
-}
 export interface TransactionInputData {
     coinbase?: string | null;
     prevout?: TransactionOutputData | null;
@@ -45,7 +35,7 @@ export interface TransactionInputData {
     size: number;
     txid: string;
     vout: number;
-    witness?: WitnessField | null;
+    witness?: WitnessData | null;
 }
 export interface TransactionOutputData {
     script_pk: ScriptField;

package/dist/types/witness.d.ts

@@ -10,6 +10,7 @@ export interface WitnessData {
     cblock: string | null;
     params: string[];
     script: string | null;
+    stack: string[];
     type: WitnessType;
     version: WitnessVersion;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vbyte/btc-dev",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Batteries-included toolset for plebian bitcoin development",
   "type": "module",
   "keywords": [

package/src/class/tx.ts

@@ -13,16 +13,18 @@ import {
   get_tx_value,
   get_txhash,
   encode_tx_locktime,
+  create_tx_input,
+  create_tx_output,
 } from '@/lib/tx/index.js'
 
 import type {
   TxData,
   TxTemplate,
   TransactionData,
-  TxInput,
   TxOutput,
   TxSize,
-  TxValue
+  TxValue,
+  TxInputTemplate
 } from '@/types/index.js'
 
 export class Transaction {
@@ -36,7 +38,7 @@ export class Transaction {
   private _vin   : TransactionInput[]
   private _vout  : TransactionOutput[]
 
-  constructor (txdata : string | TxData | TxTemplate) {
+  constructor (txdata : string | TxData | TxTemplate = {}) {
     this._tx = (typeof txdata !== 'string')
       ? parse_tx(txdata)
       : decode_tx(txdata)
@@ -109,18 +111,21 @@ export class Transaction {
     return this._vout
   }
 
-  add_vin (txin : TxInput) {
+  add_vin (tx_input : TxInputTemplate) {
+    const txin = create_tx_input(tx_input)
     this._tx.vin.push(txin)
     this._update_vin()
   }
 
-  add_vout (txout : TxOutput) {
+  add_vout (tx_output : TxOutput) {
+    const txout = create_tx_output(tx_output)
     this._tx.vout.push(txout)
     this._update_vout()
   }
 
-  insert_vin (index : number, txin : TxInput) {
+  insert_vin (index : number, tx_input : TxInputTemplate) {
     Assert.ok(index >= 0 && index <= this._tx.vin.length, 'input goes out of bounds')
+    const txin = create_tx_input(tx_input)
     if (index === this._tx.vin.length) {
       this._tx.vin.push(txin)
     } else {
@@ -129,8 +134,9 @@ export class Transaction {
     this._update_vin()
   }
 
-  insert_vout (index : number, txout : TxOutput) {
+  insert_vout (index : number, tx_output : TxOutput) {
     Assert.ok(index >= 0 && index <= this._tx.vout.length, 'output goes out of bounds')
+    const txout = create_tx_output(tx_output)
     if (index === this._tx.vout.length) {
       this._tx.vout.push(txout)
     } else {

package/src/class/witness.ts

@@ -9,7 +9,6 @@ import {
 
 import type {
   ScriptField,
-  WitnessField,
   WitnessData,
   WitnessSize,
   WitnessType
@@ -36,17 +35,8 @@ export class TransactionWitness {
     return this._data.cblock
   }
 
-  get data () : WitnessField {
-    return {
-      annex   : this.annex,
-      cblock  : this.cblock,
-      params  : this.params,
-      script  : this.script,
-      size    : this.size,
-      stack   : this.stack,
-      type    : this.type,
-      version : this.version
-    }
+  get data () : WitnessData {
+    return this._data
   }
 
   get params () : string[] {

package/src/lib/witness/parse.ts

@@ -12,6 +12,7 @@ export function parse_witness (
 ) : WitnessData {
   // Parse the witness data.
   const elems   = witness.map(e => Buff.bytes(e))
+  const stack   = witness.map(e => Buff.bytes(e).hex)
   const annex   = parse_annex_data(elems)
   if (annex !== null) elems.pop()
   const cblock  = parse_cblock_data(elems)
@@ -21,7 +22,7 @@ export function parse_witness (
   const script  = parse_witness_script(elems, type)
   if (script !== null) elems.pop()
   const params  = elems.map(e => e.hex)
-  return { annex, cblock, params, script, type, version }
+  return { annex, cblock, params, script, stack, type, version }
 }
 
 function parse_annex_data (

package/src/types/class.ts

@@ -1,6 +1,6 @@
 import type { LocktimeData, SequenceData }               from './meta.js'
 import type { TxOutput, TxOutputType, TxSize, TxValue }  from './txdata.js'
-import type { WitnessSize, WitnessType, WitnessVersion } from './witness.js'
+import type { WitnessData, WitnessVersion }              from './witness.js'
 
 export interface LocktimeField {
   hex   : string
@@ -32,17 +32,6 @@ export interface TransactionData {
   vout     : TransactionOutputData[]
 }
 
-export interface WitnessField {
-  annex   : string | null
-  cblock  : string | null
-  params  : string[]
-  script  : ScriptField | null
-  size    : WitnessSize
-  stack   : string[]
-  type    : WitnessType
-  version : WitnessVersion
-}
-
 export interface TransactionInputData {
   coinbase?   : string                | null
   prevout?    : TransactionOutputData | null
@@ -51,7 +40,7 @@ export interface TransactionInputData {
   size        : number
   txid        : string
   vout        : number
-  witness?    : WitnessField | null
+  witness?    : WitnessData | null
 }
 
 export interface TransactionOutputData {

package/src/types/witness.ts

@@ -12,6 +12,7 @@ export interface WitnessData {
   cblock  : string | null
   params  : string[]
   script  : string | null
+  stack   : string[]
   type    : WitnessType
   version : WitnessVersion
 }