@vbyte/btc-dev 1.0.7 → 1.0.9

package/dist/types/index.d.ts

@@ -1,5 +1,4 @@
 export * from './address.js';
-export * from './class.js';
 export * from './meta.js';
 export * from './psbt.js';
 export * from './sighash.js';

package/dist/types/index.js

@@ -1,5 +1,4 @@
 export * from './address.js';
-export * from './class.js';
 export * from './meta.js';
 export * from './psbt.js';
 export * from './sighash.js';

package/dist/types/meta.d.ts

@@ -1,6 +1,16 @@
+import type { WitnessType, WitnessVersion } from './witness.js';
 export type LocktimeData = LocktimeStamp | LocktimeHeight;
 export type SequenceConfig = Partial<SequenceData>;
 export type SequenceData = SequenceHeightLock | SequenceStampLock;
+export type TxOutputType = WitnessType | 'p2pkh' | 'p2sh' | 'opreturn';
+export interface TxOutputInfo {
+    type: TxOutputType;
+    version: WitnessVersion;
+}
+export interface TxInputInfo {
+    type: WitnessType;
+    version: WitnessVersion;
+}
 export interface LocktimeStamp {
     type: 'timelock';
     stamp: number;
@@ -17,6 +27,20 @@ export interface SequenceHeightLock {
     height: number;
     mode: 'height';
 }
+export interface LocktimeField {
+    hex: string;
+    data: LocktimeData | null;
+    value: number;
+}
+export interface SequenceField {
+    hex: string;
+    data: SequenceData | null;
+    value: number;
+}
+export interface ScriptField {
+    asm: string[];
+    hex: string;
+}
 export interface InscriptionData {
     content?: string;
     delegate?: string;

package/dist/types/txdata.d.ts

@@ -1,14 +1,4 @@
-import type { WitnessType, WitnessVersion } from './witness.js';
 export type TxInput = TxCoinbaseInput | TxSpendInput | TxVirtualInput;
-export type TxOutputType = WitnessType | 'p2pkh' | 'p2sh' | 'opreturn';
-export interface TxOutputInfo {
-    type: TxOutputType;
-    version: WitnessVersion;
-}
-export interface TxInputInfo {
-    type: WitnessType;
-    version: WitnessVersion;
-}
 export interface TxOutpoint {
     txid: string;
     vout: number;
@@ -56,8 +46,8 @@ export interface TxData {
 export interface TxSize {
     base: number;
     total: number;
-    weight: number;
     vsize: number;
+    weight: number;
 }
 export interface TxValue {
     fees: bigint;

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.9",
   "description": "Batteries-included toolset for plebian bitcoin development",
   "type": "module",
   "keywords": [

package/src/class/tx.ts

@@ -13,16 +13,17 @@ 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 +37,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)
@@ -48,19 +49,8 @@ export class Transaction {
     this._vout  = this._tx.vout.map(txout => new TransactionOutput(txout))
   }
 
-  get data () : TransactionData {
-    return {
-      hash     : this.hash,
-      locktime : this.locktime,
-      return   : this.return,
-      size     : this.size,
-      spends   : this.spends,
-      txid     : this.txid,
-      value    : this.value,
-      version  : this.version,
-      vin      : this.vin.map(txin => txin.data),
-      vout     : this.vout.map(txout => txout.data)
-    }
+  get data () : TxData {
+    return this._tx
   }
 
   get hash () : string {
@@ -109,18 +99,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 +122,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/txin.ts

@@ -8,10 +8,7 @@ import {
   get_txin_size,
 } from '@/lib/tx/index.js'
 
-import type {
-  TxInput,
-  TransactionInputData
-} from '@/types/index.js'
+import type { TxInput } from '@/types/index.js'
 
 export class TransactionInput {
 
@@ -25,17 +22,8 @@ export class TransactionInput {
     return this._txin.coinbase
   }
 
-  get data () : TransactionInputData {
-    return {
-      coinbase    : this.coinbase,
-      prevout     : this.prevout?.data ?? null,
-      script_sig  : this.script_sig,
-      sequence    : this.sequence,
-      size        : this.size,
-      txid        : this.txid,
-      vout        : this.vout,
-      witness     : this.witness?.data ?? null
-    }
+  get data () : TxInput {
+    return this._txin
   }
 
   get has_prevout () : boolean {

package/src/class/txout.ts

@@ -6,7 +6,7 @@ import {
   get_vout_version
 } from '@/lib/tx/index.js'
 
-import type { TxOutput, TransactionOutputData } from '@/types/index.js'
+import type { TxOutput } from '@/types/index.js'
 
 export class TransactionOutput {
 
@@ -16,14 +16,8 @@ export class TransactionOutput {
     this._txout = txout
   }
 
-  get data () : TransactionOutputData {
-    return {
-      script_pk : this.script_pk,
-      size      : this.size,
-      type      : this.type,
-      value     : this.value,
-      version   : this.version
-    }
+  get data () : TxOutput {
+    return this._txout
   }
 
   get script_pk () {

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/index.ts

@@ -1,5 +1,4 @@
 export * from './address.js'
-export * from './class.js'
 export * from './meta.js'
 export * from './psbt.js'
 export * from './sighash.js'

package/src/types/meta.ts

@@ -1,6 +1,19 @@
+import type{ WitnessType, WitnessVersion } from './witness.js'
+
 export type LocktimeData   = LocktimeStamp | LocktimeHeight
 export type SequenceConfig = Partial<SequenceData>
 export type SequenceData   = SequenceHeightLock | SequenceStampLock
+export type TxOutputType   = WitnessType | 'p2pkh' | 'p2sh' | 'opreturn'
+
+export interface TxOutputInfo {
+  type    : TxOutputType
+  version : WitnessVersion
+}
+
+export interface TxInputInfo {
+  type    : WitnessType
+  version : WitnessVersion
+}  
 
 export interface LocktimeStamp {
   type  : 'timelock'  // Discriminator for timelock type
@@ -24,6 +37,23 @@ export interface SequenceHeightLock {
   mode   : 'height'   // Discriminator for heightlock mode.
 }
 
+export interface LocktimeField {
+  hex   : string
+  data  : LocktimeData | null
+  value : number
+}
+
+export interface SequenceField {
+  hex   : string
+  data  : SequenceData | null
+  value : number
+}
+
+export interface ScriptField {
+  asm : string[]
+  hex : string
+}
+
 export interface InscriptionData {
   content  ?: string
   delegate ?: string

package/src/types/txdata.ts

@@ -1,17 +1,4 @@
-import type { WitnessType, WitnessVersion } from './witness.js'
-
-export type TxInput      = TxCoinbaseInput | TxSpendInput | TxVirtualInput
-export type TxOutputType = WitnessType | 'p2pkh' | 'p2sh' | 'opreturn'
-
-export interface TxOutputInfo {
-  type    : TxOutputType
-  version : WitnessVersion
-}
-
-export interface TxInputInfo {
-  type    : WitnessType
-  version : WitnessVersion
-}  
+export type TxInput = TxCoinbaseInput | TxSpendInput | TxVirtualInput
 
 export interface TxOutpoint {
   txid : string
@@ -68,8 +55,8 @@ export interface TxData {
 export interface TxSize {
   base   : number
   total  : number
-  weight : number
   vsize  : number
+  weight : number
 }
 
 export interface TxValue {

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
 }

package/dist/types/class.d.ts

@@ -1,56 +0,0 @@
-import type { LocktimeData, SequenceData } from './meta.js';
-import type { TxOutput, TxOutputType, TxSize, TxValue } from './txdata.js';
-import type { WitnessSize, WitnessType, WitnessVersion } from './witness.js';
-export interface LocktimeField {
-    hex: string;
-    data: LocktimeData | null;
-    value: number;
-}
-export interface SequenceField {
-    hex: string;
-    data: SequenceData | null;
-    value: number;
-}
-export interface ScriptField {
-    asm: string[];
-    hex: string;
-}
-export interface TransactionData {
-    hash: string;
-    locktime: LocktimeField;
-    return: TxOutput | null;
-    size: TxSize;
-    spends: TransactionOutputData[];
-    txid: string;
-    value: TxValue;
-    version: number;
-    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;
-    script_sig?: ScriptField | null;
-    sequence: SequenceField;
-    size: number;
-    txid: string;
-    vout: number;
-    witness?: WitnessField | null;
-}
-export interface TransactionOutputData {
-    script_pk: ScriptField;
-    size: number;
-    type: TxOutputType;
-    value: bigint;
-    version: WitnessVersion | null;
-}

package/dist/types/class.js

@@ -1 +0,0 @@
-export {};

package/src/types/class.ts

@@ -1,63 +0,0 @@
-import type { LocktimeData, SequenceData }               from './meta.js'
-import type { TxOutput, TxOutputType, TxSize, TxValue }  from './txdata.js'
-import type { WitnessSize, WitnessType, WitnessVersion } from './witness.js'
-
-export interface LocktimeField {
-  hex   : string
-  data  : LocktimeData | null
-  value : number
-}
-
-export interface SequenceField {
-  hex   : string
-  data  : SequenceData | null
-  value : number
-}
-
-export interface ScriptField {
-  asm : string[]
-  hex : string
-}
-
-export interface TransactionData {
-  hash     : string
-  locktime : LocktimeField
-  return   : TxOutput | null
-  size     : TxSize
-  spends   : TransactionOutputData[]
-  txid     : string
-  value    : TxValue
-  version  : number
-  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
-  script_sig? : ScriptField           | null
-  sequence    : SequenceField
-  size        : number
-  txid        : string
-  vout        : number
-  witness?    : WitnessField | null
-}
-
-export interface TransactionOutputData {
-  script_pk : ScriptField
-  size      : number
-  type      : TxOutputType
-  value     : bigint
-  version   : WitnessVersion | null
-}