Merge pull request #244 from sCrypt-Inc/checkNOPScript

rename
sCrypt-Inc · Sep 18, 2023 · 56707f6 · 56707f6
2 parents 1e9f95b + 92bd2c4
commit 56707f6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.1.29
+
+- rename `this.setNOPScript()` to `this.prependNOPScript()`
+
+
 ## 2.1.28
 
 - check nopscript when call `this.setNOPScript()`

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scryptlib",
-  "version": "2.1.28",
+  "version": "2.1.29",
   "description": "Javascript SDK for integration of Bitcoin SV Smart Contracts written in sCrypt language.",
   "engines": {
     "node": ">=14.0.0"

diff --git a/src/contract.ts b/src/contract.ts
@@ -476,15 +476,15 @@ export class AbstractContract {
     }
   }
 
-  setNOPScript(nopScript: NOPScript | null): void {
+  prependNOPScript(nopScript: NOPScript | null): void {
     if (nopScript instanceof bsv.Script) {
       checkNOPScript(nopScript);
     }
 
     this.nopScript = nopScript;
   }
 
-  getNOPScript(): NOPScript | null {
+  getPrependNOPScript(): NOPScript | null {
     return this.nopScript;
   }
 

diff --git a/test/counterNOP.test.ts b/test/counterNOP.test.ts
@@ -14,7 +14,7 @@ describe('test.Counter with NOPScript', () => {
         let counter = new Counter()
 
         counter.setDataPartInASM('00')
-        counter.setNOPScript(nopScript)
+        counter.prependNOPScript(nopScript)
 
 
         expect(counter.lockingScript.toASM().startsWith("OP_NOP")).to.true
@@ -71,7 +71,7 @@ describe('test.Counter with NOPScript', () => {
         let nopScript = bsv.Script.fromASM("OP_NOP");
 
         counter.setDataPartInASM('00')
-        counter.setNOPScript(nopScript)
+        counter.prependNOPScript(nopScript)
 
         let callTx = new bsv.Transaction()
             .addDummyInput(counter.lockingScript, 1000)

diff --git a/test/p2pkhNOP.test.ts b/test/p2pkhNOP.test.ts
@@ -14,7 +14,7 @@ describe('test.P2PKH with NOP', () => {
         const DemoP2PKH = buildContractClass(loadArtifact('p2pkh.json'))
         let p2pkh = new DemoP2PKH(Ripemd160(toHex(publicKeyHash)))
         let nopScript = bsv.Script.fromASM("OP_NOP");
-        p2pkh.setNOPScript(nopScript)
+        p2pkh.prependNOPScript(nopScript)
 
         const inputIndex = 0;
         expect(p2pkh.lockingScript.toASM().startsWith("OP_NOP")).to.true
@@ -44,12 +44,12 @@ describe('test.P2PKH with NOP', () => {
         const DemoP2PKH = buildContractClass(loadArtifact('p2pkh.json'))
         let p2pkh = new DemoP2PKH(Ripemd160(toHex(publicKeyHash)))
         expect(() => {
-            p2pkh.setNOPScript(bsv.Script.fromASM("OP_1 OP_IF OP_1 OP_ENDIF"))
+            p2pkh.prependNOPScript(bsv.Script.fromASM("OP_1 OP_IF OP_1 OP_ENDIF"))
         }).to.throw(/NopScript should be a script that does not affect the Bitcoin virtual machine stack\./)
 
 
         expect(() => {
-            p2pkh.setNOPScript(bsv.Script.fromASM("OP_1 OP_RETURN"))
+            p2pkh.prependNOPScript(bsv.Script.fromASM("OP_1 OP_RETURN"))
         }).to.throw(/NopScript should be a script that does not affect the Bitcoin virtual machine stack\./)
     })
 })