@bsv/sdk 1.3.13 → 1.3.14

package/src/primitives/index.ts

@@ -1,14 +1,14 @@
-export { default as BigNumber } from './BigNumber'
-export { default as Curve } from './Curve'
-export { default as Point } from './Point'
-export { default as PublicKey } from './PublicKey'
-export { default as Signature } from './Signature'
-export { default as PrivateKey, KeyShares } from './PrivateKey'
-export { default as SymmetricKey } from './SymmetricKey'
-export * as ECDSA from './ECDSA'
-export * as Utils from './utils'
-export * as Hash from './Hash'
-export { default as Random } from './Random'
-export { default as TransactionSignature } from './TransactionSignature'
-export { default as Polynomial, PointInFiniteField } from './Polynomial'
-export { default as Schnorr } from './Schnorr'
+export { default as BigNumber } from './BigNumber.js'
+export { default as Curve } from './Curve.js'
+export { default as Point } from './Point.js'
+export { default as PublicKey } from './PublicKey.js'
+export { default as Signature } from './Signature.js'
+export { default as PrivateKey, KeyShares } from './PrivateKey.js'
+export { default as SymmetricKey } from './SymmetricKey.js'
+export * as ECDSA from './ECDSA.js'
+export * as Utils from './utils.js'
+export * as Hash from './Hash.js'
+export { default as Random } from './Random.js'
+export { default as TransactionSignature } from './TransactionSignature.js'
+export { default as Polynomial, PointInFiniteField } from './Polynomial.js'
+export { default as Schnorr } from './Schnorr.js'

package/src/primitives/utils.ts

