@smartledger/bsv 7.9.0 → 7.10.1

package/lib/mnemonic/errors.js

@@ -15,4 +15,4 @@ var spec = {
   }]
 }
 
-module.exports = require('../../').errors.extend(spec)
+module.exports = require('../errors').extend(spec)

package/lib/mnemonic/index.js

@@ -1,4 +1,5 @@
-var bsv = require('../../')
-bsv.Mnemonic = require('./mnemonic')
-
-module.exports = bsv.Mnemonic
+// Previously this module required the package root and registered itself onto
+// it (`bsv.Mnemonic = require('./mnemonic')`), which made lib/ depend on
+// index.js. The registration was redundant — index.js assigns bsv.Mnemonic
+// itself — so this is now a plain re-export.
+module.exports = require('./mnemonic')

package/lib/mnemonic/mnemonic.js

@@ -1,17 +1,20 @@
 'use strict'
 
-var bsv = require('../../')
-var BN = bsv.crypto.BN
+var HDPrivateKey = require('../hdprivatekey')
+var BN = require('../crypto/bn')
 var unorm = require('unorm')
-var _ = bsv.deps._
+var _ = require('../util/_')
 
 var pbkdf2 = require('./pbkdf2')
 var errors = require('./errors')
+// Named bsvErrors, not errors: `errors` above is this module's OWN error set.
+// The library-wide errors module is a different object and must not shadow it.
+var bsvErrors = require('../errors')
 
-var Hash = bsv.crypto.Hash
-var Random = bsv.crypto.Random
+var Hash = require('../crypto/hash')
+var Random = require('../crypto/random')
 
-var $ = bsv.util.preconditions
+var $ = require('../util/preconditions')
 
 /**
  * This is an immutable class that represents a BIP39 Mnemonic code.
@@ -53,7 +56,7 @@ var Mnemonic = function (data, wordlist) {
   } else if (_.isNumber(data)) {
     ent = data
   } else if (data) {
-    throw new bsv.errors.InvalidArgument('data', 'Must be a Buffer, a string or an integer')
+    throw new bsvErrors.InvalidArgument('data', 'Must be a Buffer, a string or an integer')
   }
   ent = ent || 128
 
@@ -73,7 +76,7 @@ var Mnemonic = function (data, wordlist) {
     throw new errors.InvalidMnemonic(phrase)
   }
   if (ent % 32 !== 0 || ent < 128) {
-    throw new bsv.errors.InvalidArgument('ENT', 'Values must be ENT > 128 and ENT % 32 == 0')
+    throw new bsvErrors.InvalidArgument('ENT', 'Values must be ENT > 128 and ENT % 32 == 0')
   }
 
   phrase = phrase || Mnemonic._mnemonic(ent, wordlist)
@@ -241,7 +244,7 @@ Mnemonic.fromSeed = function (seed, wordlist) {
  */
 Mnemonic.prototype.toHDPrivateKey = function (passphrase, network) {
   var seed = this.toSeed(passphrase)
-  return bsv.HDPrivateKey.fromSeed(seed, network)
+  return HDPrivateKey.fromSeed(seed, network)
 }
 
 /**
@@ -329,6 +332,15 @@ Mnemonic._entropyChecksum = function (entropy) {
   return checksum
 }
 
-Mnemonic.bsv = bsv
+// Back-reference to the whole library, preserved as public API. Defined as a
+// lazy getter rather than `Mnemonic.bsv = require('../../')`: this module is
+// loaded while index.js is still initializing, so an eager require would
+// capture a half-built namespace. Resolving on first access defers it past
+// load and removes the module-init cycle.
+Object.defineProperty(Mnemonic, 'bsv', {
+  configurable: true,
+  enumerable: true,
+  get: function () { return require('../../') }
+})
 
 module.exports = Mnemonic

package/lib/ordinals/bsv20.js

@@ -17,6 +17,8 @@
  * are never coerced to JS numbers. `dec` (decimals, 0–18) scales display only.
  */
 var inscription = require('./inscription')
