@bsv/sdk 1.5.0 → 1.5.2

package/package.json

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

package/src/script/Script.ts

@@ -125,10 +125,28 @@ export default class Script {
     bin = [...bin]
     const chunks: ScriptChunk[] = []
 
+    let inConditionalBlock: number = 0
+
     const br = new Reader(bin)
     while (!br.eof()) {
       const op = br.readUInt8()
 
+      // if OP_RETURN and not in a conditional block, do not parse the rest of the data,
+      // rather just return the last chunk as data without prefixing with data length.
+      if (op === OP.OP_RETURN && inConditionalBlock === 0) {
+        chunks.push({
+          op,
+          data: br.read()
+        })
+        break
+      }
+
+      if (op === OP.OP_IF || op === OP.OP_NOTIF || op === OP.OP_VERIF || op === OP.OP_VERNOTIF) {
+        inConditionalBlock++
+      } else if (op === OP.OP_ENDIF) {
+        inConditionalBlock--
+      }
+
       let len = 0
       // eslint-disable-next-line @typescript-eslint/no-shadow
       let data: number[] = []
@@ -225,7 +243,10 @@ export default class Script {
       const chunk = this.chunks[i]
       const op = chunk.op
       writer.writeUInt8(op)
-      if (chunk.data != null) {
+      if (op === OP.OP_RETURN && chunk.data != null) { // special case for unformatted data
+        writer.write(chunk.data)
+        break
+      } else if (chunk.data != null) {
         if (op < OP.OP_PUSHDATA1) {
           writer.write(chunk.data)
         } else if (op === OP.OP_PUSHDATA1) {

package/src/wallet/WalletClient.ts

@@ -57,6 +57,7 @@ export default class WalletClient implements WalletInterface {
     | 'XDM'
     | 'window.CWI'
     | 'json-api'
+    | 'react-native'
     | WalletInterface = 'auto',
     originator?: OriginatorDomainNameStringUnder250Bytes
   ) {
@@ -66,6 +67,7 @@ export default class WalletClient implements WalletInterface {
     if (substrate === 'window.CWI') substrate = new WindowCWISubstrate()
     if (substrate === 'XDM') substrate = new XDMSubstrate()
     if (substrate === 'json-api') substrate = new HTTPWalletJSON(originator)
+    if (substrate === 'react-native') substrate = new ReactNativeWebView(originator)
     this.substrate = substrate
     this.originator = originator
   }
@@ -92,7 +94,6 @@ export default class WalletClient implements WalletInterface {
       }
     }
     try {
-      console.log('Connecting to substrate...')
       sub = new WindowCWISubstrate()
       await checkSub()
       this.substrate = sub
@@ -109,7 +110,7 @@ export default class WalletClient implements WalletInterface {
           await checkSub()
           this.substrate = sub
         } catch (e) {
-          // HTTP JSON failed, attempt the next...
+          // HTTP Wire failed, attempt the next...
           try {
             sub = new HTTPWalletJSON(this.originator)
             await checkSub()