@bsv/sdk 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/sdk",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "type": "module",
   "description": "BSV Blockchain Software Development Kit",
   "main": "dist/cjs/mod.js",

package/src/script/Script.ts

@@ -355,11 +355,74 @@ export default class Script {
    */
   findAndDelete (script: Script): Script {
     this.invalidateSerializationCaches()
-    const buf = script.toHex()
+    const targetBytes = script.toUint8Array()
+    const targetLen = targetBytes.length
+    if (targetLen === 0) return this
+
+    const targetOp = targetBytes[0] ?? 0
+
+    const matchesChunk = (chunk: ScriptChunk): boolean => {
+      if (chunk.op !== targetOp) return false
+      const dataArr = chunk.data ?? []
+      const dataLen = dataArr.length
+
+      if (dataLen === 0) {
+        return targetLen === 1
+      }
+
+      if (chunk.op === OP.OP_RETURN) {
+        if (targetLen !== 1 + dataLen) return false
+        for (let j = 0; j < dataLen; j++) {
+          if (targetBytes[1 + j] !== dataArr[j]) return false
+        }
+        return true
+      }
+
+      if (chunk.op < OP.OP_PUSHDATA1) {
+        if (targetLen !== 1 + dataLen) return false
+        for (let j = 0; j < dataLen; j++) {
+          if (targetBytes[1 + j] !== dataArr[j]) return false
+        }
+        return true
+      }
+
+      if (chunk.op === OP.OP_PUSHDATA1) {
+        if (targetLen !== 2 + dataLen) return false
+        if (targetBytes[1] !== (dataLen & 0xff)) return false
+        for (let j = 0; j < dataLen; j++) {
+          if (targetBytes[2 + j] !== dataArr[j]) return false
+        }
+        return true
+      }
+
+      if (chunk.op === OP.OP_PUSHDATA2) {
+        if (targetLen !== 3 + dataLen) return false
+        if (targetBytes[1] !== (dataLen & 0xff)) return false
+        if (targetBytes[2] !== ((dataLen >> 8) & 0xff)) return false
+        for (let j = 0; j < dataLen; j++) {
+          if (targetBytes[3 + j] !== dataArr[j]) return false
+        }
+        return true
+      }
+
+      if (chunk.op === OP.OP_PUSHDATA4) {
+        if (targetLen !== 5 + dataLen) return false
+        const size = dataLen >>> 0
+        if (targetBytes[1] !== (size & 0xff)) return false
+        if (targetBytes[2] !== ((size >> 8) & 0xff)) return false
+        if (targetBytes[3] !== ((size >> 16) & 0xff)) return false
+        if (targetBytes[4] !== ((size >> 24) & 0xff)) return false
+        for (let j = 0; j < dataLen; j++) {
+          if (targetBytes[5 + j] !== dataArr[j]) return false
+        }
+        return true
+      }
+
+      return false
+    }
+
     for (let i = 0; i < this.chunks.length;) {
-      const script2 = new Script([this.chunks[i]])
-      const buf2 = script2.toHex()
-      if (buf === buf2) {
+      if (matchesChunk(this.chunks[i])) {
         this.chunks.splice(i, 1)
       } else {
         i++

package/src/script/__tests/Script.test.ts

@@ -354,12 +354,45 @@ describe('Script', () => {
   })
 
   describe('#findAndDelete', () => {
-    it('should find and delete this buffer', () => {
-      expect(
-        Script.fromASM('OP_RETURN f0f0')
-          .findAndDelete(Script.fromASM('f0f0'))
-          .toASM()
-      ).toEqual('OP_RETURN')
+    it('should delete all matching single-chunk scripts', () => {
+      const target = new Script().writeBin([0xf0, 0xf0])
+      const script = new Script()
+        .writeOpCode(OP.OP_RETURN)
+        .writeBin([0xf0, 0xf0])
+        .writeOpCode(OP.OP_1)
+        .writeBin([0xf0, 0xf0])
+
+      expect(script.findAndDelete(target).toASM()).toEqual('OP_RETURN OP_1')
+    })
+
+    it('should match OP_RETURN chunks with data', () => {
+      const target = new Script([{ op: OP.OP_RETURN, data: [0x01, 0x02, 0x03] }])
+      const script = new Script([
+        { op: OP.OP_RETURN, data: [0x01, 0x02, 0x03] },
+        { op: OP.OP_1 }
+      ])
+
+      expect(script.findAndDelete(target).toASM()).toEqual('OP_1')
+    })
+
+    it('should handle PUSHDATA2 payloads', () => {
+      const data = Array.from({ length: 300 }, (_, i) => i & 0xff)
+      const other = data.slice()
+      other[0] = (other[0] + 1) & 0xff
+
+      const target = new Script().writeBin(data)
+      const script = new Script().writeBin(other).writeBin(data).writeOpCode(OP.OP_1)
+
+      script.findAndDelete(target)
+      expect(script.chunks).toHaveLength(2)
+      expect(script.chunks[0].data).toEqual(other)
+      expect(script.chunks[1].op).toEqual(OP.OP_1)
+    })
+
+    it('should not delete when the target has multiple chunks', () => {
+      const script = Script.fromASM('OP_1')
+      const target = Script.fromASM('OP_1 OP_2')
+      expect(script.findAndDelete(target).toASM()).toEqual('OP_1')
     })
   })
 

package/src/wallet/WalletClient.ts

@@ -119,13 +119,13 @@ export default class WalletClient implements WalletInterface {
       }
     }
 
-    // Try fast substrates first
+    // Try all substrates concurrently, select first available by priority order
     const fastAttempts = [
       attemptSubstrate(() => new WindowCWISubstrate()),
+      attemptSubstrate(() => new WalletWireTransceiver(new HTTPWalletWire(this.originator))),
       attemptSubstrate(() => new HTTPWalletJSON(this.originator, 'https://localhost:2121')),
       attemptSubstrate(() => new HTTPWalletJSON(this.originator)),
-      attemptSubstrate(() => new ReactNativeWebView(this.originator)),
-      attemptSubstrate(() => new WalletWireTransceiver(new HTTPWalletWire(this.originator)))
+      attemptSubstrate(() => new ReactNativeWebView(this.originator))
     ]
 
     const fastResults = await Promise.allSettled(fastAttempts)

package/src/wallet/substrates/WalletWireTransceiver.ts

@@ -1686,7 +1686,7 @@ export default class WalletWireTransceiver implements WalletInterface {
           const fieldKey = Utils.toUTF8(resultReader.read(fieldKeyLength))
           const fieldValueLength = resultReader.readVarIntNum()
           keyringForVerifier[fieldKey] = Utils.toBase64(
-              resultReader.read(fieldValueLength)
+            resultReader.read(fieldValueLength)
           )
         }
       }