@smartledger/bsv 5.4.0 → 5.4.2

package/lib/ltp/index.js

@@ -63,16 +63,11 @@ LTP.prototype.createRightToken = function(rightData, privateKey, options) {
       }
     }
     
-    // Add cryptographic proof
+    // Add cryptographic proof. Sign via the right-token signer (which sets
+    // proof.jws + tokenHash); the older LTPProof.createSignature entrypoint no
+    // longer exists (proof.js exposes prepareSignatureProof).
     if (options.addProof !== false) {
-      var proofResult = LTPProof.createSignature(token, privateKey, {
-        purpose: 'assertionMethod'
-      })
-      
-      if (proofResult.success) {
-        token.proof = proofResult.proof
-        token.tokenHash = proofResult.tokenHash
-      }
+      token = LTPRight._signToken(token, privateKey)
     }
     
     // Anchor to blockchain if requested
@@ -128,7 +123,7 @@ LTP.prototype.validateClaim = function(claimData, schemaType) {
  * @returns {Object} Selective disclosure proof
  */
 LTP.prototype.createSelectiveDisclosure = function(token, revealedFields, nonce) {
-  return LTPProof.createSelectiveDisclosure(token, revealedFields, nonce)
+  return LTPProof.prepareSelectiveDisclosure(token, revealedFields, nonce)
 }
 
 /**
@@ -144,8 +139,12 @@ LTP.prototype.verifyToken = function(token, publicKey) {
       error: 'No proof found in token'
     }
   }
-  
-  return LTPProof.verifySignature(token, publicKey)
+
+  // Instance-created tokens (right/transfer/obligation) are signed by
+  // RightToken._signToken (detached ES256K JWS + tokenHash), so verification
+  // goes through the matching RightToken.verifyToken rather than the
+  // proofValue-based LTPProof path.
+  return LTPRight.verifyToken(token, publicKey)
 }
 
 /**
@@ -164,7 +163,7 @@ LTP.prototype.transferRight = function(token, newOwner, ownerKey, options) {
   options = options || {}
   
   try {
-    // Verify current ownership
+    // Verify current ownership against the owner's key before transferring.
     var verification = this.verifyToken(token, ownerKey.toPublicKey().toString())
     if (!verification.valid) {
       return {
@@ -172,23 +171,21 @@ LTP.prototype.transferRight = function(token, newOwner, ownerKey, options) {
         error: 'Invalid token or ownership proof'
       }
     }
-    
-    // Create transfer
-    var transferResult = LTPRight.transfer(token, newOwner, ownerKey, options)
-    
+
+    // Build and sign the transferred token. prepareRightTokenTransfer signs
+    // the new token with the current owner's key, so no separate proof step
+    // is needed.
+    var transferResult = LTPRight.prepareRightTokenTransfer(token, newOwner, ownerKey, options)
+    if (!transferResult.success) {
+      return {
+        success: false,
+        error: transferResult.error
+      }
+    }
+
     var transferredToken = transferResult.newToken
     var transferProof = transferResult.transferProof
-    
-    // Add new proof with new owner
-    var proofResult = LTPProof.createSignature(transferredToken, ownerKey, {
-      purpose: 'authentication'
-    })
-    
-    if (proofResult.success) {
-      transferredToken.proof = proofResult.proof
-      transferredToken.tokenHash = proofResult.tokenHash
-    }
-    
+
     // Anchor transfer if requested
     if (options.anchor) {
       var anchorResult = LTPAnchor.anchorToken(transferredToken, options.anchor)
@@ -243,29 +240,20 @@ LTP.prototype.createObligation = function(rightToken, obligationData, privateKey
   $.checkArgument(privateKey instanceof PrivateKey, 'Invalid private key')
   
   try {
-    // Create obligation token
-    var obligation = LTPRight.createObligation(rightToken, obligationData.obligor, obligationData, privateKey)
-    
-    if (!obligation) {
+    // Build and sign the correlative obligation token. prepareObligationToken
+    // signs inline via _signToken, so no separate proof step is needed.
+    var obligationResult = LTPRight.prepareObligationToken(rightToken, obligationData.obligor, obligationData, privateKey)
+
+    if (!obligationResult.success) {
       return {
         success: false,
-        error: 'Failed to create obligation'
+        error: obligationResult.error
       }
     }
-    
-    // Add proof
-    var proofResult = LTPProof.createSignature(obligation, privateKey, {
-      purpose: 'assertionMethod'
-    })
-    
-    if (proofResult.success) {
-      obligation.proof = proofResult.proof
-      obligation.tokenHash = proofResult.tokenHash
-    }
-    
+
     return {
       success: true,
-      obligation: obligation,
+      obligation: obligationResult.obligationToken,
       rightTokenId: rightToken.id
     }
     
@@ -360,7 +348,7 @@ LTP.prototype.getRegistryStats = function() {
  * @returns {Object} Legal validity proof
  */
 LTP.prototype.createLegalValidityProof = function(token, jurisdiction, nonce) {
-  return LTPProof.createLegalValidityProof(token, jurisdiction, nonce)
+  return LTPProof.prepareLegalValidityProof(token, jurisdiction, nonce)
 }
 
 /**

package/lib/ltp/right.js

@@ -3,6 +3,7 @@
 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 _ = require('../util/_')
@@ -40,7 +41,60 @@ var RightTypes = {
  * Legal Right Token
  */
 var RightToken = {
-  
+
+  /**
+   * Build an (unsigned) legal right token structure. Callers that need a signed
+   * token use prepareRightToken (signs inline) or add their own proof afterward
+   * (e.g. LTP#createRightToken via LTPProof).
+   * @param {String} type - Right type (from RightTypes)
+   * @param {String} issuerDID - Issuer DID
+   * @param {String} subjectDID - Subject DID
+   * @param {Object} claim - Legal claim object
+   * @param {PrivateKey} [issuerPrivateKey] - unused here; accepted for signature parity
+   * @param {Object} options - Additional options
+   * @returns {Object} Unsigned legal right token
+   */
+  create: function(type, issuerDID, subjectDID, claim, issuerPrivateKey, options) {
+    options = options || {}
+
+    $.checkArgument(typeof type === 'string', 'Right type must be string')
+    $.checkArgument(typeof issuerDID === 'string', 'Issuer DID must be string')
+    $.checkArgument(typeof subjectDID === 'string', 'Subject DID must be string')
+    $.checkArgument(claim && typeof claim === 'object', 'Claim must be object')
+
+    var validTypes = Object.values(RightTypes)
+    $.checkArgument(validTypes.includes(type), 'Invalid right type: ' + type)
+
+    var rightToken = {
+      '@context': [
+        'https://www.w3.org/2018/credentials/v1',
+        'https://smartledger.technology/contexts/ltp/v1'
+      ],
+      id: 'urn:uuid:' + this._generateUUID(),
+      type: ['VerifiableCredential', 'LegalRightToken', type],
+      issuer: issuerDID,
+      issuanceDate: new Date().toISOString(),
+      credentialSubject: {
+        id: subjectDID,
+        rightType: type,
+        claim: claim,
+        jurisdiction: options.jurisdiction || 'US',
+        purpose: options.purpose || 'legal_right',
+        validFrom: options.validFrom || new Date().toISOString(),
+        validUntil: options.validUntil || null,
+        transferable: options.transferable !== false,
+        revocable: options.revocable !== false
+      }
+    }
+
+    // Add metadata
+    if (options.metadata) {
+      rightToken.credentialSubject.metadata = options.metadata
+    }
+
+    return rightToken
+  },
+
   /**
    * Prepare legal right token for external processing
    * @param {String} type - Right type (from RightTypes)
@@ -65,33 +119,8 @@ var RightToken = {
     $.checkArgument(validTypes.includes(type), 'Invalid right type: ' + type)
     
     try {
-      var rightToken = {
-        '@context': [
-          'https://www.w3.org/2018/credentials/v1',
-          'https://smartledger.technology/contexts/ltp/v1'
-        ],
-        id: 'urn:uuid:' + this._generateUUID(),
-        type: ['VerifiableCredential', 'LegalRightToken', type],
-        issuer: issuerDID,
-        issuanceDate: new Date().toISOString(),
-        credentialSubject: {
-          id: subjectDID,
-          rightType: type,
-          claim: claim,
-          jurisdiction: options.jurisdiction || 'US',
-          purpose: options.purpose || 'legal_right',
-          validFrom: options.validFrom || new Date().toISOString(),
-          validUntil: options.validUntil || null,
-          transferable: options.transferable !== false,
-          revocable: options.revocable !== false
-        }
-      }
-      
-      // Add metadata
-      if (options.metadata) {
-        rightToken.credentialSubject.metadata = options.metadata
-      }
-      
+      var rightToken = this.create(type, issuerDID, subjectDID, claim, issuerPrivateKey, options)
+
       // Sign the token
       var signedToken = this._signToken(rightToken, issuerPrivateKey)
       
@@ -540,6 +569,72 @@ var RightToken = {
   getRightTypes: function() {
     return RightTypes
   },
+
+  /**
+   * Verify a token signed by _signToken against a public key.
+   *
+   * Tokens produced here carry a detached ES256K JWS in proof.jws plus the
+   * canonical tokenHash. Verification recomputes the canonical hash (catching
+   * tampering of any field), confirms it matches the stored tokenHash, then
+   * checks the ECDSA signature embedded in the JWS against the supplied public
+   * key. This is the verification counterpart to _signToken and works for
+   * right, transfer and obligation tokens alike — all are signed the same way.
+   *
+   * @param {Object} token - Token with a proof.jws produced by _signToken
+   * @param {String|PublicKey} publicKey - Expected signer's public key
+   * @returns {Object} { valid, errors, tokenHash, verifiedAt }
+   */
+  verifyToken: function(token, publicKey) {
+    var errors = []
+    try {
+      $.checkArgument(token && typeof token === 'object', 'Invalid token')
+
+      if (!token.proof || !token.proof.jws) {
+        errors.push('Missing signature proof')
+        return { valid: false, errors: errors }
+      }
+
+      var pubKey = publicKey instanceof bsv.PublicKey
+        ? publicKey
+        : bsv.PublicKey.fromString(publicKey)
+
+      // Recompute the canonical hash and confirm integrity.
+      var canonicalToken = this._canonicalizeToken(token)
+      var tokenHash = Hash.sha256(Buffer.from(canonicalToken))
+
+      if (token.tokenHash && token.tokenHash !== tokenHash.toString('hex')) {
+        errors.push('Token hash mismatch')
+        return { valid: false, errors: errors }
+      }
+
+      // Extract the DER signature from the detached JWS (header..signature).
+      var parts = token.proof.jws.split('.')
+      if (parts.length !== 3 || !parts[2]) {
+        errors.push('Malformed JWS')
+        return { valid: false, errors: errors }
+      }
+      var signature = Signature.fromDER(Buffer.from(parts[2], 'base64url'))
+
+      var ecdsa = new ECDSA()
+      ecdsa.hashbuf = tokenHash
+      ecdsa.sig = signature
+      ecdsa.pubkey = pubKey
+
+      if (!ecdsa.verify().verified) {
+        errors.push('Signature verification failed')
+      }
+
+      return {
+        valid: errors.length === 0,
+        errors: errors,
+        tokenHash: tokenHash.toString('hex'),
+        verifiedAt: new Date().toISOString()
+      }
+    } catch (error) {
+      errors.push(error.message)
+      return { valid: false, errors: errors }
+    }
+  },
   
   /**
    * Sign a token with private key
@@ -577,19 +672,23 @@ var RightToken = {
   },
   
   /**
-   * Sign a token with private key
+   * Build a detached compact JWS (RFC 7797) for a token hash + ECDSA signature.
+   * The payload segment is intentionally empty (header..signature) because the
+   * signed content is the canonical token hash, carried separately as tokenHash.
    * @private
+   * @param {Buffer} hash - 32-byte canonical token hash
+   * @param {Signature} signature - ECDSA signature over the hash
+   * @returns {String} compact detached JWS
    */
-  _signToken: function(token, privateKey) {
+  _createJWS: function(hash, signature) {
     var header = {
       alg: 'ES256K',
       typ: 'JWT'
     }
-    
+
     var headerB64 = Buffer.from(JSON.stringify(header)).toString('base64url')
-    var payloadB64 = hash.toString('base64url')
     var signatureB64 = signature.toDER().toString('base64url')
-    
+
     return headerB64 + '..' + signatureB64
   },
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartledger/bsv",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "description": "🚀 Complete Bitcoin SV development framework with legally-recognizable DID:web + W3C VC-JWT toolkit, Legal Token Protocol (LTP), Global Digital Attestation Framework (GDAF), StatusList2021 revocation, and 16 flexible loading options. Standards-based credentials with ES256/ES256K support, on-chain BSV anchoring, and comprehensive Bitcoin SV API. Perfect for legal tokens, verifiable credentials, DeFi, smart contracts, and secure Bitcoin applications.",
   "author": "SmartLedger Technology <hello@smartledger.technology> (https://smartledger.technology)",
   "homepage": "https://github.com/codenlighten/smartledger-bsv#readme",
@@ -196,7 +196,7 @@
     "@noble/curves": "2.2.0",
     "@noble/hashes": "2.2.0",
     "aes-js": "^3.1.2",
-    "bn.js": "=4.11.9",
+    "bn.js": "=4.12.3",
     "bs58": "=4.0.1",
     "clone-deep": "^4.0.1",
     "hash.js": "^1.1.7",
@@ -212,8 +212,8 @@
     "chai": "4.2.0",
     "crypto-browserify": "^3.12.1",
     "jose": "^5.10.0",
-    "mocha": "^8.4.0",
-    "nyc": "^14.1.1",
+    "mocha": "^11.7.6",
+    "nyc": "^18.0.0",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "sinon": "7.2.3",