@smartledger/bsv 7.8.0 → 7.9.0

package/test/script/string_ops.js

@@ -7,10 +7,15 @@ var Interpreter = bsv.Script.Interpreter
 var Script = bsv.Script
 var Opcode = bsv.Opcode
 var Transaction = bsv.Transaction
+var CHRONICLE = Interpreter.SCRIPT_ENABLE_CHRONICLE
 
-// OP_SUBSTR / OP_LEFT / OP_RIGHT — re-enabled BSV (Chronicle) string opcodes,
-// original Satoshi semantics. Declared in the opcode map at 0xb3/0xb4/0xb5 but
-// previously unimplemented (BAD_OPCODE). These tests verify behavior end-to-end.
+// OP_SUBSTR / OP_LEFT / OP_RIGHT — Chronicle string opcodes at 0xb3/0xb4/0xb5.
+//
+// Every case here passes SCRIPT_ENABLE_CHRONICLE, because without it these
+// bytes are UPGRADABLE NOPS, exactly as they are on a pre-Chronicle node. An
+// earlier version of these tests ran them with flags=0 and passed, which is
+// what hid the fact that the interpreter was executing them unconditionally —
+// more permissively than the network.
 describe('String opcodes OP_SUBSTR / OP_LEFT / OP_RIGHT', function () {
   var DATA = Buffer.from('aabbccdd', 'hex')
 
@@ -20,14 +25,14 @@ describe('String opcodes OP_SUBSTR / OP_LEFT / OP_RIGHT', function () {
     buildOps(lock)
     lock.add(Buffer.from(expectedHex, 'hex')).add(Opcode.OP_EQUAL)
     var interp = new Interpreter()
-    return interp.verify(new Script(), lock, new Transaction(), 0, 0)
+    return interp.verify(new Script(), lock, new Transaction(), 0, CHRONICLE)
   }
   function errors (buildOps) {
     var lock = new Script().add(DATA)
     buildOps(lock)
     var interp = new Interpreter()
     var ok
-    try { ok = interp.verify(new Script(), lock, new Transaction(), 0, 0) } catch (e) { ok = false }
+    try { ok = interp.verify(new Script(), lock, new Transaction(), 0, CHRONICLE) } catch (e) { ok = false }
     return ok === false
   }
 
@@ -52,12 +57,23 @@ describe('String opcodes OP_SUBSTR / OP_LEFT / OP_RIGHT', function () {
     yields(function (s) { s.add(Opcode.OP_1).add(Opcode.OP_2).add(Opcode.OP_SUBSTR) }, 'bbcc').should.equal(true)
   })
 
-  it('OP_LEFT clamps n greater than the length', function () {
-    yields(function (s) { s.add(Opcode.OP_10).add(Opcode.OP_LEFT) }, 'aabbccdd').should.equal(true)
+  // The node ERRORS rather than clamping:
+  //   if(len < 0 || len > size) return SCRIPT_ERR_INVALID_NUMBER_RANGE;
+  // Clamping made scripts the node rejects succeed here.
+  it('OP_LEFT rejects n greater than the length', function () {
+    errors(function (s) { s.add(Opcode.OP_10).add(Opcode.OP_LEFT) }).should.equal(true)
   })
 
-  it('OP_RIGHT clamps n greater than the length', function () {
-    yields(function (s) { s.add(Opcode.OP_10).add(Opcode.OP_RIGHT) }, 'aabbccdd').should.equal(true)
+  it('OP_RIGHT rejects n greater than the length', function () {
+    errors(function (s) { s.add(Opcode.OP_10).add(Opcode.OP_RIGHT) }).should.equal(true)
+  })
+
+  it('is a no-op without SCRIPT_ENABLE_CHRONICLE, as a pre-Chronicle node is', function () {
+    const interp = new Interpreter()
+    const lock = new Script().add(DATA).add(Opcode.OP_2).add(Opcode.OP_LEFT)
+    interp.verify(new Script(), lock, new Transaction(), 0, 0).should.equal(true)
+    // Untouched: the opcode did nothing, so both operands survive.
+    interp.stack.length.should.equal(2)
   })
 
   it('rejects a negative size', function () {
@@ -67,6 +83,6 @@ describe('String opcodes OP_SUBSTR / OP_LEFT / OP_RIGHT', function () {
   it('rejects OP_LEFT with too few stack items', function () {
     var interp = new Interpreter()
     var lock = new Script().add(Opcode.OP_LEFT) // nothing to operate on
-    interp.verify(new Script(), lock, new Transaction(), 0, 0).should.equal(false)
+    interp.verify(new Script(), lock, new Transaction(), 0, CHRONICLE).should.equal(false)
   })
 })

package/version.js

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