@smartledger/bsv 7.9.0 → 7.10.1

package/lib/custom-script-helper.js

@@ -3,7 +3,13 @@
  * Simplified API for custom script development
  */
 
-const bsv = require('../index.js');
+var sighash = require('./transaction/sighash')
+var Interpreter = require('./script/interpreter')
+var Signature = require('./crypto/signature')
+var BN = require('./crypto/bn')
+var Transaction = require('./transaction')
+var Opcode = require('./opcode')
+var Script = require('./script')
 
 class CustomScriptHelper {
   
@@ -18,15 +24,15 @@ class CustomScriptHelper {
    * @returns {Buffer} Complete signature with sighash type
    */
   static createSignature(transaction, privateKey, inputIndex, lockingScript, satoshis, sighashType = null) {
-    sighashType = sighashType || (bsv.crypto.Signature.SIGHASH_ALL | bsv.crypto.Signature.SIGHASH_FORKID);
+    sighashType = sighashType || (Signature.SIGHASH_ALL | Signature.SIGHASH_FORKID);
     
-    const signature = bsv.Transaction.sighash.sign(
+    const signature = sighash.sign(
       transaction,
       privateKey,
       sighashType,
       inputIndex,
       lockingScript,
-      new bsv.crypto.BN(satoshis)
+      new BN(satoshis)
     );
     
     return Buffer.concat([signature.toDER(), Buffer.from([sighashType])]);
@@ -39,15 +45,15 @@ class CustomScriptHelper {
    * @returns {Script} Multi-signature locking script
    */
   static createMultisigScript(m, publicKeys) {
-    let script = new bsv.Script().add(bsv.Opcode[`OP_${m}`]);
+    let script = new Script().add(Opcode[`OP_${m}`]);
     
     for (const pubKey of publicKeys) {
       script = script.add(pubKey.toBuffer());
     }
     
     return script
-      .add(bsv.Opcode[`OP_${publicKeys.length}`])
-      .add(bsv.Opcode.OP_CHECKMULTISIG);
+      .add(Opcode[`OP_${publicKeys.length}`])
+      .add(Opcode.OP_CHECKMULTISIG);
   }
 
   /**
@@ -56,7 +62,7 @@ class CustomScriptHelper {
    * @returns {Script} Unlocking script for multisig
    */
   static createMultisigUnlocking(signatures) {
-    let script = new bsv.Script().add(bsv.Opcode.OP_0); // CHECKMULTISIG bug
+    let script = new Script().add(Opcode.OP_0); // CHECKMULTISIG bug
     
     for (const sig of signatures) {
       script = script.add(sig);
@@ -74,10 +80,10 @@ class CustomScriptHelper {
   static createTimelockScript(lockTime, baseScript) {
     const lockTimeBuffer = Buffer.from(lockTime.toString(16).padStart(8, '0'), 'hex').reverse();
     
-    return new bsv.Script()
+    return new Script()
       .add(lockTimeBuffer)
-      .add(bsv.Opcode.OP_CHECKLOCKTIMEVERIFY)
-      .add(bsv.Opcode.OP_DROP)
+      .add(Opcode.OP_CHECKLOCKTIMEVERIFY)
+      .add(Opcode.OP_DROP)
       .add(baseScript.toBuffer());
   }
 
@@ -88,17 +94,17 @@ class CustomScriptHelper {
    * @returns {Script} Conditional script
    */
   static createConditionalScript(ifScript, elseScript = null) {
-    let script = new bsv.Script()
-      .add(bsv.Opcode.OP_IF)
+    let script = new Script()
+      .add(Opcode.OP_IF)
       .add(ifScript.toBuffer());
     
     if (elseScript) {
       script = script
-        .add(bsv.Opcode.OP_ELSE)
+        .add(Opcode.OP_ELSE)
         .add(elseScript.toBuffer());
     }
     
-    return script.add(bsv.Opcode.OP_ENDIF);
+    return script.add(Opcode.OP_ENDIF);
   }
 
   /**
@@ -107,12 +113,12 @@ class CustomScriptHelper {
    * @returns {Script} P2PKH locking script
    */
   static createP2PKHScript(publicKey) {
-    return new bsv.Script()
-      .add(bsv.Opcode.OP_DUP)
-      .add(bsv.Opcode.OP_HASH160)
+    return new Script()
+      .add(Opcode.OP_DUP)
+      .add(Opcode.OP_HASH160)
       .add(publicKey.toAddress().hashBuffer)
-      .add(bsv.Opcode.OP_EQUALVERIFY)
-      .add(bsv.Opcode.OP_CHECKSIG);
+      .add(Opcode.OP_EQUALVERIFY)
+      .add(Opcode.OP_CHECKSIG);
   }
 
   /**
@@ -122,7 +128,7 @@ class CustomScriptHelper {
    * @returns {Script} P2PKH unlocking script
    */
   static createP2PKHUnlocking(signature, publicKey) {
-    return new bsv.Script()
+    return new Script()
       .add(signature)
       .add(publicKey.toBuffer());
   }
@@ -137,14 +143,14 @@ class CustomScriptHelper {
    * @returns {Buffer} Transaction preimage
    */
   static getPreimage(transaction, inputIndex, lockingScript, satoshis, sighashType = null) {
-    sighashType = sighashType || (bsv.crypto.Signature.SIGHASH_ALL | bsv.crypto.Signature.SIGHASH_FORKID);
+    sighashType = sighashType || (Signature.SIGHASH_ALL | Signature.SIGHASH_FORKID);
     
-    return bsv.Transaction.sighash.sighash(
+    return sighash.sighash(
       transaction,
       sighashType,
       inputIndex,
       lockingScript,
-      new bsv.crypto.BN(satoshis)
+      new BN(satoshis)
     );
   }
 
@@ -157,7 +163,7 @@ class CustomScriptHelper {
     if (typeof data === 'string') {
       data = Buffer.from(data, 'utf8');
     }
-    return new bsv.Script().add(data);
+    return new Script().add(data);
   }
 
   /**
@@ -169,9 +175,9 @@ class CustomScriptHelper {
     if (typeof data === 'string') {
       data = Buffer.from(data, 'utf8');
     }
-    return new bsv.Script()
-      .add(bsv.Opcode.OP_FALSE)
-      .add(bsv.Opcode.OP_RETURN)
+    return new Script()
+      .add(Opcode.OP_FALSE)
+      .add(Opcode.OP_RETURN)
       .add(data);
   }
 
@@ -199,17 +205,17 @@ class CustomScriptHelper {
    */
   static validateScript(unlockingScript, lockingScript, transaction, inputIndex) {
     try {
-      const interpreter = new bsv.Script.Interpreter();
+      const interpreter = new Interpreter();
       return interpreter.verify(
         unlockingScript,
         lockingScript,
         transaction,
         inputIndex,
-        bsv.Script.Interpreter.SCRIPT_VERIFY_P2SH | 
-        bsv.Script.Interpreter.SCRIPT_VERIFY_STRICTENC |
-        bsv.Script.Interpreter.SCRIPT_ENABLE_SIGHASH_FORKID |
-        bsv.Script.Interpreter.SCRIPT_ENABLE_MAGNETIC_OPCODES |
-        bsv.Script.Interpreter.SCRIPT_ENABLE_MONOLITH_OPCODES
+        Interpreter.SCRIPT_VERIFY_P2SH | 
+        Interpreter.SCRIPT_VERIFY_STRICTENC |
+        Interpreter.SCRIPT_ENABLE_SIGHASH_FORKID |
+        Interpreter.SCRIPT_ENABLE_MAGNETIC_OPCODES |
+        Interpreter.SCRIPT_ENABLE_MONOLITH_OPCODES
       );
     } catch (error) {
       console.error('Script validation error:', error.message);
@@ -225,7 +231,7 @@ class CustomScriptHelper {
    * @returns {Transaction} Transaction with ultra-low fees
    */
   static createLowFeeTransaction(utxos, outputs, feePerKb = 10) {
-    let tx = new bsv.Transaction().feePerKb(feePerKb);
+    let tx = new Transaction().feePerKb(feePerKb);
     
     // Add inputs
     for (const utxo of utxos) {
@@ -242,8 +248,8 @@ class CustomScriptHelper {
 }
 
 // Common signature hash types
-CustomScriptHelper.SIGHASH_ALL = bsv.crypto.Signature.SIGHASH_ALL | bsv.crypto.Signature.SIGHASH_FORKID;
-CustomScriptHelper.SIGHASH_NONE = bsv.crypto.Signature.SIGHASH_NONE | bsv.crypto.Signature.SIGHASH_FORKID;
-CustomScriptHelper.SIGHASH_SINGLE = bsv.crypto.Signature.SIGHASH_SINGLE | bsv.crypto.Signature.SIGHASH_FORKID;
+CustomScriptHelper.SIGHASH_ALL = Signature.SIGHASH_ALL | Signature.SIGHASH_FORKID;
+CustomScriptHelper.SIGHASH_NONE = Signature.SIGHASH_NONE | Signature.SIGHASH_FORKID;
+CustomScriptHelper.SIGHASH_SINGLE = Signature.SIGHASH_SINGLE | Signature.SIGHASH_FORKID;
 
 module.exports = CustomScriptHelper;

package/lib/ecies/bitcore-ecies.js

@@ -20,10 +20,9 @@ var { sha512, sha256 } = require('@noble/hashes/sha2.js')
 var { hmac } = require('@noble/hashes/hmac.js')
 var { cbc } = require('@noble/ciphers/aes.js')
 
-var bsv = require('../../')
-var PublicKey = bsv.PublicKey
-var $ = bsv.util.preconditions
-var Random = bsv.crypto.Random
+var PublicKey = require('../publickey')
+var $ = require('../util/preconditions')
+var Random = require('../crypto/random')
 
 function buf (u8) { return Buffer.from(u8.buffer, u8.byteOffset, u8.byteLength) }
 function hmacSha256 (key, data) { return buf(hmac(sha256, key, data)) }

package/lib/ecies/electrum-ecies.js

@@ -4,11 +4,9 @@
 // and byte-compatible with prior versions (locked by the golden known-answer
 // vector in test/ecies/electrum-ecies.js).
 
-var bsv = require('../../')
-
-var PublicKey = bsv.PublicKey
-var PrivateKey = bsv.PrivateKey
-var $ = bsv.util.preconditions
+var PublicKey = require('../publickey')
+var PrivateKey = require('../privatekey')
+var $ = require('../util/preconditions')
 var bitcoreECIES = require('./bitcore-ecies')
 var errors = require('./errors')
 
@@ -45,7 +43,7 @@ var ECIES = function ECIES (opts, algorithm = 'BIE1') {
   if (!(this instanceof ECIES)) {
     return new ECIES(opts, algorithm)
   }
-  this._privateKey = new bsv.PrivateKey()
+  this._privateKey = new PrivateKey()
   this.opts = opts || {}
   this.opts.ephemeralKey = true
 }

package/lib/ecies/errors.js

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

package/lib/gdaf/attestation-signer.js

@@ -1,12 +1,12 @@
 'use strict'
 
-var bsv = require('../../')
+var Random = require('../crypto/random')
 var DIDResolver = require('./did-resolver')
-var PrivateKey = bsv.PrivateKey
-var Hash = bsv.crypto.Hash
-var ECDSA = bsv.crypto.ECDSA
-var Signature = bsv.crypto.Signature
-var $ = bsv.util.preconditions
+var PrivateKey = require('../privatekey')
+var Hash = require('../crypto/hash')
+var ECDSA = require('../crypto/ecdsa')
+var Signature = require('../crypto/signature')
+var $ = require('../util/preconditions')
 var _ = require('../util/_')
 
 /**
@@ -402,7 +402,7 @@ AttestationSigner.prototype.createOrganizationCredential = function(orgData, opt
  * @private
  */
 AttestationSigner.prototype._generateUUID = function() {
-  var random = bsv.crypto.Random.getRandomBuffer(16)
+  var random = Random.getRandomBuffer(16)
   
   // Set version (4) and variant bits
   random[6] = (random[6] & 0x0f) | 0x40

package/lib/gdaf/attestation-verifier.js

@@ -1,13 +1,12 @@
 'use strict'
 
-var bsv = require('../../')
 var DIDResolver = require('./did-resolver')
 var AttestationSigner = require('./attestation-signer')
-var PublicKey = bsv.PublicKey
-var Hash = bsv.crypto.Hash
-var ECDSA = bsv.crypto.ECDSA
-var Signature = bsv.crypto.Signature
-var $ = bsv.util.preconditions
+var PublicKey = require('../publickey')
+var Hash = require('../crypto/hash')
+var ECDSA = require('../crypto/ecdsa')
+var Signature = require('../crypto/signature')
+var $ = require('../util/preconditions')
 
 /**
  * AttestationVerifier

package/lib/gdaf/did-resolver.js

@@ -1,11 +1,12 @@
 'use strict'
 
-var bsv = require('../../')
-var PublicKey = bsv.PublicKey
-var PrivateKey = bsv.PrivateKey
-var Hash = bsv.crypto.Hash
-var $ = bsv.util.preconditions
-var errors = bsv.errors
+var Signature = require('../crypto/signature')
+var ECDSA = require('../crypto/ecdsa')
+var PublicKey = require('../publickey')
+var PrivateKey = require('../privatekey')
+var Hash = require('../crypto/hash')
+var $ = require('../util/preconditions')
+var errors = require('../errors')
 
 /**
  * SmartLedger DID Resolver
@@ -272,8 +273,8 @@ DIDResolver.verifyOwnership = function(did, signature, message) {
     var publicKey = DIDResolver.getPublicKey(did)
     var messageHash = Hash.sha256(Buffer.isBuffer(message) ? message : Buffer.from(message, 'utf8'))
     
-    var sig = bsv.crypto.Signature.fromString(signature)
-    var ecdsa = new bsv.crypto.ECDSA()
+    var sig = Signature.fromString(signature)
+    var ecdsa = new ECDSA()
     ecdsa.hashbuf = messageHash
     ecdsa.pubkey = publicKey
     ecdsa.sig = sig
@@ -295,7 +296,7 @@ DIDResolver.signMessage = function(message, privateKey) {
   
   var messageHash = Hash.sha256(Buffer.isBuffer(message) ? message : Buffer.from(message, 'utf8'))
   
-  var ecdsa = new bsv.crypto.ECDSA()
+  var ecdsa = new ECDSA()
   ecdsa.hashbuf = messageHash
   ecdsa.privkey = privateKey
   ecdsa.pubkey = privateKey.toPublicKey()

package/lib/gdaf/smartledger-anchor.js

@@ -1,13 +1,14 @@
 'use strict'
 
-var bsv = require('../../')
-var Transaction = bsv.Transaction
-var Script = bsv.Script
-var PrivateKey = bsv.PrivateKey
-var Address = bsv.Address
-var Hash = bsv.crypto.Hash
-var SPV = bsv.SPV
-var $ = bsv.util.preconditions
+var HDPrivateKey = require('../hdprivatekey')
+var Mnemonic = require('../mnemonic')
+var Transaction = require('../transaction')
+var Script = require('../script')
+var PrivateKey = require('../privatekey')
+var Address = require('../address')
+var Hash = require('../crypto/hash')
+var SPV = require('../spv')
+var $ = require('../util/preconditions')
 
 /**
  * SmartLedgerAnchor
@@ -246,7 +247,7 @@ var AMBIGUOUS_KEYS = ['d', 'seed', 'secret', 'key']
 function isWIF (str) {
   if (typeof str !== 'string' || str.length < 50 || str.length > 53) return false
   try {
-    bsv.PrivateKey.fromWIF(str)
+    PrivateKey.fromWIF(str)
     return true
   } catch (e) { return false }
 }
@@ -255,7 +256,7 @@ function isWIF (str) {
 function isXprv (str) {
   if (typeof str !== 'string' || !/^(xprv|tprv)/.test(str)) return false
   try {
-    bsv.HDPrivateKey.fromString(str)
+    HDPrivateKey.fromString(str)
     return true
   } catch (e) { return false }
 }
@@ -266,7 +267,7 @@ function isMnemonic (str) {
   var words = str.trim().split(/\s+/)
   if ([12, 15, 18, 21, 24].indexOf(words.length) === -1) return false
   try {
-    return bsv.Mnemonic.isValid(str.trim())
+    return Mnemonic.isValid(str.trim())
   } catch (e) { return false }
 }
 
@@ -274,7 +275,7 @@ function isMnemonic (str) {
 function isHexScalar (str) {
   if (typeof str !== 'string' || !/^[0-9a-fA-F]{64}$/.test(str)) return false
   try {
-    bsv.PrivateKey.fromHex(str)
+    PrivateKey.fromHex(str)
     return true
   } catch (e) { return false }
 }

package/lib/gdaf/zk-prover.js

@@ -1,10 +1,10 @@
 'use strict'
 
-var bsv = require('../../')
+var Random = require('../crypto/random')
 var AttestationSigner = require('./attestation-signer')
-var Hash = bsv.crypto.Hash
-var BN = bsv.crypto.BN
-var $ = bsv.util.preconditions
+var Hash = require('../crypto/hash')
+var BN = require('../crypto/bn')
+var $ = require('../util/preconditions')
 
 /**
  * ZKProver
@@ -43,7 +43,7 @@ function ZKProver(options) {
  * @returns {Object} Merkle tree data
  */
 ZKProver.createMerkleTree = function(credential, salt) {
-  salt = salt || bsv.crypto.Random.getRandomBuffer(32).toString('hex')
+  salt = salt || Random.getRandomBuffer(32).toString('hex')
   
   $.checkArgument(credential && typeof credential === 'object', 'Invalid credential')
   
@@ -204,7 +204,7 @@ ZKProver.generateAgeProof = function(birthDate, minimumAge, salt) {
   $.checkArgument(birthDate instanceof Date, 'Birth date must be Date object')
   $.checkArgument(typeof minimumAge === 'number', 'Minimum age must be number')
   
-  salt = salt || bsv.crypto.Random.getRandomBuffer(32).toString('hex')
+  salt = salt || Random.getRandomBuffer(32).toString('hex')
   
   var now = new Date()
   var ageInYears = Math.floor((now - birthDate) / (365.25 * 24 * 60 * 60 * 1000))
@@ -286,7 +286,7 @@ ZKProver.generateRangeProof = function(value, min, max, salt) {
   $.checkArgument(typeof max === 'number', 'Max must be number')
   $.checkArgument(value >= min && value <= max, 'Value not in range')
   
-  salt = salt || bsv.crypto.Random.getRandomBuffer(32).toString('hex')
+  salt = salt || Random.getRandomBuffer(32).toString('hex')
   
   // Create commitment to value
   var commitment = Hash.sha256(Buffer.from(value.toString() + ':' + salt, 'utf8')).toString('hex')
@@ -459,7 +459,7 @@ ZKProver.generateMembershipProof = function(set, value, salt) {
   $.checkArgument(Array.isArray(set), 'Set must be array')
   $.checkArgument(set.includes(value), 'Value not in set')
   
-  salt = salt || bsv.crypto.Random.getRandomBuffer(32).toString('hex')
+  salt = salt || Random.getRandomBuffer(32).toString('hex')
   
   // Create commitments to all set members
   var commitments = set.map(function(member) {

package/lib/ltp/anchor.js

@@ -1,8 +1,7 @@
 'use strict'
 
-var bsv = require('../../')
-var Hash = bsv.crypto.Hash
-var $ = bsv.util.preconditions
+var Hash = require('../crypto/hash')
+var $ = require('../util/preconditions')
 
 /**
  * Legal Token Protocol - Blockchain Anchoring Primitives

package/lib/ltp/claim.js

@@ -1,8 +1,7 @@
 'use strict'
 
-var bsv = require('../../')
-var Hash = bsv.crypto.Hash
-var $ = bsv.util.preconditions
+var Hash = require('../crypto/hash')
+var $ = require('../util/preconditions')
 var Id = require('../util/id')
 
 /**

package/lib/ltp/index.js

@@ -7,9 +7,8 @@ var LTPProof = require('./proof')
 var LTPRegistry = require('./registry')
 var LTPObligation = require('./obligation')
 
-var bsv = require('../../')
-var PrivateKey = bsv.PrivateKey
-var $ = bsv.util.preconditions
+var PrivateKey = require('../privatekey')
+var $ = require('../util/preconditions')
 
 /**
  * Legal Token Protocol (LTP) - Main Interface

package/lib/ltp/obligation.js

@@ -1,11 +1,11 @@
 'use strict'
 
-var bsv = require('../../')
-var Hash = bsv.crypto.Hash
-var ECDSA = bsv.crypto.ECDSA
-var Signature = bsv.crypto.Signature
-var PrivateKey = bsv.PrivateKey
-var $ = bsv.util.preconditions
+var PublicKey = require('../publickey')
+var Hash = require('../crypto/hash')
+var ECDSA = require('../crypto/ecdsa')
+var Signature = require('../crypto/signature')
+var PrivateKey = require('../privatekey')
+var $ = require('../util/preconditions')
 var Id = require('../util/id')
 
 /**
@@ -18,16 +18,16 @@ var Id = require('../util/id')
 function _resolveIssuerPublicKey (token, options) {
   options = options || {}
   if (options.issuerPublicKey) {
-    return options.issuerPublicKey instanceof bsv.PublicKey
+    return options.issuerPublicKey instanceof PublicKey
       ? options.issuerPublicKey
-      : bsv.PublicKey.fromString(options.issuerPublicKey)
+      : PublicKey.fromString(options.issuerPublicKey)
   }
   var did = token && token.issuer
   if (typeof did !== 'string') return null
   try {
     var identifier = did.split('#')[0].split(':')[2] // did:method:<identifier>[:...]
     if (!identifier) return null
-    return bsv.PublicKey.fromString(identifier)
+    return PublicKey.fromString(identifier)
   } catch (e) {
     return null
   }

package/lib/ltp/proof.js

@@ -1,11 +1,11 @@
 'use strict'
 
-var bsv = require('../../')
-var Hash = bsv.crypto.Hash
-var ECDSA = bsv.crypto.ECDSA
-var Signature = bsv.crypto.Signature
-var PrivateKey = bsv.PrivateKey
-var $ = bsv.util.preconditions
+var PublicKey = require('../publickey')
+var Hash = require('../crypto/hash')
+var ECDSA = require('../crypto/ecdsa')
+var Signature = require('../crypto/signature')
+var PrivateKey = require('../privatekey')
+var $ = require('../util/preconditions')
 
 /**
  * Legal Token Protocol - Proof Generation Primitives
@@ -129,7 +129,7 @@ var LTPProof = {
       var ecdsa = new ECDSA()
       ecdsa.hashbuf = tokenHash
       ecdsa.sig = signature
-      ecdsa.pubkey = bsv.PublicKey.fromString(publicKey)
+      ecdsa.pubkey = PublicKey.fromString(publicKey)
       
       var isValid = ecdsa.verify() === true
 

package/lib/ltp/registry.js

@@ -1,10 +1,9 @@
 'use strict'
 
-var bsv = require('../../')
-var Hash = bsv.crypto.Hash
-var Address = bsv.Address
-var Transaction = bsv.Transaction
-var $ = bsv.util.preconditions
+var Hash = require('../crypto/hash')
+var Address = require('../address')
+var Transaction = require('../transaction')
+var $ = require('../util/preconditions')
 var Id = require('../util/id')
 
 /**

package/lib/ltp/right.js

@@ -1,11 +1,11 @@
 'use strict'
 
-var bsv = require('../../')
-var Hash = bsv.crypto.Hash
-var ECDSA = bsv.crypto.ECDSA
-var Signature = bsv.crypto.Signature
-var PrivateKey = bsv.PrivateKey
-var $ = bsv.util.preconditions
+var PublicKey = require('../publickey')
+var Hash = require('../crypto/hash')
+var ECDSA = require('../crypto/ecdsa')
+var Signature = require('../crypto/signature')
+var PrivateKey = require('../privatekey')
+var $ = require('../util/preconditions')
 var _ = require('../util/_')
 var Id = require('../util/id')
 
@@ -21,16 +21,16 @@ var Id = require('../util/id')
 function _resolveIssuerPublicKey (token, options) {
   options = options || {}
   if (options.issuerPublicKey) {
-    return options.issuerPublicKey instanceof bsv.PublicKey
+    return options.issuerPublicKey instanceof PublicKey
       ? options.issuerPublicKey
-      : bsv.PublicKey.fromString(options.issuerPublicKey)
+      : PublicKey.fromString(options.issuerPublicKey)
   }
   var did = token && token.issuer
   if (typeof did !== 'string') return null
   try {
     var identifier = did.split('#')[0].split(':')[2] // did:method:<identifier>[:...]
     if (!identifier) return null
-    return bsv.PublicKey.fromString(identifier)
+    return PublicKey.fromString(identifier)
   } catch (e) {
     return null
   }
@@ -647,9 +647,9 @@ var RightToken = {
         return { valid: false, errors: errors }
       }
 
-      var pubKey = publicKey instanceof bsv.PublicKey
+      var pubKey = publicKey instanceof PublicKey
         ? publicKey
-        : bsv.PublicKey.fromString(publicKey)
+        : PublicKey.fromString(publicKey)
 
       // Recompute the canonical hash and confirm integrity.
       var canonicalToken = this._canonicalizeToken(token)

package/lib/message/index.js

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

package/lib/message/message.js

@@ -1,16 +1,16 @@
 'use strict'
 
-var bsv = require('../../')
-var _ = bsv.deps._
-var PrivateKey = bsv.PrivateKey
-var PublicKey = bsv.PublicKey
-var Address = bsv.Address
-var BufferWriter = bsv.encoding.BufferWriter
-var ECDSA = bsv.crypto.ECDSA
-var Signature = bsv.crypto.Signature
-var sha256sha256 = bsv.crypto.Hash.sha256sha256
-var JSUtil = bsv.util.js
-var $ = bsv.util.preconditions
+var Hash = require('../crypto/hash')
+var _ = require('../util/_')
+var PrivateKey = require('../privatekey')
+var PublicKey = require('../publickey')
+var Address = require('../address')
+var BufferWriter = require('../encoding/bufferwriter')
+var ECDSA = require('../crypto/ecdsa')
+var Signature = require('../crypto/signature')
+var sha256sha256 = Hash.sha256sha256
+var JSUtil = require('../util/js')
+var $ = require('../util/preconditions')
 
 /**
  * constructs a new message to sign and verify.