@btc-vision/bitcoin 6.3.6 → 6.4.1

package/test/script.spec.ts

@@ -1,9 +1,10 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import { describe, it } from 'mocha';
-import * as bscript from '../src/script';
-import * as fixtures from './fixtures/script.json';
+import * as bscript from '../src/script.js';
+import fixtures from './fixtures/script.json' with { type: 'json' };
 
-const minimalData = require('minimaldata');
+// @ts-ignore
+import minimalData from 'minimaldata';
 
 describe('script', () => {
     // TODO
@@ -13,26 +14,24 @@ describe('script', () => {
         });
         it('rejects smaller than 33', () => {
             for (let i = 0; i < 33; i++) {
-                assert.strictEqual(
-                    false,
-                    bscript.isCanonicalPubKey(Buffer.allocUnsafe(i)),
-                );
+                assert.strictEqual(false, bscript.isCanonicalPubKey(Buffer.allocUnsafe(i)));
             }
         });
     });
+
     describe.skip('isCanonicalScriptSignature', () => {
         assert.ok(true);
     });
 
     describe('fromASM/toASM', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('encodes/decodes ' + f.asm, () => {
                 const script = bscript.fromASM(f.asm);
                 assert.strictEqual(bscript.toASM(script), f.asm);
             });
         });
 
