@bsv/sdk 1.0.4 → 1.0.5

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

@@ -19,7 +19,7 @@ describe('Spend', () => {
     const hash = publicKey.toHash()
     const p2pkh = new P2PKH()
     const lockingScript = p2pkh.lock(hash)
-    const satoshis = new BigNumber(1)
+    const satoshis = 1
     const unlockingTemplate = p2pkh.unlock(privateKey)
     const sourceTx = new Transaction(1, [], [{
       lockingScript,
@@ -54,7 +54,7 @@ describe('Spend', () => {
     const hash = publicKey.toHash()
     const p2pkh = new P2PKH()
     const lockingScript = p2pkh.lock(hash)
-    const satoshis = new BigNumber(1)
+    const satoshis = 1
     const unlockingTemplate = p2pkh.unlock(wrongPrivateKey)
     const sourceTx = new Transaction(1, [], [{
       lockingScript,
@@ -88,7 +88,7 @@ describe('Spend', () => {
     r = r[0] > 127 ? [0, ...r] : r
     const puz = new RPuzzle()
     const lockingScript = puz.lock(r)
-    const satoshis = new BigNumber(1)
+    const satoshis = 1
     const unlockingTemplate = puz.unlock(k)
     const sourceTx = new Transaction(1, [], [{
       lockingScript,
@@ -124,7 +124,7 @@ describe('Spend', () => {
     r = hash256(r)
     const puz = new RPuzzle('HASH256')
     const lockingScript = puz.lock(r)
-    const satoshis = new BigNumber(1)
+    const satoshis = 1
     const unlockingTemplate = puz.unlock(k)
     const sourceTx = new Transaction(1, [], [{
       lockingScript,
@@ -161,7 +161,7 @@ describe('Spend', () => {
     r = hash256(r)
     const puz = new RPuzzle('HASH256')
     const lockingScript = puz.lock(r)
-    const satoshis = new BigNumber(1)
+    const satoshis = 1
     const unlockingTemplate = puz.unlock(wrongK)
     const sourceTx = new Transaction(1, [], [{
       lockingScript,
@@ -196,7 +196,7 @@ describe('Spend', () => {
     r = hash160(r)
     const puz = new RPuzzle('HASH256')
     const lockingScript = puz.lock(r)
-    const satoshis = new BigNumber(1)
+    const satoshis = 1
     const unlockingTemplate = puz.unlock(k)
     const sourceTx = new Transaction(1, [], [{
       lockingScript,
@@ -232,7 +232,7 @@ describe('Spend', () => {
       const spend = new Spend({
         sourceTXID: '0000000000000000000000000000000000000000000000000000000000000000',
         sourceOutputIndex: 0,
-        sourceSatoshis: new BigNumber(1),
+        sourceSatoshis: 1,
         lockingScript: new LockingScript(scriptFromVector(a[1]).chunks),
         transactionVersion: 1,
         otherInputs: [],

package/src/script/templates/P2PKH.ts

@@ -1,5 +1,6 @@
 import OP from '../OP.js'
 import ScriptTemplate from '../ScriptTemplate.js'
+import { fromBase58Check } from '../../primitives/utils.js'
 import LockingScript from '../LockingScript.js'
 import UnlockingScript from '../UnlockingScript.js'
 import Transaction from '../../transaction/Transaction.js'
@@ -14,16 +15,24 @@ import { sha256 } from '../../primitives/Hash.js'
  */
 export default class P2PKH implements ScriptTemplate {
   /**
-   * Creates a P2PKH locking script for a given public key hash.
+   * Creates a P2PKH locking script for a given public key hash or address string
    *
-   * @param {number[]} pubkeyhash - An array representing the public key hash.
+   * @param {number[] | string} pubkeyhash or address - An array or address representing the public key hash.
    * @returns {LockingScript} - A P2PKH locking script.
    */
-  lock(pubkeyhash: number[]): LockingScript {
+  lock(pubkeyhash: string | number[]): LockingScript {
+    let data: number[]
+    if (typeof pubkeyhash === 'string') {
+      const hash = fromBase58Check(pubkeyhash)
+      if (hash.prefix[0] !== 0x00 && hash.prefix[0] !== 0x6f) throw new Error('only P2PKH is supported')
+      data = hash.data as number[]
+    } else {
+      data = pubkeyhash
+    }
     return new LockingScript([
       { op: OP.OP_DUP },
       { op: OP.OP_HASH160 },
-      { op: pubkeyhash.length, data: pubkeyhash },
+      { op: pubkeyhash.length, data },
       { op: OP.OP_EQUALVERIFY },
       { op: OP.OP_CHECKSIG }
     ])

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

@@ -317,7 +317,7 @@ describe('Transaction', () => {
 
   describe('Verification', () => {
     it('Verifies the transaction from the BEEF spec', async () => {
-      const tx = Transaction.fromBEEF(toArray(BRC62Hex, 'hex'))
+      const tx = Transaction.fromHexBEEF(BRC62Hex)
       const alwaysYesChainTracker = {
         isValidRootForHeight: async () => true
       }