@vbyte/btc-dev 1.0.8 → 1.0.10

package/dist/class/signer.js

@@ -1,8 +1,10 @@
 import { Buff } from '@vbyte/buff';
-import { ECC } from '@vbyte/micro-lib';
+import { Assert, ECC } from '@vbyte/micro-lib';
 import { sign_segwit_tx, sign_taproot_tx } from '../lib/signer/sign.js';
 export class TxSigner {
     constructor(seckey) {
+        Assert.ok(Buff.is_bytes(seckey), 'seckey must be a string or bytes');
+        Assert.size(seckey, 32, 'seckey must be 32 bytes');
         this._seckey = Buff.bytes(seckey).hex;
     }
     get pubkey() {

package/dist/class/tx.d.ts

@@ -1,6 +1,6 @@
 import { TransactionInput } from './txin.js';
 import { TransactionOutput } from './txout.js';
-import type { TxData, TxTemplate, TransactionData, TxOutput, TxSize, TxValue, TxInputTemplate } from '../types/index.js';
+import type { TxData, TxTemplate, TxOutput, TxSize, TxValue, TxInputTemplate } from '../types/index.js';
 export declare class Transaction {
     private readonly _tx;
     private _size;
@@ -10,7 +10,7 @@ export declare class Transaction {
     private _vin;
     private _vout;
     constructor(txdata?: string | TxData | TxTemplate);
-    get data(): TransactionData;
+    get data(): TxData;
     get hash(): string;
     get locktime(): {
         hex: string;
@@ -40,12 +40,12 @@ export declare class Transaction {
         witness: number;
         base: number;
         total: number;
-        weight: number;
         vsize: number;
+        weight: number;
     };
     _update_tx(): void;
     _update_vin(): void;
     _update_vout(): void;
-    toJSON(): TransactionData;
+    toJSON(): TxData;
     toString(): string;
 }

package/dist/class/tx.js

@@ -2,32 +2,19 @@ import { Assert } from '@vbyte/micro-lib';
 import { LocktimeUtil } from '../lib/meta/index.js';
 import { TransactionInput } from './txin.js';
 import { TransactionOutput } from './txout.js';
-import { decode_tx, get_txid, is_return_script, parse_tx, get_txsize, get_tx_value, get_txhash, encode_tx_locktime, create_tx_input, create_tx_output, } from '../lib/tx/index.js';
+import { get_txid, is_return_script, parse_tx, get_txsize, get_tx_value, get_txhash, encode_tx_locktime, create_tx_input, create_tx_output, } from '../lib/tx/index.js';
 export class Transaction {
     constructor(txdata = {}) {
-        this._tx = (typeof txdata !== 'string')
-            ? parse_tx(txdata)
-            : decode_tx(txdata);
+        this._tx = parse_tx(txdata);
+        this._vin = this._tx.vin.map(txin => new TransactionInput(txin));
+        this._vout = this._tx.vout.map(txout => new TransactionOutput(txout));
         this._size = this._get_size();
         this._hash = get_txhash(this._tx);
         this._txid = get_txid(this._tx);
         this._value = get_tx_value(this._tx);
-        this._vin = this._tx.vin.map(txin => new TransactionInput(txin));
-        this._vout = this._tx.vout.map(txout => new TransactionOutput(txout));
     }
     get data() {
-        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)
-        };
+        return this._tx;
     }
     get hash() {
         return this._hash;

package/dist/class/txin.d.ts

@@ -1,11 +1,11 @@
 import { TransactionOutput } from './txout.js';
 import { TransactionWitness } from './witness.js';
-import type { TxInput, TransactionInputData } from '../types/index.js';
+import type { TxInput } from '../types/index.js';
 export declare class TransactionInput {
     private readonly _txin;
     constructor(txin: TxInput);
     get coinbase(): string | null;
-    get data(): TransactionInputData;
+    get data(): TxInput;
     get has_prevout(): boolean;
     get is_coinbase(): boolean;
     get prevout(): TransactionOutput | null;
@@ -22,6 +22,6 @@ export declare class TransactionInput {
     get txid(): string;
     get vout(): number;
     get witness(): TransactionWitness | null;
-    toJSON(): TransactionInputData;
+    toJSON(): TxInput;
     toString(): string;
 }

package/dist/class/txin.js

@@ -2,25 +2,17 @@ import { decode_script } from '../lib/script/index.js';
 import { SequenceUtil } from '../lib/meta/index.js';
 import { TransactionOutput } from './txout.js';
 import { TransactionWitness } from './witness.js';
-import { encode_txin_sequence, get_txin_size, } from '../lib/tx/index.js';
+import { assert_tx_input, encode_txin_sequence, get_txin_size, } from '../lib/tx/index.js';
 export class TransactionInput {
     constructor(txin) {
+        assert_tx_input(txin);
         this._txin = txin;
     }
     get coinbase() {
         return this._txin.coinbase;
     }
     get data() {
-        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
-        };
+        return this._txin;
     }
     get has_prevout() {
         return this._txin.prevout !== null;

package/dist/class/txout.d.ts

@@ -1,8 +1,8 @@
-import type { TxOutput, TransactionOutputData } from '../types/index.js';
+import type { TxOutput } from '../types/index.js';
 export declare class TransactionOutput {
     private readonly _txout;
     constructor(txout: TxOutput);
-    get data(): TransactionOutputData;
+    get data(): TxOutput;
     get script_pk(): {
         hex: string;
         asm: string[];
@@ -11,6 +11,6 @@ export declare class TransactionOutput {
     get type(): import("../types/index.js").TxOutputType;
     get value(): bigint;
     get version(): import("../types/index.js").WitnessVersion;
-    toJSON(): TransactionOutputData;
+    toJSON(): TxOutput;
     toString(): string;
 }

package/dist/class/txout.js

@@ -1,17 +1,12 @@
 import { decode_script } from '../lib/script/index.js';
-import { get_txout_size, get_vout_type, get_vout_version } from '../lib/tx/index.js';
+import { assert_tx_output, get_txout_size, get_vout_type, get_vout_version } from '../lib/tx/index.js';
 export class TransactionOutput {
     constructor(txout) {
+        assert_tx_output(txout);
         this._txout = txout;
     }
     get data() {
-        return {
-            script_pk: this.script_pk,
-            size: this.size,
-            type: this.type,
-            value: this.value,
-            version: this.version
-        };
+        return this._txout;
     }
     get script_pk() {
         return {

package/dist/class/witness.js

@@ -1,9 +1,10 @@
 import { Buff } from '@vbyte/buff';
 import { Assert } from '@vbyte/micro-lib';
 import { decode_script } from '../lib/script/index.js';
-import { parse_witness, get_witness_size, } from '../lib/witness/index.js';
+import { parse_witness, get_witness_size, assert_witness, } from '../lib/witness/index.js';
 export class TransactionWitness {
     constructor(witness) {
+        assert_witness(witness);
         this._elems = witness.map(e => Buff.bytes(e));
         this._data = parse_witness(this._elems);
         this._size = get_witness_size(this._elems);

package/dist/lib/tx/decode.js

@@ -8,7 +8,7 @@ const DEFAULT_CONFIG = {
 };
 export function decode_tx(txbytes, options = {}) {
     const config = { ...DEFAULT_CONFIG, ...options };
-    Assert.is_bytes(txbytes, 'txbytes must be hex or a unit array');
+    Assert.is_bytes(txbytes, 'transaction must be hex or a byte-array');
     const stream = new Stream(txbytes);
     const version = read_version(stream);
     const has_witness = (config.segwit)

package/dist/lib/tx/size.js

@@ -5,7 +5,7 @@ const WIT_FLAG_BYTES = 2;
 export function get_vsize(bytes) {
     const weight = Buff.bytes(bytes).length;
     const remain = (weight % 4 > 0) ? 1 : 0;
-    return Math.floor(weight / 4) + remain;
+    return Math.ceil(weight / 4) + remain;
 }
 export function get_txsize(txdata) {
     const json = parse_tx(txdata);
@@ -13,7 +13,7 @@ export function get_txsize(txdata) {
     const total = encode_tx(json, true).length;
     const weight = base * 3 + total;
     const remain = (weight % 4 > 0) ? 1 : 0;
-    const vsize = Math.floor(weight / 4) + remain;
+    const vsize = Math.ceil(weight / 4) + remain;
     return { base, total, vsize, weight };
 }
 export function get_vin_size(vin) {

package/dist/lib/witness/util.d.ts

@@ -1,3 +1,4 @@
 import { Bytes } from '@vbyte/buff';
 import type { WitnessSize } from '../../types/index.js';
 export declare function get_witness_size(witness: Bytes[]): WitnessSize;
+export declare function assert_witness(witness: unknown): asserts witness is Bytes[];

package/dist/lib/witness/util.js

@@ -1,4 +1,5 @@
 import { Buff } from '@vbyte/buff';
+import { Assert } from '@vbyte/micro-lib';
 const WIT_LENGTH_BYTE = 1;
 export function get_witness_size(witness) {
     const stack = witness.map(e => Buff.bytes(e));
@@ -6,3 +7,7 @@ export function get_witness_size(witness) {
     const vsize = Math.ceil(WIT_LENGTH_BYTE + size / 4);
     return { total: size, vsize };
 }
+export function assert_witness(witness) {
+    Assert.ok(Array.isArray(witness), 'witness must be an array');
+    Assert.ok(witness.every(e => Buff.is_bytes(e)), 'witness must be an array of strings or bytes');
+}

package/dist/main.cjs

@@ -8415,7 +8415,7 @@ const DEFAULT_CONFIG = {
 };
 function decode_tx(txbytes, options = {}) {
     const config = { ...DEFAULT_CONFIG, ...options };
-    Assert.is_bytes(txbytes, 'txbytes must be hex or a unit array');
+    Assert.is_bytes(txbytes, 'transaction must be hex or a byte-array');
     const stream = new Stream(txbytes);
     const version = read_version(stream);
     const has_witness = (config.segwit)
@@ -9154,7 +9154,7 @@ const WIT_FLAG_BYTES = 2;
 function get_vsize$1(bytes) {
     const weight = Buff.bytes(bytes).length;
     const remain = (weight % 4 > 0) ? 1 : 0;
-    return Math.floor(weight / 4) + remain;
+    return Math.ceil(weight / 4) + remain;
 }
 function get_txsize(txdata) {
     const json = parse_tx(txdata);
@@ -9162,7 +9162,7 @@ function get_txsize(txdata) {
     const total = encode_tx(json, true).length;
     const weight = base * 3 + total;
     const remain = (weight % 4 > 0) ? 1 : 0;
-    const vsize = Math.floor(weight / 4) + remain;
+    const vsize = Math.ceil(weight / 4) + remain;
     return { base, total, vsize, weight };
 }
 function get_vin_size(vin) {
@@ -9473,6 +9473,8 @@ function sign_taproot_tx(seckey, txdata, options) {
 
 class TxSigner {
     constructor(seckey) {
+        Assert.ok(Buff.is_bytes(seckey), 'seckey must be a string or bytes');
+        Assert.size(seckey, 32, 'seckey must be 32 bytes');
         this._seckey = Buff.bytes(seckey).hex;
     }
     get pubkey() {
@@ -9879,16 +9881,11 @@ var index$6 = /*#__PURE__*/Object.freeze({
 
 class TransactionOutput {
     constructor(txout) {
+        assert_tx_output(txout);
         this._txout = txout;
     }
     get data() {
-        return {
-            script_pk: this.script_pk,
-            size: this.size,
-            type: this.type,
-            value: this.value,
-            version: this.version
-        };
+        return this._txout;
     }
     get script_pk() {
         return {
@@ -10003,15 +10000,21 @@ function get_witness_size(witness) {
     const vsize = Math.ceil(WIT_LENGTH_BYTE + size / 4);
     return { total: size, vsize };
 }
+function assert_witness(witness) {
+    Assert.ok(Array.isArray(witness), 'witness must be an array');
+    Assert.ok(witness.every(e => Buff.is_bytes(e)), 'witness must be an array of strings or bytes');
+}
 
 var index$5 = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    assert_witness: assert_witness,
     get_witness_size: get_witness_size,
     parse_witness: parse_witness
 });
 
 class TransactionWitness {
     constructor(witness) {
+        assert_witness(witness);
         this._elems = witness.map(e => Buff.bytes(e));
         this._data = parse_witness(this._elems);
         this._size = get_witness_size(this._elems);
@@ -10076,22 +10079,14 @@ class TransactionWitness {
 
 class TransactionInput {
     constructor(txin) {
+        assert_tx_input(txin);
         this._txin = txin;
     }
     get coinbase() {
         return this._txin.coinbase;
     }
     get data() {
-        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
-        };
+        return this._txin;
     }
     get has_prevout() {
         return this._txin.prevout !== null;
@@ -10139,29 +10134,16 @@ class TransactionInput {
 
 let Transaction$1 = class Transaction {
     constructor(txdata = {}) {
-        this._tx = (typeof txdata !== 'string')
-            ? parse_tx(txdata)
-            : decode_tx(txdata);
+        this._tx = parse_tx(txdata);
+        this._vin = this._tx.vin.map(txin => new TransactionInput(txin));
+        this._vout = this._tx.vout.map(txout => new TransactionOutput(txout));
         this._size = this._get_size();
         this._hash = get_txhash(this._tx);
         this._txid = get_txid(this._tx);
         this._value = get_tx_value(this._tx);
-        this._vin = this._tx.vin.map(txin => new TransactionInput(txin));
-        this._vout = this._tx.vout.map(txout => new TransactionOutput(txout));
     }
     get data() {
-        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)
-        };
+        return this._tx;
     }
     get hash() {
         return this._hash;