@vbyte/btc-dev 1.0.9 → 1.0.10

package/package.json

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

package/src/class/signer.ts

@@ -1,5 +1,5 @@
 import { Buff, Bytes } from '@vbyte/buff'
-import { ECC }         from '@vbyte/micro-lib'
+import { Assert, ECC } from '@vbyte/micro-lib'
 
 import {
   sign_segwit_tx,
@@ -15,6 +15,8 @@ export class TxSigner {
   private readonly _seckey : string
 
   constructor (seckey : Bytes) {
+    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
   }
 

package/src/class/tx.ts

@@ -5,7 +5,6 @@ import { TransactionInput }  from './txin.js'
 import { TransactionOutput } from './txout.js'
 
 import {
-  decode_tx,
   get_txid,
   is_return_script,
   parse_tx,
@@ -38,15 +37,14 @@ export class Transaction {
   private _vout  : TransactionOutput[]
 
   constructor (txdata : string | TxData | TxTemplate = {}) {
-    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 () : TxData {

package/src/class/txin.ts

@@ -4,6 +4,7 @@ import { TransactionOutput }  from './txout.js'
 import { TransactionWitness } from './witness.js'
 
 import {
+  assert_tx_input,
   encode_txin_sequence,
   get_txin_size,
 } from '@/lib/tx/index.js'
@@ -15,6 +16,7 @@ export class TransactionInput {
   private readonly _txin : TxInput
 
   constructor (txin : TxInput) {
+    assert_tx_input(txin)
     this._txin = txin
   }
 

package/src/class/txout.ts

@@ -1,6 +1,7 @@
 import { decode_script } from '@/lib/script/index.js'
 
 import {
+  assert_tx_output,
   get_txout_size,
   get_vout_type,
   get_vout_version
@@ -13,6 +14,7 @@ export class TransactionOutput {
   private readonly _txout : TxOutput
 
   constructor (txout : TxOutput) {
+    assert_tx_output(txout)
     this._txout = txout
   }
 

package/src/class/witness.ts

@@ -5,6 +5,7 @@ import { decode_script } from '@/lib/script/index.js'
 import {
   parse_witness,
   get_witness_size,
+  assert_witness,
 } from '@/lib/witness/index.js'
 
 import type {
@@ -22,6 +23,7 @@ export class TransactionWitness {
   private _size : WitnessSize
 
   constructor (witness : Bytes[]) {
+    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/src/lib/tx/decode.ts

@@ -29,7 +29,7 @@ export function decode_tx (
   // Merge the options with the default config.
   const config = { ...DEFAULT_CONFIG, ...options }
   // Assert the txhex is a bytes object.
-  Assert.is_bytes(txbytes, 'txbytes must be hex or a unit array')
+  Assert.is_bytes(txbytes, 'transaction must be hex or a byte-array')
   // Setup a byte-stream.
   const stream = new Stream(txbytes)
   // Parse tx version.

package/src/lib/tx/size.ts

@@ -24,7 +24,7 @@ export function get_vsize (
 ) : number {
   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 (
@@ -35,7 +35,7 @@ export function get_txsize (
   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 }
 }
 

package/src/lib/witness/util.ts

@@ -1,4 +1,5 @@
 import { Buff, Bytes } from '@vbyte/buff'
+import { Assert }      from '@vbyte/micro-lib'
 
 import type { WitnessSize } from '@/types/index.js'
 
@@ -10,3 +11,8 @@ export function get_witness_size (witness : Bytes[]) : WitnessSize {
   const vsize = Math.ceil(WIT_LENGTH_BYTE + size / 4) 
   return { total: size, vsize }
 }
+
+export function assert_witness (witness : unknown) : asserts witness is Bytes[] {
+  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')
+}