@vbyte/btc-dev 1.1.6 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vbyte/btc-dev",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "Batteries-included toolset for plebian bitcoin development",
   "type": "module",
   "keywords": [
@@ -79,12 +79,12 @@
     "test": "npm run script test/src/tape.ts"
   },
   "dependencies": {
-    "@noble/curves": "^1.9.3",
-    "@noble/hashes": "^1.8.0",
-    "@scure/btc-signer": "^1.8.1",
+    "@noble/curves": "1.9.7",
+    "@noble/hashes": "1.8.0",
+    "@scure/btc-signer": "1.8.1",
     "@vbyte/buff": "^1.0.2",
-    "@vbyte/micro-lib": "^1.1.1",
-    "zod": "^4.0.5"
+    "@vbyte/micro-lib": "^1.1.2",
+    "zod": "^4.1.5"
   },
   "devDependencies": {
     "@cmdcode/core-cmd": "^1.6.5",
@@ -93,13 +93,13 @@
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.4",
-    "@types/node": "^24.0.14",
+    "@types/node": "^24.3.1",
     "@types/tape": "^5.8.1",
     "faucet": "^0.0.4",
-    "rollup": "^4.45.1",
+    "rollup": "^4.50.1",
     "tape": "^5.9.0",
     "tslib": "^2.8.1",
-    "tsx": "^4.20.3",
-    "typescript": "^5.8.3"
+    "tsx": "^4.20.5",
+    "typescript": "^5.9.2"
   }
 }

package/src/lib/tx/decode.ts

@@ -22,9 +22,9 @@ export function decode_tx (
   // Parse tx version.
   const version = read_version(stream)
   // Check and enable any flags that are set.
-  const has_witness = (use_segwit)
-    ? check_witness_flag(stream)
-    : false
+  let has_witness = check_witness_flag(stream)
+  // If use_segwit is false, set has_witness to false.
+  has_witness = (use_segwit) ? has_witness : false
   // Parse our inputs and outputs.
   const vin  = read_inputs(stream)
   const vout = read_outputs(stream)

package/src/lib/tx/util.ts

@@ -2,6 +2,7 @@ import { Buff }               from '@vbyte/buff'
 import { Test }               from '@vbyte/micro-lib'
 import { Assert }             from '@vbyte/micro-lib/assert'
 import { hash256 }            from '@vbyte/micro-lib/hash'
+import { decode_tx }          from './decode.js'
 import { encode_tx }          from './encode.js'
 import { parse_tx }           from './parse.js'
 import { assert_tx_template } from './validate.js'
@@ -15,16 +16,39 @@ import type {
   TxValue
 } from '@/types/index.js'
 
+export function transcode_tx (
+  txdata : string | Uint8Array,
+  use_segwit = true
+) : Buff {
+  console.log('txdata:', txdata)
+  // Decode the transaction data.
+  const decoded = decode_tx(txdata)
+  console.log('decoded:', decoded)
+  // Re-encode and return the encoded transaction data.
+  return encode_tx(decoded, use_segwit)
+}
+
 export function get_txid (txdata : string | Uint8Array | TxData) : string {
-  // If the transaction data is an object,
-  if (typeof txdata === 'object') {
+  let buffer : Uint8Array
+
+  if (txdata instanceof Uint8Array) {
+    // Set the buffer to the transaction data.
+    buffer = transcode_tx(txdata, false)
+  } else 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)
+    buffer = encode_tx(txdata, false)
+  } else if (typeof txdata === 'string') {
+    // Assert the transaction data is a hex string.
+    Assert.is_hex(txdata)
+    // Convert the hex string to a Uint8Array.
+    buffer = transcode_tx(txdata, false)
+  } else {
+    throw new TypeError('invalid txdata type: ' + typeof txdata)
   }
   // Return the txid of the transaction data.
-  return hash256(txdata).reverse().hex
+  return hash256(buffer).reverse().hex
 }
 
 export function get_txhash (txdata : string | Uint8Array | TxData) : string {

package/src/schema/base.ts

@@ -0,0 +1,57 @@
+import { z } from 'zod'
+
+type Literal = z.infer<typeof literal>
+type Json    = Literal | { [key : string] : Json } | Json[]
+
+export const big     = z.bigint()
+export const bool    = z.boolean()
+export const date    = z.date()
+export const num     = z.number().min(Number.MIN_SAFE_INTEGER).max(Number.MAX_SAFE_INTEGER)
+export const int     = num.int()
+export const u8a     = z.instanceof(Uint8Array)
+export const str     = z.string()
+export const stamp   = int.min(500_000_000)
+export const any     = z.any()
+export const zod     = z
+export const char  = int.min(0).max(0xFF)
+export const short = int.min(0).max(0xFFFF)
+export const uint  = int.min(0).max(0xFFFFFFFF)
+
+export const float  = z.number().refine((e) => String(e).includes('.'))
+
+export const float2 = float.refine((e) => {
+  const parts = String(e).split('.').at(1)
+  return parts !== undefined && parts.length <= 2
+})
+
+export const hex = z.string()
+  .regex(/^[0-9a-fA-F]*$/)
+  .refine(e => e.length % 2 === 0)
+
+export const literal = z.union([
+  z.string(), z.number(), z.boolean(), z.null()
+])
+
+export const json : z.ZodType<Json> = z.lazy(() =>
+  z.union([ literal, z.array(json), z.record(str, json) ])
+)
+
+export const u8a20    = u8a.refine((e) => e.length === 20)
+export const u8a32    = u8a.refine((e) => e.length === 32)
+export const u8a33    = u8a.refine((e) => e.length === 33)
+export const u8a64    = u8a.refine((e) => e.length === 64)
+
+export const hex20    = hex.refine((e) => e.length === 40)
+export const hex32    = hex.refine((e) => e.length === 64)
+export const hex33    = hex.refine((e) => e.length === 66)
+export const hex64    = hex.refine((e) => e.length === 128)
+
+export const bytes  = z.union([ hex, u8a ])
+export const byte32 = z.union([ hex32, u8a32 ])
+export const byte33 = z.union([ hex33, u8a33 ])
+export const byte64 = z.union([ hex64, u8a64 ])
+
+export const base58    = z.string().regex(/^[1-9A-HJ-NP-Za-km-z]+$/)
+export const base64    = z.string().regex(/^[a-zA-Z0-9+/]+={0,2}$/)
+export const base64url = z.string().regex(/^[a-zA-Z0-9\-_]+={0,2}$/)
+export const bech32    = z.string().regex(/^[a-z]+1[023456789acdefghjklmnpqrstuvwxyz]+$/)

package/src/schema/taproot.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { byte32, uint } from '@vbyte/micro-lib/schema'
+import { byte32, uint } from './base.js'
 
 export const taptree = z.union([ z.array(byte32), byte32 ])
 

package/src/schema/tx.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 
-import { hex, hex32, uint } from '@vbyte/micro-lib/schema'
+import { hex, hex32, uint } from './base.js'
 
 import type { TxOutput, TxOutputTemplate } from '@/types/index.js'