fix(utxo-core): use tsx to run test files

modules/utxo-core/.mocharc.js → modules/utxo-core/.mocharc.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
 module.exports = {
-  require: 'ts-node/register',
+  "node-option": ["import=tsx"],
   extension: ['.js', '.ts'],
 };

modules/utxo-core/package.json

@@ -27,7 +27,7 @@
     "lint": "eslint --quiet .",
     "prepare": "npm run build",
     "test": "npm run unit-test",
-    "unit-test": "mocha --recursive \"dist/test/**/*.js\""
+    "unit-test": "mocha --recursive test"
   },
   "author": "BitGo SDK Team <[email protected]>",
   "license": "MIT",
@@ -45,7 +45,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "type": "commonjs",
+  "type": "module",
   "nyc": {
     "extension": [
       ".ts"
@@ -58,5 +58,9 @@
     "bip174": "npm:@bitgo-forks/[email protected]",
     "bitcoinjs-message": "npm:@bitgo-forks/[email protected]"
   },
-  "gitHead": "18e460ddf02de2dbf13c2aa243478188fb539f0c"
+  "gitHead": "18e460ddf02de2dbf13c2aa243478188fb539f0c",
+  "devDependencies": {
+    "@types/node": "^24",
+    "tsx": "^4.20.3"
+  }
 }

modules/utxo-core/src/bip65/index.ts

@@ -1 +1 @@
-export * from './locktime';
+export * from './locktime.js';

modules/utxo-core/src/descriptor/Output.ts

@@ -2,10 +2,10 @@ import assert from 'assert';
 
 import { Descriptor } from '@bitgo/wasm-miniscript';
 
-import { getFixedOutputSum, MaxOutput, Output, PrevOutput } from '../Output';
+import { getFixedOutputSum, MaxOutput, Output, PrevOutput } from '../Output.js';
 