-        fixtures.invalid.fromASM.forEach(f => {
+        fixtures.invalid.fromASM.forEach((f) => {
             it('throws ' + f.description, () => {
                 assert.throws(() => {
                     bscript.fromASM(f.script);
@@ -57,7 +56,7 @@ describe('script', () => {
     });
 
     describe('fromASM/toASM (templates)', () => {
-        fixtures.valid2.forEach(f => {
+        fixtures.valid2.forEach((f) => {
             if (f.inputHex) {
                 const ih = bscript.toASM(Buffer.from(f.inputHex, 'hex'));
 
@@ -79,7 +78,7 @@ describe('script', () => {
     });
 
     describe('isPushOnly', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('returns ' + !!f.stack + ' for ' + f.asm, () => {
                 const script = bscript.fromASM(f.asm);
                 const chunks = bscript.decompile(script);
@@ -90,7 +89,7 @@ describe('script', () => {
     });
 
     describe('toStack', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('returns ' + !!f.stack + ' for ' + f.asm, () => {
                 if (!f.stack || !f.asm) return;
 
@@ -98,7 +97,7 @@ describe('script', () => {
 
                 const stack = bscript.toStack(script);
                 assert.deepStrictEqual(
-                    stack.map(x => {
+                    stack.map((x) => {
                         return x.toString('hex');
                     }),
                     f.stack,
@@ -114,16 +113,14 @@ describe('script', () => {
     });
 
     describe('compile (via fromASM)', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('compiles ' + f.asm, () => {
                 const scriptSig = bscript.fromASM(f.asm);
 
                 assert.strictEqual(scriptSig.toString('hex'), f.script);
 
                 if (f.nonstandard) {
-                    const scriptSigNS = bscript.fromASM(
-                        f.nonstandard.scriptSig,
-                    );
+                    const scriptSigNS = bscript.fromASM(f.nonstandard.scriptSig);
 
                     assert.strictEqual(scriptSigNS.toString('hex'), f.script);
                 }
@@ -132,14 +129,11 @@ describe('script', () => {
     });
 
     describe('decompile', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('decompiles ' + f.asm, () => {
                 const chunks = bscript.decompile(Buffer.from(f.script, 'hex'));
 
-                assert.strictEqual(
-                    bscript.compile(chunks!).toString('hex'),
-                    f.script,
-                );
+                assert.strictEqual(bscript.compile(chunks!).toString('hex'), f.script);
                 assert.strictEqual(bscript.toASM(chunks!), f.asm);
 
                 if (f.nonstandard) {
@@ -147,40 +141,25 @@ describe('script', () => {
                         Buffer.from(f.nonstandard.scriptSigHex, 'hex'),
                     );
 
-                    assert.strictEqual(
-                        bscript.compile(chunksNS!).toString('hex'),
-                        f.script,
-                    );
+                    assert.strictEqual(bscript.compile(chunksNS!).toString('hex'), f.script);
 
                     // toASM converts verbatim, only `compile` transforms the script to a minimalpush compliant script
-                    assert.strictEqual(
-                        bscript.toASM(chunksNS!),
-                        f.nonstandard.scriptSig,
-                    );
+                    assert.strictEqual(bscript.toASM(chunksNS!), f.nonstandard.scriptSig);
                 }
             });
         });
 
-        fixtures.invalid.decompile.forEach(f => {
-            it(
-                'fails to decompile ' +
-                    f.script +
-                    ',  because "' +
-                    f.description +
-                    '"',
-                () => {
-                    const chunks = bscript.decompile(
-                        Buffer.from(f.script, 'hex'),
-                    );
+        fixtures.invalid.decompile.forEach((f) => {
+            it('fails to decompile ' + f.script + ',  because "' + f.description + '"', () => {
+                const chunks = bscript.decompile(Buffer.from(f.script, 'hex'));
 
-                    assert.strictEqual(chunks, null);
-                },
-            );
+                assert.strictEqual(chunks, null);
+            });
         });
     });
 
     describe('SCRIPT_VERIFY_MINIMALDATA policy', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('compliant for scriptSig ' + f.asm, () => {
                 const script = Buffer.from(f.script, 'hex');
 
@@ -195,10 +174,7 @@ describe('script', () => {
 
                 assert(
                     minimalData(script),
-                    'Failed for ' +
-                        num +
-                        ' length script: ' +
-                        script.toString('hex'),
+                    'Failed for ' + num + ' length script: ' + script.toString('hex'),
                 );
             });
         }

package/test/script_number.spec.ts

@@ -1,16 +1,13 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import { describe, it } from 'mocha';
-import * as scriptNumber from '../src/script_number';
-import * as fixtures from './fixtures/script_number.json';
+import * as scriptNumber from '../src/script_number.js';
+import fixtures from './fixtures/script_number.json' with { type: 'json' };
 
 describe('script-number', () => {
     describe('decode', () => {
-        fixtures.forEach(f => {
+        fixtures.forEach((f) => {
             it(f.hex + ' returns ' + f.number, () => {
-                const actual = scriptNumber.decode(
-                    Buffer.from(f.hex, 'hex'),
-                    f.bytes,
-                );
+                const actual = scriptNumber.decode(Buffer.from(f.hex, 'hex'), f.bytes);
 
                 assert.strictEqual(actual, f.number);
             });
@@ -18,7 +15,7 @@ describe('script-number', () => {
     });
 
     describe('encode', () => {
-        fixtures.forEach(f => {
+        fixtures.forEach((f) => {
             it(f.number + ' returns ' + f.hex, () => {
                 const actual = scriptNumber.encode(f.number);
 

package/test/script_signature.spec.ts

@@ -1,7 +1,7 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import { describe, it } from 'mocha';
-import { signature as bscriptSig } from '../src/script';
-import * as fixtures from './fixtures/signature.json';
+import { signature as bscriptSig } from '../src/script.js';
+import fixtures from './fixtures/signature.json' with { type: 'json' };
 
 describe('Script Signatures', () => {
     function fromRaw(signature: { r: string; s: string }): Buffer {
@@ -22,7 +22,7 @@ describe('Script Signatures', () => {
     }
 
     describe('encode', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('encodes ' + f.hex, () => {
                 const buffer = bscriptSig.encode(fromRaw(f.raw), f.hashType);
 
@@ -30,7 +30,7 @@ describe('Script Signatures', () => {
             });
         });
 
-        fixtures.invalid.forEach(f => {
+        fixtures.invalid.forEach((f) => {
             if (!f.raw) return;
 
             it('throws ' + f.exception, () => {
@@ -44,7 +44,7 @@ describe('Script Signatures', () => {
     });
 
     describe('decode', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('decodes ' + f.hex, () => {
                 const decode = bscriptSig.decode(Buffer.from(f.hex, 'hex'));
 
@@ -53,7 +53,7 @@ describe('Script Signatures', () => {
             });
         });
 
-        fixtures.invalid.forEach(f => {
+        fixtures.invalid.forEach((f) => {
             it('throws on ' + f.hex, () => {
                 const buffer = Buffer.from(f.hex, 'hex');
 

package/test/transaction.spec.ts

@@ -1,8 +1,8 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import { beforeEach, describe, it } from 'mocha';
-import { Transaction } from '..';
-import * as bscript from '../src/script';
-import * as fixtures from './fixtures/transaction.json';
+import { Transaction } from '../src/index.js';
+import * as bscript from '../src/script.js';
+import fixtures from './fixtures/transaction.json' with { type: 'json' };
 
 describe('Transaction', () => {
     function fromRaw(raw: any, noWitness?: boolean): Transaction {
@@ -58,14 +58,11 @@ describe('Transaction', () => {
             });
 
             if (f.whex) {
-                it(
-                    'imports ' + f.description + ' (' + id + ') as witness',
-                    () => {
-                        const actual = Transaction.fromHex(f.whex);
+                it('imports ' + f.description + ' (' + id + ') as witness', () => {
+                    const actual = Transaction.fromHex(f.whex);
 
-                        assert.strictEqual(actual.toHex(), f.whex);
-                    },
-                );
+                    assert.strictEqual(actual.toHex(), f.whex);
+                });
             }
         }
 
@@ -73,7 +70,7 @@ describe('Transaction', () => {
         fixtures.hashForSignature.forEach(importExport);
         fixtures.hashForWitnessV0.forEach(importExport);
 
-        fixtures.invalid.fromBuffer.forEach(f => {
+        fixtures.invalid.fromBuffer.forEach((f) => {
             it('throws on ' + f.exception, () => {
                 assert.throws(() => {
                     Transaction.fromHex(f.hex);
@@ -90,20 +87,17 @@ describe('Transaction', () => {
     });
 
     describe('toBuffer/toHex', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             it('exports ' + f.description + ' (' + f.id + ')', () => {
                 const actual = fromRaw(f.raw, true);
                 assert.strictEqual(actual.toHex(), f.hex);
             });
 
             if (f.whex) {
-                it(
-                    'exports ' + f.description + ' (' + f.id + ') as witness',
-                    () => {
-                        const wactual = fromRaw(f.raw);
-                        assert.strictEqual(wactual.toHex(), f.whex);
-                    },
-                );
+                it('exports ' + f.description + ' (' + f.id + ') as witness', () => {
+                    const wactual = fromRaw(f.raw);
+                    assert.strictEqual(wactual.toHex(), f.whex);
+                });
             }
         });
 
@@ -127,38 +121,28 @@ describe('Transaction', () => {
     });
 
     describe('hasWitnesses', () => {
-        fixtures.valid.forEach(f => {
-            it(
-                'detects if the transaction has witnesses: ' +
-                    (f.whex ? 'true' : 'false'),
-                () => {
-                    assert.strictEqual(
-                        Transaction.fromHex(
-                            f.whex ? f.whex : f.hex,
-                        ).hasWitnesses(),
-                        !!f.whex,
-                    );
-                },
-            );
+        fixtures.valid.forEach((f) => {
+            it('detects if the transaction has witnesses: ' + (f.whex ? 'true' : 'false'), () => {
+                assert.strictEqual(
+                    Transaction.fromHex(f.whex ? f.whex : f.hex).hasWitnesses(),
+                    !!f.whex,
+                );
+            });
         });
     });
 
     describe('weight/virtualSize', () => {
         it('computes virtual size', () => {
-            fixtures.valid.forEach(f => {
-                const transaction = Transaction.fromHex(
-                    f.whex ? f.whex : f.hex,
-                );
+            fixtures.valid.forEach((f) => {
+                const transaction = Transaction.fromHex(f.whex ? f.whex : f.hex);
 
                 assert.strictEqual(transaction.virtualSize(), f.virtualSize);
             });
         });
 
         it('computes weight', () => {
-            fixtures.valid.forEach(f => {
-                const transaction = Transaction.fromHex(
-                    f.whex ? f.whex : f.hex,
-                );
+            fixtures.valid.forEach((f) => {
+                const transaction = Transaction.fromHex(f.whex ? f.whex : f.hex);
 
                 assert.strictEqual(transaction.weight(), f.weight);
             });
@@ -189,7 +173,7 @@ describe('Transaction', () => {
             assert.strictEqual(tx.ins[0].sequence, 0xffffffff);
         });
 
-        fixtures.invalid.addInput.forEach(f => {
+        fixtures.invalid.addInput.forEach((f) => {
             it('throws on ' + f.exception, () => {
                 const tx = new Transaction();
                 const hash = Buffer.from(f.hash, 'hex');
@@ -210,7 +194,7 @@ describe('Transaction', () => {
     });
 
     describe('clone', () => {
-        fixtures.valid.forEach(f => {
+        fixtures.valid.forEach((f) => {
             let actual: Transaction;
             let expected: Transaction;
 
@@ -231,15 +215,12 @@ describe('Transaction', () => {
 
     describe('getHash/getId', () => {
         function verify(f: any): void {
-            it(
-                'should return the id for ' + f.id + '(' + f.description + ')',
-                () => {
-                    const tx = Transaction.fromHex(f.whex || f.hex);
+            it('should return the id for ' + f.id + '(' + f.description + ')', () => {
+                const tx = Transaction.fromHex(f.whex || f.hex);
 
-                    assert.strictEqual(tx.getHash().toString('hex'), f.hash);
-                    assert.strictEqual(tx.getId(), f.id);
-                },
-            );
+                assert.strictEqual(tx.getHash().toString('hex'), f.hash);
+                assert.strictEqual(tx.getId(), f.id);
+            });
         }
 
         fixtures.valid.forEach(verify);
@@ -247,20 +228,11 @@ describe('Transaction', () => {
 
     describe('isCoinbase', () => {
         function verify(f: any): void {
-            it(
-                'should return ' +
-                    f.coinbase +
-                    ' for ' +
-                    f.id +
-                    '(' +
-                    f.description +
-                    ')',
-                () => {
-                    const tx = Transaction.fromHex(f.hex);
+            it('should return ' + f.coinbase + ' for ' + f.id + '(' + f.description + ')', () => {
+                const tx = Transaction.fromHex(f.hex);
 
-                    assert.strictEqual(tx.isCoinbase(), f.coinbase);
-                },
-            );
+                assert.strictEqual(tx.isCoinbase(), f.coinbase);
+            });
         }
 
         fixtures.valid.forEach(verify);
@@ -281,14 +253,8 @@ describe('Transaction', () => {
             tx.addOutput(randScript, 5000000000);
 
             const original = (tx as any).__toBuffer;
-            (tx as any).__toBuffer = function (
-                this: Transaction,
-                a: any,
-                b: any,
-                c: any,
-            ): any {
-                if (c !== false)
-                    throw new Error('hashForSignature MUST pass false');
+            (tx as any).__toBuffer = function (this: Transaction, a: any, b: any, c: any): any {
+                if (c !== false) throw new Error('hashForSignature MUST pass false');
 
                 return original.call(this, a, b, c);
             };
@@ -303,7 +269,7 @@ describe('Transaction', () => {
             });
         });
 
-        fixtures.hashForSignature.forEach(f => {
+        fixtures.hashForSignature.forEach((f) => {
             it(
                 'should return ' +
                     f.hash +
@@ -314,9 +280,7 @@ describe('Transaction', () => {
                     const script = bscript.fromASM(f.script);
 
                     assert.strictEqual(
-                        tx
-                            .hashForSignature(f.inIndex, script, f.type)
-                            .toString('hex'),
+                        tx.hashForSignature(f.inIndex, script, f.type).toString('hex'),
                         f.hash,
                     );
                 },
@@ -325,7 +289,7 @@ describe('Transaction', () => {
     });
 
     describe('hashForWitnessV0', () => {
-        fixtures.hashForWitnessV0.forEach(f => {
+        fixtures.hashForWitnessV0.forEach((f) => {
             it(
                 'should return ' +
                     f.hash +
@@ -336,14 +300,7 @@ describe('Transaction', () => {
                     const script = bscript.fromASM(f.script);
 
                     assert.strictEqual(
-                        tx
-                            .hashForWitnessV0(
-                                f.inIndex,
-                                script,
-                                f.value,
-                                f.type,
-                            )
-                            .toString('hex'),
+                        tx.hashForWitnessV0(f.inIndex, script, f.value, f.type).toString('hex'),
                         f.hash,
                     );
                 },
@@ -352,25 +309,18 @@ describe('Transaction', () => {
     });
 
     describe('taprootSigning', () => {
-        fixtures.taprootSigning.forEach(f => {
+        fixtures.taprootSigning.forEach((f) => {
             const tx = Transaction.fromHex(f.txHex);
-            const prevOutScripts = f.utxos.map(({ scriptHex }) =>
-                Buffer.from(scriptHex, 'hex'),
-            );
+            const prevOutScripts = f.utxos.map(({ scriptHex }) => Buffer.from(scriptHex, 'hex'));
             const values = f.utxos.map(({ value }) => value);
 
-            f.cases.forEach(c => {
+            f.cases.forEach((c) => {
                 let hash: Buffer;
 
                 it(`should hash to ${c.hash} for ${f.description}:${c.vin}`, () => {
                     const hashType = Buffer.from(c.typeHex, 'hex').readUInt8(0);
 
-                    hash = tx.hashForWitnessV1(
-                        c.vin,
-                        prevOutScripts,
-                        values,
-                        hashType,
-                    );
+                    hash = tx.hashForWitnessV1(c.vin, prevOutScripts, values, hashType);
                     assert.strictEqual(hash.toString('hex'), c.hash);
                 });
             });

package/test/ts-node-register.js

@@ -1,5 +1,7 @@
 // This file is required to run mocha tests on the TS files directly
 
-require('ts-node').register({
+import { register } from 'ts-node';
+
+register({
     project: 'test/tsconfig.json',
 });

package/test/tsconfig.json

@@ -1,9 +1,11 @@
 {
     "compilerOptions": {
         "target": "ESNext",
-        "module": "commonjs",
+        "module": "esnext",
+        "moduleResolution": "nodenext",
         "outDir": "../",
         "declaration": false,
+        "allowSyntheticDefaultImports": true,
         "rootDir": "../",
         "rootDirs": [
             "../src",
@@ -16,6 +18,7 @@
         "lib": [
             "ES2021"
         ],
+        "resolvePackageJsonImports": true,
         "allowJs": false,
         "resolveJsonModule": true,
         "strict": true,

package/test/types.spec.ts

@@ -1,8 +1,9 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import { describe, it } from 'mocha';
-import * as types from '../src/types';
+import * as types from '../src/types.js';
 
-const typeforce = require('typeforce');
+// @ts-ignore
+import typeforce from 'typeforce';
 
 describe('types', () => {
     describe('Buffer Hash160/Hash256', () => {
@@ -16,17 +17,11 @@ describe('types', () => {
 
         it('return true for oneOf', () => {
             assert.doesNotThrow(() => {
-                typeforce(
-                    types.oneOf(types.Hash160bit, types.Hash256bit),
-                    buffer32byte,
-                );
+                typeforce(types.oneOf(types.Hash160bit, types.Hash256bit), buffer32byte);
             });
 
             assert.doesNotThrow(() => {
-                typeforce(
-                    types.oneOf(types.Hash256bit, types.Hash160bit),
-                    buffer32byte,
-                );
+                typeforce(types.oneOf(types.Hash256bit, types.Hash160bit), buffer32byte);
             });
         });
 
@@ -49,7 +44,7 @@ describe('types', () => {
             { value: 20999999 * 1e8, result: true },
             { value: 21000000 * 1e8, result: true },
             { value: 21000001 * 1e8, result: false },
-        ].forEach(f => {
+        ].forEach((f) => {
             it('returns ' + f.result + ' for valid for ' + f.value, () => {
                 assert.strictEqual(types.Satoshi(f.value), f.result);
             });