@smartledger/bsv 7.8.1 → 7.10.0

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

package/lib/smart_contract/covenant_helpers.js

@@ -1,129 +1,9 @@
 'use strict'
-/**
- * SmartContract covenant helpers
- * ==============================
- *
- * Shared utilities for building and verifying custom locking scripts &
- * OP_PUSH_TX covenants: a consensus-flag verify() harness, raw BIP-143 preimage
- * access, signing, and fund/spend scaffolding. Used by ./pushtx, ./pels, ./token
- * and ./locks.
- */
-
-var bsv = require('../..')
-var BN = require('../crypto/bn')
-var Hash = require('../crypto/hash')
-var Signature = require('../crypto/signature')
-
-// SIGHASH_ALL | SIGHASH_FORKID — the BSV default these covenants are built for.
-var SIGHASH = Signature.SIGHASH_ALL | Signature.SIGHASH_FORKID // 0x41
-
-// Post-Genesis consensus + STANDARD RELAY flags — what mainnet miners actually
-// enforce. Includes SCRIPT_VERIFY_MINIMALDATA (every push must be minimal) and
-// SCRIPT_VERIFY_LOW_S (canonical signatures). Verifying with these flags locally
-// mirrors mainnet relay/consensus policy, so a covenant that passes here is
-// expected to be accepted on broadcast — catch non-relayable scripts before then.
-function flags () {
-  var I = bsv.Script.Interpreter
-  return I.SCRIPT_VERIFY_P2SH |
-    I.SCRIPT_VERIFY_STRICTENC |
-    I.SCRIPT_VERIFY_DERSIG |
-    I.SCRIPT_VERIFY_LOW_S |
-    I.SCRIPT_VERIFY_MINIMALDATA |
-    I.SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY |
-    I.SCRIPT_VERIFY_CHECKSEQUENCEVERIFY |
-    I.SCRIPT_ENABLE_SIGHASH_FORKID |
-    I.SCRIPT_ENABLE_MAGNETIC_OPCODES |
-    I.SCRIPT_ENABLE_MONOLITH_OPCODES
-}
-
-/**
- * Opt into post-Genesis script limits (needed by OP_PUSH_TX covenants).
- * Thin wrapper over Interpreter.useGenesisLimits (added in 4.1.0).
- */
-function enableGenesis (max) {
-  return bsv.Script.Interpreter.useGenesisLimits(max)
-}
-
-/**
- * Verify an unlocking script against a locking script through the consensus
- * interpreter. @returns {{ok:boolean, err:string}}
- */
-function verify (unlockingScript, lockingScript, opts) {
-  opts = opts || {}
-  var interp = new bsv.Script.Interpreter()
-  var ok = interp.verify(
-    unlockingScript,
-    lockingScript,
-    opts.tx || new bsv.Transaction(),
-    opts.inputIndex || 0,
-    opts.flags || flags(),
-    new BN(opts.satoshis || 0)
-  )
-  return { ok: ok, err: interp.errstr || '' }
-}
-
-/** Raw BIP-143 preimage (the serialization that is double-SHA256'd), not the digest. */
-function rawPreimage (tx, inputIndex, lockingScript, satoshis, sighashType) {
-  return bsv.Transaction.sighash.sighashPreimage(
-    tx, sighashType || SIGHASH, inputIndex, lockingScript, new BN(satoshis))
-}
-
-/** Sighash digest = HASH256(rawPreimage) — useful for asserting OP_PUSH_TX linkage in JS. */
-function sighashDigest (tx, inputIndex, lockingScript, satoshis, sighashType) {
-  return Hash.sha256sha256(rawPreimage(tx, inputIndex, lockingScript, satoshis, sighashType))
-}
-
-/** DER+sighash-byte signature over `lockingScript` for `inputIndex`. */
-function signInput (tx, privateKey, inputIndex, lockingScript, satoshis, sighashType) {
-  sighashType = sighashType || SIGHASH
-  var sig = bsv.Transaction.sighash.sign(tx, privateKey, sighashType, inputIndex, lockingScript, new BN(satoshis))
-  return Buffer.concat([sig.toDER(), Buffer.from([sighashType])])
-}
-
-/**
- * Build a funding tx paying `satoshis` into `lockingScript`, plus a spending tx
- * consuming it with the supplied outputs. Returns { funding, spend }; the caller
- * sets spend.inputs[0] script.
- */
-function fundAndSpend (lockingScript, satoshis, opts) {
-  opts = opts || {}
-  var funding = new bsv.Transaction().addOutput(
-    new bsv.Transaction.Output({ script: lockingScript, satoshis: satoshis }))
-  var spend = new bsv.Transaction()
-  spend.addInput(
-    new bsv.Transaction.Input({ prevTxId: funding.hash, outputIndex: 0, script: bsv.Script.empty() }),
-    lockingScript, satoshis)
-  if (opts.outputs) opts.outputs.forEach(function (o) { spend.addOutput(o) })
-  return { funding: funding, spend: spend }
-}
-
-/** A P2PKH Output object for an address or public key. */
-function p2pkhOutput (addressOrPubKey, satoshis) {
-  var addr = addressOrPubKey.toAddress ? addressOrPubKey.toAddress() : addressOrPubKey
-  return new bsv.Transaction.Output({ script: bsv.Script.buildPublicKeyHashOut(addr), satoshis: satoshis })
-}
-
-/** Minimal little-endian script-number Buffer (push as data to put a number on-stack). */
-function scriptNum (n) {
-  // Minimal on-stack number: 0..16 and -1 use the dedicated opcodes (OP_0..OP_16,
-  // OP_1NEGATE) instead of a data push, so covenant scripts stay MINIMALDATA-clean
-  // (mainnet relay policy). Larger values use a minimal scriptNum push. The result
-  // is passed to Script.add(), which accepts an opcode number or a Buffer.
-  if (n === 0) return bsv.Opcode.OP_0
-  if (n === -1) return bsv.Opcode.OP_1NEGATE
-  if (n >= 1 && n <= 16) return bsv.Opcode['OP_' + n]
-  return new BN(n).toScriptNumBuffer()
-}
-
-module.exports = {
-  SIGHASH: SIGHASH,
-  flags: flags,
-  enableGenesis: enableGenesis,
-  verify: verify,
-  rawPreimage: rawPreimage,
-  sighashDigest: sighashDigest,
-  signInput: signInput,
-  fundAndSpend: fundAndSpend,
-  p2pkhOutput: p2pkhOutput,
-  scriptNum: scriptNum
-}
+// Moved to lib/covenant/helpers.js.
+//
+// lib/ordinals needs these primitives too, and importing them from
+// lib/smart_contract was the only dependency from core code into the
+// application layer. This path is retained because deep imports
+// (require('@smartledger/bsv/lib/smart_contract/covenant_helpers')) are public
+// API via the package.json exports map.
+module.exports = require('../covenant/helpers')