-import { DescriptorMap } from './DescriptorMap';
-import { getDescriptorAtIndexCheckScript } from './derive';
+import { DescriptorMap } from './DescriptorMap.js';
+import { getDescriptorAtIndexCheckScript } from './derive.js';
 
 export type WithDescriptor<T> = T & {
   descriptor: Descriptor;

modules/utxo-core/src/descriptor/VirtualSize.ts

@@ -2,8 +2,8 @@ import * as utxolib from '@bitgo/utxo-lib';
 import { Dimensions, VirtualSizes } from '@bitgo/unspents';
 import { Descriptor } from '@bitgo/wasm-miniscript';
 
-import { DescriptorMap } from './DescriptorMap';
-import { findDescriptorForInput } from './psbt';
+import { DescriptorMap } from './DescriptorMap.js';
+import { findDescriptorForInput } from './psbt/findDescriptors.js';
 
 function getScriptPubKeyLength(descType: string): number {
   // See https://bitcoinops.org/en/tools/calc-size/

modules/utxo-core/src/descriptor/index.ts

@@ -1,11 +1,11 @@
-export * from './psbt';
-export * from './address';
-export * from './DescriptorMap';
-export * from './derive';
-export * from './Output';
-export * from './VirtualSize';
-export * from './fromFixedScriptWallet';
-export * from './parse/PatternMatcher';
+export * from './psbt/index.js';
+export * from './address.js';
+export * from './DescriptorMap.js';
+export * from './derive.js';
+export * from './Output.js';
+export * from './VirtualSize.js';
+export * from './fromFixedScriptWallet.js';
+export * from './parse/PatternMatcher.js';
 
 /** @deprecated - import from @bitgo/utxo-core directly instead */
-export * from '../Output';
+export * from '../Output.js';

modules/utxo-core/src/descriptor/psbt/createPsbt.ts

@@ -1,12 +1,12 @@
-import { TapLeafScript } from 'bip174/src/lib/interfaces';
+import { TapLeafScript } from 'bip174/src/lib/interfaces.js';
 import * as utxolib from '@bitgo/utxo-lib';
 import { Descriptor, Miniscript } from '@bitgo/wasm-miniscript';
 
-import { DerivedDescriptorWalletOutput, WithOptDescriptor } from '../Output';
-import { Output } from '../../Output';
+import { DerivedDescriptorWalletOutput, WithOptDescriptor } from '../Output.js';
+import { Output } from '../../Output.js';
 
-import { toUtxoPsbt, toWrappedPsbt } from './wrap';
-import { assertSatisfiable } from './assertSatisfiable';
+import { toUtxoPsbt, toWrappedPsbt } from './wrap.js';
+import { assertSatisfiable } from './assertSatisfiable.js';
 
 /**
  * Non-Final (Replaceable)

modules/utxo-core/src/descriptor/psbt/findDescriptors.ts

@@ -9,10 +9,10 @@ It will probably only work correctly if all xpubs in the descriptor are derivabl
 We should take a look at a more robust and standard approach like this: https://github.com/bitcoin/bips/pull/1548
 
  */
-import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces';
+import { PsbtInput, PsbtOutput } from 'bip174/src/lib/interfaces.js';
 import { Descriptor } from '@bitgo/wasm-miniscript';
 
-import { DescriptorMap } from '../DescriptorMap';
+import { DescriptorMap } from '../DescriptorMap.js';
 
 type DescriptorWithoutIndex = { descriptor: Descriptor; index: undefined };
 

modules/utxo-core/src/descriptor/psbt/index.ts

@@ -1,6 +1,6 @@
-export * from './assertSatisfiable';
-export * from './createPsbt';
-export * from './parse';
-export * from './findDescriptors';
-export * from './wrap';
-export * from './sign';
+export * from './assertSatisfiable.js';
+export * from './createPsbt.js';
+export * from './parse.js';
+export * from './findDescriptors.js';
+export * from './wrap.js';
+export * from './sign.js';

modules/utxo-core/src/descriptor/psbt/parse.ts

@@ -1,11 +1,11 @@
 import { Descriptor } from '@bitgo/wasm-miniscript';
 import * as utxolib from '@bitgo/utxo-lib';
 
-import { DescriptorMap } from '../DescriptorMap';
-import { getVirtualSize } from '../VirtualSize';
+import { DescriptorMap } from '../DescriptorMap.js';
+import { getVirtualSize } from '../VirtualSize.js';
 
-import { findDescriptorForInput, findDescriptorForOutput } from './findDescriptors';
-import { assertSatisfiable } from './assertSatisfiable';
+import { findDescriptorForInput, findDescriptorForOutput } from './findDescriptors.js';
+import { assertSatisfiable } from './assertSatisfiable.js';
 
 export type ScriptId = { descriptor: Descriptor; index: number | undefined };
 

modules/utxo-core/src/index.ts

@@ -1,8 +1,8 @@
-export * as bip65 from './bip65';
-export * as descriptor from './descriptor';
-export * as testutil from './testutil';
-export * as paygo from './paygo';
-export * as bip32utils from './bip32utils';
-export * from './dustThreshold';
-export * from './Output';
-export * from './xOnlyPubkey';
+export * as bip65 from './bip65/index.js';
+export * as descriptor from './descriptor/index.js';
+export * as testutil from './testutil/index.js';
+export * as paygo from './paygo/index.js';
+export * as bip32utils from './bip32utils.js';
+export * from './dustThreshold.js';
+export * from './Output.js';
+export * from './xOnlyPubkey.js';

modules/utxo-core/src/paygo/index.ts

@@ -1,2 +1,2 @@
-export * from './parsePayGoAttestation';
-export * from './psbt';
+export * from './parsePayGoAttestation.js';
+export * from './psbt/index.js';

modules/utxo-core/src/paygo/psbt/index.ts

@@ -1 +1 @@
-export * from './payGoAddressProof';
+export * from './payGoAddressProof.js';

modules/utxo-core/src/paygo/psbt/payGoAddressProof.ts

@@ -1,16 +1,16 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import { checkForOutput } from 'bip174/src/lib/utils';
+import { checkForOutput } from 'bip174/src/lib/utils.js';
 
-import { verifyMessage } from '../../bip32utils';
-import { createPayGoAttestationBuffer } from '../attestation';
+import { verifyMessage } from '../../bip32utils.js';
+import { createPayGoAttestationBuffer } from '../attestation.js';
 
 import {
   ErrorMultiplePayGoProof,
   ErrorMultiplePayGoProofAtPsbtIndex,
   ErrorNoPayGoProof,
   ErrorOutputIndexOutOfBounds,
   ErrorPayGoAddressProofFailedVerification,
-} from './Errors';
+} from './Errors.js';
 
 /** This function adds the entropy and signature into the PSBT output unknown key vals.
  * We store the entropy so that we reconstruct the message <ENTROPY><ADDRESS><UUID>

modules/utxo-core/src/testutil/descriptor/descriptors.ts

@@ -3,8 +3,8 @@ import assert from 'assert';
 import { Miniscript, Descriptor, ast } from '@bitgo/wasm-miniscript';
 import { bip32, BIP32Interface } from '@bitgo/utxo-lib';
 
-import { DescriptorMap, PsbtParams } from '../../descriptor';
-import { getKeyTriple, Triple, KeyTriple } from '../key.utils';
+import { DescriptorMap, PsbtParams } from '../../descriptor/index.js';
+import { getKeyTriple, Triple, KeyTriple } from '../key.utils.js';
 
 export function getDefaultXPubs(seed?: string): Triple<string> {
   return getKeyTriple(seed).map((k) => k.neutered().toBase58()) as Triple<string>;

modules/utxo-core/src/testutil/descriptor/index.ts

@@ -1,3 +1,3 @@
-export * from './descriptors';
-export * from './mock.utils';
-export * from './psbt.utils';
+export * from './descriptors.js';
+export * from './mock.utils.js';
+export * from './psbt.utils.js';

modules/utxo-core/src/testutil/descriptor/mock.utils.ts

@@ -6,9 +6,9 @@ import {
   createPsbt,
   createScriptPubKeyFromDescriptor,
   DerivedDescriptorTransactionInput,
-} from '../../descriptor';
+} from '../../descriptor/index.js';
 
-import { DescriptorTemplate, getDefaultXPubs, getDescriptor } from './descriptors';
+import { DescriptorTemplate, getDefaultXPubs, getDescriptor } from './descriptors.js';
 
 type MockOutputIdParams = { hash?: string; vout?: number };
 

modules/utxo-core/src/testutil/descriptor/psbt.utils.ts

@@ -1,6 +1,6 @@
 import * as utxolib from '@bitgo/utxo-lib';
 
-import { matchPath, PathElement, toPlainObject } from '../../../src/testutil';
+import { matchPath, PathElement, toPlainObject } from '../../../src/testutil/index.js';
 
 export function toPlainObjectFromPsbt(v: utxolib.Psbt): unknown {
   return toPlainObject(

modules/utxo-core/src/testutil/generatePayGoAttestationProof.utils.ts

@@ -2,7 +2,7 @@ import crypto from 'crypto';
 
 import { bufferutils } from '@bitgo/utxo-lib';
 
-import { Prefix } from '../paygo';
+import { Prefix } from '../paygo/index.js';
 
 /** We have a mirrored function similar to our hsm that generates our Bitcoin signed
  * message so that we can use for testing. This creates a random entropy as well using

modules/utxo-core/src/testutil/index.ts

@@ -1,5 +1,5 @@
-export * from './fixtures.utils';
-export * from './key.utils';
-export * from './toPlainObject.utils';
-export * from './generatePayGoAttestationProof.utils';
-export * from './trimMessagePrefix';
+export * from './fixtures.utils.js';
+export * from './key.utils.js';
+export * from './toPlainObject.utils.js';
+export * from './generatePayGoAttestationProof.utils.js';
+export * from './trimMessagePrefix.js';

modules/utxo-core/test/Output.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 
-import { getFixedOutputSum, getMaxOutput, getOutputSum, isMaxOutput, toFixedOutputs } from '../src';
+import { getFixedOutputSum, getMaxOutput, getOutputSum, isMaxOutput, toFixedOutputs } from '../src/index.js';
 
 describe('Output', function () {
   const oBigInt = { value: 1n };

modules/utxo-core/test/bip32utils.ts

@@ -3,7 +3,7 @@ import * as assert from 'assert';
 
 import * as utxolib from '@bitgo/utxo-lib';
 
-import { signMessage, verifyMessage } from '../src/bip32utils';
+import { signMessage, verifyMessage } from '../src/bip32utils.js';
 
 describe('bip32utils', function () {
   function getSeedBuffers(length: number) {
@@ -21,7 +21,12 @@ describe('bip32utils', function () {
             const expectValid = message === otherMessage && key === otherKey;
             assert.strictEqual(verifyMessage(otherMessage, otherKey, signature, utxolib.networks.bitcoin), expectValid);
             assert.strictEqual(
-              verifyMessage(Buffer.from(otherMessage), otherKey, signature, utxolib.networks.bitcoin),
+              verifyMessage(
+                typeof otherMessage === 'string' ? Buffer.from(otherMessage) : otherMessage,
+                otherKey,
+                signature,
+                utxolib.networks.bitcoin
+              ),
               expectValid
             );
           });

modules/utxo-core/test/bip65/locktime.ts

@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-import { encodeLocktime } from '../../src/bip65/locktime';
+import { encodeLocktime } from '../../src/bip65/locktime.js';
 
 describe('locktime', function () {
   it('encodes relative and absolute locktimes', function () {

modules/utxo-core/test/descriptor/Output.ts

@@ -1,8 +1,8 @@
 import assert from 'assert';
 
-import { isExternalOutput, isInternalOutput, toDerivedDescriptorWalletOutput } from '../../src/descriptor/Output';
-import { getDescriptor } from '../../src/testutil/descriptor';
-import { createScriptPubKeyFromDescriptor } from '../../src/descriptor';
+import { isExternalOutput, isInternalOutput, toDerivedDescriptorWalletOutput } from '../../src/descriptor/Output.js';
+import { getDescriptor } from '../../src/testutil/descriptor/index.js';
+import { createScriptPubKeyFromDescriptor } from '../../src/descriptor/index.js';
 
 describe('decscriptor.Output', function () {
   const descriptor = getDescriptor('Wsh2Of3');

modules/utxo-core/test/descriptor/derive.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 
-import { getDescriptor } from '../../src/testutil/descriptor';
-import { getDescriptorAtIndex, getDescriptorAtIndexCheckScript } from '../../src/descriptor/derive';
+import { getDescriptor } from '../../src/testutil/descriptor/index.js';
+import { getDescriptorAtIndex, getDescriptorAtIndexCheckScript } from '../../src/descriptor/derive.js';
 
 describe('derive', function () {
   const derivable = getDescriptor('Wsh2Of3');

modules/utxo-core/test/descriptor/fromFixedScriptWallet.ts

@@ -6,7 +6,7 @@ import { Descriptor } from '@bitgo/wasm-miniscript';
 import {
   getDescriptorForScriptType,
   getNamedDescriptorsForRootWalletKeys,
-} from '../../src/descriptor/fromFixedScriptWallet';
+} from '../../src/descriptor/fromFixedScriptWallet.js';
 
 function getRootWalletKeys(derivationPrefixes?: utxolib.bitgo.Triple<string>): utxolib.bitgo.RootWalletKeys {
   // This is a fixed script wallet, so we use a fixed key triple.

modules/utxo-core/test/descriptor/parse/PatternMatcher.ts

@@ -2,9 +2,9 @@ import assert from 'assert';
 
 import { Descriptor, ast } from '@bitgo/wasm-miniscript';
 
-import { getKey } from '../../../src/testutil';
-import { toXOnlyPublicKey } from '../../../src';
-import { PatternMatcher, Pattern } from '../../../src/descriptor/parse/PatternMatcher';
+import { getKey } from '../../../src/testutil/index.js';
+import { toXOnlyPublicKey } from '../../../src/index.js';
+import { PatternMatcher, Pattern } from '../../../src/descriptor/parse/PatternMatcher.js';
 
 function key32(seed: string): Buffer {
   // return x-only public key from seed

modules/utxo-core/test/descriptor/psbt/VirtualSize.ts

@@ -5,16 +5,16 @@ import {
   getInputVSizesForDescriptors,
   getVirtualSize,
   getVirtualSizeEstimateForPsbt,
-} from '../../../src/descriptor/VirtualSize';
+} from '../../../src/descriptor/VirtualSize.js';
 import {
   DescriptorTemplate,
   getDefaultXPubs,
   getDescriptor,
   getDescriptorMap,
   mockPsbtDefault,
-} from '../../../src/testutil/descriptor';
-import { getKeyTriple } from '../../../src/testutil';
-import { finalizePsbt } from '../../../src/descriptor';
+} from '../../../src/testutil/descriptor/index.js';
+import { getKeyTriple } from '../../../src/testutil/index.js';
+import { finalizePsbt } from '../../../src/descriptor/index.js';
 
 describe('VirtualSize', function () {
   describe('getInputVSizesForDescriptorWallet', function () {

modules/utxo-core/test/descriptor/psbt/assertSatisfiable.ts

@@ -2,8 +2,8 @@ import * as assert from 'assert';
 
 import { Descriptor } from '@bitgo/wasm-miniscript';
 
-import { getDefaultXPubs } from '../../../src/testutil/descriptor';
-import { getRequiredLocktime } from '../../../src/descriptor';
+import { getDefaultXPubs } from '../../../src/testutil/descriptor/index.js';
+import { getRequiredLocktime } from '../../../src/descriptor/index.js';
 
 function d(s: string): Descriptor {
   return Descriptor.fromString(s, 'derivable');

modules/utxo-core/test/descriptor/psbt/findDescriptors.ts

@@ -1,7 +1,12 @@
 import * as assert from 'assert';
 
-import { DescriptorTemplate, getDefaultXPubs, getDescriptor, mockPsbt } from '../../../src/testutil/descriptor';
-import { findDescriptorForInput, findDescriptorForOutput } from '../../../src/descriptor';
+import {
+  DescriptorTemplate,
+  getDefaultXPubs,
+  getDescriptor,
+  mockPsbt,
+} from '../../../src/testutil/descriptor/index.js';
+import { findDescriptorForInput, findDescriptorForOutput } from '../../../src/descriptor/index.js';
 
 function describeWithTemplates(templateSelf: DescriptorTemplate, templateOther: DescriptorTemplate) {
   describe(`parsePsbt [${templateSelf},${templateOther}]`, function () {