+var Script = require('../script')
+var Output = require('../transaction/output')
 
 var CONTENT_TYPE = 'application/bsv-20'
 var MAX_DEC = 18
@@ -261,8 +263,7 @@ function buildDeployMint (params) {
 }
 
 function outputFor (script, satoshis) {
-  var bsv = require('../..')
-  return new bsv.Transaction.Output({ script: script, satoshis: satoshis != null ? satoshis : 1 })
+  return new Output({ script: script, satoshis: satoshis != null ? satoshis : 1 })
 }
 
 /** 1-sat Output helpers mirroring the builders. */
@@ -276,8 +277,7 @@ function createAuthOutput (params) { return outputFor(buildAuth(params), params
 
 /** Extract the JSON body from a locking script, a JSON string, a Buffer, or an object. */
 function bodyOf (input) {
-  var bsv = require('../..')
-  if (input && typeof input === 'object' && !Buffer.isBuffer(input) && !(input instanceof bsv.Script)) {
+  if (input && typeof input === 'object' && !Buffer.isBuffer(input) && !(input instanceof Script)) {
     return input // already a parsed object
   }
   if (typeof input === 'string' && input.trim()[0] === '{') return input // raw JSON string

package/lib/ordinals/inscription.js

@@ -16,13 +16,13 @@
  *
  * This matches the widely-used 1Sat Ordinals format (js-1sat-ord).
  */
-var bsv = require('../..')
+var Script = require('../script')
+var Opcode = require('../opcode')
+var Address = require('../address')
+var Output = require('../transaction/output')
 
 var ORD = Buffer.from('ord', 'utf8')
 
-function scriptClass () { return bsv.Script }
-function op () { return bsv.Opcode }
-
 /** Describe a rejected value for an error message, without dumping its contents. */
 function typeName (v) {
   if (v === null) return 'null'
@@ -50,7 +50,6 @@ var CONTENT_ALIASES = ['data', 'body', 'payload', 'text', 'message']
 
 /** Resolve a base locking script from a Script, an Address, or an address string. */
 function resolveLock (params) {
-  var Script = scriptClass()
   var hasLock = params.lock != null
   var hasAddress = params.address != null
 
@@ -81,9 +80,9 @@ function resolveLock (params) {
   }
 
   if (hasAddress) {
-    var addr = (params.address instanceof bsv.Address)
+    var addr = (params.address instanceof Address)
       ? params.address
-      : bsv.Address.fromString(String(params.address))
+      : Address.fromString(String(params.address))
     return Script.buildPublicKeyHashOut(addr)
   }
 
@@ -111,7 +110,6 @@ function resolveLock (params) {
  */
 function buildInscription (params) {
   params = params || {}
-  var Opcode = op()
   var lock = resolveLock(params)
 
   if (params.content == null) {
@@ -137,7 +135,7 @@ function buildInscription (params) {
   }
 
   // Clone the base lock so we never mutate the caller's Script.
-  var s = scriptClass().fromBuffer(lock.toBuffer())
+  var s = Script.fromBuffer(lock.toBuffer())
   s.add(Opcode.OP_FALSE)
   s.add(Opcode.OP_IF)
   s.add(ORD)
@@ -168,8 +166,6 @@ function chunkIsOp (chunk, opcodenum) {
  *   null if the script carries no inscription envelope.
  */
 function parseInscription (script) {
-  var Script = scriptClass()
-  var Opcode = op()
   var s = (script instanceof Script) ? script
     : Buffer.isBuffer(script) ? Script.fromBuffer(script)
       : Script.fromHex(script)
@@ -235,7 +231,7 @@ function createInscriptionOutput (params) {
   if (typeof satoshis !== 'number' || !Number.isInteger(satoshis) || satoshis < 1) {
     throw new Error('satoshis must be a positive integer (1 for a standard 1Sat ordinal)')
   }
-  return new bsv.Transaction.Output({
+  return new Output({
     script: buildInscription(params),
     satoshis: satoshis
   })

package/lib/ordinals/ordlock.js

@@ -37,14 +37,19 @@
  *
  * Requires post-Genesis limits: call SmartContract.enableGenesis() before verifying.
  */
-var bsv = require('../..')
-var P = require('../smart_contract/pushtx')
-var H = require('../smart_contract/covenant_helpers')
+var P = require('../covenant/pushtx')
+var H = require('../covenant/helpers')
 var inscription = require('./inscription')
 
-var Script = bsv.Script
-var Opcode = bsv.Opcode
-var BufferReader = bsv.encoding.BufferReader
+var Script = require('../script')
+var Opcode = require('../opcode')
+var Address = require('../address')
+var PublicKey = require('../publickey')
+var Hash = require('../crypto/hash')
+var Transaction = require('../transaction')
+var Input = require('../transaction/input')
+var Output = require('../transaction/output')
+var BufferReader = require('../encoding/bufferreader')
 
 // OrdLock commits to the FULL output set (so payments can be pinned) but leaves the
 // input set open for the buyer's funding — SIGHASH_ALL|ANYONECANPAY|FORKID (0xc1).
@@ -73,9 +78,9 @@ function coerceScript (v) {
 
 /** Coerce an Address, PublicKey, PrivateKey, or address string to an Address. */
 function toAddress (v) {
-  if (v instanceof bsv.Address) return v
+  if (v instanceof Address) return v
   if (v && typeof v.toAddress === 'function') return v.toAddress() // PublicKey / PrivateKey
-  return bsv.Address.fromString(String(v))
+  return Address.fromString(String(v))
 }
 
 /** Resolve a 20-byte HASH160 owner commitment from an Address/PublicKey/key or 20-byte Buffer. */
@@ -84,7 +89,7 @@ function resolvePubKeyHash (owner) {
     if (owner.length !== 20) throw new Error('seller pubkeyhash buffer must be 20 bytes (HASH160)')
     return owner
   }
-  if (owner instanceof bsv.PublicKey) return bsv.crypto.Hash.sha256ripemd160(owner.toBuffer())
+  if (owner instanceof PublicKey) return Hash.sha256ripemd160(owner.toBuffer())
   return toAddress(owner).hashBuffer
 }
 
@@ -95,15 +100,15 @@ function resolvePubKeyHash (owner) {
  */
 function payOutputFor (payTo, price) {
   assertSats(price, 'payment price')
-  return new bsv.Transaction.Output({
+  return new Output({
     script: Script.buildPublicKeyHashOut(toAddress(payTo)), satoshis: price
   })
 }
 
 /** Coerce one payment spec to a Transaction.Output. */
 function outputFromSpec (spec) {
-  if (spec instanceof bsv.Transaction.Output) return spec
-  if (Buffer.isBuffer(spec)) return bsv.Transaction.Output.fromBufferReader(new BufferReader(spec))
+  if (spec instanceof Output) return spec
+  if (Buffer.isBuffer(spec)) return Output.fromBufferReader(new BufferReader(spec))
   var to = spec.payTo != null ? spec.payTo : spec.address
   var amt = spec.satoshis != null ? spec.satoshis : spec.price
   if (to == null || amt == null) throw new Error('payment spec needs {address|payTo, satoshis|price}')
@@ -125,7 +130,7 @@ function resolvePayOutputs (params) {
   if (params.price != null) {
     var payTo = params.payTo != null ? params.payTo : params.seller
     // A pre-built Output as payTo is used verbatim (its own value); otherwise build P2PKH(price).
-    var first = (payTo instanceof bsv.Transaction.Output) ? payTo : payOutputFor(payTo, params.price)
+    var first = (payTo instanceof Output) ? payTo : payOutputFor(payTo, params.price)
     var arr = [first]
     if (params.royalties) params.royalties.forEach(function (r) { arr.push(outputFromSpec(r)) })
     return arr
@@ -199,7 +204,7 @@ function chunkIsOp (chunk, opcodenum) {
 function splitPayBlob (blob) {
   var br = new BufferReader(blob)
   var outs = []
-  while (!br.eof()) outs.push(bsv.Transaction.Output.fromBufferReader(br))
+  while (!br.eof()) outs.push(Output.fromBufferReader(br))
   return outs
 }
 
@@ -296,7 +301,7 @@ function parseOrdLock (script, opts) {
     if (rebuilt.toHex() !== s.toHex()) return null
 
     return {
-      seller: { pubKeyHash: sellerPKH, address: bsv.Address.fromPublicKeyHash(sellerPKH, network).toString() },
+      seller: { pubKeyHash: sellerPKH, address: Address.fromPublicKeyHash(sellerPKH, network).toString() },
       payOutputs: payOutputs,
       payBlob: payBlob,
       totalPrice: totalPrice,
@@ -317,7 +322,7 @@ function isOrdLock (script, opts) { return parseOrdLock(script, opts) !== null }
 function listInscriptionOutput (params) {
   params = params || {}
   var satoshis = params.satoshis != null ? params.satoshis : 1
-  return new bsv.Transaction.Output({ script: buildOrdLock(params), satoshis: satoshis })
+  return new Output({ script: buildOrdLock(params), satoshis: satoshis })
 }
 
 /**
@@ -426,7 +431,7 @@ function cancel (params) {
 
 /** Add an input spending `outpoint` under `script` worth `satoshis`, script-sig empty. */
 function addSpendInput (tx, outpoint, script, satoshis) {
-  tx.addInput(new bsv.Transaction.Input({
+  tx.addInput(new Input({
     prevTxId: outpoint.txid || outpoint.prevTxId,
     outputIndex: outpoint.outputIndex != null ? outpoint.outputIndex : outpoint.vout,
     script: Script.empty()
@@ -479,11 +484,11 @@ function buildListingTx (params) {
     throw new Error('buildListingTx: insufficient funding — need ' + fee + ' sat fee, funded ' + fundingTotal)
   }
 
-  var tx = new bsv.Transaction()
+  var tx = new Transaction()
   addSpendInput(tx, ordinal, ordinal.script, ordSats) // input 0 = the ordinal (P2PKH)
   funding.forEach(function (f) { addSpendInput(tx, f, f.script, f.satoshis) })
 
-  tx.addOutput(new bsv.Transaction.Output({ script: lock, satoshis: ordSats })) // output 0 = listing
+  tx.addOutput(new Output({ script: lock, satoshis: ordSats })) // output 0 = listing
   if (change > 0) {
     tx.addOutput(payOutputFor(params.changeAddress || ordinal.privateKey.toAddress(), change))
   }
@@ -533,7 +538,7 @@ function buildPurchaseTx (params) {
   var payOuts = params.payOutputs
     ? params.payOutputs.map(outputFromSpec)
     : parsed.payOutputs.map(function (p) {
-      return new bsv.Transaction.Output({ script: p.script, satoshis: p.satoshis })
+      return new Output({ script: p.script, satoshis: p.satoshis })
     })
   var paidTotal = payOuts.reduce(function (a, o) { return a + o.satoshis }, 0)
 
@@ -545,7 +550,7 @@ function buildPurchaseTx (params) {
       ' sat (payments ' + paidTotal + ' + fee ' + fee + '), funded ' + fundingTotal)
   }
 
-  var tx = new bsv.Transaction()
+  var tx = new Transaction()
   addSpendInput(tx, listing, lockingScript, ordSats) // input 0 = the listing (covenant)
   params.funding.forEach(function (f) { addSpendInput(tx, f, f.script, f.satoshis) })
 

package/lib/smart_contract/authorizers.js

@@ -28,16 +28,18 @@
  * always just a 20-byte value the covenant splices into the recreated scriptCode.
  */
 
-var bsv = require('../..')
+var PrivateKey = require('../privatekey')
+var PublicKey = require('../publickey')
+var Script = require('../script')
 var Hash = require('../crypto/hash')
-var H = require('./covenant_helpers')
+var H = require('../covenant/helpers')
 
-var Opcode = bsv.Opcode
+var Opcode = require('../opcode')
 var n = H.scriptNum
 
 function pubBuffer (key) {
-  if (key instanceof bsv.PrivateKey) return key.toPublicKey().toBuffer()
-  if (key instanceof bsv.PublicKey) return key.toBuffer()
+  if (key instanceof PrivateKey) return key.toPublicKey().toBuffer()
+  if (key instanceof PublicKey) return key.toBuffer()
   return key // already a Buffer
 }
 
@@ -71,7 +73,7 @@ function singleKey () {
 function redeemScript (m, pubkeys) {
   var nn = pubkeys.length
   if (m < 1 || m > nn || nn < 1 || nn > 16) throw new Error('multisig requires 1 <= m <= n <= 16')
-  var s = new bsv.Script().add(Opcode['OP_' + m])
+  var s = new Script().add(Opcode['OP_' + m])
   pubkeys.forEach(function (p) { s.add(Buffer.from(p)) }) // each emitted as 0x21||pk (33-byte push)
   s.add(Opcode['OP_' + nn]).add(Opcode.OP_CHECKMULTISIG)
   return s.toBuffer()

package/lib/smart_contract/builder.js

@@ -13,7 +13,13 @@
 
 'use strict'
 
-var bsv = require('../..')
+var sighash = require('../transaction/sighash')
+var Interpreter = require('../script/interpreter')
+var Signature = require('../crypto/signature')
+var Hash = require('../crypto/hash')
+var BN = require('../crypto/bn')
+var Transaction = require('../transaction')
+var Script = require('../script')
 
 /**
  * @deprecated NON-ENFORCING. `buildLockingScript` / `createCovenant` emit
@@ -45,7 +51,7 @@ function Builder(privateKey, options) {
   this.validationRules = []
   
   this.sighashType = this.options.sighashType ||
-    (bsv.crypto.Signature.SIGHASH_ALL | bsv.crypto.Signature.SIGHASH_FORKID)
+    (Signature.SIGHASH_ALL | Signature.SIGHASH_FORKID)
 }
 
 // The scripts this class builds are non-enforcing (see the class @deprecated note).
@@ -125,7 +131,7 @@ Builder.prototype.useTemplate = function(template, params) {
  */
 Builder.prototype.buildLockingScript = function(preimageData) {
   this._assertEnforcingAllowed()
-  var script = new bsv.Script()
+  var script = new Script()
 
   if (this.scriptTemplate) {
     return this._buildFromTemplate(preimageData)
@@ -143,17 +149,17 @@ Builder.prototype.buildLockingScript = function(preimageData) {
  * @returns {Script} Constructed unlocking script
  */
 Builder.prototype.buildUnlockingScript = function(spendingTx, inputIndex, covenantData) {
-  var script = new bsv.Script()
+  var script = new Script()
 
   // Add signature
-  var covenantScript = bsv.Script.fromHex(covenantData.script)
-  var signature = bsv.Transaction.sighash.sign(
+  var covenantScript = Script.fromHex(covenantData.script)
+  var signature = sighash.sign(
     spendingTx,
     this.privateKey,
     this.sighashType,
     inputIndex,
     covenantScript,
-    new bsv.crypto.BN(covenantData.satoshis)
+    new BN(covenantData.satoshis)
   )
 
   var fullSignature = Buffer.concat([
@@ -189,7 +195,7 @@ Builder.prototype.createCovenant = function(utxo, buildOptions) {
   buildOptions = buildOptions || {}
 
   // Create covenant creation transaction
-  var creationTx = new bsv.Transaction()
+  var creationTx = new Transaction()
     .from({
       txId: utxo.txid,
       outputIndex: utxo.vout,
@@ -199,13 +205,13 @@ Builder.prototype.createCovenant = function(utxo, buildOptions) {
     .to(this.privateKey.toAddress(), utxo.satoshis - (buildOptions.fee || 1000))
 
   // Generate creation preimage
-  var p2pkhScript = bsv.Script.fromHex(utxo.script)
-  var creationPreimage = bsv.Transaction.sighash.sighashPreimage(
+  var p2pkhScript = Script.fromHex(utxo.script)
+  var creationPreimage = sighash.sighashPreimage(
     creationTx,
     this.sighashType,
     0,
     p2pkhScript,
-    new bsv.crypto.BN(utxo.satoshis)
+    new BN(utxo.satoshis)
   )
 
   // Extract preimage fields for covenant construction
@@ -266,13 +272,13 @@ Builder.prototype.validateSpending = function(spendingTx, covenantUtxo) {
   }
 
   // Generate spending preimage
-  var covenantScript = bsv.Script.fromHex(covenantUtxo.script)
-  var spendingPreimage = bsv.Transaction.sighash.sighashPreimage(
+  var covenantScript = Script.fromHex(covenantUtxo.script)
+  var spendingPreimage = sighash.sighashPreimage(
     spendingTx,
     this.sighashType,
     0,
     covenantScript,
-    new bsv.crypto.BN(covenantUtxo.satoshis)
+    new BN(covenantUtxo.satoshis)
   )
 
   var Preimage = require('./preimage')
@@ -293,15 +299,15 @@ Builder.prototype.validateSpending = function(spendingTx, covenantUtxo) {
   }
 
   // Run Script.Interpreter validation
-  var interpreter = new bsv.Script.Interpreter()
-  var flags = bsv.Script.Interpreter.SCRIPT_VERIFY_P2SH |
-              bsv.Script.Interpreter.SCRIPT_VERIFY_STRICTENC |
-              bsv.Script.Interpreter.SCRIPT_VERIFY_DERSIG |
-              bsv.Script.Interpreter.SCRIPT_VERIFY_LOW_S |
-              bsv.Script.Interpreter.SCRIPT_ENABLE_SIGHASH_FORKID
+  var interpreter = new Interpreter()
+  var flags = Interpreter.SCRIPT_VERIFY_P2SH |
+              Interpreter.SCRIPT_VERIFY_STRICTENC |
+              Interpreter.SCRIPT_VERIFY_DERSIG |
+              Interpreter.SCRIPT_VERIFY_LOW_S |
+              Interpreter.SCRIPT_ENABLE_SIGHASH_FORKID
 
   var unlockingScript = spendingTx.inputs[0].script
-  var lockingScript = bsv.Script.fromHex(covenantUtxo.script)
+  var lockingScript = Script.fromHex(covenantUtxo.script)
 
   var interpreterResult = interpreter.verify(
     unlockingScript,
@@ -309,7 +315,7 @@ Builder.prototype.validateSpending = function(spendingTx, covenantUtxo) {
     spendingTx,
     0,
     flags,
-    new bsv.crypto.BN(covenantUtxo.satoshis)
+    new BN(covenantUtxo.satoshis)
   )
 
   if (!interpreterResult) {
@@ -347,7 +353,7 @@ Builder.prototype._buildFromTemplate = function(preimageData) {
  * @private
  */
 Builder.prototype._buildMultiFieldCovenant = function(preimageData) {
-  var script = new bsv.Script()
+  var script = new Script()
 
   // Duplicate preimage for multiple validations
   script.add('OP_DUP')
@@ -359,7 +365,7 @@ Builder.prototype._buildMultiFieldCovenant = function(preimageData) {
     script.add('OP_HASH256')
     
     if (rule.expectedValue) {
-      var expectedHash = bsv.crypto.Hash.sha256sha256(Buffer.from(rule.expectedValue, 'hex'))
+      var expectedHash = Hash.sha256sha256(Buffer.from(rule.expectedValue, 'hex'))
       script.add(expectedHash)
       script.add('OP_EQUALVERIFY')
     }
@@ -381,12 +387,12 @@ Builder.prototype._buildMultiFieldCovenant = function(preimageData) {
  * @private
  */
 Builder.prototype._buildHashLockTemplate = function(preimageData, params) {
-  var script = new bsv.Script()
+  var script = new Script()
   
   script.add('OP_DUP')
   script.add('OP_HASH256')
   
-  var expectedHash = params.hash || bsv.crypto.Hash.sha256sha256(preimageData.preimage)
+  var expectedHash = params.hash || Hash.sha256sha256(preimageData.preimage)
   script.add(expectedHash)
   script.add('OP_EQUALVERIFY')
   script.add('OP_DROP')

package/lib/smart_contract/covenant.js

@@ -26,7 +26,14 @@
 
 'use strict'
 
-var bsv = require('../..')
+var sighash = require('../transaction/sighash')
+var Input = require('../transaction/input')
+var Interpreter = require('../script/interpreter')
+var Signature = require('../crypto/signature')
+var Hash = require('../crypto/hash')
+var BN = require('../crypto/bn')
+var Transaction = require('../transaction')
+var Script = require('../script')
 var path = require('path')
 
 // Optional fs dependency for Node.js environments
@@ -65,7 +72,7 @@ function Covenant(privateKey, options) {
   this.storageDir = options.storageDir || (typeof process !== 'undefined' ? path.join(process.cwd(), '.bsv-covenants') : '.bsv-covenants')
   this.covenantUtxoPath = path.join(this.storageDir, 'covenant_utxos.json')
   
-  this.sighashType = bsv.crypto.Signature.SIGHASH_ALL | bsv.crypto.Signature.SIGHASH_FORKID
+  this.sighashType = Signature.SIGHASH_ALL | Signature.SIGHASH_FORKID
 
   // The locking script this class builds does NOT constrain the spend (see the
   // class doc). Require explicit acknowledgement so no one ships it as a real
@@ -100,7 +107,7 @@ Covenant.prototype.createFromP2PKH = function(utxo) {
   }
 
   // Create covenant creation transaction
-  var creationTx = new bsv.Transaction()
+  var creationTx = new Transaction()
     .from({
       txId: utxo.txid,
       outputIndex: utxo.vout,
@@ -110,19 +117,19 @@ Covenant.prototype.createFromP2PKH = function(utxo) {
     .to(this.address, utxo.satoshis - 1000) // 1000 sat fee
 
   // Get preimage for covenant creation
-  var p2pkhScript = bsv.Script.fromHex(utxo.script)
-  var creationPreimage = bsv.Transaction.sighash.sighashPreimage(
+  var p2pkhScript = Script.fromHex(utxo.script)
+  var creationPreimage = sighash.sighashPreimage(
     creationTx,
     this.sighashType,
     0,
     p2pkhScript,
-    new bsv.crypto.BN(utxo.satoshis)
+    new BN(utxo.satoshis)
   )
 
-  var preimageHash = bsv.crypto.Hash.sha256sha256(creationPreimage)
+  var preimageHash = Hash.sha256sha256(creationPreimage)
 
   // Build covenant locking script
-  var covenantLockingScript = new bsv.Script()
+  var covenantLockingScript = new Script()
     .add('OP_DUP')
     .add('OP_HASH256')
     .add(preimageHash)
@@ -168,28 +175,28 @@ Covenant.prototype.createSpendingTx = function(covenantUtxo, outputAddress, outp
   var outputSats = outputSatoshis || (covenantUtxo.satoshis - 500) // 500 sat fee
 
   // Create spending transaction - manual input for custom scripts
-  var spendingTx = new bsv.Transaction()
+  var spendingTx = new Transaction()
   
   // Manually add input for custom covenant script
-  spendingTx.addInput(new bsv.Transaction.Input({
+  spendingTx.addInput(new Input({
     prevTxId: covenantUtxo.txid,
     outputIndex: covenantUtxo.vout,
-    script: bsv.Script.empty() // Will be set after signing
-  }), bsv.Script.fromHex(covenantUtxo.script), covenantUtxo.satoshis)
+    script: Script.empty() // Will be set after signing
+  }), Script.fromHex(covenantUtxo.script), covenantUtxo.satoshis)
 
   // Add output
   spendingTx.to(outputAddr, outputSats)
 
-  var covenantScript = bsv.Script.fromHex(covenantUtxo.script)
+  var covenantScript = Script.fromHex(covenantUtxo.script)
 
   // Create signature against covenant script
-  var covenantSignature = bsv.Transaction.sighash.sign(
+  var covenantSignature = sighash.sign(
     spendingTx,
     this.privateKey,
     this.sighashType,
     0,
     covenantScript,
-    new bsv.crypto.BN(covenantUtxo.satoshis)
+    new BN(covenantUtxo.satoshis)
   )
 
   var fullSignature = Buffer.concat([
@@ -201,7 +208,7 @@ Covenant.prototype.createSpendingTx = function(covenantUtxo, outputAddress, outp
   var originalPreimage = Buffer.from(covenantUtxo.originalPreimage, 'hex')
 
   // Create unlocking script
-  var unlockingScript = new bsv.Script()
+  var unlockingScript = new Script()
     .add(fullSignature)
     .add(originalPreimage)
 
@@ -217,15 +224,15 @@ Covenant.prototype.createSpendingTx = function(covenantUtxo, outputAddress, outp
  * @returns {Object} Validation result
  */
 Covenant.prototype.validate = function(spendingTx, covenantUtxo) {
-  var interpreter = new bsv.Script.Interpreter()
-  var flags = bsv.Script.Interpreter.SCRIPT_VERIFY_P2SH |
-              bsv.Script.Interpreter.SCRIPT_VERIFY_STRICTENC |
-              bsv.Script.Interpreter.SCRIPT_VERIFY_DERSIG |
-              bsv.Script.Interpreter.SCRIPT_VERIFY_LOW_S |
-              bsv.Script.Interpreter.SCRIPT_ENABLE_SIGHASH_FORKID
+  var interpreter = new Interpreter()
+  var flags = Interpreter.SCRIPT_VERIFY_P2SH |
+              Interpreter.SCRIPT_VERIFY_STRICTENC |
+              Interpreter.SCRIPT_VERIFY_DERSIG |
+              Interpreter.SCRIPT_VERIFY_LOW_S |
+              Interpreter.SCRIPT_ENABLE_SIGHASH_FORKID
 
   var unlockingScript = spendingTx.inputs[0].script
-  var lockingScript = bsv.Script.fromHex(covenantUtxo.script)
+  var lockingScript = Script.fromHex(covenantUtxo.script)
 
   var result = interpreter.verify(
     unlockingScript,
@@ -233,7 +240,7 @@ Covenant.prototype.validate = function(spendingTx, covenantUtxo) {
     spendingTx,
     0,
     flags,
-    new bsv.crypto.BN(covenantUtxo.satoshis)
+    new BN(covenantUtxo.satoshis)
   )
 
   return { 
@@ -366,7 +373,7 @@ Covenant.prototype._ensureStorageDir = function() {
  * Static utility methods
  */
 Covenant.reconstructP2pkhScript = function(address) {
-  return bsv.Script.buildPublicKeyHashOut(address).toHex()
+  return Script.buildPublicKeyHashOut(address).toHex()
 }
 
 module.exports = Covenant