diff --git a/.changeset/ripe-heads-stop.md b/.changeset/ripe-heads-stop.md new file mode 100644 index 000000000..e7faeb41c --- /dev/null +++ b/.changeset/ripe-heads-stop.md @@ -0,0 +1,36 @@ +--- +'@xchainjs/xchain-mayachain-query': patch +'@xchainjs/xchain-thorchain-query': patch +'@xchainjs/xchain-mayachain': patch +'@xchainjs/xchain-thorchain': patch +'@xchainjs/xchain-arbitrum': patch +'@xchainjs/xchain-ethereum': patch +'@xchainjs/xchain-litecoin': patch +'@xchainjs/xchain-bitcoin': patch +'xchainjs-estimate-swap': patch +'@xchainjs/xchain-cosmos': patch +'@xchainjs/xchain-kujira': patch +'@xchainjs/xchain-wallet': patch +'@xchainjs/xchain-avax': patch +'@xchainjs/xchain-base': patch +'@xchainjs/xchain-doge': patch +'@xchainjs/xchain-util': patch +'@xchainjs/xchain-bsc': patch +'@xchainjs/xchain-evm': patch +'xchainjs-liquidity': patch +'xchainjs-check-tx': patch +'xchainjs-loans': patch +'txJammer': patch +--- + +Fix ESM (ECMAScript Module) compatibility issues + +- Update bignumber.js to 9.1.2 for proper ESM support +- Change bitcore-lib-cash imports from namespace to default imports for ESM compatibility +- Change @dashevo/dashcore-lib imports from namespace to default imports for ESM compatibility +- Add .js extensions to coinselect/accumulative imports for ESM +- Add .js extensions to cosmjs-types imports for ESM +- Update module type declarations for ESM compatibility +- Regenerate protobuf files with correct ESM import patterns + +This enables the library to work properly in ESM environments (Node.js type: "module", modern bundlers, etc.) diff --git a/examples/check-tx/package.json b/examples/check-tx/package.json index d4ffecf0f..beb7741f3 100644 --- a/examples/check-tx/package.json +++ b/examples/check-tx/package.json @@ -20,7 +20,7 @@ "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", "axios-retry": "^3.2.5", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "rimraf": "~3.0.2" }, "devDependencies": { diff --git a/examples/estimate-swap/package.json b/examples/estimate-swap/package.json index dd6a471a9..a83ae24f2 100644 --- a/examples/estimate-swap/package.json +++ b/examples/estimate-swap/package.json @@ -22,7 +22,7 @@ "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", "axios-retry": "^3.2.5", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "rimraf": "~3.0.2" }, "devDependencies": { diff --git a/examples/liquidity/package.json b/examples/liquidity/package.json index 2cc4b6101..945d54ab4 100644 --- a/examples/liquidity/package.json +++ b/examples/liquidity/package.json @@ -30,7 +30,7 @@ "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", "axios-retry": "^3.2.5", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "rimraf": "~3.0.2" }, "devDependencies": { diff --git a/packages/xchain-arbitrum/package.json b/packages/xchain-arbitrum/package.json index efd6069af..dae72dfb7 100644 --- a/packages/xchain-arbitrum/package.json +++ b/packages/xchain-arbitrum/package.json @@ -40,7 +40,7 @@ "@xchainjs/xchain-evm": "workspace:*", "@xchainjs/xchain-evm-providers": "workspace:*", "@xchainjs/xchain-util": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "ethers": "^6.14.3" } } diff --git a/packages/xchain-avax/package.json b/packages/xchain-avax/package.json index 5d5055cf5..628494300 100644 --- a/packages/xchain-avax/package.json +++ b/packages/xchain-avax/package.json @@ -41,7 +41,7 @@ "@xchainjs/xchain-evm": "workspace:*", "@xchainjs/xchain-evm-providers": "workspace:*", "@xchainjs/xchain-util": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "ethers": "^6.14.3" }, "devDependencies": { diff --git a/packages/xchain-base/package.json b/packages/xchain-base/package.json index 74c1e14f8..deb1fab20 100644 --- a/packages/xchain-base/package.json +++ b/packages/xchain-base/package.json @@ -40,7 +40,7 @@ "@xchainjs/xchain-evm": "workspace:*", "@xchainjs/xchain-evm-providers": "workspace:*", "@xchainjs/xchain-util": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "ethers": "^6.14.3" }, "devDependencies": { diff --git a/packages/xchain-bitcoin/src/client.ts b/packages/xchain-bitcoin/src/client.ts index cf8720419..d7d565afe 100644 --- a/packages/xchain-bitcoin/src/client.ts +++ b/packages/xchain-bitcoin/src/client.ts @@ -3,7 +3,7 @@ import { AssetInfo, FeeRate, Network } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { Client as UTXOClient, PreparedTx, TxParams, UTXO, UtxoClientParams } from '@xchainjs/xchain-utxo' import * as Bitcoin from 'bitcoinjs-lib' -import accumulative from 'coinselect/accumulative' +import accumulative from 'coinselect/accumulative.js' import { AssetBTC, diff --git a/packages/xchain-bitcoin/src/modules.d.ts b/packages/xchain-bitcoin/src/modules.d.ts index 978408eca..8d79111fc 100644 --- a/packages/xchain-bitcoin/src/modules.d.ts +++ b/packages/xchain-bitcoin/src/modules.d.ts @@ -1,2 +1,2 @@ -// This statement declares a module augmentation for the external module 'coinselect/accumulative'. -declare module 'coinselect/accumulative' +// This statement declares a module augmentation for the external module 'coinselect/accumulative.js'. +declare module 'coinselect/accumulative.js' diff --git a/packages/xchain-bitcoincash/src/client.ts b/packages/xchain-bitcoincash/src/client.ts index c2f7b7016..05a374fac 100644 --- a/packages/xchain-bitcoincash/src/client.ts +++ b/packages/xchain-bitcoincash/src/client.ts @@ -1,9 +1,9 @@ // Import statements for necessary modules and types -import * as bitcore from 'bitcore-lib-cash' +import bitcore from 'bitcore-lib-cash' import { AssetInfo, FeeRate, Network } from '@xchainjs/xchain-client' // Importing various types and constants from xchain-client module import { Address } from '@xchainjs/xchain-util' // Importing the Address type from xchain-util module import { Client as UTXOClient, TxParams, UtxoClientParams, UTXO } from '@xchainjs/xchain-utxo' // Importing necessary types and the UTXOClient class from xchain-utxo module -import accumulative from 'coinselect/accumulative' // Importing accumulative function from coinselect/accumulative module +import accumulative from 'coinselect/accumulative.js' // Importing accumulative function from coinselect/accumulative.js module import { AssetBCH, diff --git a/packages/xchain-bitcoincash/src/clientKeystore.ts b/packages/xchain-bitcoincash/src/clientKeystore.ts index 8e7df8bc6..310e5411c 100644 --- a/packages/xchain-bitcoincash/src/clientKeystore.ts +++ b/packages/xchain-bitcoincash/src/clientKeystore.ts @@ -1,4 +1,4 @@ -import * as bitcore from 'bitcore-lib-cash' +import bitcore from 'bitcore-lib-cash' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' // Importing getSeed function from xchain-crypto module import { getSeed } from '@xchainjs/xchain-crypto' // Importing the Address type from xchain-util module import { Address } from '@xchainjs/xchain-util' // Importing necessary types from bitcoincashjs-types module diff --git a/packages/xchain-bitcoincash/src/modules.d.ts b/packages/xchain-bitcoincash/src/modules.d.ts index 5b0d366a0..81908826c 100644 --- a/packages/xchain-bitcoincash/src/modules.d.ts +++ b/packages/xchain-bitcoincash/src/modules.d.ts @@ -1,6 +1,6 @@ /** - * Declaration file for the 'coinselect/accumulative' module. + * Declaration file for the 'coinselect/accumulative.js' module. * This module likely provides functions or utilities related to coin selection algorithms, * specifically the 'accumulative' algorithm. */ -declare module 'coinselect/accumulative' +declare module 'coinselect/accumulative.js' diff --git a/packages/xchain-bitcoincash/src/utils.ts b/packages/xchain-bitcoincash/src/utils.ts index a2adb3f9f..10aea8e6e 100644 --- a/packages/xchain-bitcoincash/src/utils.ts +++ b/packages/xchain-bitcoincash/src/utils.ts @@ -5,7 +5,7 @@ import { Network, TxType } from '@xchainjs/xchain-client' // Importing types rel import { Address, baseAmount } from '@xchainjs/xchain-util' // Importing utilities related to addresses and amounts import { Tx, TxFrom, TxTo } from '@xchainjs/xchain-utxo' // Importing Bitcoin Cash address utilities import * as bchaddr from './bchaddrjs' // Importing coin information utility -import * as bitcore from 'bitcore-lib-cash' +import bitcore from 'bitcore-lib-cash' import { AssetBCH, BCH_DECIMAL } from './const' // Importing BCH asset and decimal constants import { Transaction, TransactionInput, TransactionOutput } from './types' // Importing custom transaction types diff --git a/packages/xchain-bsc/package.json b/packages/xchain-bsc/package.json index 3a85ae541..40f0d6f7d 100644 --- a/packages/xchain-bsc/package.json +++ b/packages/xchain-bsc/package.json @@ -41,7 +41,7 @@ "@xchainjs/xchain-evm": "workspace:*", "@xchainjs/xchain-evm-providers": "workspace:*", "@xchainjs/xchain-util": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "ethers": "^6.14.3" } } diff --git a/packages/xchain-cosmos/package.json b/packages/xchain-cosmos/package.json index 9d55ffad0..a1c6b48fa 100644 --- a/packages/xchain-cosmos/package.json +++ b/packages/xchain-cosmos/package.json @@ -47,7 +47,7 @@ "@xchainjs/xchain-crypto": "workspace:*", "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "cosmjs-types": "0.9.0", "protobufjs": "6.11.4" }, diff --git a/packages/xchain-cosmos/src/client.ts b/packages/xchain-cosmos/src/client.ts index 66548155e..d0efd000b 100644 --- a/packages/xchain-cosmos/src/client.ts +++ b/packages/xchain-cosmos/src/client.ts @@ -12,7 +12,7 @@ import { AssetInfo, FeeType, Fees, PreparedTx, singleFee } from '@xchainjs/xchai import { Client as CosmosSDKClient, CosmosSdkClientParams, MsgTypes, makeClientPath } from '@xchainjs/xchain-cosmos-sdk' import { Address, Asset, AssetType, baseAmount, eqAsset } from '@xchainjs/xchain-util' import BigNumber from 'bignumber.js' -import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx.js' import { AssetATOM, diff --git a/packages/xchain-dash/src/client.ts b/packages/xchain-dash/src/client.ts index c043a3e31..62f1692c4 100644 --- a/packages/xchain-dash/src/client.ts +++ b/packages/xchain-dash/src/client.ts @@ -1,4 +1,4 @@ -import * as dashcore from '@dashevo/dashcore-lib' +import dashcore from '@dashevo/dashcore-lib' import { AssetInfo, FeeRate, Network, TxHistoryParams, TxType } from '@xchainjs/xchain-client' import { Address, assetAmount, assetToBase, baseAmount } from '@xchainjs/xchain-util' import { Balance, Client as UTXOClient, Tx, TxParams, TxsPage, UTXO, UtxoClientParams } from '@xchainjs/xchain-utxo' diff --git a/packages/xchain-dash/src/clientKeystore.ts b/packages/xchain-dash/src/clientKeystore.ts index 7b987abb6..c9f52b9df 100644 --- a/packages/xchain-dash/src/clientKeystore.ts +++ b/packages/xchain-dash/src/clientKeystore.ts @@ -1,5 +1,5 @@ import * as ecc from '@bitcoin-js/tiny-secp256k1-asmjs' -import * as dashcore from '@dashevo/dashcore-lib' +import dashcore from '@dashevo/dashcore-lib' import { Transaction } from '@dashevo/dashcore-lib/typings/transaction/Transaction' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' import { getSeed } from '@xchainjs/xchain-crypto' diff --git a/packages/xchain-dash/src/clientLedger.ts b/packages/xchain-dash/src/clientLedger.ts index 824a2a1fe..e67c6c790 100644 --- a/packages/xchain-dash/src/clientLedger.ts +++ b/packages/xchain-dash/src/clientLedger.ts @@ -1,4 +1,4 @@ -import * as dashcore from '@dashevo/dashcore-lib' +import dashcore from '@dashevo/dashcore-lib' import AppBtc from '@ledgerhq/hw-app-btc' import type { Transaction as LedgerTransaction } from '@ledgerhq/hw-app-btc/lib/types' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' diff --git a/packages/xchain-dash/src/modules.d copy.ts b/packages/xchain-dash/src/modules.d copy.ts deleted file mode 100644 index 371ffa133..000000000 --- a/packages/xchain-dash/src/modules.d copy.ts +++ /dev/null @@ -1 +0,0 @@ -declare module 'coinselect/accumulative' diff --git a/packages/xchain-dash/src/modules.d.ts b/packages/xchain-dash/src/modules.d.ts index 81e1852b0..7d9a8c805 100644 --- a/packages/xchain-dash/src/modules.d.ts +++ b/packages/xchain-dash/src/modules.d.ts @@ -1 +1,2 @@ declare module '@dashevo/dashcore-lib' +declare module 'coinselect/accumulative.js' diff --git a/packages/xchain-dash/src/utils.ts b/packages/xchain-dash/src/utils.ts index 9d420a9c6..33cca0720 100644 --- a/packages/xchain-dash/src/utils.ts +++ b/packages/xchain-dash/src/utils.ts @@ -7,7 +7,7 @@ import { FeeRate, Network } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { TxParams, UTXO, toBitcoinJS } from '@xchainjs/xchain-utxo' import * as Dash from 'bitcoinjs-lib' -import accumulative from 'coinselect/accumulative' +import accumulative from 'coinselect/accumulative.js' import * as insight from './insight-api' diff --git a/packages/xchain-doge/src/client.ts b/packages/xchain-doge/src/client.ts index e7663ae0b..a2b33b411 100644 --- a/packages/xchain-doge/src/client.ts +++ b/packages/xchain-doge/src/client.ts @@ -2,7 +2,7 @@ import { AssetInfo, FeeRate, Network } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { Client as UTXOClient, PreparedTx, TxParams, UTXO, UtxoClientParams } from '@xchainjs/xchain-utxo' import * as Dogecoin from 'bitcoinjs-lib' -import accumulative from 'coinselect/accumulative' +import accumulative from 'coinselect/accumulative.js' import { AssetDOGE, diff --git a/packages/xchain-doge/src/modules.d.ts b/packages/xchain-doge/src/modules.d.ts index ef1bf771a..548558265 100644 --- a/packages/xchain-doge/src/modules.d.ts +++ b/packages/xchain-doge/src/modules.d.ts @@ -1,7 +1,7 @@ /** - * Declaration file for the 'coinselect/accumulative' module. + * Declaration file for the 'coinselect/accumulative.js' module. * - * 'coinselect/accumulative' is a module used for selecting and accumulating unspent transaction outputs (UTXOs). + * 'coinselect/accumulative.js' is a module used for selecting and accumulating unspent transaction outputs (UTXOs). * This declaration file allows TypeScript to recognize and properly handle the module. */ -declare module 'coinselect/accumulative' +declare module 'coinselect/accumulative.js' diff --git a/packages/xchain-ethereum/package.json b/packages/xchain-ethereum/package.json index 8595dcfdb..bb6fd8940 100644 --- a/packages/xchain-ethereum/package.json +++ b/packages/xchain-ethereum/package.json @@ -41,7 +41,7 @@ "@xchainjs/xchain-evm": "workspace:*", "@xchainjs/xchain-evm-providers": "workspace:*", "@xchainjs/xchain-util": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "ethers": "^6.14.3" } } diff --git a/packages/xchain-evm/package.json b/packages/xchain-evm/package.json index e5ebec0b1..be67f0654 100644 --- a/packages/xchain-evm/package.json +++ b/packages/xchain-evm/package.json @@ -41,7 +41,7 @@ "@xchainjs/xchain-crypto": "workspace:*", "@xchainjs/xchain-evm-providers": "workspace:*", "@xchainjs/xchain-util": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "ethers": "^6.14.3" }, "devDependencies": { diff --git a/packages/xchain-kujira/src/client.ts b/packages/xchain-kujira/src/client.ts index f1e729306..6d1080c40 100644 --- a/packages/xchain-kujira/src/client.ts +++ b/packages/xchain-kujira/src/client.ts @@ -14,7 +14,7 @@ import { getSeed } from '@xchainjs/xchain-crypto' import { Address, AssetType, eqAsset } from '@xchainjs/xchain-util' import { bech32 } from '@scure/base' import { HDKey } from '@scure/bip32' -import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx.js' import { createHash } from 'crypto' import * as secp from '@bitcoin-js/tiny-secp256k1-asmjs' diff --git a/packages/xchain-litecoin/src/client.ts b/packages/xchain-litecoin/src/client.ts index 2a1693f59..8626ed7a3 100644 --- a/packages/xchain-litecoin/src/client.ts +++ b/packages/xchain-litecoin/src/client.ts @@ -2,7 +2,7 @@ import { AssetInfo, FeeRate, Network } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { Client as UTXOClient, PreparedTx, TxParams, UTXO, UtxoClientParams } from '@xchainjs/xchain-utxo' import * as Litecoin from 'bitcoinjs-lib' -import accumulative from 'coinselect/accumulative' +import accumulative from 'coinselect/accumulative.js' import { AssetLTC, diff --git a/packages/xchain-litecoin/src/modules.d.ts b/packages/xchain-litecoin/src/modules.d.ts index 9089ceea2..159198557 100644 --- a/packages/xchain-litecoin/src/modules.d.ts +++ b/packages/xchain-litecoin/src/modules.d.ts @@ -1,5 +1,5 @@ /** - * Declaration file for the 'coinselect/accumulative' module. + * Declaration file for the 'coinselect/accumulative.js' module. * This module is used for selecting UTXOs for transactions. */ -declare module 'coinselect/accumulative' +declare module 'coinselect/accumulative.js' diff --git a/packages/xchain-mayachain-query/package.json b/packages/xchain-mayachain-query/package.json index 4e7885e12..505b9cc59 100644 --- a/packages/xchain-mayachain-query/package.json +++ b/packages/xchain-mayachain-query/package.json @@ -40,7 +40,7 @@ "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", "axios-retry": "3.2.5", - "bignumber.js": "^9.0.0" + "bignumber.js": "^9.1.2" }, "devDependencies": { "axios-mock-adapter": "2.1.0" diff --git a/packages/xchain-mayachain/genMsgs.sh b/packages/xchain-mayachain/genMsgs.sh index 7082af057..d13e984e8 100755 --- a/packages/xchain-mayachain/genMsgs.sh +++ b/packages/xchain-mayachain/genMsgs.sh @@ -17,6 +17,8 @@ tput setaf 2 echo "Generating $MSG_COMPILED_OUTPUTFILE" tput sgr0 yarn run pbjs -w commonjs -t static-module $TMP_DIR/mayanode/proto/mayachain/v1/common/common.proto $TMP_DIR/mayanode/proto/mayachain/v1/x/mayachain/types/msg_deposit.proto $TMP_DIR/mayanode/proto/mayachain/v1/x/mayachain/types/msg_send.proto $TMP_DIR/mayanode/third_party/proto/cosmos/base/v1beta1/coin.proto -o $MSG_COMPILED_OUTPUTFILE +# Fix import to be ESM-compatible (no omitted file extension) +sed -i -E 's|"(protobufjs/minimal)"|"\1.js"|' "$MSG_COMPILED_OUTPUTFILE" tput setaf 2 echo "Generating $MSG_COMPILED_TYPES_OUTPUTFILE" diff --git a/packages/xchain-mayachain/package.json b/packages/xchain-mayachain/package.json index c470f6980..6647f8550 100644 --- a/packages/xchain-mayachain/package.json +++ b/packages/xchain-mayachain/package.json @@ -47,7 +47,7 @@ "@xchainjs/xchain-crypto": "workspace:*", "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "cosmjs-types": "0.9.0", "protobufjs": "6.11.4" }, diff --git a/packages/xchain-mayachain/src/client.ts b/packages/xchain-mayachain/src/client.ts index fd598396b..be6463a83 100644 --- a/packages/xchain-mayachain/src/client.ts +++ b/packages/xchain-mayachain/src/client.ts @@ -22,7 +22,7 @@ import { Address, BaseAmount, assetFromString, eqAsset, isSynthAsset } from '@xc import { bech32 } from '@scure/base' import BigNumber from 'bignumber.js' import { HDKey } from '@scure/bip32' -import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx.js' import { createHash } from 'crypto' import * as secp from '@bitcoin-js/tiny-secp256k1-asmjs' diff --git a/packages/xchain-mayachain/src/types/proto/MsgCompiled.js b/packages/xchain-mayachain/src/types/proto/MsgCompiled.js index 3e72884ca..24b3c6194 100644 --- a/packages/xchain-mayachain/src/types/proto/MsgCompiled.js +++ b/packages/xchain-mayachain/src/types/proto/MsgCompiled.js @@ -1,7 +1,7 @@ /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/ "use strict"; -var $protobuf = require("protobufjs/minimal"); +var $protobuf = require("protobufjs/minimal.js"); // Common aliases var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; diff --git a/packages/xchain-radix/__tests__/client.test.ts b/packages/xchain-radix/__tests__/client.test.ts index f2ba97693..4afb7431d 100644 --- a/packages/xchain-radix/__tests__/client.test.ts +++ b/packages/xchain-radix/__tests__/client.test.ts @@ -10,6 +10,7 @@ import { Balance, Fees, Network, XChainClientParams } from '@xchainjs/xchain-cli import { AssetType, baseAmount } from '@xchainjs/xchain-util' import { generateMnemonic } from 'bip39' +import { jest } from '@jest/globals' import { mockCommittedDetailsResponse, diff --git a/packages/xchain-thorchain-query/package.json b/packages/xchain-thorchain-query/package.json index 07d2d5906..fa45c5a79 100644 --- a/packages/xchain-thorchain-query/package.json +++ b/packages/xchain-thorchain-query/package.json @@ -39,7 +39,7 @@ "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", "axios-retry": "3.2.5", - "bignumber.js": "^9.0.0" + "bignumber.js": "^9.1.2" }, "devDependencies": { "axios-mock-adapter": "2.1.0" diff --git a/packages/xchain-thorchain/genMsgs.sh b/packages/xchain-thorchain/genMsgs.sh index 89340c6ae..316a09bab 100755 --- a/packages/xchain-thorchain/genMsgs.sh +++ b/packages/xchain-thorchain/genMsgs.sh @@ -41,6 +41,9 @@ yarn pbjs -w commonjs -t static-module \ "$TMP_DIR/thornode/third_party/proto/cosmos/base/v1beta1/coin.proto" \ -o "$MSG_COMPILED_OUTPUTFILE" 2>pbjs_errors.txt +# Fix import to be ESM-compatible (no omitted file extension) +sed -i -E 's|"(protobufjs/minimal)"|"\1.js"|' "$MSG_COMPILED_OUTPUTFILE" + # Generate TypeScript definitions with explicit namespace tput setaf 2 echo "Generating $MSG_COMPILED_TYPES_OUTPUTFILE" diff --git a/packages/xchain-thorchain/package.json b/packages/xchain-thorchain/package.json index e9f7c28f2..ea3ba05e4 100644 --- a/packages/xchain-thorchain/package.json +++ b/packages/xchain-thorchain/package.json @@ -50,7 +50,7 @@ "@xchainjs/xchain-crypto": "workspace:*", "@xchainjs/xchain-util": "workspace:*", "axios": "1.8.4", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "cosmjs-types": "0.9.0", "protobufjs": "6.11.4" }, diff --git a/packages/xchain-thorchain/src/client.ts b/packages/xchain-thorchain/src/client.ts index 07f8743ac..1a93222c9 100644 --- a/packages/xchain-thorchain/src/client.ts +++ b/packages/xchain-thorchain/src/client.ts @@ -13,7 +13,7 @@ import { bech32ToBase64, } from '@xchainjs/xchain-cosmos-sdk' import { Address, assetFromString, eqAsset } from '@xchainjs/xchain-util' -import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx.js' /** * Import constants and types diff --git a/packages/xchain-thorchain/src/clientKeystore.ts b/packages/xchain-thorchain/src/clientKeystore.ts index d5bdda36f..fe051c769 100644 --- a/packages/xchain-thorchain/src/clientKeystore.ts +++ b/packages/xchain-thorchain/src/clientKeystore.ts @@ -13,7 +13,7 @@ import { BaseAmount } from '@xchainjs/xchain-util' import { bech32 } from '@scure/base' import BigNumber from 'bignumber.js' import { HDKey } from '@scure/bip32' -import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx.js' import { createHash } from 'crypto' import * as secp from '@bitcoin-js/tiny-secp256k1-asmjs' diff --git a/packages/xchain-thorchain/src/clientLedger.ts b/packages/xchain-thorchain/src/clientLedger.ts index cefa7ae86..27093d385 100644 --- a/packages/xchain-thorchain/src/clientLedger.ts +++ b/packages/xchain-thorchain/src/clientLedger.ts @@ -7,8 +7,8 @@ import THORChainApp, { extractSignatureFromTLV } from '@xchainjs/ledger-thorchai import { CompatibleAsset, base64ToBech32, bech32ToBase64 } from '@xchainjs/xchain-cosmos-sdk' import { assetFromStringEx, assetToString } from '@xchainjs/xchain-util' import BigNumber from 'bignumber.js' -import { SignMode } from 'cosmjs-types/cosmos/tx/signing/v1beta1/signing' -import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' +import { SignMode } from 'cosmjs-types/cosmos/tx/signing/v1beta1/signing.js' +import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx.js' import { Client, ThorchainClientParams } from './client' import { AssetRuneNative, DEPOSIT_GAS_LIMIT_VALUE, defaultClientConfig } from './const' diff --git a/packages/xchain-thorchain/src/types/proto/MsgCompiled.js b/packages/xchain-thorchain/src/types/proto/MsgCompiled.js index b2ebddc85..403f2edd3 100644 --- a/packages/xchain-thorchain/src/types/proto/MsgCompiled.js +++ b/packages/xchain-thorchain/src/types/proto/MsgCompiled.js @@ -1,7 +1,7 @@ /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/ "use strict"; -var $protobuf = require("protobufjs/minimal"); +var $protobuf = require("protobufjs/minimal.js"); // Common aliases var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util; diff --git a/packages/xchain-util/package.json b/packages/xchain-util/package.json index 84667daec..b61ba2605 100755 --- a/packages/xchain-util/package.json +++ b/packages/xchain-util/package.json @@ -31,7 +31,7 @@ "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0" }, "dependencies": { - "bignumber.js": "^9.0.0" + "bignumber.js": "^9.1.2" }, "publishConfig": { "access": "public", diff --git a/packages/xchain-wallet/package.json b/packages/xchain-wallet/package.json index 6ee99fe06..acea2a965 100644 --- a/packages/xchain-wallet/package.json +++ b/packages/xchain-wallet/package.json @@ -36,7 +36,7 @@ "@xchainjs/xchain-thorchain": "workspace:*", "@xchainjs/xchain-util": "workspace:*", "@xchainjs/xchain-utxo": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "ethers": "^6.14.3" }, "devDependencies": { diff --git a/tools/txJammer/package.json b/tools/txJammer/package.json index a809392b9..d48bbebe2 100644 --- a/tools/txJammer/package.json +++ b/tools/txJammer/package.json @@ -31,7 +31,7 @@ "@xchainjs/xchain-thornode": "workspace:*", "@xchainjs/xchain-util": "workspace:*", "@xchainjs/xchain-wallet": "workspace:*", - "bignumber.js": "^9.0.0", + "bignumber.js": "^9.1.2", "commander": "^9.4.1", "weighted": "^1.0.0" } diff --git a/yarn.lock b/yarn.lock index 43807c1c0..d47a118e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3829,7 +3829,7 @@ __metadata: "@xchainjs/xchain-evm": "workspace:*" "@xchainjs/xchain-evm-providers": "workspace:*" "@xchainjs/xchain-util": "workspace:*" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" ethers: "npm:^6.14.3" languageName: unknown linkType: soft @@ -3844,7 +3844,7 @@ __metadata: "@xchainjs/xchain-evm": "workspace:*" "@xchainjs/xchain-evm-providers": "workspace:*" "@xchainjs/xchain-util": "workspace:*" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" ethers: "npm:^6.14.3" languageName: unknown linkType: soft @@ -3858,7 +3858,7 @@ __metadata: "@xchainjs/xchain-evm": "workspace:*" "@xchainjs/xchain-evm-providers": "workspace:*" "@xchainjs/xchain-util": "workspace:*" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" ethers: "npm:^6.14.3" languageName: unknown linkType: soft @@ -3916,7 +3916,7 @@ __metadata: "@xchainjs/xchain-evm": "workspace:*" "@xchainjs/xchain-evm-providers": "workspace:*" "@xchainjs/xchain-util": "workspace:*" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" ethers: "npm:^6.14.3" languageName: unknown linkType: soft @@ -3982,7 +3982,7 @@ __metadata: "@xchainjs/xchain-crypto": "workspace:*" "@xchainjs/xchain-util": "workspace:*" axios: "npm:1.8.4" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" cosmjs-types: "npm:0.9.0" protobufjs: "npm:6.11.4" languageName: unknown @@ -4052,7 +4052,7 @@ __metadata: "@xchainjs/xchain-evm": "workspace:*" "@xchainjs/xchain-evm-providers": "workspace:*" "@xchainjs/xchain-util": "workspace:*" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" ethers: "npm:^6.14.3" languageName: unknown linkType: soft @@ -4082,7 +4082,7 @@ __metadata: "@xchainjs/xchain-util": "workspace:*" axios: "npm:^1.8.4" axios-mock-adapter: "npm:^2.1.0" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" ethers: "npm:^6.14.3" languageName: unknown linkType: soft @@ -4166,7 +4166,7 @@ __metadata: axios: "npm:1.8.4" axios-mock-adapter: "npm:2.1.0" axios-retry: "npm:3.2.5" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" languageName: unknown linkType: soft @@ -4187,7 +4187,7 @@ __metadata: "@xchainjs/xchain-crypto": "workspace:*" "@xchainjs/xchain-util": "workspace:*" axios: "npm:1.8.4" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" cosmjs-types: "npm:0.9.0" protobufjs: "npm:6.11.4" languageName: unknown @@ -4334,7 +4334,7 @@ __metadata: axios: "npm:1.8.4" axios-mock-adapter: "npm:2.1.0" axios-retry: "npm:3.2.5" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" languageName: unknown linkType: soft @@ -4358,7 +4358,7 @@ __metadata: "@xchainjs/xchain-crypto": "workspace:*" "@xchainjs/xchain-util": "workspace:*" axios: "npm:1.8.4" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" cosmjs-types: "npm:0.9.0" protobufjs: "npm:6.11.4" languageName: unknown @@ -4378,7 +4378,7 @@ __metadata: version: 0.0.0-use.local resolution: "@xchainjs/xchain-util@workspace:packages/xchain-util" dependencies: - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" languageName: unknown linkType: soft @@ -4418,7 +4418,7 @@ __metadata: "@xchainjs/xchain-thorchain": "workspace:*" "@xchainjs/xchain-util": "workspace:*" "@xchainjs/xchain-utxo": "workspace:*" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" ethers: "npm:^6.14.3" languageName: unknown linkType: soft @@ -12542,7 +12542,7 @@ __metadata: "@xchainjs/xchain-thornode": "workspace:*" "@xchainjs/xchain-util": "workspace:*" "@xchainjs/xchain-wallet": "workspace:*" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" commander: "npm:^9.4.1" weighted: "npm:^1.0.0" languageName: unknown @@ -13296,7 +13296,7 @@ __metadata: "@xchainjs/xchain-util": "workspace:*" axios: "npm:1.8.4" axios-retry: "npm:^3.2.5" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" rimraf: "npm:~3.0.2" ts-node: "npm:10.9.2" typescript: "npm:^5.8.3" @@ -13357,7 +13357,7 @@ __metadata: "@xchainjs/xchain-util": "workspace:*" axios: "npm:1.8.4" axios-retry: "npm:^3.2.5" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" rimraf: "npm:~3.0.2" ts-node: "npm:10.9.2" typescript: "npm:^5.8.3" @@ -13379,7 +13379,7 @@ __metadata: "@xchainjs/xchain-util": "workspace:*" axios: "npm:1.8.4" axios-retry: "npm:^3.2.5" - bignumber.js: "npm:^9.0.0" + bignumber.js: "npm:^9.1.2" rimraf: "npm:~3.0.2" ts-node: "npm:10.9.2" typescript: "npm:^5.8.3"