@smartledger/bsv 9.3.0 → 9.5.0

package/lib/smart_contract/dsl.js

@@ -28,6 +28,11 @@ var Opcode = require('../opcode')
 var Transaction = require('../transaction')
 var n = helpers.scriptNum
 
+// Consensus constants, named so the compiled script can be read against the node.
+var LOCKTIME_THRESHOLD = 500000000 // below: block height. at or above: unix time.
+var SEQUENCE_FINAL = Buffer.from([0xff, 0xff, 0xff, 0xff])
+var SIGN_PAD = Buffer.from([0x00]) // makes an unsigned 32-bit field read positive
+
 function toOutput (dest, satoshis) {
   if (dest instanceof Transaction.Output) return dest
   if (dest instanceof Script) return new Transaction.Output({ script: dest, satoshis: satoshis })
@@ -59,8 +64,22 @@ Policy.prototype.payTo = function (dest, satoshis) {
   return this
 }
 
-/** Require the spend's nLockTime to be >= height. */
+/**
+ * Require the spend's nLockTime to be >= height.
+ *
+ * Below LOCKTIME_THRESHOLD (500000000) the value is a BLOCK HEIGHT; at or above
+ * it, a UNIX TIMESTAMP. The compiled script enforces the same unit the floor
+ * uses, so a height floor cannot be satisfied by a timestamp.
+ *
+ * 0 is rejected: consensus reads nLockTime 0 as "no lock" and treats the
+ * transaction as final regardless of any input's sequence, so a floor of 0
+ * would compile to a lock that binds nothing.
+ */
 Policy.prototype.lockUntil = function (height) {
+  if (!Number.isInteger(height) || height < 1 || height > 0xffffffff) {
+    throw new Error('lockUntil: expected an integer in 1..4294967295, got ' + height +
+      ' (nLockTime 0 means "no lock" — consensus treats such a transaction as final)')
+  }
   this._minLockTime = height
   return this
 }
@@ -75,7 +94,11 @@ Policy.prototype.describe = function () {
   this._outputs.forEach(function (o, i) {
     parts.push('output[' + i + '] = ' + o.satoshis + ' sat to ' + o.script.toASM().slice(0, 24) + '...')
   })
-  if (this._minLockTime !== null) parts.push('nLockTime >= ' + this._minLockTime)
+  if (this._minLockTime !== null) {
+    var unit = this._minLockTime < LOCKTIME_THRESHOLD ? 'block height' : 'unix time'
+    parts.push('nLockTime >= ' + this._minLockTime + ' as a ' + unit)
+    parts.push('this input is non-final (nSequence != 0xffffffff)')
+  }
   return 'spend allowed iff: ' + parts.join(' AND ')
 }
 
@@ -97,9 +120,38 @@ Policy.prototype.compile = function () {
   }
 
   if (this._minLockTime !== null) {
+    // A time lock is three consensus rules, not one comparison. All three are in
+    // the node's CheckLockTime; checking only the number reproduces none of them.
+
+    // 1. nSequence of THIS input must be non-final. IsFinalTx() ignores nLockTime
+    //    outright when every input is 0xffffffff, so without this the spend is
+    //    minable in the next block no matter how large a locktime it declares.
+    //    One non-final input is enough to make the whole transaction non-final,
+    //    and this input is the only one the preimage lets us see.
+    s.add(Opcode.OP_DUP)
+    s.add(n(44)).add(Opcode.OP_RIGHT).add(n(4)).add(Opcode.OP_LEFT) // last 44, first 4 = nSequence
+    s.add(SEQUENCE_FINAL).add(Opcode.OP_EQUAL).add(Opcode.OP_NOT).add(Opcode.OP_VERIFY)
+
+    // 2. nLockTime is an UNSIGNED 32-bit field, and OP_BIN2NUM reads a SIGNED
+    //    one. From 19 Jan 2038 the high bit is set, and 0x80000000 minimally
+    //    encodes to negative zero — the floor would be compared against 0 and no
+    //    spend would ever satisfy it. Sign-pad to five bytes first. That push is
+    //    only legal because OP_BIN2NUM now honours the era's script-number width.
     s.add(Opcode.OP_DUP)
     s.add(n(8)).add(Opcode.OP_RIGHT).add(n(4)).add(Opcode.OP_LEFT) // last 8, first 4 = nLockTime
-    s.add(Opcode.OP_BIN2NUM).add(n(this._minLockTime)).add(Opcode.OP_GREATERTHANOREQUAL).add(Opcode.OP_VERIFY)
+    s.add(SIGN_PAD).add(Opcode.OP_CAT).add(Opcode.OP_BIN2NUM)
+
+    // 3. Units must match the floor's. Consensus reads nLockTime below
+    //    LOCKTIME_THRESHOLD as a height and at or above it as a timestamp, so a
+    //    bare `>=` lets a long-past timestamp clear a future height floor —
+    //    1500000000 >= 900000 is true, and that transaction is minable today.
+    //    A floor already at or above the threshold needs no guard: `>= floor`
+    //    implies `>= threshold`.
+    if (this._minLockTime < LOCKTIME_THRESHOLD) {
+      s.add(Opcode.OP_DUP).add(n(LOCKTIME_THRESHOLD)).add(Opcode.OP_LESSTHAN).add(Opcode.OP_VERIFY)
+    }
+
+    s.add(n(this._minLockTime)).add(Opcode.OP_GREATERTHANOREQUAL).add(Opcode.OP_VERIFY)
   }
 
   s.add(Opcode.OP_DROP).add(Opcode.OP_1) // drop preimage; succeed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartledger/bsv",
-  "version": "9.3.0",
+  "version": "9.5.0",
   "description": "Bitcoin SV library with an interpreter-verified script engine: OP_PUSH_TX covenants, BIP-143 preimage tooling, and consensus flags that match what miners actually enforce. Also ships DID:web / W3C VC-JWT credentials and the Legal Token Protocol.",
   "author": "SmartLedger Technology <hello@smartledger.technology> (https://smartledger.technology)",
   "homepage": "https://github.com/codenlighten/smartledger-bsv#readme",
@@ -118,7 +118,7 @@
     "test:all": "npm test && npm run test:covenants && npm run test:scripts",
     "coverage": "nyc --reporter=text npm run test",
     "demo": "node demos/smart_contract_demo.js",
-    "demo:web": "echo '\ud83c\udf10 Open demos/smart_contract_demo.html in your browser'",
+    "demo:web": "echo '🌐 Open demos/smart_contract_demo.html in your browser'",
     "demo:basics": "node demos/smart_contract_demo.js --feature basics",
     "demo:covenant": "node demos/smart_contract_demo.js --feature covenant",
     "demo:preimage": "node demos/smart_contract_demo.js --feature preimage",
@@ -127,7 +127,7 @@
     "demo:legacy": "npm run test:covenants",
     "demo:legacy:basic": "npm run test:basic",
     "demo:legacy:scripts": "npm run test:scripts",
-    "demo:legacy:preimage": "echo '\ud83e\udde0 BIP-143 Preimage Extractor Demo' && node examples/preimage/extract_preimage_bidirectional.js",
+    "demo:legacy:preimage": "echo '🧠 BIP-143 Preimage Extractor Demo' && node examples/preimage/extract_preimage_bidirectional.js",
     "smart-contracts": "node examples/smart_contract_templates.js",
     "smart-contracts:working": "node examples/final_working_contracts.js",
     "workflow": "node examples/complete_workflow_demo.js",

package/version.js

@@ -1,3 +1,3 @@
 'use strict'
 // GENERATED by scripts/sync-version.js on `npm version` — do not edit.
-module.exports = '9.3.0'
+module.exports = '9.5.0'