@bsv/templates 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/templates",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "type": "module",
   "description": "BSV Blockchain Script Templates",
   "main": "dist/cjs/mod.js",
@@ -24,18 +24,10 @@
       "require": "./dist/cjs/src/*.js"
     }
   },
-  "scripts": {
-    "test": "npm run build && jest",
-    "test:watch": "npm run build && jest --watch",
-    "test:coverage": "npm run build && jest --coverage",
-    "lint": "ts-standard --fix 'src/**/*.ts'",
-    "build": "tsc -b && tsconfig-to-dual-package tsconfig.cjs.json",
-    "dev": "tsc -b -w",
-    "prepublish": "npm run build"
-  },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bsv-blockchain/ts-templates.git"
+    "url": "git+https://github.com/bsv-blockchain/ts-stack.git",
+    "directory": "packages/helpers/ts-templates"
   },
   "keywords": [
     "BSV",
@@ -48,19 +40,28 @@
   "author": "BSV Association",
   "license": "SEE LICENSE IN LICENSE.txt",
   "bugs": {
-    "url": "https://github.com/bsv-blockchain/ts-templates/issues"
+    "url": "https://github.com/bsv-blockchain/ts-stack/issues"
   },
-  "homepage": "https://github.com/bsv-blockchain/ts-templates#readme",
+  "homepage": "https://github.com/bsv-blockchain/ts-stack/tree/main/packages/helpers/ts-templates#readme",
   "devDependencies": {
-    "@bsv/wallet-toolbox": "^1.6.23",
-    "@types/jest": "^29.5.12",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.1.1",
+    "@bsv/wallet-toolbox": "^2.1.27",
+    "@types/jest": "^30.0.0",
+    "jest": "^30.3.0",
+    "ts-jest": "^29.4.9",
     "ts-standard": "^12.0.2",
     "tsconfig-to-dual-package": "^1.2.0",
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@bsv/sdk": "^1.7.6"
+    "@bsv/sdk": "^2.1.2"
+  },
+  "scripts": {
+    "test": "npm run build && jest --passWithNoTests",
+    "test:watch": "npm run build && jest --watch",
+    "test:coverage": "npm run build && jest --coverage",
+    "lint": "ts-standard --fix 'src/**/*.ts'",
+    "build": "tsc -b && tsconfig-to-dual-package tsconfig.cjs.json",
+    "dev": "tsc -b -w",
+    "prepublish": "npm run build"
   }
-}
+}

package/src/MultiPushDrop.ts

@@ -173,20 +173,16 @@ export class MultiPushDrop implements ScriptTemplate {
 
     // Pick the value on the stack that's right before the locking script.
     // This should be the index of the key to use in the unlock.
-    lockPart.push(createMinimallyEncodedScriptChunk([nPublicKeys]))
-    lockPart.push({ op: OP.OP_PICK })
+    lockPart.push(createMinimallyEncodedScriptChunk([nPublicKeys]), { op: OP.OP_PICK })
 
     // Now we use the index to get the actual key.
     lockPart.push({ op: OP.OP_PICK })
 
     // We pull the signature from the bottom of the stack, no matter the number of keys.
-    lockPart.push({ op: OP.OP_DEPTH })
-    lockPart.push({ op: OP.OP_1SUB })
-    lockPart.push({ op: OP.OP_PICK })
+    lockPart.push({ op: OP.OP_DEPTH }, { op: OP.OP_1SUB }, { op: OP.OP_PICK })
 
     // We swap the signature and public key so they're in the correct order, then CHECKSIGVERIFY
-    lockPart.push({ op: OP.OP_SWAP })
-    lockPart.push({ op: OP.OP_CHECKSIGVERIFY })
+    lockPart.push({ op: OP.OP_SWAP }, { op: OP.OP_CHECKSIGVERIFY })
 
     // Construct PushDrop Part for fields
     const pushDropPart: Array<{ op: number, data?: number[] }> = []
@@ -302,8 +298,7 @@ export class MultiPushDrop implements ScriptTemplate {
 
         // Create Unlocking Script Chunks: <Signature> <Index>
         const unlockingChunks: Array<{ op: number, data?: number[] }> = []
-        unlockingChunks.push({ op: sigForScript.length, data: sigForScript })
-        unlockingChunks.push(createMinimallyEncodedScriptChunk([unlockerIndex]))
+        unlockingChunks.push({ op: sigForScript.length, data: sigForScript }, createMinimallyEncodedScriptChunk([unlockerIndex]))
         return new UnlockingScript(unlockingChunks)
       },
       // Estimate length: Signature (~71-73 bytes) + Index push (1 byte for 0-15, potentially more)

package/src/P2MSKH.ts

@@ -7,7 +7,7 @@ export interface MultiSigInstructions {
 }
 
 function concatPubkeys (pubkeys: PublicKey[]): number[] {
-  return pubkeys.map((p) => p.toDER() as number[]).reduce((a, b) => a.concat(b), [])
+  return pubkeys.map((p) => p.toDER() as number[]).flat()
 }
 
 function numberFromScriptChunk (chunk: ScriptChunk): number {
@@ -192,7 +192,7 @@ export class P2MSKH implements ScriptTemplate {
         workingUnlockingScript.writeBin(sigForScript)
         const chunkforSig = workingUnlockingScript.chunks.pop() as ScriptChunk
         // add it to the array before the pubkeys, pushing the other content to the right
-        workingUnlockingScript.chunks.splice(workingUnlockingScript.chunks.length - 1, 0, chunkforSig)
+        workingUnlockingScript.chunks.splice(-1, 0, chunkforSig)
         return workingUnlockingScript
       },