package/lib/smart_contract/debugger.js

@@ -9,8 +9,11 @@
  * covenants (their preimage element / opcode count exceed pre-Genesis limits).
  */
 
-var bsv = require('../..')
-var helpers = require('./covenant_helpers')
+var Interpreter = require('../script/interpreter')
+var BN = require('../crypto/bn')
+var Transaction = require('../transaction')
+var Opcode = require('../opcode')
+var helpers = require('../covenant/helpers')
 
 function opLabel (opcodenum) {
   if (opcodenum === 0) return 'OP_0'
@@ -18,7 +21,7 @@ function opLabel (opcodenum) {
   if (opcodenum === 76) return 'OP_PUSHDATA1'
   if (opcodenum === 77) return 'OP_PUSHDATA2'
   if (opcodenum === 78) return 'OP_PUSHDATA4'
-  try { return bsv.Opcode.fromNumber(opcodenum).toString() } catch (e) { return '0x' + opcodenum.toString(16) }
+  try { return Opcode.fromNumber(opcodenum).toString() } catch (e) { return '0x' + opcodenum.toString(16) }
 }
 
 function hex (buf, max) {
@@ -32,7 +35,7 @@ function hex (buf, max) {
  */
 function trace (unlock, lock, opts) {
   opts = opts || {}
-  var interp = new bsv.Script.Interpreter()
+  var interp = new Interpreter()
   var steps = []
   interp.stepListener = function (step, stack, altstack) {
     steps.push({
@@ -44,10 +47,10 @@ function trace (unlock, lock, opts) {
   }
   var ok = interp.verify(
     unlock, lock,
-    opts.tx || new bsv.Transaction(),
+    opts.tx || new Transaction(),
     opts.inputIndex || 0,
     typeof opts.flags === 'number' ? opts.flags : helpers.flags(),
-    new bsv.crypto.BN(opts.satoshis || 0)
+    new BN(opts.satoshis || 0)
   )
   return { ok: ok, err: interp.errstr || '', steps: steps }
 }

package/lib/smart_contract/dsl.js

@@ -18,15 +18,14 @@
  * time (SmartContract.enableGenesis()).
  */
 
-var bsv = require('../..')
-var PushTx = require('./pushtx')
+var PushTx = require('../covenant/pushtx')
 var PELS = require('./pels')
 var Token = require('./token')
-var helpers = require('./covenant_helpers')
+var helpers = require('../covenant/helpers')
 
-var Script = bsv.Script
-var Opcode = bsv.Opcode
-var Transaction = bsv.Transaction
+var Script = require('../script')
+var Opcode = require('../opcode')
+var Transaction = require('../transaction')
 var n = helpers.scriptNum
 
 function toOutput (dest, satoshis) {

package/lib/smart_contract/index.js

@@ -27,7 +27,10 @@
 
 'use strict'
 
-var bsv = require('../..')
+var Hash = require('../crypto/hash')
+var Transaction = require('../transaction')
+var Address = require('../address')
+var Script = require('../script')
 
 var SmartContract = {
   Covenant: require('./covenant'),
@@ -44,9 +47,9 @@ var SmartContract = {
   ScriptInterpreter: require('./script_interpreter'),
 
   // Interpreter-verified custom locking scripts & OP_PUSH_TX covenants (v4.2.0)
-  CovenantHelpers: require('./covenant_helpers'),
+  CovenantHelpers: require('../covenant/helpers'),
   Locks: require('./locks'),
-  PushTx: require('./pushtx'),
+  PushTx: require('../covenant/pushtx'),
   PELS: require('./pels'),
   Token: require('./token'),
   Authorizers: require('./authorizers'),
@@ -258,14 +261,14 @@ SmartContract.debugScriptExecution = function (unlockingScript, lockingScript, o
   if (options.stepMode) {
     return SmartContract.ScriptInterpreter.stepThroughScript(
       SmartContract.ScriptInterpreter.parseScript(unlockingScript + ' ' + lockingScript),
-      new bsv.Transaction(),
+      new Transaction(),
       true
     )
   } else {
     return SmartContract.ScriptInterpreter.runFullEvaluation(
       SmartContract.ScriptInterpreter.parseScript(unlockingScript),
       SmartContract.ScriptInterpreter.parseScript(lockingScript),
-      new bsv.Transaction()
+      new Transaction()
     )
   }
 }
@@ -362,13 +365,13 @@ SmartContract.getEducationalResources = function () {
 // Utility functions
 SmartContract.utils = {}
 SmartContract.utils.reconstructP2pkhScript = function (address) {
-  return bsv.Script.buildPublicKeyHashOut(address).toHex()
+  return Script.buildPublicKeyHashOut(address).toHex()
 }
 
 SmartContract.utils.createCovenantAddress = function (script) {
   // Create P2SH address for covenant script
-  var scriptHash = bsv.crypto.Hash.sha256ripemd160(script.toBuffer())
-  return bsv.Address.fromScriptHash(scriptHash)
+  var scriptHash = Hash.sha256ripemd160(script.toBuffer())
+  return Address.fromScriptHash(scriptHash)
 }
 
 SmartContract.utils.decodeCompactSize = function (buffer, offset) {

package/lib/smart_contract/locks.js

@@ -4,12 +4,11 @@
  * Each factory returns { lock: Script, unlock: fn, meta }.
  */
 
-var bsv = require('../..')
 var Hash = require('../crypto/hash')
-var H = require('./covenant_helpers')
+var H = require('../covenant/helpers')
 
-var Script = bsv.Script
-var Opcode = bsv.Opcode
+var Script = require('../script')
+var Opcode = require('../opcode')
 var signInput = H.signInput
 var n = H.scriptNum
 

package/lib/smart_contract/opcode_list.js

@@ -1,12 +1,11 @@
-const bsv = require('../..')
-const opcode = bsv.Opcode;
+const opcode = require('../opcode')
 console.log('Opcode List:');
 for (let key in opcode.map) {
   const code = opcode.map[key];
   console.log(`${key}: 0x${code.toString(16).padStart(2, '0')}`);
 }
 
-const Script = bsv.Script;
+const Script = require('../script')
 console.log(Script);
 console.log('\nSample Script using OP_CHECKSIG and OP_RETURN:');
 const script = new Script()

package/lib/smart_contract/pels.js

@@ -17,12 +17,11 @@
  * Requires post-Genesis limits (SmartContract.enableGenesis()).
  */
 
-var bsv = require('../..')
-var P = require('./pushtx')
-var H = require('./covenant_helpers')
+var P = require('../covenant/pushtx')
+var H = require('../covenant/helpers')
 
-var Script = bsv.Script
-var Opcode = bsv.Opcode
+var Script = require('../script')
+var Opcode = require('../opcode')
 var n = H.scriptNum
 
 /**

package/lib/smart_contract/preimage.js

@@ -13,7 +13,11 @@
 
 'use strict'
 
-var bsv = require('../..')
+var sighash = require('../transaction/sighash')
+var BN = require('../crypto/bn')
+var Transaction = require('../transaction')
+var PrivateKey = require('../privatekey')
+var Script = require('../script')
 var crypto = require('crypto')
 
 /**
@@ -800,12 +804,12 @@ Preimage.decodeCompactSize = function(buffer, offset) {
  * @returns {Preimage} Preimage instance
  */
 Preimage.fromTransaction = function(transaction, inputIndex, subscript, satoshis, sighashType) {
-  var preimageBuffer = bsv.Transaction.sighash.sighashPreimage(
+  var preimageBuffer = sighash.sighashPreimage(
     transaction,
     sighashType,
     inputIndex,
     subscript,
-    new bsv.crypto.BN(satoshis)
+    new BN(satoshis)
   )
 
   return new Preimage(preimageBuffer, {
@@ -824,21 +828,21 @@ Preimage.fromTransaction = function(transaction, inputIndex, subscript, satoshis
  */
 Preimage.createExample = function(sighashType) {
   // Create a simple example transaction
-  var privateKey = bsv.PrivateKey.fromRandom()
+  var privateKey = PrivateKey.fromRandom()
   var address = privateKey.toAddress()
 
   var utxo = {
     txId: '0'.repeat(64),
     outputIndex: 0,
-    script: bsv.Script.buildPublicKeyHashOut(address).toHex(),
+    script: Script.buildPublicKeyHashOut(address).toHex(),
     satoshis: 100000
   }
 
-  var transaction = new bsv.Transaction()
+  var transaction = new Transaction()
     .from(utxo)
     .to(address, 99000)
 
-  var subscript = bsv.Script.fromHex(utxo.script)
+  var subscript = Script.fromHex(utxo.script)
   
   return Preimage.fromTransaction(transaction, 0, subscript, utxo.satoshis, sighashType)
 }