@@ -1,5 +1,5 @@
-import BigNumber from './BigNumber'
-import { hash256 } from './Hash'
+import BigNumber from './BigNumber.js'
+import { hash256 } from './Hash.js'
 
 /**
  * Prepends a '0' to an odd character length word to ensure it has an even number of characters.
@@ -37,7 +37,7 @@ export const toHex = (msg: number[]): string => {
  */
 export const toArray = (msg: any, enc?: 'hex' | 'utf8' | 'base64'): any[] => {
   if (Array.isArray(msg)) return msg.slice()
-  if (!msg) return []
+  if (msg === undefined) return []
 
   if (typeof msg !== 'string') {
     return Array.from(msg, (item: any) => item | 0)
@@ -90,7 +90,7 @@ const utf8ToArray = (msg: string): number[] => {
     const c = msg.charCodeAt(i)
     const hi = c >> 8
     const lo = c & 0xff
-    if (hi) {
+    if (hi !== 0) {
       res.push(hi, lo)
     } else {
       res.push(lo)
@@ -121,25 +121,22 @@ export const toUTF8 = (arr: number[]): string => {
     // 1-byte sequence (0xxxxxxx)
     if (byte <= 0x7f) {
       result += String.fromCharCode(byte)
-    }
-    // 2-byte sequence (110xxxxx 10xxxxxx)
-    else if (byte >= 0xc0 && byte <= 0xdf) {
+    } else if (byte >= 0xc0 && byte <= 0xdf) {
+      // 2-byte sequence (110xxxxx 10xxxxxx)
       const byte2 = arr[i + 1]
       skip = 1
       const codePoint = ((byte & 0x1f) << 6) | (byte2 & 0x3f)
       result += String.fromCharCode(codePoint)
-    }
-    // 3-byte sequence (1110xxxx 10xxxxxx 10xxxxxx)
-    else if (byte >= 0xe0 && byte <= 0xef) {
+    } else if (byte >= 0xe0 && byte <= 0xef) {
+      // 3-byte sequence (1110xxxx 10xxxxxx 10xxxxxx)
       const byte2 = arr[i + 1]
       const byte3 = arr[i + 2]
       skip = 2
       const codePoint =
         ((byte & 0x0f) << 12) | ((byte2 & 0x3f) << 6) | (byte3 & 0x3f)
       result += String.fromCharCode(codePoint)
-    }
-    // 4-byte sequence (11110xxx 10xxxxxx 10xxxxxx 10xxxxxx)
-    else if (byte >= 0xf0 && byte <= 0xf7) {
+    } else if (byte >= 0xf0 && byte <= 0xf7) {
+      // 4-byte sequence (11110xxx 10xxxxxx 10xxxxxx 10xxxxxx)
       const byte2 = arr[i + 1]
       const byte3 = arr[i + 2]
       const byte4 = arr[i + 3]
@@ -224,20 +221,23 @@ const base58chars =
  * @returns The binary representation
  */
 export const fromBase58 = (str: string): number[] => {
-  if (!str || typeof str !== 'string') {
+  if (str === '' || typeof str !== 'string') {
     throw new Error(`Expected base58 string but got “${str}”`)
   }
-  if (str.match(/[IOl0]/gmu)) {
-    throw new Error(`Invalid base58 character “${str.match(/[IOl0]/gmu)}”`)
+  const match: string[] | null = str.match(/[IOl0]/gmu)
+
+  if (match !== null) {
+    throw new Error(`Invalid base58 character “${match.join('')}”`)
   }
   const lz = str.match(/^1+/gmu)
-  const psz: number = lz ? lz[0].length : 0
+  const psz: number = (lz !== null) ? lz[0].length : 0
   const size = ((str.length - psz) * (Math.log(58) / Math.log(256)) + 1) >>> 0
 
   const uint8 = new Uint8Array([
     ...new Uint8Array(psz),
-    ...str
-      .match(/./gmu)
+    ...(
+      str.match(/./gmu) ?? [] // ✅ Safe Fix: If null, use []
+    )
       .map((i) => base58chars.indexOf(i))
       .reduce((acc, i) => {
         acc = acc.map((j) => {
@@ -270,7 +270,7 @@ export const toBase58 = (bin: number[]): string => {
     base58Map[base58chars.charCodeAt(i)] = i
   }
 
-  const result = []
+  const result: number[] = []
 
   for (const byte of bin) {
     let carry = byte
@@ -279,14 +279,14 @@ export const toBase58 = (bin: number[]): string => {
       result[j] = base58chars.charCodeAt(x % 58)
       carry = (x / 58) | 0
     }
-    while (carry) {
+    while (carry !== 0) {
       result.push(base58chars.charCodeAt(carry % 58))
       carry = (carry / 58) | 0
     }
   }
 
   for (const byte of bin) {
-    if (byte) break
+    if (byte !== 0) break
     else result.push('1'.charCodeAt(0))
   }
 
@@ -300,7 +300,7 @@ export const toBase58 = (bin: number[]): string => {
  * @param bin - The binary array to convert to base58check
  * @returns The base58check string representation
  */
-export const toBase58Check = (bin: number[], prefix: number[] = [0]) => {
+export const toBase58Check = (bin: number[], prefix: number[] = [0]): string => {
   let hash = hash256([...prefix, ...bin])
   hash = [...prefix, ...bin, ...hash.slice(0, 4)]
   return toBase58(hash)
@@ -317,7 +317,7 @@ export const fromBase58Check = (
   str: string,
   enc?: 'hex',
   prefixLength: number = 1
-) => {
+): any => {
   const bin = fromBase58(str)
   let prefix: string | number[] = bin.slice(0, prefixLength)
   let data: string | number[] = bin.slice(prefixLength, -4)
@@ -339,7 +339,7 @@ export class Writer {
   public bufs: number[][]
 
   constructor (bufs?: number[][]) {
-    this.bufs = bufs || []
+    this.bufs = bufs !== undefined ? bufs : []
   }
 
   getLength (): number {
@@ -658,7 +658,6 @@ export class Reader {
   public readVarIntNum (): number {
     const first = this.readUInt8()
     let bn: BigNumber
-    let n: number
     switch (first) {
       case 0xfd:
         return this.readUInt16LE()

package/src/script/LockingScript.ts

@@ -1,4 +1,4 @@
-import Script from './Script'
+import Script from './Script.js'
 
 /**
  * The LockingScript class represents a locking script in a Bitcoin SV transaction.

package/src/script/Script.ts

@@ -1,7 +1,7 @@
-import ScriptChunk from './ScriptChunk'
-import OP from './OP'
-import { encode, toHex, Reader, Writer, toArray } from '../primitives/utils'
-import BigNumber from '../primitives/BigNumber'
+import ScriptChunk from './ScriptChunk.js'
+import OP from './OP.js'
+import { encode, toHex, Reader, Writer, toArray } from '../primitives/utils.js'
+import BigNumber from '../primitives/BigNumber.js'
 
 /**
  * The Script class represents a script in a Bitcoin SV transaction,
@@ -28,7 +28,7 @@ export default class Script {
     while (i < tokens.length) {
       const token = tokens[i]
       let opCode
-      let opCodeNum: number
+      let opCodeNum: number = 0
       if (token.startsWith('OP_') && typeof OP[token] !== 'undefined') {
         opCode = token
         opCodeNum = OP[token]
@@ -107,7 +107,9 @@ export default class Script {
         'There is an uneven number of characters in the string which suggests it is not hex encoded.'
       )
     }
-    if (!/^[0-9a-fA-F]+$/.test(hex)) { throw new Error('Some elements in this string are not hex encoded.') }
+    if (!/^[0-9a-fA-F]+$/.test(hex)) {
+      throw new Error('Some elements in this string are not hex encoded.')
+    }
     return Script.fromBinary(toArray(hex, 'hex'))
   }
 
@@ -140,7 +142,7 @@ export default class Script {
         try {
           len = br.readUInt8()
           data = br.read(len)
-        } catch (err) {
+        } catch {
           br.read()
         }
         chunks.push({
@@ -151,7 +153,7 @@ export default class Script {
         try {
           len = br.readUInt16LE()
           data = br.read(len)
-        } catch (err) {
+        } catch {
           br.read()
         }
         chunks.push({
@@ -162,7 +164,7 @@ export default class Script {
         try {
           len = br.readUInt32LE()
           data = br.read(len)
-        } catch (err) {
+        } catch {
           br.read()
         }
         chunks.push({
@@ -223,7 +225,7 @@ export default class Script {
       const chunk = this.chunks[i]
       const op = chunk.op
       writer.writeUInt8(op)
-      if (chunk.data) {
+      if (chunk.data != null) {
         if (op < OP.OP_PUSHDATA1) {
           writer.write(chunk.data)
         } else if (op === OP.OP_PUSHDATA1) {
@@ -349,7 +351,7 @@ export default class Script {
    * @returns This script instance for chaining.
    */
   removeCodeseparators (): Script {
-    const chunks = []
+    const chunks: ScriptChunk[] = []
     for (let i = 0; i < this.chunks.length; i++) {
       if (this.chunks[i].op !== OP.OP_CODESEPARATOR) {
         chunks.push(this.chunks[i])

package/src/script/ScriptTemplate.ts

@@ -1,6 +1,6 @@
-import LockingScript from './LockingScript'
-import UnlockingScript from './UnlockingScript'
-import Transaction from '../transaction/Transaction'
+import LockingScript from './LockingScript.js'
+import UnlockingScript from './UnlockingScript.js'
+import Transaction from '../transaction/Transaction.js'
 
 /**
  * @interface
@@ -15,7 +15,7 @@ export default interface ScriptTemplate {
    * @param {...any} params - The parameters required to create the locking script.
    * @returns {LockingScript} - An instance of LockingScript, or a Promise for one.
    */
-  lock: (...params: any) => LockingScript | Promise<LockingScript>
+  lock: (...params: unknown[]) => LockingScript | Promise<LockingScript>
 
   /**
    * Creates a function that generates an unlocking script along with its signature and length estimation.
@@ -27,7 +27,7 @@ export default interface ScriptTemplate {
    * @param {...any} params - The parameters required to create the unlocking script.
    * @returns {Object} - An object containing the `sign` and `estimateLength` functions.
    */
-  unlock: (...params: any) => {
+  unlock: (...params: unknown[]) => {
     sign: (tx: Transaction, inputIndex: number) => Promise<UnlockingScript>
     estimateLength: (tx: Transaction, inputIndex: number) => Promise<number>
   }

package/src/script/Spend.ts

@@ -1,16 +1,16 @@
-import LockingScript from './LockingScript'
-import UnlockingScript from './UnlockingScript'
-import Script from './Script'
-import BigNumber from '../primitives/BigNumber'
-import OP from './OP'
-import ScriptChunk from './ScriptChunk'
-import { toHex, minimallyEncode } from '../primitives/utils'
-import * as Hash from '../primitives/Hash'
-import TransactionSignature from '../primitives/TransactionSignature'
-import PublicKey from '../primitives/PublicKey'
-import { verify } from '../primitives/ECDSA'
-import TransactionInput from '../transaction/TransactionInput'
-import TransactionOutput from '../transaction/TransactionOutput'
+import LockingScript from './LockingScript.js'
+import UnlockingScript from './UnlockingScript.js'
+import Script from './Script.js'
+import BigNumber from '../primitives/BigNumber.js'
+import OP from './OP.js'
+import ScriptChunk from './ScriptChunk.js'
+import { toHex, minimallyEncode } from '../primitives/utils.js'
+import * as Hash from '../primitives/Hash.js'
+import TransactionSignature from '../primitives/TransactionSignature.js'
+import PublicKey from '../primitives/PublicKey.js'
+import { verify } from '../primitives/ECDSA.js'
+import TransactionInput from '../transaction/TransactionInput.js'
+import TransactionOutput from '../transaction/TransactionOutput.js'
 
 // These constants control the current behavior of the interpreter.
 // In the future, all of them will go away.
@@ -385,8 +385,7 @@ export default class Spend {
       bn3: BigNumber,
       bufSig: number[],
       bufPubkey: number[],
-      subscript,
-      bufHash: number[]
+      subscript
     let sig,
       pubkey,
       i: number,
@@ -600,10 +599,9 @@ export default class Spend {
         case OP.OP_TOALTSTACK:
           if (this.stack.length < 1) {
             this.scriptEvaluationError(
-              'OP_TOALTSTACK requires at oeast one item to be on the stack.'
-            )
+              'OP_TOALTSTACK requires at oeast one item to be on the stack.')
           }
-          this.altStack.push(this.stack.pop())
+          this.altStack.push(this.stack.pop() ?? [])
           break
 
         case OP.OP_FROMALTSTACK:
@@ -612,7 +610,7 @@ export default class Spend {
               'OP_FROMALTSTACK requires at least one item to be on the stack.'
             )
           }
-          this.stack.push(this.altStack.pop())
+          this.stack.push(this.altStack.pop() ?? [])
           break
 
         case OP.OP_2DROP:
@@ -1080,12 +1078,14 @@ export default class Spend {
         case OP.OP_SHA1:
         case OP.OP_SHA256:
         case OP.OP_HASH160:
-        case OP.OP_HASH256:
+        case OP.OP_HASH256: {
           if (this.stack.length < 1) {
             this.scriptEvaluationError(
               `${OP[currentOpcode] as string} requires at least one item to be on the stack.`
             )
           }
+
+          let bufHash: number[] = [] // ✅ Initialize bufHash to an empty array
           buf = this.stacktop(-1)
           if (currentOpcode === OP.OP_RIPEMD160) {
             bufHash = Hash.ripemd160(buf)
@@ -1098,9 +1098,11 @@ export default class Spend {
           } else if (currentOpcode === OP.OP_HASH256) {
             bufHash = Hash.hash256(buf)
           }
+
           this.stack.pop()
           this.stack.push(bufHash)
           break
+        }
 
         case OP.OP_CODESEPARATOR:
           this.lastCodeSeparator = this.programCounter
@@ -1130,11 +1132,11 @@ export default class Spend {
           // CScript scriptCode(pbegincodehash, pend);
           if (this.context === 'UnlockingScript') {
             subscript = new Script(
-              this.unlockingScript.chunks.slice(this.lastCodeSeparator)
+              this.unlockingScript.chunks.slice(this.lastCodeSeparator ?? 0)
             )
           } else {
             subscript = new Script(
-              this.lockingScript.chunks.slice(this.lastCodeSeparator)
+              this.lockingScript.chunks.slice(this.lastCodeSeparator ?? 0)
             )
           }
 
@@ -1226,11 +1228,11 @@ export default class Spend {
           // Subset of script starting at the most recent codeseparator
           if (this.context === 'UnlockingScript') {
             subscript = new Script(
-              this.unlockingScript.chunks.slice(this.lastCodeSeparator)
+              this.unlockingScript.chunks.slice(this.lastCodeSeparator ?? 0)
             )
           } else {
             subscript = new Script(
-              this.lockingScript.chunks.slice(this.lastCodeSeparator)
+              this.lockingScript.chunks.slice(this.lastCodeSeparator ?? 0)
             )
           }
 
@@ -1281,7 +1283,7 @@ export default class Spend {
 
           // Clean up stack of actual arguments
           while (i-- > 1) {
-            if (!fSuccess && !ikey2 && this.stacktop(-1).length > 0) {
+            if (!fSuccess && ikey2 === 0 && this.stacktop(-1).length > 0) {
               this.scriptEvaluationError(
                 `${OP[currentOpcode] as string} failed to verify a signature, and requires an empty signature when verification fails.`
               )

package/src/script/UnlockingScript.ts

@@ -1,4 +1,4 @@
-import Script from './Script'
+import Script from './Script.js'
 
 /**
  * The UnlockingScript class represents an unlocking script in a Bitcoin SV transaction.

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

@@ -48,7 +48,7 @@ describe('Script', () => {
     it('should error when attempting to parse this strange Base58Check encoded string', () => {
       const priv = PrivateKey.fromRandom()
       const address = priv.toAddress([0x88])
-      function attemptToDeriveAddress() {
+      function attemptToDeriveAddress (): string {
         const script = new P2PKH().lock(address).toASM()
         return script
       }
@@ -257,12 +257,16 @@ describe('Script', () => {
       const asm =
         'OP_DUP OP_HASH160 f4c03610e60ad15100929cc23da2f3a799af1725 OP_EQUALVERIFY OP_CHECKSIG'
       const script = Script.fromASM(asm)
+
       expect(script.chunks[0].op).toEqual(OP.OP_DUP)
       expect(script.chunks[1].op).toEqual(OP.OP_HASH160)
       expect(script.chunks[2].op).toEqual(20)
-      expect(toHex(script.chunks[2].data)).toEqual(
+
+      // Ensure `data` is defined before calling `toHex`
+      expect(toHex(script.chunks[2].data ?? [])).toEqual(
         'f4c03610e60ad15100929cc23da2f3a799af1725'
       )
+
       expect(script.chunks[3].op).toEqual(OP.OP_EQUALVERIFY)
       expect(script.chunks[4].op).toEqual(OP.OP_CHECKSIG)
     })
@@ -276,7 +280,7 @@ describe('Script', () => {
     it('should know this is invalid hex', () => {
       const asm = 'OP_RETURN 026d02 0568656c6c6fzz'
 
-      const createScript = () => {
+      const createScript = (): string => {
         const script = Script.fromASM(asm)
         return script.toASM()
       }

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

@@ -110,11 +110,13 @@ describe('Spend', () => {
   it('Successfully validates an R-puzzle spend', async () => {
     const k = new PrivateKey(2)
     const c = new Curve()
-    let r = c.g.mul(k).x.umod(c.n).toArray()
-    r = r[0] > 127 ? [0, ...r] : r
+    let r = c.g.mul(k).x?.umod(c.n)?.toArray()
+    if (r !== null && r !== undefined) {
+      r = r[0] > 127 ? [0, ...r] : r
+    }
 
     const puz = new RPuzzle()
-    const lockingScript = puz.lock(r)
+    const lockingScript = puz.lock(r ?? [])
     const satoshis = 1
 
     // ✅ Fix: Ensure privateKey is valid and within range
@@ -168,12 +170,13 @@ describe('Spend', () => {
   it('Successfully validates an R-puzzle spend (HASH256)', async () => {
     const k = new PrivateKey(2)
     const c = new Curve()
-    let r = c.g.mul(k).x.umod(c.n).toArray()
-    r = r[0] > 127 ? [0, ...r] : r
-    r = hash256(r)
-
+    let r = c.g.mul(k).x?.umod(c.n)?.toArray()
+    if (r !== null && r !== undefined) {
+      r = r[0] > 127 ? [0, ...r] : r
+      r = hash256(r)
+    }
     const puz = new RPuzzle('HASH256')
-    const lockingScript = puz.lock(r)
+    const lockingScript = puz.lock(r ?? [])
     const satoshis = 1
 
     // ✅ Fix: Ensure privateKey is valid and within range
@@ -228,12 +231,13 @@ describe('Spend', () => {
     const k = new PrivateKey(2)
     const wrongK = new PrivateKey(5)
     const c = new Curve()
-    let r = c.g.mul(k).x.umod(c.n).toArray()
-    r = r[0] > 127 ? [0, ...r] : r
-    r = hash256(r)
-
+    let r = c.g.mul(k).x?.umod(c.n)?.toArray()
+    if (r !== null && r !== undefined) {
+      r = r[0] > 127 ? [0, ...r] : r
+      r = hash256(r)
+    }
     const puz = new RPuzzle('HASH256')
-    const lockingScript = puz.lock(r)
+    const lockingScript = puz.lock(r ?? [])
     const satoshis = 1
 
     // ✅ Fix: Ensure privateKey is valid and within range
@@ -286,12 +290,13 @@ describe('Spend', () => {
   it('Fails to validate an R-puzzle spend with the wrong hash', async () => {
     const k = new PrivateKey(2)
     const c = new Curve()
-    let r = c.g.mul(k).x.umod(c.n).toArray()
-    r = r[0] > 127 ? [0, ...r] : r
-    r = hash160(r)
-
+    let r = c.g.mul(k).x?.umod(c.n)?.toArray()
+    if (r !== null && r !== undefined) {
+      r = r[0] > 127 ? [0, ...r] : r
+      r = hash160(r)
+    }
     const puz = new RPuzzle('HASH256')
-    const lockingScript = puz.lock(r)
+    const lockingScript = puz.lock(r ?? [])
     const satoshis = 1
 
     // ✅ Fix: Ensure privateKey is valid and within range

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

@@ -1,45 +1,41 @@
-import Script from "../../script/Script";
-import Spend from "../../script/Spend";
-import Transaction from "../../transaction/Transaction";
+import Script from '../../script/Script'
+import Spend from '../../script/Spend'
+import Transaction from '../../transaction/Transaction'
 
-describe("SpendComplex", () => {
-  it("complex unlock script validation", () => {
+describe('SpendComplex', () => {
+  it('complex unlock script validation', () => {
     const rawTx =
-      "010000000130f9f05e6ff77b647f72a86c249204aa476d205a320e918d0ae589c1d17943f200000000fd8c0447304402205773ed93e743866c3b1987780d0e0fe79b83229e88ecc41caeb7028194ccbaa902201441eee38be05d8e041ca0ae4880c91e85f43e1a5209547cfb88dcf45dfdaa2dc2210253108f70a2a86ab671f7f8cbff55478d8fee1dd115ee34ada7778aa5407fe0f64d1f04010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030f9f05e6ff77b647f72a86c249204aa476d205a320e918d0ae589c1d17943f200000000fd80032097dfd76851bf465e8f715593b217714858bbe9570ff3bd5e33840a34e20ff0262102ba79df5f8ae7604a9830f03c7933028186aede0675a16f025dc4f8be8eec0382201008ce7480da41702918d1ec8e6849ba32b4d65b1e40dc669c31a1e6306b266c0000000014fb941ff552d7f5b07fe7cdb799f3a769a3818bba03ba6818615179567a75557a557a557a557a557a0079557a75547a547a547a547a757561577901c261517959795979210ac407f0e4bd44bfc207355a778b046225a7068fc59ee7eda43ad905aadbffc800206c266b30e6a1319c66dc401e5bd6b432ba49688eecd118297041da8074ce08105b795679615679aa0079610079517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01007e81517a75615779567956795679567961537956795479577995939521414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff00517951796151795179970079009f63007952799367007968517a75517a75517a7561527a75517a517951795296a0630079527994527a75517a6853798277527982775379012080517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01205279947f7754537993527993013051797e527e54797e58797e527e53797e52797e57797e0079517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a756100795779ac517a75517a75517a75517a75517a75517a75517a75517a75517a7561517a75517a756169577961007961007982775179517954947f75517958947f77517a75517a756161007901007e81517a7561517a7561527a75517a57796100796100798277517951790128947f755179012c947f77517a75517a756161007901007e81517a7561517a7561517a75007905ffffffff009f6951795379a2695879a95479876959795979ac77777777777777777777e903000000000000feffffff0000000000000000000000000000000000000000000000000000000000000000ba681800c2000000feffffff02c8000000000000001976a91454193bbfcf6541e49d0a9e5b1aa40205eae76d6d88ac8e020000000000001976a91492e4a083b28a331b12d42d77d8b21126eaa9ccff88acba681800";
+      '010000000130f9f05e6ff77b647f72a86c249204aa476d205a320e918d0ae589c1d17943f200000000fd8c0447304402205773ed93e743866c3b1987780d0e0fe79b83229e88ecc41caeb7028194ccbaa902201441eee38be05d8e041ca0ae4880c91e85f43e1a5209547cfb88dcf45dfdaa2dc2210253108f70a2a86ab671f7f8cbff55478d8fee1dd115ee34ada7778aa5407fe0f64d1f04010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030f9f05e6ff77b647f72a86c249204aa476d205a320e918d0ae589c1d17943f200000000fd80032097dfd76851bf465e8f715593b217714858bbe9570ff3bd5e33840a34e20ff0262102ba79df5f8ae7604a9830f03c7933028186aede0675a16f025dc4f8be8eec0382201008ce7480da41702918d1ec8e6849ba32b4d65b1e40dc669c31a1e6306b266c0000000014fb941ff552d7f5b07fe7cdb799f3a769a3818bba03ba6818615179567a75557a557a557a557a557a0079557a75547a547a547a547a757561577901c261517959795979210ac407f0e4bd44bfc207355a778b046225a7068fc59ee7eda43ad905aadbffc800206c266b30e6a1319c66dc401e5bd6b432ba49688eecd118297041da8074ce08105b795679615679aa0079610079517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01007e81517a75615779567956795679567961537956795479577995939521414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff00517951796151795179970079009f63007952799367007968517a75517a75517a7561527a75517a517951795296a0630079527994527a75517a6853798277527982775379012080517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01205279947f7754537993527993013051797e527e54797e58797e527e53797e52797e57797e0079517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a756100795779ac517a75517a75517a75517a75517a75517a75517a75517a75517a7561517a75517a756169577961007961007982775179517954947f75517958947f77517a75517a756161007901007e81517a7561517a7561527a75517a57796100796100798277517951790128947f755179012c947f77517a75517a756161007901007e81517a7561517a7561517a75007905ffffffff009f6951795379a2695879a95479876959795979ac77777777777777777777e903000000000000feffffff0000000000000000000000000000000000000000000000000000000000000000ba681800c2000000feffffff02c8000000000000001976a91454193bbfcf6541e49d0a9e5b1aa40205eae76d6d88ac8e020000000000001976a91492e4a083b28a331b12d42d77d8b21126eaa9ccff88acba681800'
     const lockingScript =
-      "2097dfd76851bf465e8f715593b217714858bbe9570ff3bd5e33840a34e20ff0262102ba79df5f8ae7604a9830f03c7933028186aede0675a16f025dc4f8be8eec0382201008ce7480da41702918d1ec8e6849ba32b4d65b1e40dc669c31a1e6306b266c0000000014fb941ff552d7f5b07fe7cdb799f3a769a3818bba03ba6818615179567a75557a557a557a557a557a0079557a75547a547a547a547a757561577901c261517959795979210ac407f0e4bd44bfc207355a778b046225a7068fc59ee7eda43ad905aadbffc800206c266b30e6a1319c66dc401e5bd6b432ba49688eecd118297041da8074ce08105b795679615679aa0079610079517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01007e81517a75615779567956795679567961537956795479577995939521414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff00517951796151795179970079009f63007952799367007968517a75517a75517a7561527a75517a517951795296a0630079527994527a75517a6853798277527982775379012080517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01205279947f7754537993527993013051797e527e54797e58797e527e53797e52797e57797e0079517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a756100795779ac517a75517a75517a75517a75517a75517a75517a75517a75517a7561517a75517a756169577961007961007982775179517954947f75517958947f77517a75517a756161007901007e81517a7561517a7561527a75517a57796100796100798277517951790128947f755179012c947f77517a75517a756161007901007e81517a7561517a7561517a75007905ffffffff009f6951795379a2695879a95479876959795979ac77777777777777777777";
-    const i = rawTx.indexOf(lockingScript.slice(0, 100));
-    const j = rawTx.indexOf(lockingScript.slice(lockingScript.length - 100));
+      '2097dfd76851bf465e8f715593b217714858bbe9570ff3bd5e33840a34e20ff0262102ba79df5f8ae7604a9830f03c7933028186aede0675a16f025dc4f8be8eec0382201008ce7480da41702918d1ec8e6849ba32b4d65b1e40dc669c31a1e6306b266c0000000014fb941ff552d7f5b07fe7cdb799f3a769a3818bba03ba6818615179567a75557a557a557a557a557a0079557a75547a547a547a547a757561577901c261517959795979210ac407f0e4bd44bfc207355a778b046225a7068fc59ee7eda43ad905aadbffc800206c266b30e6a1319c66dc401e5bd6b432ba49688eecd118297041da8074ce08105b795679615679aa0079610079517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01007e81517a75615779567956795679567961537956795479577995939521414136d08c5ed2bf3ba048afe6dcaebafeffffffffffffffffffffffffffffff00517951796151795179970079009f63007952799367007968517a75517a75517a7561527a75517a517951795296a0630079527994527a75517a6853798277527982775379012080517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f517f7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e7c7e01205279947f7754537993527993013051797e527e54797e58797e527e53797e52797e57797e0079517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a75517a756100795779ac517a75517a75517a75517a75517a75517a75517a75517a75517a7561517a75517a756169577961007961007982775179517954947f75517958947f77517a75517a756161007901007e81517a7561517a7561527a75517a57796100796100798277517951790128947f755179012c947f77517a75517a756161007901007e81517a7561517a7561517a75007905ffffffff009f6951795379a2695879a95479876959795979ac77777777777777777777'
+    const i = rawTx.indexOf(lockingScript.slice(0, 100))
+    const j = rawTx.indexOf(lockingScript.slice(lockingScript.length - 100))
     if (i >= 0 && j >= 0) {
-      const pushtx = rawTx.slice(i, j + 100);
-      expect(pushtx).toBe(lockingScript);
+      const pushtx = rawTx.slice(i, j + 100)
+      expect(pushtx).toBe(lockingScript)
     }
-    const ok = validateUnlockScript(rawTx, 0, lockingScript, 1001);
-    expect(ok).toBe(true);
-  });
-});
+    const ok = validateUnlockScript(rawTx, 0, lockingScript, 1001)
+    expect(ok).toBe(true)
+  })
+})
 
-function verifyTruthy<T>(v: T | undefined): T {
-  if (v == null) throw new Error("must have value");
-  return v;
+function verifyTruthy<T> (v: T | undefined): T {
+  if (v == null) throw new Error('must have value')
+  return v
 }
 
-export function validateUnlockScript(
+export function validateUnlockScript (
   spendingRawTx: string,
   vin: number,
   lockingScript: string,
   amount: number
 ): boolean {
-  const spendingTx = Transaction.fromHex(spendingRawTx);
-  const ls = Script.fromHex(lockingScript);
-
-  const us = spendingTx.inputs[0].unlockingScript?.toASM();
-  const lsh = ls.toHex();
-  const lsa = ls.toASM();
+  const spendingTx = Transaction.fromHex(spendingRawTx)
+  const ls = Script.fromHex(lockingScript)
 
   const spend = new Spend({
     sourceTXID: verifyTruthy(spendingTx.inputs[vin].sourceTXID),
-    sourceOutputIndex: spendingTx.inputs[vin].sourceOutputIndex,
+    sourceOutputIndex: verifyTruthy(spendingTx.inputs[vin].sourceOutputIndex),
     sourceSatoshis: amount,
     lockingScript: ls,
     transactionVersion: spendingTx.version,
@@ -47,10 +43,10 @@ export function validateUnlockScript(
     inputIndex: vin,
     unlockingScript: verifyTruthy(spendingTx.inputs[vin].unlockingScript),
     outputs: spendingTx.outputs,
-    inputSequence: spendingTx.inputs[vin].sequence,
-    lockTime: spendingTx.lockTime,
-  });
+    inputSequence: verifyTruthy(spendingTx.inputs[vin].sequence),
+    lockTime: spendingTx.lockTime
+  })
 
-  const valid = spend.validate();
-  return valid;
+  const valid = spend.validate()
+  return valid
 }