@vbyte/btc-dev 1.1.1 → 1.1.3

package/dist/types/meta.d.ts

@@ -2,10 +2,10 @@ 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 type TxOutputType = 'p2pkh' | 'p2sh' | 'p2w-pkh' | 'p2w-sh' | 'p2tr' | 'opreturn';
 export interface TxOutputInfo {
-    type: TxOutputType;
-    version: WitnessVersion;
+    type: TxOutputType | null;
+    version: WitnessVersion | null;
 }
 export interface TxInputInfo {
     type: WitnessType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vbyte/btc-dev",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Batteries-included toolset for plebian bitcoin development",
   "type": "module",
   "keywords": [
@@ -79,7 +79,7 @@
     "test": "npm run script test/src/tape.ts"
   },
   "dependencies": {
-    "@noble/curves": "^1.9.2",
+    "@noble/curves": "^1.9.3",
     "@noble/hashes": "^1.8.0",
     "@scure/btc-signer": "^1.8.1",
     "@vbyte/buff": "^1.0.2",

package/src/lib/signer/sign.ts

@@ -17,7 +17,7 @@ export function sign_segwit_tx (
 ) {
   const tx   = parse_tx(txdata)
   const msg  = hash_segwit_tx(tx, options)
-  const sig  = ECC.get_ecdsa_sig(seckey, msg).hex
+  const sig  = ECC.sign_ecdsa(seckey, msg).hex
   const flag = format_sigflag(options.sigflag ?? SIGHASH_DEFAULT)
   return sig + flag
 }
@@ -29,7 +29,7 @@ export function sign_taproot_tx (
 ) {
   const tx   = parse_tx(txdata)
   const msg  = hash_taproot_tx(tx, options)
-  const sig  = ECC.get_bip340_sig(seckey, msg).hex
+  const sig  = ECC.sign_bip340(seckey, msg).hex
   const flag = format_sigflag(options.sigflag ?? 0)
   return sig + flag
 }

package/src/lib/tx/util.ts

@@ -1,8 +1,9 @@
-import { Buff }               from '@vbyte/buff'
+import { Buff, Bytes }        from '@vbyte/buff'
 import { Test }               from '@vbyte/micro-lib'
 import { Assert }             from '@vbyte/micro-lib/assert'
 import { hash256 }            from '@vbyte/micro-lib/hash'
 import { encode_tx }          from './encode.js'
+import { parse_tx }           from './parse.js'
 import { assert_tx_template } from './validate.js'
 
 import { DEFAULT, LOCK_SCRIPT_REGEX } from '@/const.js'
@@ -17,59 +18,75 @@ import type {
   WitnessVersion
 } from '@/types/index.js'
 
-export function is_return_script (script : string) : boolean {
-  return script.startsWith('6a')
+export function is_return_script (script : Bytes) : boolean {
+  const bytes = Buff.bytes(script)
+  return bytes.at(0) === 0x6a
 }
 
-export function get_vout_info (txout : TxOutput) : TxOutputInfo {
+export function get_vout_script_info (script : Bytes) : TxOutputInfo {
   return {
-    type    : get_vout_type(txout.script_pk),
-    version : get_vout_version(txout.script_pk)
+    type    : get_vout_script_type(script),
+    version : get_vout_script_version(script)
   }
 }
 
-export function get_vout_type (
-  script : string
-) : TxOutputType {
+export function get_vout_script_type (script : Bytes) : TxOutputType | null {
+  // Get the hex string of the script.
+  const hex = Buff.bytes(script).hex
+  // Iterate over the lock script regexes.
   for (const [ type, regex ] of Object.entries(LOCK_SCRIPT_REGEX)) {
-    if (regex.test(script)) return type as TxOutputType
+    // If the script matches the regex, return the type.
+    if (regex.test(hex)) return type as TxOutputType
   }
-  return 'unknown'
+  // If the script does not match any regex, return null.
+  return null
 }
 
-export function get_vout_version (
-  script : string
-) : WitnessVersion {
-  const wit_ver = script.slice(0, 4)
-  switch (wit_ver) {
-    case '0014' : return 0
-    case '5120' : return 1
-    default     : return null
+export function get_vout_script_version (script : Bytes) : WitnessVersion | null {
+  // Get the version of the script.
+  const version = Buff.bytes(script)
+  // Return the version of the script.
+  switch (version.at(0)) {
+    case 0x00 : return 0
+    case 0x51 : return 1
+    default   : return null
   }
 }
 
-export function get_txid (
-  txdata : TxData
-) : string {
-  assert_tx_template(txdata)
-  const data = encode_tx(txdata, false)
-  return hash256(data).reverse().hex
+export function get_txid (txdata : string | Uint8Array | TxData) : string {
+  // If the transaction data is an object,
+  if (typeof txdata === 'object') {
+    // Assert the structure of the transaction data is valid.
+    assert_tx_template(txdata)
+    // Encode the transaction data.
+    txdata = encode_tx(txdata, false)
+  }
+  // Return the txid of the transaction data.
+  return hash256(txdata).reverse().hex
 }
 
-export function get_txhash (
-  txdata : TxData
-) : string {
-  assert_tx_template(txdata)
-  const data = encode_tx(txdata, true)
-  return hash256(data).reverse().hex
+export function get_txhash (txdata : string | Uint8Array | TxData) : string {
+  // If the transaction data is an object,
+  if (typeof txdata === 'object') {
+    // Assert the structure of the transaction data is valid.
+    assert_tx_template(txdata)
+    // Encode the transaction data.
+    txdata = encode_tx(txdata, true)
+  }
+  // Return the txhash of the transaction data.
+  return hash256(txdata).reverse().hex
 }
 
-export function get_tx_value (
-  txdata : TxData
-) : TxValue {
-  const vin  = txdata.vin.reduce((acc, txin) => acc + (txin.prevout?.value ?? 0n), 0n)
-  const vout = txdata.vout.reduce((acc, txout) => acc + txout.value, 0n)
+export function get_tx_value (txdata : string | Uint8Array | TxData) : TxValue {
+  // Parse the transaction data.
+  const tx = parse_tx(txdata)
+  // Assert the structure of the transaction data is valid.
+  assert_tx_template(tx)
+  // Calculate the value of the transaction.
+  const vin  = tx.vin.reduce((acc, txin) => acc + (txin.prevout?.value ?? 0n), 0n)
+  const vout = tx.vout.reduce((acc, txout) => acc + txout.value, 0n)
   const fees = (vin > vout) ? (vin - vout) : 0n
+  // Return the value of the transaction.
   return { fees, vin, vout }
 }
 

package/src/types/meta.ts

@@ -3,11 +3,11 @@ 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 type TxOutputType   = 'p2pkh' | 'p2sh' | 'p2w-pkh' | 'p2w-sh' | 'p2tr' | 'opreturn'
 
 export interface TxOutputInfo {
-  type    : TxOutputType
-  version : WitnessVersion
+  type    : TxOutputType   | null
+  version : WitnessVersion | null
 }
 
 export interface TxInputInfo {