@bsv/sdk 1.2.15 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/sdk",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "type": "module",
   "description": "BSV Blockchain Software Development Kit",
   "main": "dist/cjs/mod.js",
@@ -188,7 +188,7 @@
     "build:umd": "webpack --config webpack.config.js",
     "dev": "tsc -b -w",
     "prepublish": "npm run build",
-    "doc": "ts2md --inputFilename=src/script/index.ts --outputFilename=docs/script.md --filenameSubString=script --firstHeadingLevel=1 && ts2md --inputFilename=src/primitives/index.ts --outputFilename=docs/primitives.md --filenameSubString=primitives --firstHeadingLevel=1 && ts2md --inputFilename=src/transaction/index.ts --outputFilename=docs/transaction.md --filenameSubString=transaction --firstHeadingLevel=1 && ts2md --inputFilename=src/messages/index.ts --outputFilename=docs/messages.md --filenameSubString=messages --firstHeadingLevel=1 && ts2md --inputFilename=src/compat/index.ts --outputFilename=docs/compat.md --filenameSubString=compat --firstHeadingLevel=1 && ts2md --inputFilename=src/wallet/index.ts --outputFilename=docs/wallet.md --filenameSubString=wallet --firstHeadingLevel=1 && ts2md --inputFilename=src/totp/index.ts --outputFilename=docs/totp.md --filenameSubString=totp --firstHeadingLevel=1 && ts2md --inputFilename=src/overlay-tools/index.ts --outputFilename=docs/overlay-tools.md --filenameSubString=overlay-tools --firstHeadingLevel=1"
+    "doc": "ts2md --inputFilename=src/script/index.ts --outputFilename=docs/script.md --filenameSubString=script --firstHeadingLevel=1 && ts2md --inputFilename=src/primitives/index.ts --outputFilename=docs/primitives.md --filenameSubString=primitives --firstHeadingLevel=1 && ts2md --inputFilename=src/transaction/index.ts --outputFilename=docs/transaction.md --filenameSubString=transaction --firstHeadingLevel=1 && ts2md --inputFilename=src/messages/index.ts --outputFilename=docs/messages.md --filenameSubString=messages --firstHeadingLevel=1 && ts2md --inputFilename=src/compat/index.ts --outputFilename=docs/compat.md --filenameSubString=compat --firstHeadingLevel=1 && ts2md --inputFilename=src/wallet/index.ts --outputFilename=docs/wallet.md --filenameSubString=wallet --firstHeadingLevel=1 && ts2md --inputFilename=src/wallet/substrates/index.ts --outputFilename=docs/wallet-substrates.md --filenameSubString=wallet/substrates --firstHeadingLevel=1 && ts2md --inputFilename=src/totp/index.ts --outputFilename=docs/totp.md --filenameSubString=totp --firstHeadingLevel=1 && ts2md --inputFilename=src/overlay-tools/index.ts --outputFilename=docs/overlay-tools.md --filenameSubString=overlay-tools --firstHeadingLevel=1"
   },
   "repository": {
     "type": "git",

package/src/transaction/Beef.ts

@@ -3,6 +3,7 @@ import Transaction from './Transaction.js'
 import ChainTracker from './ChainTracker.js'
 import BeefTx from './BeefTx.js'
 import { Reader, Writer, toHex, toArray } from '../primitives/utils.js'
+import { hash256 } from '../primitives/Hash.js'
 
 export const BEEF_MAGIC = 4022206465 // 0100BEEF in LE order
 export const BEEF_MAGIC_V2 = 4022206466 // 0200BEEF in LE order
@@ -308,9 +309,12 @@ export class Beef {
 
   mergeBeefTx (btx: BeefTx): BeefTx {
     let beefTx = this.findTxid(btx.txid)
-    if (!beefTx && btx.isTxidOnly) { beefTx = this.mergeTxidOnly(btx.txid) } else if (!beefTx || beefTx.isTxidOnly) {
-      if (btx._tx) { beefTx = this.mergeTransaction(btx._tx) } else { beefTx = this.mergeRawTx(btx._rawTx) }
-    }
+    if (btx.isTxidOnly && !beefTx)
+      beefTx = this.mergeTxidOnly(btx.txid)
+    else if (btx._tx && (!beefTx || beefTx.isTxidOnly))
+      beefTx = this.mergeTransaction(btx._tx)
+    else if (btx._rawTx && (!beefTx || beefTx.isTxidOnly))
+      beefTx = this.mergeRawTx(btx._rawTx)
     return beefTx
   }
 
@@ -442,8 +446,9 @@ export class Beef {
   /**
    * Serialize this Beef as AtomicBEEF.
    *
-   * `txid` must exist and be the last transaction
-   * in sorted (dependency) order.
+   * `txid` must exist
+   * 
+   * after sorting, if txid is not last txid, creates a clone and removes newer txs
    *
    * @param txid
    * @returns serialized contents of this Beef with AtomicBEEF prefix.
@@ -452,11 +457,16 @@ export class Beef {
     this.sortTxs()
     const tx = this.findTxid(txid)
     if (!tx) { throw new Error(`${txid} does not exist in this Beef`) }
-    if (this.txs[this.txs.length - 1] !== tx) { throw new Error(`${txid} is not the last transaction in this Beef`) }
+    let beef: Beef = this
+    if (this.txs[this.txs.length - 1] !== tx) {
+      beef = this.clone()
+      const i = this.txs.findIndex(t => t.txid === txid)
+      beef.txs.splice(i + 1)
+    }
     const writer = new Writer()
     writer.writeUInt32LE(ATOMIC_BEEF)
     writer.write(toArray(txid, 'hex'))
-    this.toWriter(writer)
+    beef.toWriter(writer)
     return writer.toArray()
   }
 
@@ -480,7 +490,7 @@ export class Beef {
     const beef = new Beef(version === BEEF_MAGIC_V2 ? 'V2' : undefined)
     const bumpsLength = br.readVarIntNum()
     for (let i = 0; i < bumpsLength; i++) {
-      const bump = MerklePath.fromReader(br)
+      const bump = MerklePath.fromReader(br, false)
       beef.bumps.push(bump)
     }
     const txsLength = br.readVarIntNum()
@@ -697,6 +707,37 @@ export class Beef {
     }
     return log
   }
+
+  /**
+   * In some circumstances it may be helpful for the BUMP MerkePaths to include
+   * leaves that can be computed from row zero.
+   */
+  addComputedLeaves() {
+    const beef = this
+    const hash = (m: string): string => toHex((
+      hash256(toArray(m, 'hex').reverse())
+    ).reverse())
+
+    for (const bump of beef.bumps) {
+      for (let row = 1; row < bump.path.length; row++) {
+        for (const leafL of bump.path[row - 1]) {
+          if (leafL.hash && (leafL.offset & 1) === 0) {
+            const leafR = bump.path[row - 1].find(l => l.offset === leafL.offset + 1)
+            const offsetOnRow = leafL.offset >> 1
+            if (leafR && leafR.hash && -1 === bump.path[row].findIndex(l => l.offset === offsetOnRow)) {
+              // computable leaf is missing... add it.
+              bump.path[row].push({
+                offset: offsetOnRow,
+                // string concatenation puts the right leaf on the left of the left leaf hash :-)
+                hash: hash(leafR.hash + leafL.hash)
+              })
+            }
+          }
+        }
+      }
+    }
+  }
+
 }
 
 export default Beef

package/src/transaction/MerklePath.ts

@@ -50,7 +50,7 @@ export default class MerklePath {
     return MerklePath.fromBinary(toArray(hex, 'hex'))
   }
 
-  static fromReader (reader: Reader): MerklePath {
+  static fromReader (reader: Reader, legalOffsetsOnly: boolean = true): MerklePath {
     const blockHeight = reader.readVarIntNum()
     const treeHeight = reader.readUInt8()
     const path = Array(treeHeight).fill(0).map(() => ([]))
@@ -79,7 +79,7 @@ export default class MerklePath {
       }
       path[level].sort((a, b) => a.offset - b.offset)
     }
-    return new MerklePath(blockHeight, path)
+    return new MerklePath(blockHeight, path, legalOffsetsOnly)
   }
 
   /**
@@ -114,7 +114,7 @@ export default class MerklePath {
     hash?: string
     txid?: boolean
     duplicate?: boolean
-  }>>) {
+  }>>, legalOffsetsOnly: boolean = true) {
     this.blockHeight = blockHeight
     this.path = path
 
@@ -135,7 +135,7 @@ export default class MerklePath {
             }
           }
         } else {
-          if (!legalOffsets[height].has(leaf.offset)) {
+          if (legalOffsetsOnly && !legalOffsets[height].has(leaf.offset)) {
             throw new Error(`Invalid offset: ${leaf.offset}, at height: ${height}, with legal offsets: ${Array.from(legalOffsets[height]).join(', ')}`)
           }
         }

package/src/transaction/__tests/Beef.test.ts

@@ -4,13 +4,17 @@ import Beef from "../../../dist/cjs/src/transaction/Beef"
 import BeefParty from "../../../dist/cjs/src/transaction/BeefParty"
 import { BEEF_MAGIC, BEEF_MAGIC_V2 } from "../../../dist/cjs/src/transaction/Beef"
 import Transaction from "../../../dist/cjs/src/transaction/Transaction"
+import { fromBase58 } from '../../../dist/cjs/src/primitives/utils'
 
 // The following imports allow full type checking by the VsCode editor, but tests will fail to run:
-//import BeefTx from '../BeefTx'
-//import Beef from '../Beef'
-//import BeefParty from "../BeefParty"
-//import { BEEF_MAGIC, BEEF_MAGIC_V2 } from "../Beef"
-//import Transaction from "../Transaction"
+/*
+import BeefTx from '../BeefTx'
+import Beef from '../Beef'
+import BeefParty from "../BeefParty"
+import { BEEF_MAGIC, BEEF_MAGIC_V2 } from "../Beef"
+import Transaction from "../Transaction"
+import { fromBase58 } from "../../primitives/utils"
+*/
 
 describe('Beef tests', () => {
     jest.setTimeout(99999999)
@@ -323,8 +327,23 @@ describe('Beef tests', () => {
         expect(beef.txs[1].txid).toBe('a')
       }
     })
+
+    test('10_deserialize beef with extra leaves', async () => {
+      const b58Beef = b58Beef_10
+
+      const beef = Beef.fromBinary(fromBase58(b58Beef))
+      expect(beef.verifyValid().valid).toBe(true)
+      const abeef = beef.toBinaryAtomic(beef.txs[beef.txs.length -1].txid)
+      const pbeef = Beef.fromBinary(abeef)
+      pbeef.addComputedLeaves();
+      const pbeefBinary = pbeef.toBinary();
+      expect(pbeefBinary).toBeTruthy()
+      expect(pbeef.verifyValid().valid).toBe(true)
+    })
 })
 
+const b58Beef_10 = 'gno9MC7VXii1KoCkc2nsVyYJpqzN3dhBzYATETJcys62emMKfpBof4R7GozwYEaSapUtnNvqQ57aaYYjm3U2dv9eUJ1sV46boHkQgppYmAz9YH8FdZduV8aJayPViaKcyPmbDhEw6UW8TM5iFZLXNs7HBnJHUKCeTdNK4FUEL7vAugxAV9WUUZ43BZjJk2SmSeps9TCXjt1Ci9fKWp3d9QSoYvTpxwzyUFHjRKtbUgwq55ZfkBp5bV2Bpz9qSuKywKewW7Hh4S1nCUScwwzpKDozb3zic1V9p2k8rQxoPsRxjUJ8bjhNDdsN8d7KukFuc3n47fXzdWttvnxwsujLJRGnQbgJuknQqx3KLf5kJXHzwjG6TzigZk2t24qeB6d3hbYiaDr2fFkUJBL3tukTHhfNkQYRXuz3kucVDzvejHyqJaF51mXG8BjMN5aQj91ZJXCaPVqkMWCzmvyaqmXMdRiJdSAynhXbQK91xf6RwdNhz1tg5f9B6oJJMhsi9UYSVymmax8VLKD9AKzBCBDcfyD83m3jyS1VgKGZn3SkQmr6bsoWq88L3GsMnnmYUGogvdAYarTqg3pzkjCMxHzmJBMN6ofnUk8c1sRTXQue7BbyUaN5uZu3KW6CmFsEfpuqVvnqFW93TU1jrPP2S8yz8AexAnARPCKE8Yz7RfVaT6RCavwQKL3u5iookwRWEZXW1QWmM37yJWHD87SjVynyg327a1CLwcBxmE2CB48QeNVGyQki4CTQMqw2o8TMhDPJej1g68oniAjBcxBLSCs7KGvK3k7AfrHbCMULX9CTibYhCjdFjbsbBoocqJpxxcvkMo1fEEiAzZuiBVZQDYktDdTVbhKHvYkW25HcYX75NJrpNAhm7AjFeKLzEVxqAQkMfvTufpESNRZF4kQqg2Rg8h2ajcKTd5cpEPwXCrZLHm4EaZEmZVbg3QNfGhn7BJu1bHMtLqPD4y8eJxm2uGrW6saf6qKYmmu64F8A667NbD4yskPRQ1S863VzwGpxxmgLc1Ta3R46jEqsAoRDoZVUaCgBBZG3Yg1CTgi1EVBMXU7qvY4n3h8o2FLCEMWY4KadnV3iD4FbcdCmg4yxBosNAZgbPjhgGjCimjh4YsLd9zymGLmivmz2ZBg5m3xaiXT9NN81X9C1JUujd'
+
 const txs: string[] = [
     // 0
     "0100000001074d631cc91344daf964cb8b1f43fd3439b804eb673cbe82d9bde3dcc6394abd020000006b48304502210096e24b07db278344a32c12667bac0d38ea87b28e9c52f3630ff7c11760d4002e02201b9dc879465c82152920f650828bfabba0d0bc8f7e15b568b196f1fa7e2cb4644121034e6dcc60f278b83e3e7b2b6570c13a184f4cf27a279199625c981adfe42de997ffffffff03b706000000000000fdc20421029b09fdddfae493e309d3d97b919f6ab2902a789158f6f78489ad903b7a14baeaac2131546f446f44744b7265457a6248594b466a6d6f42756475466d53585855475a474d3004a1edf497c9db470e7862d8c8319b4312f197a18db529a5839ba7c7e4f4dcee4ff4b4651a2a30040ef0aab1c2a4386620b96cb068c2ad2bc06ed90cebed65643710497f785f48c91482ac86893dd675c3de5d7db2e305fb30a588c75282f062367dee1dd4d930502f64f043c45cd1f220f875ff749f5449c99b29a200a86287a842a4f1df21dafda06a1b39b590b33b15109ee8a700728f1a80016ed370f639b35c9d079dea938d7fe451a52c744605a64a89ac7ebfcf692ef345a1e41fba055c197f7e3f608196001ed150bd56883970f3b8954a63aa70e4fa1c33799d43caaacf7ca30f8e873a6a20a04b1508f851633fcb4f30de75954747e702775b143c668c3b80cef96001980f05a8322726a567a379a2901db030057400bf0484c0852b1ec42cdaae6bf9f258ba0c914d83a96522d63b46a71571087fc4ad4ea0be0f6f354e7f638a7c316ceca3be69698104c1662ce0d5f4334b3327377497f9bb8605388c86a5a3928b22dbafd20a488442862c0ea4cd72778ae3b1bfd1d517299969f553b21173f75b530d1c19e23835dbc423c0ab5d3a894560a064951e237d2956db5d007d2132721a949849df49c5c5ab21f9eacb9ea5aa704c37cd101c17bee37954eae01472096f0e3e52b9f98d46426f35437c76c643c6f5d4d0a5ceb89d03a31c451d7882a527c9e78abf01f6178446cd74a7ad4190f364cc79fccc91583f3521e706bd548dc19633234fe96e40e19ef6424b252691e2183484cbf088e965066d4b93b80de927f3426e71f265152d898537c6112ed4500b8b7f23d033c18bad6c3ae5a2e069b03af5b619a334713f367082d41fdff8d5b17ab90a8aff224fbec3a8ca93828fe18c24b54fdcffdd9ee53c40808a4d233a56ed6f21bda0ebf1f4375785f2427da484ba9cdcd45bd28f8072e885bcb687c575ed00bea520508e795b32b7c882ffdd36062e9f748fddbb99a71e7afaed26c24e631ccce19ceb92f1920fb45ae30b58dde09389062eccf1292c55aca96e7eae53a3b6721a568b1bc8f1bad201c0e3b3fe7caec178e491dc12e97a0d0448136f7fb9970c7b053a85a553927a2273682eb2ae4c41c12f1d893d427f659048bbfa6c4be0682d8226d21e4b522e0a2d575655dea64d36d1e0f5719d4f6d06b47f4b4e32731652f0c12e28a9642e90d049b0fbc2c2c94079106c017ad85a81882344ddb71e3c5de31f5b42df9c269e1f64e36b3179ef5e9581fc57c1ed919962ba11686ef0e0a40694f8733bd1e2232196ca4f35c33df1b27872bd3aa0e258601192e50ec5bb64c6ae1a60f580cb6434048c7a419a76028f95442ce5c628f1324281ca3e8050c7ea8a90c3782a6df2cfee5d735e43f518bc215017cd036f70011312204bf885c615b1d1601626de7a1ff9ff21a44818fa19b7a8ed241b6f16380c9e376c6c7a2f48414269e4a3f130ac5c01a7ca8ad4af044ed4288657f59b675e89287c3811c8e81ba1c75f68b8ec85a35d15b5f1cee0fa25874730450221008d6e0b7d98442477d5637fc12fa871f224fd82194d2c3d8e524a12e389ddc35602206286a3b292ef3bac9f047c842a3e9b418102617546e9dc6f9dcc6653c82e645c6d75c8000000000000001976a9142e1ba3aade0562035e69630cb40024f403c0599e88ac77420000000000001976a914eeea6c76530f46d0f2a20ad522c4a6886bad686d88ac00000000"