diff --git a/.changeset/shy-wombats-wink.md b/.changeset/shy-wombats-wink.md new file mode 100644 index 000000000..5cedfc871 --- /dev/null +++ b/.changeset/shy-wombats-wink.md @@ -0,0 +1,44 @@ +--- +'@xchainjs/xchain-mayamidgard-query': patch +'@xchainjs/xchain-mayachain-query': patch +'@xchainjs/xchain-thorchain-query': patch +'@xchainjs/xchain-utxo-providers': patch +'@xchainjs/xchain-evm-providers': patch +'@xchainjs/xchain-mayachain-amm': patch +'@xchainjs/xchain-midgard-query': patch +'@xchainjs/xchain-thorchain-amm': patch +'@xchainjs/xchain-bitcoincash': patch +'@xchainjs/xchain-aggregator': patch +'@xchainjs/xchain-cosmos-sdk': patch +'@xchainjs/xchain-mayachain': patch +'@xchainjs/xchain-thorchain': patch +'@xchainjs/xchain-arbitrum': patch +'@xchainjs/xchain-ethereum': patch +'@xchainjs/xchain-litecoin': patch +'@xchainjs/xchain-binance': patch +'@xchainjs/xchain-bitcoin': patch +'@xchainjs/xchain-cardano': patch +'xchainjs-estimate-swap': patch +'@xchainjs/xchain-client': patch +'@xchainjs/xchain-cosmos': patch +'@xchainjs/xchain-crypto': patch +'@xchainjs/xchain-kujira': patch +'@xchainjs/xchain-solana': patch +'@xchainjs/xchain-wallet': patch +'@xchainjs/xchain-radix': patch +'@xchainjs/xchain-zcash': patch +'@xchainjs/xchain-avax': patch +'@xchainjs/xchain-base': patch +'@xchainjs/xchain-dash': patch +'@xchainjs/xchain-doge': patch +'@xchainjs/xchain-util': patch +'@xchainjs/xchain-utxo': patch +'@xchainjs/xchain-bsc': patch +'@xchainjs/xchain-evm': patch +'xchainjs-liquidity': patch +'xchainjs-check-tx': patch +'xchainjs-loans': patch +'txJammer': patch +--- + +updates and jest config changes diff --git a/packages/xchain-aggregator/jest.config.e2e.js b/packages/xchain-aggregator/jest.config.e2e.mjs similarity index 73% rename from packages/xchain-aggregator/jest.config.e2e.js rename to packages/xchain-aggregator/jest.config.e2e.mjs index c7e753cbd..869267ab9 100644 --- a/packages/xchain-aggregator/jest.config.e2e.js +++ b/packages/xchain-aggregator/jest.config.e2e.mjs @@ -1,7 +1,7 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, } diff --git a/packages/xchain-bitcoin/jest.config.js b/packages/xchain-aggregator/jest.config.mjs similarity index 86% rename from packages/xchain-bitcoin/jest.config.js rename to packages/xchain-aggregator/jest.config.mjs index fbc46d7c3..697e69100 100644 --- a/packages/xchain-bitcoin/jest.config.js +++ b/packages/xchain-aggregator/jest.config.mjs @@ -1,4 +1,4 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], diff --git a/packages/xchain-aggregator/jest.setup.js b/packages/xchain-aggregator/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-aggregator/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-aggregator/package.json b/packages/xchain-aggregator/package.json index 27980214f..138a30130 100644 --- a/packages/xchain-aggregator/package.json +++ b/packages/xchain-aggregator/package.json @@ -21,7 +21,7 @@ "clean": "rm -rf .turbo && rm -rf lib", "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "test": "jest" }, "publishConfig": { diff --git a/packages/xchain-arbitrum/jest.config.js b/packages/xchain-arbitrum/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-arbitrum/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-arbitrum/jest.config.mjs b/packages/xchain-arbitrum/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-arbitrum/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-arbitrum/jest.setup.js b/packages/xchain-arbitrum/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-arbitrum/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-arbitrum/package.json b/packages/xchain-arbitrum/package.json index d3074f5d9..dba01cabb 100644 --- a/packages/xchain-arbitrum/package.json +++ b/packages/xchain-arbitrum/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, "publishConfig": { diff --git a/packages/xchain-arbitrum/src/const.ts b/packages/xchain-arbitrum/src/const.ts index c7096dcd9..e78a12396 100644 --- a/packages/xchain-arbitrum/src/const.ts +++ b/packages/xchain-arbitrum/src/const.ts @@ -4,7 +4,7 @@ import { EVMClientParams } from '@xchainjs/xchain-evm' import { EtherscanProviderV2 } from '@xchainjs/xchain-evm-providers' import { Asset, AssetType, TokenAsset } from '@xchainjs/xchain-util' import { JsonRpcProvider } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' // Define constants related to Arbitrum export const ARB_DECIMAL = 18 diff --git a/packages/xchain-bitcoin/jest.config.e2e.js b/packages/xchain-avax/jest.config.e2e.mjs similarity index 73% rename from packages/xchain-bitcoin/jest.config.e2e.js rename to packages/xchain-avax/jest.config.e2e.mjs index c7e753cbd..869267ab9 100644 --- a/packages/xchain-bitcoin/jest.config.e2e.js +++ b/packages/xchain-avax/jest.config.e2e.mjs @@ -1,7 +1,7 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, } diff --git a/packages/xchain-avax/jest.config.js b/packages/xchain-avax/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-avax/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-avax/jest.config.mjs b/packages/xchain-avax/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-avax/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-avax/jest.setup.js b/packages/xchain-avax/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-avax/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-avax/package.json b/packages/xchain-avax/package.json index 4456290a4..a14bb2b5a 100644 --- a/packages/xchain-avax/package.json +++ b/packages/xchain-avax/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, "publishConfig": { diff --git a/packages/xchain-avax/src/const.ts b/packages/xchain-avax/src/const.ts index 4767e61f8..2424ee1a7 100644 --- a/packages/xchain-avax/src/const.ts +++ b/packages/xchain-avax/src/const.ts @@ -4,7 +4,7 @@ import { EVMClientParams } from '@xchainjs/xchain-evm' import { EtherscanProviderV2, RoutescanProvider } from '@xchainjs/xchain-evm-providers' import { Asset, AssetType } from '@xchainjs/xchain-util' import { JsonRpcProvider } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' // Define constants related to Avalanche export const AVAX_DECIMAL = 18 diff --git a/packages/xchain-base/jest.config.js b/packages/xchain-base/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-base/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-base/jest.config.mjs b/packages/xchain-base/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-base/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-base/jest.setup.js b/packages/xchain-base/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-base/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-base/package.json b/packages/xchain-base/package.json index 8079abc3b..806c15deb 100644 --- a/packages/xchain-base/package.json +++ b/packages/xchain-base/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, "publishConfig": { diff --git a/packages/xchain-base/src/const.ts b/packages/xchain-base/src/const.ts index f9408a5d4..2326c2d47 100644 --- a/packages/xchain-base/src/const.ts +++ b/packages/xchain-base/src/const.ts @@ -4,7 +4,7 @@ import { EVMClientParams } from '@xchainjs/xchain-evm' import { EtherscanProviderV2 } from '@xchainjs/xchain-evm-providers' import { Asset, AssetType } from '@xchainjs/xchain-util' import { JsonRpcProvider } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' // Define constants related to Base export const BASE_DECIMAL = 18 diff --git a/packages/xchain-avax/jest.config.e2e.js b/packages/xchain-bitcoin/jest.config.e2e.mjs similarity index 73% rename from packages/xchain-avax/jest.config.e2e.js rename to packages/xchain-bitcoin/jest.config.e2e.mjs index c7e753cbd..869267ab9 100644 --- a/packages/xchain-avax/jest.config.e2e.js +++ b/packages/xchain-bitcoin/jest.config.e2e.mjs @@ -1,7 +1,7 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, } diff --git a/packages/xchain-aggregator/jest.config.js b/packages/xchain-bitcoin/jest.config.mjs similarity index 86% rename from packages/xchain-aggregator/jest.config.js rename to packages/xchain-bitcoin/jest.config.mjs index fbc46d7c3..697e69100 100644 --- a/packages/xchain-aggregator/jest.config.js +++ b/packages/xchain-bitcoin/jest.config.mjs @@ -1,4 +1,4 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], diff --git a/packages/xchain-bitcoin/jest.setup.js b/packages/xchain-bitcoin/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-bitcoin/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-bitcoin/package.json b/packages/xchain-bitcoin/package.json index 14ac0c79f..886d6073d 100644 --- a/packages/xchain-bitcoin/package.json +++ b/packages/xchain-bitcoin/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-bitcoin/src/clientLedger.ts b/packages/xchain-bitcoin/src/clientLedger.ts index 47e41ea8e..1b5c5e7ec 100644 --- a/packages/xchain-bitcoin/src/clientLedger.ts +++ b/packages/xchain-bitcoin/src/clientLedger.ts @@ -1,5 +1,5 @@ import AppBtc from '@ledgerhq/hw-app-btc' -import { Transaction } from '@ledgerhq/hw-app-btc/lib/types' +import type { Transaction } from '@ledgerhq/hw-app-btc/lib/types' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { TxParams, UTXO, UtxoClientParams } from '@xchainjs/xchain-utxo' diff --git a/packages/xchain-bitcoincash/jest.config.e2e.js b/packages/xchain-bitcoincash/jest.config.e2e.mjs similarity index 73% rename from packages/xchain-bitcoincash/jest.config.e2e.js rename to packages/xchain-bitcoincash/jest.config.e2e.mjs index c7e753cbd..869267ab9 100644 --- a/packages/xchain-bitcoincash/jest.config.e2e.js +++ b/packages/xchain-bitcoincash/jest.config.e2e.mjs @@ -1,7 +1,7 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, } diff --git a/packages/xchain-bitcoincash/jest.config.js b/packages/xchain-bitcoincash/jest.config.mjs similarity index 86% rename from packages/xchain-bitcoincash/jest.config.js rename to packages/xchain-bitcoincash/jest.config.mjs index fbc46d7c3..697e69100 100644 --- a/packages/xchain-bitcoincash/jest.config.js +++ b/packages/xchain-bitcoincash/jest.config.mjs @@ -1,4 +1,4 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], diff --git a/packages/xchain-bitcoincash/jest.setup.js b/packages/xchain-bitcoincash/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-bitcoincash/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-bitcoincash/package.json b/packages/xchain-bitcoincash/package.json index e8ff3b53b..dc2cc0d27 100644 --- a/packages/xchain-bitcoincash/package.json +++ b/packages/xchain-bitcoincash/package.json @@ -29,7 +29,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__,__mocks__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-bitcoincash/src/clientLedger.ts b/packages/xchain-bitcoincash/src/clientLedger.ts index 9c6222930..5726e9aa7 100644 --- a/packages/xchain-bitcoincash/src/clientLedger.ts +++ b/packages/xchain-bitcoincash/src/clientLedger.ts @@ -1,5 +1,5 @@ import AppBtc from '@ledgerhq/hw-app-btc' -import { Transaction } from '@ledgerhq/hw-app-btc/lib/types' +import type { Transaction } from '@ledgerhq/hw-app-btc/lib/types' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { TxParams, UtxoClientParams } from '@xchainjs/xchain-utxo' diff --git a/packages/xchain-bsc/jest.config.e2e.js b/packages/xchain-bsc/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-bsc/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-bsc/jest.config.e2e.mjs b/packages/xchain-bsc/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-bsc/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-bsc/jest.config.js b/packages/xchain-bsc/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-bsc/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-bsc/jest.config.mjs b/packages/xchain-bsc/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-bsc/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-bsc/jest.setup.js b/packages/xchain-bsc/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-bsc/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-bsc/package.json b/packages/xchain-bsc/package.json index a0b7e6dca..d1eff0c85 100644 --- a/packages/xchain-bsc/package.json +++ b/packages/xchain-bsc/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, "publishConfig": { diff --git a/packages/xchain-bsc/src/const.ts b/packages/xchain-bsc/src/const.ts index 0ab40c8a3..b0db9a056 100644 --- a/packages/xchain-bsc/src/const.ts +++ b/packages/xchain-bsc/src/const.ts @@ -6,7 +6,7 @@ import { EVMClientParams } from '@xchainjs/xchain-evm' // Importing EVMClientPar import { EtherscanProviderV2 } from '@xchainjs/xchain-evm-providers' // Importing EtherscanProvider from xchain-evm-providers import { Asset, AssetType } from '@xchainjs/xchain-util' // Importing Asset from xchain-util import { JsonRpcProvider } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' /** * Lower fee bound for BSC transactions. diff --git a/packages/xchain-cardano/jest.config.js b/packages/xchain-cardano/jest.config.mjs similarity index 81% rename from packages/xchain-cardano/jest.config.js rename to packages/xchain-cardano/jest.config.mjs index 6ed1dd7fd..30a1004ee 100644 --- a/packages/xchain-cardano/jest.config.js +++ b/packages/xchain-cardano/jest.config.mjs @@ -1,8 +1,8 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, moduleNameMapper: { '@emurgo/cardano-serialization-lib-browser': '/__mocks__/@emurgo/cardano-serialization-lib-browser.js', }, diff --git a/packages/xchain-cardano/jest.setup.js b/packages/xchain-cardano/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-cardano/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-cardano/package.json b/packages/xchain-cardano/package.json index 0607aa698..2f869127b 100644 --- a/packages/xchain-cardano/package.json +++ b/packages/xchain-cardano/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0" }, "dependencies": { diff --git a/packages/xchain-client/jest.config.js b/packages/xchain-client/jest.config.mjs similarity index 86% rename from packages/xchain-client/jest.config.js rename to packages/xchain-client/jest.config.mjs index fbc46d7c3..697e69100 100644 --- a/packages/xchain-client/jest.config.js +++ b/packages/xchain-client/jest.config.mjs @@ -1,4 +1,4 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], diff --git a/packages/xchain-cosmos-sdk/jest.config.e2e.js b/packages/xchain-cosmos-sdk/jest.config.e2e.mjs similarity index 75% rename from packages/xchain-cosmos-sdk/jest.config.e2e.js rename to packages/xchain-cosmos-sdk/jest.config.e2e.mjs index ea1f7573c..488448a3f 100644 --- a/packages/xchain-cosmos-sdk/jest.config.e2e.js +++ b/packages/xchain-cosmos-sdk/jest.config.e2e.mjs @@ -1,8 +1,8 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], testMatch: ['/__e2e__/**/*.[jt]s?(x)'], maxConcurrency: 1, - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, } diff --git a/packages/xchain-cosmos-sdk/jest.config.js b/packages/xchain-cosmos-sdk/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-cosmos-sdk/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-cosmos-sdk/jest.config.mjs b/packages/xchain-cosmos-sdk/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-cosmos-sdk/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-cosmos-sdk/jest.setup.js b/packages/xchain-cosmos-sdk/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-cosmos-sdk/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-cosmos-sdk/package.json b/packages/xchain-cosmos-sdk/package.json index 5abfa5bd3..0c8b371ce 100644 --- a/packages/xchain-cosmos-sdk/package.json +++ b/packages/xchain-cosmos-sdk/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, "publishConfig": { diff --git a/packages/xchain-cosmos/jest.config.e2e.js b/packages/xchain-cosmos/jest.config.e2e.mjs similarity index 75% rename from packages/xchain-cosmos/jest.config.e2e.js rename to packages/xchain-cosmos/jest.config.e2e.mjs index ea1f7573c..488448a3f 100644 --- a/packages/xchain-cosmos/jest.config.e2e.js +++ b/packages/xchain-cosmos/jest.config.e2e.mjs @@ -1,8 +1,8 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], testMatch: ['/__e2e__/**/*.[jt]s?(x)'], maxConcurrency: 1, - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, } diff --git a/packages/xchain-cosmos/jest.config.js b/packages/xchain-cosmos/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-cosmos/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-cosmos/jest.config.mjs b/packages/xchain-cosmos/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-cosmos/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-cosmos/jest.setup.js b/packages/xchain-cosmos/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-cosmos/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-cosmos/package.json b/packages/xchain-cosmos/package.json index 7afec2524..2e342d877 100644 --- a/packages/xchain-cosmos/package.json +++ b/packages/xchain-cosmos/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0" }, "dependencies": { diff --git a/packages/xchain-cosmos/src/const.ts b/packages/xchain-cosmos/src/const.ts index 89d151da1..de18aedb4 100644 --- a/packages/xchain-cosmos/src/const.ts +++ b/packages/xchain-cosmos/src/const.ts @@ -1,4 +1,4 @@ -import { Network } from '@xchainjs/xchain-client/lib' +import { Network } from '@xchainjs/xchain-client' import { CosmosSdkClientParams } from '@xchainjs/xchain-cosmos-sdk' import { Asset, AssetType, baseAmount, BaseAmount } from '@xchainjs/xchain-util' diff --git a/packages/xchain-cosmos/src/types/types.ts b/packages/xchain-cosmos/src/types/types.ts index 8a6fb91a4..5eaf1896b 100644 --- a/packages/xchain-cosmos/src/types/types.ts +++ b/packages/xchain-cosmos/src/types/types.ts @@ -1,6 +1,6 @@ import { TxParams as BaseTxParams } from '@xchainjs/xchain-cosmos-sdk' import { Asset, TokenAsset } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' export type CompatibleAsset = Asset | TokenAsset diff --git a/packages/xchain-crypto/src/utils.ts b/packages/xchain-crypto/src/utils.ts index 2b957efca..676e3ca5c 100755 --- a/packages/xchain-crypto/src/utils.ts +++ b/packages/xchain-crypto/src/utils.ts @@ -1,8 +1,10 @@ import { bech32 } from 'bech32' import crypto from 'crypto' -import hexEncoding from 'crypto-js/enc-hex' -import ripemd160 from 'crypto-js/ripemd160' -import sha256 from 'crypto-js/sha256' +import cryptojs from 'crypto-js' + +const ripemd160 = cryptojs.RIPEMD160, + sha256 = cryptojs.SHA256, + hexEncoding = cryptojs.enc.Hex /** * Convert a string to an array of bytes. diff --git a/packages/xchain-dash/jest.config.e2e.js b/packages/xchain-dash/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-dash/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-dash/jest.config.e2e.mjs b/packages/xchain-dash/jest.config.e2e.mjs new file mode 100644 index 000000000..d2352daf7 --- /dev/null +++ b/packages/xchain-dash/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 30000, +} diff --git a/packages/xchain-dash/jest.config.js b/packages/xchain-dash/jest.config.js deleted file mode 100644 index fbc46d7c3..000000000 --- a/packages/xchain-dash/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-dash/jest.config.mjs b/packages/xchain-dash/jest.config.mjs new file mode 100644 index 000000000..697e69100 --- /dev/null +++ b/packages/xchain-dash/jest.config.mjs @@ -0,0 +1,5 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], +} diff --git a/packages/xchain-dash/jest.setup.js b/packages/xchain-dash/jest.setup.js deleted file mode 100644 index daa161e9b..000000000 --- a/packages/xchain-dash/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(30000) diff --git a/packages/xchain-dash/package.json b/packages/xchain-dash/package.json index 877040607..652ef9144 100644 --- a/packages/xchain-dash/package.json +++ b/packages/xchain-dash/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-dash/src/clientLedger.ts b/packages/xchain-dash/src/clientLedger.ts index 8a77d9199..824a2a1fe 100644 --- a/packages/xchain-dash/src/clientLedger.ts +++ b/packages/xchain-dash/src/clientLedger.ts @@ -1,6 +1,6 @@ import * as dashcore from '@dashevo/dashcore-lib' import AppBtc from '@ledgerhq/hw-app-btc' -import { Transaction as LedgerTransaction } from '@ledgerhq/hw-app-btc/lib/types' +import type { Transaction as LedgerTransaction } from '@ledgerhq/hw-app-btc/lib/types' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { TxParams, UtxoClientParams } from '@xchainjs/xchain-utxo' diff --git a/packages/xchain-dash/src/utils.ts b/packages/xchain-dash/src/utils.ts index 897292724..9d420a9c6 100644 --- a/packages/xchain-dash/src/utils.ts +++ b/packages/xchain-dash/src/utils.ts @@ -1,4 +1,4 @@ -import * as dashcore from '@dashevo/dashcore-lib' +import dashcore from '@dashevo/dashcore-lib' import { Address as DashAddress } from '@dashevo/dashcore-lib/typings/Address' import { Script } from '@dashevo/dashcore-lib/typings/script/Script' import { Transaction } from '@dashevo/dashcore-lib/typings/transaction/Transaction' diff --git a/packages/xchain-doge/jest.config.e2e.js b/packages/xchain-doge/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-doge/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-doge/jest.config.e2e.mjs b/packages/xchain-doge/jest.config.e2e.mjs new file mode 100644 index 000000000..d2352daf7 --- /dev/null +++ b/packages/xchain-doge/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 30000, +} diff --git a/packages/xchain-doge/jest.config.js b/packages/xchain-doge/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-doge/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-doge/jest.config.mjs b/packages/xchain-doge/jest.config.mjs new file mode 100644 index 000000000..7f0dbfef6 --- /dev/null +++ b/packages/xchain-doge/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 30000, +} diff --git a/packages/xchain-doge/jest.setup.js b/packages/xchain-doge/jest.setup.js deleted file mode 100644 index daa161e9b..000000000 --- a/packages/xchain-doge/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(30000) diff --git a/packages/xchain-doge/package.json b/packages/xchain-doge/package.json index 42eac1a29..1f3b605af 100644 --- a/packages/xchain-doge/package.json +++ b/packages/xchain-doge/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-doge/src/clientLedger.ts b/packages/xchain-doge/src/clientLedger.ts index f26b9890d..d9f05d49e 100644 --- a/packages/xchain-doge/src/clientLedger.ts +++ b/packages/xchain-doge/src/clientLedger.ts @@ -1,5 +1,5 @@ import AppBtc from '@ledgerhq/hw-app-btc' -import { Transaction } from '@ledgerhq/hw-app-btc/lib/types' +import type { Transaction } from '@ledgerhq/hw-app-btc/lib/types' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { TxParams, UtxoClientParams } from '@xchainjs/xchain-utxo' diff --git a/packages/xchain-ethereum/jest.config.e2e.js b/packages/xchain-ethereum/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-ethereum/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-ethereum/jest.config.e2e.mjs b/packages/xchain-ethereum/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-ethereum/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-ethereum/jest.config.js b/packages/xchain-ethereum/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-ethereum/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-ethereum/jest.config.mjs b/packages/xchain-ethereum/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-ethereum/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-ethereum/jest.setup.js b/packages/xchain-ethereum/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-ethereum/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-ethereum/package.json b/packages/xchain-ethereum/package.json index f56911350..4088512bd 100644 --- a/packages/xchain-ethereum/package.json +++ b/packages/xchain-ethereum/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, "publishConfig": { diff --git a/packages/xchain-ethereum/src/const.ts b/packages/xchain-ethereum/src/const.ts index 44a4b1e9d..2ba994b24 100644 --- a/packages/xchain-ethereum/src/const.ts +++ b/packages/xchain-ethereum/src/const.ts @@ -3,7 +3,7 @@ import { EVMClientParams } from '@xchainjs/xchain-evm' import { EtherscanProviderV2 } from '@xchainjs/xchain-evm-providers' import { Asset, AssetType } from '@xchainjs/xchain-util' import { JsonRpcProvider, Network as EthersNetwork } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' /** * Constants for fee bounds in Gwei. diff --git a/packages/xchain-evm-providers/jest.config.e2e.js b/packages/xchain-evm-providers/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-evm-providers/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-evm-providers/jest.config.e2e.mjs b/packages/xchain-evm-providers/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-evm-providers/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-evm-providers/jest.config.js b/packages/xchain-evm-providers/jest.config.js deleted file mode 100644 index fbc46d7c3..000000000 --- a/packages/xchain-evm-providers/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-evm-providers/jest.config.mjs b/packages/xchain-evm-providers/jest.config.mjs new file mode 100644 index 000000000..697e69100 --- /dev/null +++ b/packages/xchain-evm-providers/jest.config.mjs @@ -0,0 +1,5 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], +} diff --git a/packages/xchain-evm-providers/jest.setup.js b/packages/xchain-evm-providers/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-evm-providers/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-evm-providers/package.json b/packages/xchain-evm-providers/package.json index ac0d67a56..90efb46d9 100644 --- a/packages/xchain-evm-providers/package.json +++ b/packages/xchain-evm-providers/package.json @@ -20,7 +20,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "clean": "rm -rf .turbo && rm -rf lib", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "test": "jest --passWithNoTests" }, "publishConfig": { diff --git a/packages/xchain-evm-providers/src/providers/etherscan/etherscan-data-provider.ts b/packages/xchain-evm-providers/src/providers/etherscan/etherscan-data-provider.ts index 63bbbe9a1..2f8bfb8f7 100644 --- a/packages/xchain-evm-providers/src/providers/etherscan/etherscan-data-provider.ts +++ b/packages/xchain-evm-providers/src/providers/etherscan/etherscan-data-provider.ts @@ -11,7 +11,7 @@ import { } from '@xchainjs/xchain-util' import axios from 'axios' import { Contract, Provider } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import { Balance, CompatibleAsset, EvmOnlineDataProvider, Tx, TxsPage } from '../../types' diff --git a/packages/xchain-evm-providers/src/providers/etherscan/utils.ts b/packages/xchain-evm-providers/src/providers/etherscan/utils.ts index 77e6642b1..cc8236e0a 100644 --- a/packages/xchain-evm-providers/src/providers/etherscan/utils.ts +++ b/packages/xchain-evm-providers/src/providers/etherscan/utils.ts @@ -1,6 +1,6 @@ import { Address, Asset, BaseAmount, baseAmount } from '@xchainjs/xchain-util' import { Signer, getAddress, Contract, InterfaceAbi, Provider, BaseContract } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import erc20ABI from './erc20.json' diff --git a/packages/xchain-evm/jest.config.e2e.js b/packages/xchain-evm/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-evm/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-evm/jest.config.e2e.mjs b/packages/xchain-evm/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-evm/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-evm/jest.config.js b/packages/xchain-evm/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-evm/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-evm/jest.config.mjs b/packages/xchain-evm/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-evm/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-evm/jest.setup.js b/packages/xchain-evm/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-evm/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-evm/package.json b/packages/xchain-evm/package.json index 4a85b8828..862efb4e9 100644 --- a/packages/xchain-evm/package.json +++ b/packages/xchain-evm/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, "publishConfig": { diff --git a/packages/xchain-evm/src/clients/client.ts b/packages/xchain-evm/src/clients/client.ts index a988b7298..443ff74ad 100644 --- a/packages/xchain-evm/src/clients/client.ts +++ b/packages/xchain-evm/src/clients/client.ts @@ -27,7 +27,7 @@ import { eqAsset, } from '@xchainjs/xchain-util' import { Provider, Contract, Transaction, toUtf8Bytes, hexlify } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import erc20ABI from '../data/erc20.json' import { diff --git a/packages/xchain-evm/src/types/client-types.ts b/packages/xchain-evm/src/types/client-types.ts index a3f9db85b..84c39c172 100644 --- a/packages/xchain-evm/src/types/client-types.ts +++ b/packages/xchain-evm/src/types/client-types.ts @@ -2,7 +2,7 @@ import { FeeOption, Fees, Network, TxParams as BaseTxParams } from '@xchainjs/xc import { Balance, CompatibleAsset, Tx, TxsPage } from '@xchainjs/xchain-evm-providers' import { Address, BaseAmount } from '@xchainjs/xchain-util' import { Signer, InterfaceAbi, BigNumberish, BytesLike } from 'ethers' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' export type ClientUrl = Record export type ExplorerUrl = Record diff --git a/packages/xchain-evm/src/utils.ts b/packages/xchain-evm/src/utils.ts index 980798d49..a6841f8fa 100644 --- a/packages/xchain-evm/src/utils.ts +++ b/packages/xchain-evm/src/utils.ts @@ -1,6 +1,6 @@ import { Address, BaseAmount, TokenAsset, baseAmount } from '@xchainjs/xchain-util' import { Signer, Contract, Provider, getAddress, InterfaceAbi, BaseContract } from 'ethers' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import erc20ABI from './data/erc20.json' /** diff --git a/packages/xchain-kujira/jest.config.e2e.js b/packages/xchain-kujira/jest.config.e2e.mjs similarity index 75% rename from packages/xchain-kujira/jest.config.e2e.js rename to packages/xchain-kujira/jest.config.e2e.mjs index ea1f7573c..488448a3f 100644 --- a/packages/xchain-kujira/jest.config.e2e.js +++ b/packages/xchain-kujira/jest.config.e2e.mjs @@ -1,8 +1,8 @@ -module.exports = { +export default { preset: 'ts-jest', testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules', '/lib'], testMatch: ['/__e2e__/**/*.[jt]s?(x)'], maxConcurrency: 1, - setupFilesAfterEnv: ['./jest.setup.js'], + testTimeout: 60000, } diff --git a/packages/xchain-kujira/jest.config.js b/packages/xchain-kujira/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-kujira/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-kujira/jest.config.mjs b/packages/xchain-kujira/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-kujira/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-kujira/jest.setup.js b/packages/xchain-kujira/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-kujira/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-kujira/package.json b/packages/xchain-kujira/package.json index 541303566..ad6533f79 100644 --- a/packages/xchain-kujira/package.json +++ b/packages/xchain-kujira/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0" }, "dependencies": { diff --git a/packages/xchain-litecoin/jest.config.e2e.js b/packages/xchain-litecoin/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-litecoin/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-litecoin/jest.config.e2e.mjs b/packages/xchain-litecoin/jest.config.e2e.mjs new file mode 100644 index 000000000..d2352daf7 --- /dev/null +++ b/packages/xchain-litecoin/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 30000, +} diff --git a/packages/xchain-litecoin/jest.config.js b/packages/xchain-litecoin/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-litecoin/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-litecoin/jest.config.mjs b/packages/xchain-litecoin/jest.config.mjs new file mode 100644 index 000000000..7f0dbfef6 --- /dev/null +++ b/packages/xchain-litecoin/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 30000, +} diff --git a/packages/xchain-litecoin/jest.setup.js b/packages/xchain-litecoin/jest.setup.js deleted file mode 100644 index daa161e9b..000000000 --- a/packages/xchain-litecoin/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(30000) diff --git a/packages/xchain-litecoin/package.json b/packages/xchain-litecoin/package.json index 26095fce3..d1832db05 100644 --- a/packages/xchain-litecoin/package.json +++ b/packages/xchain-litecoin/package.json @@ -29,7 +29,7 @@ "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "postversion": "git push --follow-tags" }, "dependencies": { diff --git a/packages/xchain-litecoin/src/ClientLedger.ts b/packages/xchain-litecoin/src/ClientLedger.ts index b521ef263..60e79a34f 100644 --- a/packages/xchain-litecoin/src/ClientLedger.ts +++ b/packages/xchain-litecoin/src/ClientLedger.ts @@ -1,5 +1,5 @@ import AppBtc from '@ledgerhq/hw-app-btc' -import { Transaction } from '@ledgerhq/hw-app-btc/lib/types' +import type { Transaction } from '@ledgerhq/hw-app-btc/lib/types' import { FeeOption, FeeRate, TxHash, checkFeeBounds } from '@xchainjs/xchain-client' import { Address } from '@xchainjs/xchain-util' import { TxParams, UtxoClientParams } from '@xchainjs/xchain-utxo' diff --git a/packages/xchain-mayachain-amm/jest.config.e2e.js b/packages/xchain-mayachain-amm/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-mayachain-amm/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-mayachain-amm/jest.config.e2e.mjs b/packages/xchain-mayachain-amm/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-mayachain-amm/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayachain-amm/jest.config.js b/packages/xchain-mayachain-amm/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-mayachain-amm/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-mayachain-amm/jest.config.mjs b/packages/xchain-mayachain-amm/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-mayachain-amm/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayachain-amm/jest.setup.js b/packages/xchain-mayachain-amm/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-mayachain-amm/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-mayachain-amm/package.json b/packages/xchain-mayachain-amm/package.json index 662dcc534..43dd774e0 100644 --- a/packages/xchain-mayachain-amm/package.json +++ b/packages/xchain-mayachain-amm/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-mayachain-query/jest.config.e2e.js b/packages/xchain-mayachain-query/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-mayachain-query/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-mayachain-query/jest.config.e2e.mjs b/packages/xchain-mayachain-query/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-mayachain-query/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayachain-query/jest.config.js b/packages/xchain-mayachain-query/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-mayachain-query/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-mayachain-query/jest.config.mjs b/packages/xchain-mayachain-query/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-mayachain-query/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayachain-query/jest.setup.js b/packages/xchain-mayachain-query/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-mayachain-query/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-mayachain-query/package.json b/packages/xchain-mayachain-query/package.json index 66bd1b30c..fa8fcd8a0 100644 --- a/packages/xchain-mayachain-query/package.json +++ b/packages/xchain-mayachain-query/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-mayachain-query/src/mayachain-cache.ts b/packages/xchain-mayachain-query/src/mayachain-cache.ts index a86005d1b..17092432f 100644 --- a/packages/xchain-mayachain-query/src/mayachain-cache.ts +++ b/packages/xchain-mayachain-query/src/mayachain-cache.ts @@ -1,7 +1,7 @@ import { PoolDetail } from '@xchainjs/xchain-mayamidgard' import { MidgardQuery } from '@xchainjs/xchain-mayamidgard-query' import { CachedValue } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import { InboundDetail } from './types' import { MayaChain, Mayanode } from './utils' diff --git a/packages/xchain-mayachain-query/src/types.ts b/packages/xchain-mayachain-query/src/types.ts index ad937f79d..4e27b6f2f 100644 --- a/packages/xchain-mayachain-query/src/types.ts +++ b/packages/xchain-mayachain-query/src/types.ts @@ -1,6 +1,6 @@ import { TxHash } from '@xchainjs/xchain-client' import { Address, Asset, AssetCryptoAmount, Chain, CryptoAmount, SynthAsset, TokenAsset } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' export type CompatibleAsset = Asset | TokenAsset | SynthAsset diff --git a/packages/xchain-mayachain/jest.config.e2e.js b/packages/xchain-mayachain/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-mayachain/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-mayachain/jest.config.e2e.mjs b/packages/xchain-mayachain/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-mayachain/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayachain/jest.config.js b/packages/xchain-mayachain/jest.config.js deleted file mode 100644 index 26c1123fc..000000000 --- a/packages/xchain-mayachain/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'] -} diff --git a/packages/xchain-mayachain/jest.config.mjs b/packages/xchain-mayachain/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-mayachain/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayachain/jest.setup.js b/packages/xchain-mayachain/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-mayachain/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-mayachain/package.json b/packages/xchain-mayachain/package.json index d227663ff..9052f7def 100644 --- a/packages/xchain-mayachain/package.json +++ b/packages/xchain-mayachain/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "start:example": "ts-node example/index.ts", "generate:MayachainMsgs": "./genMsgs.sh" diff --git a/packages/xchain-mayachain/src/types/client-types.ts b/packages/xchain-mayachain/src/types/client-types.ts index cc19525af..e12be211a 100644 --- a/packages/xchain-mayachain/src/types/client-types.ts +++ b/packages/xchain-mayachain/src/types/client-types.ts @@ -1,6 +1,6 @@ import { CompatibleAsset, Tx, TxParams as BaseTxParams } from '@xchainjs/xchain-cosmos-sdk' import { BaseAmount } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' export type DepositParam = { walletIndex?: number diff --git a/packages/xchain-mayamidgard-query/jest.config.e2e.js b/packages/xchain-mayamidgard-query/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-mayamidgard-query/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-mayamidgard-query/jest.config.e2e.mjs b/packages/xchain-mayamidgard-query/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-mayamidgard-query/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayamidgard-query/jest.config.js b/packages/xchain-mayamidgard-query/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-mayamidgard-query/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-mayamidgard-query/jest.config.mjs b/packages/xchain-mayamidgard-query/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-mayamidgard-query/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-mayamidgard-query/jest.setup.js b/packages/xchain-mayamidgard-query/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-mayamidgard-query/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-mayamidgard-query/package.json b/packages/xchain-mayamidgard-query/package.json index 9af08795c..5300fc415 100644 --- a/packages/xchain-mayamidgard-query/package.json +++ b/packages/xchain-mayamidgard-query/package.json @@ -27,7 +27,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-midgard-query/jest.config.e2e.js b/packages/xchain-midgard-query/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-midgard-query/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-midgard-query/jest.config.e2e.mjs b/packages/xchain-midgard-query/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-midgard-query/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-midgard-query/jest.config.js b/packages/xchain-midgard-query/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-midgard-query/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-midgard-query/jest.config.mjs b/packages/xchain-midgard-query/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-midgard-query/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-midgard-query/jest.setup.js b/packages/xchain-midgard-query/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-midgard-query/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-midgard-query/package.json b/packages/xchain-midgard-query/package.json index 0e35928df..ecc5d6c94 100644 --- a/packages/xchain-midgard-query/package.json +++ b/packages/xchain-midgard-query/package.json @@ -27,7 +27,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-radix/README.md b/packages/xchain-radix/README.md index 80e1c6cc2..74cc700fb 100644 --- a/packages/xchain-radix/README.md +++ b/packages/xchain-radix/README.md @@ -63,7 +63,7 @@ second one submits the transaction to the ledger ``` import { Network, TxParams, XChainClientParams } from '@xchainjs/xchain-client' import { Client, XrdAssetStokenet } from '@xchainjs/xchain-radix' -import { baseAmount } from '@xchainjs/xchain-util/lib' +import { baseAmount } from '@xchainjs/xchain-util' const phrase = 'rural bright ball negative already grass good grant nation screen model pizza' const params: XChainClientParams = { @@ -93,7 +93,7 @@ main().catch(console.error) ``` import { Network, TxParams, XChainClientParams } from '@xchainjs/xchain-client' import { Client, XrdAssetStokenet } from '@xchainjs/xchain-radix' -import { baseAmount } from '@xchainjs/xchain-util/lib' +import { baseAmount } from '@xchainjs/xchain-util' const phrase = 'rural bright ball negative already grass good grant nation screen model pizza' const params: XChainClientParams = { @@ -121,7 +121,7 @@ main().catch(console.error) ### Getting a transaction data ``` -import { Network, Tx, TxParams, XChainClientParams } from '@xchainjs/xchain-client/lib' +import { Network, Tx, TxParams, XChainClientParams } from '@xchainjs/xchain-client' import { Client } from '@xchainjs/xchain-radix' import { XrdAsset } from '@xchainjs/xchain-radix/src/const' import { baseAmount } from '@xchainjs/xchain-util' @@ -146,9 +146,9 @@ console.log(transaction) ### Getting balances ``` -import { Balance, Network, XChainClientParams } from '@xchainjs/xchain-client/lib' +import { Balance, Network, XChainClientParams } from '@xchainjs/xchain-client' import { Client } from '@xchainjs/xchain-radix' -import { Asset } from '@xchainjs/xchain-util/lib' +import { Asset } from '@xchainjs/xchain-util' const phrase = 'rural bright ball negative already grass good grant nation screen model pizza' const params: XChainClientParams = { @@ -174,7 +174,7 @@ console.log(balances) ### Getting fees ``` -import { Fees, Network, XChainClientParams } from '@xchainjs/xchain-client/lib' +import { Fees, Network, XChainClientParams } from '@xchainjs/xchain-client' import { Client } from '@xchainjs/xchain-radix' const phrase = 'rural bright ball negative already grass good grant nation screen model pizza' @@ -191,7 +191,7 @@ console.log(fees) ### Getting transactions history ``` -import { Network, XChainClientParams } from '@xchainjs/xchain-client/lib' +import { Network, XChainClientParams } from '@xchainjs/xchain-client' import { Client } from '@xchainjs/xchain-radix' const phrase = 'rural bright ball negative already grass good grant nation screen model pizza' diff --git a/packages/xchain-radix/jest.config.js b/packages/xchain-radix/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-radix/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-radix/jest.config.mjs b/packages/xchain-radix/jest.config.mjs new file mode 100644 index 000000000..7f0dbfef6 --- /dev/null +++ b/packages/xchain-radix/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 30000, +} diff --git a/packages/xchain-radix/jest.setup.js b/packages/xchain-radix/jest.setup.js deleted file mode 100644 index daa161e9b..000000000 --- a/packages/xchain-radix/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(30000) diff --git a/packages/xchain-ripple/jest.config.e2e.js b/packages/xchain-ripple/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-ripple/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-ripple/jest.config.e2e.mjs b/packages/xchain-ripple/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-ripple/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-ripple/jest.config.js b/packages/xchain-ripple/jest.config.js deleted file mode 100644 index fbc46d7c3..000000000 --- a/packages/xchain-ripple/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-ripple/jest.config.mjs b/packages/xchain-ripple/jest.config.mjs new file mode 100644 index 000000000..7f0dbfef6 --- /dev/null +++ b/packages/xchain-ripple/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 30000, +} diff --git a/packages/xchain-ripple/jest.setup.js b/packages/xchain-ripple/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-ripple/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-ripple/package.json b/packages/xchain-ripple/package.json index e9fbc8f66..c60373b6a 100644 --- a/packages/xchain-ripple/package.json +++ b/packages/xchain-ripple/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest --passWithNoTests", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-solana/jest.config.e2e.js b/packages/xchain-solana/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-solana/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-solana/jest.config.e2e.mjs b/packages/xchain-solana/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-solana/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-solana/jest.config.js b/packages/xchain-solana/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-solana/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-solana/jest.config.mjs b/packages/xchain-solana/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-solana/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-solana/jest.setup.js b/packages/xchain-solana/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-solana/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-solana/package.json b/packages/xchain-solana/package.json index db03cdbdc..7d3741484 100644 --- a/packages/xchain-solana/package.json +++ b/packages/xchain-solana/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0" }, "dependencies": { diff --git a/packages/xchain-thorchain-amm/jest.config.e2e.js b/packages/xchain-thorchain-amm/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-thorchain-amm/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-thorchain-amm/jest.config.e2e.mjs b/packages/xchain-thorchain-amm/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-thorchain-amm/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-thorchain-amm/jest.config.js b/packages/xchain-thorchain-amm/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-thorchain-amm/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-thorchain-amm/jest.config.mjs b/packages/xchain-thorchain-amm/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-thorchain-amm/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-thorchain-amm/jest.setup.js b/packages/xchain-thorchain-amm/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-thorchain-amm/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-thorchain-amm/package.json b/packages/xchain-thorchain-amm/package.json index 0491eb207..c155be2a0 100644 --- a/packages/xchain-thorchain-amm/package.json +++ b/packages/xchain-thorchain-amm/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-thorchain-query/jest.config.e2e.js b/packages/xchain-thorchain-query/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-thorchain-query/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-thorchain-query/jest.config.e2e.mjs b/packages/xchain-thorchain-query/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-thorchain-query/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-thorchain-query/jest.config.js b/packages/xchain-thorchain-query/jest.config.js deleted file mode 100644 index 2c5daf952..000000000 --- a/packages/xchain-thorchain-query/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-thorchain-query/jest.config.mjs b/packages/xchain-thorchain-query/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-thorchain-query/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-thorchain-query/jest.setup.js b/packages/xchain-thorchain-query/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-thorchain-query/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-thorchain-query/package.json b/packages/xchain-thorchain-query/package.json index 0bf1b74ff..8e52ad3b6 100644 --- a/packages/xchain-thorchain-query/package.json +++ b/packages/xchain-thorchain-query/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" }, diff --git a/packages/xchain-thorchain-query/src/liquidity-pool.ts b/packages/xchain-thorchain-query/src/liquidity-pool.ts index 0158593b3..3b0ba2dcd 100644 --- a/packages/xchain-thorchain-query/src/liquidity-pool.ts +++ b/packages/xchain-thorchain-query/src/liquidity-pool.ts @@ -1,6 +1,6 @@ -import { Pool } from '@xchainjs/xchain-thornode/lib' +import { Pool } from '@xchainjs/xchain-thornode' import { Asset, BaseAmount, TokenAsset, assetFromString, baseAmount } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' /** * Represents a Liquidity Pool in Thorchain diff --git a/packages/xchain-thorchain-query/src/thorchain-cache.ts b/packages/xchain-thorchain-query/src/thorchain-cache.ts index 908272dbd..5f36e8dae 100644 --- a/packages/xchain-thorchain-query/src/thorchain-cache.ts +++ b/packages/xchain-thorchain-query/src/thorchain-cache.ts @@ -16,7 +16,7 @@ import { isSynthAsset, isTradeAsset, } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import { LiquidityPool } from './liquidity-pool' import { InboundDetail } from './types' diff --git a/packages/xchain-thorchain-query/src/thorchain-query.ts b/packages/xchain-thorchain-query/src/thorchain-query.ts index 8b713797e..496fdad18 100644 --- a/packages/xchain-thorchain-query/src/thorchain-query.ts +++ b/packages/xchain-thorchain-query/src/thorchain-query.ts @@ -21,7 +21,7 @@ import { baseAmount, isSynthAsset, } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import { DefaultChainAttributes } from './chain-defaults' import { LiquidityPool } from './liquidity-pool' diff --git a/packages/xchain-thorchain-query/src/types.ts b/packages/xchain-thorchain-query/src/types.ts index 4289d95a4..483300c05 100644 --- a/packages/xchain-thorchain-query/src/types.ts +++ b/packages/xchain-thorchain-query/src/types.ts @@ -13,7 +13,7 @@ import { TradeAsset, TradeCryptoAmount, } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' export type CompatibleAsset = Asset | TokenAsset | SynthAsset | TradeAsset | SecuredAsset diff --git a/packages/xchain-thorchain-query/src/utils/liquidity.ts b/packages/xchain-thorchain-query/src/utils/liquidity.ts index 1859cd2fc..09a7b4955 100644 --- a/packages/xchain-thorchain-query/src/utils/liquidity.ts +++ b/packages/xchain-thorchain-query/src/utils/liquidity.ts @@ -1,5 +1,5 @@ import { CryptoAmount, baseAmount } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import { LiquidityPool } from '../liquidity-pool' import { Block, ILProtectionData, LiquidityToAdd, PoolShareDetail, PostionDepositValue, UnitData } from '../types' diff --git a/packages/xchain-thorchain-query/src/utils/utils.ts b/packages/xchain-thorchain-query/src/utils/utils.ts index 939940c85..f4cd7a4c5 100644 --- a/packages/xchain-thorchain-query/src/utils/utils.ts +++ b/packages/xchain-thorchain-query/src/utils/utils.ts @@ -8,7 +8,7 @@ import { eqAsset, isSynthAsset, } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' import { CompatibleAsset, InboundDetail } from '../types' import { diff --git a/packages/xchain-thorchain/jest.config.e2e.js b/packages/xchain-thorchain/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-thorchain/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-thorchain/jest.config.e2e.mjs b/packages/xchain-thorchain/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-thorchain/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-thorchain/jest.config.js b/packages/xchain-thorchain/jest.config.js deleted file mode 100644 index 26c1123fc..000000000 --- a/packages/xchain-thorchain/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - setupFilesAfterEnv: ['./jest.setup.js'] -} diff --git a/packages/xchain-thorchain/jest.config.mjs b/packages/xchain-thorchain/jest.config.mjs new file mode 100644 index 000000000..aa3d4d563 --- /dev/null +++ b/packages/xchain-thorchain/jest.config.mjs @@ -0,0 +1,6 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testTimeout: 60000, +} diff --git a/packages/xchain-thorchain/jest.setup.js b/packages/xchain-thorchain/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-thorchain/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-thorchain/package.json b/packages/xchain-thorchain/package.json index 58b8bf9bc..f05b3477b 100644 --- a/packages/xchain-thorchain/package.json +++ b/packages/xchain-thorchain/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "start:example": "ts-node example/index.ts", "generate:ThorchainMsgs": "./genMsgs.sh" diff --git a/packages/xchain-thorchain/src/clientKeystore.ts b/packages/xchain-thorchain/src/clientKeystore.ts index fb1868eb8..9177ec176 100644 --- a/packages/xchain-thorchain/src/clientKeystore.ts +++ b/packages/xchain-thorchain/src/clientKeystore.ts @@ -11,7 +11,7 @@ import { import { getSeed } from '@xchainjs/xchain-crypto' import { BaseAmount } from '@xchainjs/xchain-util' import { encode, toWords } from 'bech32' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import { HDKey } from '@scure/bip32' import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' import { createHash } from 'crypto' diff --git a/packages/xchain-thorchain/src/clientLedger.ts b/packages/xchain-thorchain/src/clientLedger.ts index d3c2e84b8..cefa7ae86 100644 --- a/packages/xchain-thorchain/src/clientLedger.ts +++ b/packages/xchain-thorchain/src/clientLedger.ts @@ -6,7 +6,7 @@ import Transport from '@ledgerhq/hw-transport' import THORChainApp, { extractSignatureFromTLV } from '@xchainjs/ledger-thorchain' import { CompatibleAsset, base64ToBech32, bech32ToBase64 } from '@xchainjs/xchain-cosmos-sdk' import { assetFromStringEx, assetToString } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import BigNumber from 'bignumber.js' import { SignMode } from 'cosmjs-types/cosmos/tx/signing/v1beta1/signing' import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx' diff --git a/packages/xchain-thorchain/src/types/client-types.ts b/packages/xchain-thorchain/src/types/client-types.ts index d723cc861..1e2f89342 100644 --- a/packages/xchain-thorchain/src/types/client-types.ts +++ b/packages/xchain-thorchain/src/types/client-types.ts @@ -1,6 +1,6 @@ import { CompatibleAsset, Tx, TxParams as BaseTxParams } from '@xchainjs/xchain-cosmos-sdk' import { BaseAmount } from '@xchainjs/xchain-util' -import { BigNumber } from 'bignumber.js' +import type BigNumber from 'bignumber.js' export type DepositParam = { walletIndex?: number diff --git a/packages/xchain-util/jest.config.js b/packages/xchain-util/jest.config.js deleted file mode 100755 index fbc46d7c3..000000000 --- a/packages/xchain-util/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-util/jest.config.mjs b/packages/xchain-util/jest.config.mjs new file mode 100755 index 000000000..697e69100 --- /dev/null +++ b/packages/xchain-util/jest.config.mjs @@ -0,0 +1,5 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], +} diff --git a/packages/xchain-util/src/asset.ts b/packages/xchain-util/src/asset.ts index aa28c0c88..a4ccd39cc 100755 --- a/packages/xchain-util/src/asset.ts +++ b/packages/xchain-util/src/asset.ts @@ -2,19 +2,18 @@ import BigNumber from 'bignumber.js' import { fixedBN, formatBN } from './bn' import { trimZeros as trimZerosHelper } from './string' -import { +import type { Amount, AnyAsset, Asset, AssetAmount, - AssetType, BaseAmount, - Denomination, SecuredAsset, SynthAsset, TokenAsset, TradeAsset, } from './types' +import { AssetType, Denomination } from './types' export type Address = string diff --git a/packages/xchain-util/src/crypto-amount.ts b/packages/xchain-util/src/crypto-amount.ts index c2ecbcd9b..e8bf9c265 100644 --- a/packages/xchain-util/src/crypto-amount.ts +++ b/packages/xchain-util/src/crypto-amount.ts @@ -1,20 +1,7 @@ -import { BigNumber } from 'bignumber.js' - -import { - AnyAsset, - Asset, - AssetAmount, - BaseAmount, - SecuredAsset, - SynthAsset, - TokenAsset, - TradeAsset, - assetToBase, - assetToString, - baseToAsset, - eqAsset, - formatAssetAmountCurrency, -} from './' +import type BigNumber from 'bignumber.js' + +import type { AnyAsset, Asset, AssetAmount, BaseAmount, SecuredAsset, SynthAsset, TokenAsset, TradeAsset } from './' +import { assetToBase, assetToString, baseToAsset, eqAsset, formatAssetAmountCurrency } from './' /** * Utility Class to combine an amount (asset/base) with the Asset diff --git a/packages/xchain-util/src/types/asset.ts b/packages/xchain-util/src/types/asset.ts index 185c594fe..61794feb0 100644 --- a/packages/xchain-util/src/types/asset.ts +++ b/packages/xchain-util/src/types/asset.ts @@ -1,4 +1,4 @@ -import { Chain } from './chain' +import type { Chain } from './chain' /** * Asset type diff --git a/packages/xchain-utxo-providers/jest.config.e2e.js b/packages/xchain-utxo-providers/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-utxo-providers/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-utxo-providers/jest.config.e2e.mjs b/packages/xchain-utxo-providers/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-utxo-providers/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-utxo-providers/jest.config.js b/packages/xchain-utxo-providers/jest.config.js deleted file mode 100644 index fbc46d7c3..000000000 --- a/packages/xchain-utxo-providers/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-utxo-providers/jest.config.mjs b/packages/xchain-utxo-providers/jest.config.mjs new file mode 100644 index 000000000..697e69100 --- /dev/null +++ b/packages/xchain-utxo-providers/jest.config.mjs @@ -0,0 +1,5 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], +} diff --git a/packages/xchain-utxo-providers/jest.setup.js b/packages/xchain-utxo-providers/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-utxo-providers/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-utxo-providers/package.json b/packages/xchain-utxo-providers/package.json index 928671a90..643088df9 100644 --- a/packages/xchain-utxo-providers/package.json +++ b/packages/xchain-utxo-providers/package.json @@ -20,7 +20,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "clean": "rm -rf .turbo && rm -rf lib", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "test": "jest " }, "publishConfig": { diff --git a/packages/xchain-utxo/jest.config.js b/packages/xchain-utxo/jest.config.js deleted file mode 100755 index fbc46d7c3..000000000 --- a/packages/xchain-utxo/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-utxo/jest.config.mjs b/packages/xchain-utxo/jest.config.mjs new file mode 100755 index 000000000..697e69100 --- /dev/null +++ b/packages/xchain-utxo/jest.config.mjs @@ -0,0 +1,5 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], +} diff --git a/packages/xchain-wallet/__tests__/wallet.test.ts b/packages/xchain-wallet/__tests__/wallet.test.ts index 157b81546..22c34a476 100644 --- a/packages/xchain-wallet/__tests__/wallet.test.ts +++ b/packages/xchain-wallet/__tests__/wallet.test.ts @@ -3,7 +3,7 @@ import { Network } from '@xchainjs/xchain-client' import { Client as EthClient, defaultEthParams } from '@xchainjs/xchain-ethereum' import { Client as ThorClient } from '@xchainjs/xchain-thorchain' -import { Wallet } from '../' +import { Wallet } from '@xchainjs/xchain-wallet' describe('Wallet', () => { describe('Instantiation', () => { diff --git a/packages/xchain-wallet/jest.config.e2e.js b/packages/xchain-wallet/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-wallet/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-wallet/jest.config.e2e.mjs b/packages/xchain-wallet/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-wallet/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-wallet/jest.config.js b/packages/xchain-wallet/jest.config.js deleted file mode 100644 index fbc46d7c3..000000000 --- a/packages/xchain-wallet/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-wallet/jest.config.mjs b/packages/xchain-wallet/jest.config.mjs new file mode 100644 index 000000000..697e69100 --- /dev/null +++ b/packages/xchain-wallet/jest.config.mjs @@ -0,0 +1,5 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], +} diff --git a/packages/xchain-wallet/jest.setup.js b/packages/xchain-wallet/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-wallet/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-wallet/package.json b/packages/xchain-wallet/package.json index 7cb5fc8fe..6c7423274 100644 --- a/packages/xchain-wallet/package.json +++ b/packages/xchain-wallet/package.json @@ -21,7 +21,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "clean": "rm -rf .turbo && rm -rf lib", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "test": "jest" }, "publishConfig": { diff --git a/packages/xchain-zcash/jest.config.e2e.js b/packages/xchain-zcash/jest.config.e2e.js deleted file mode 100644 index c7e753cbd..000000000 --- a/packages/xchain-zcash/jest.config.e2e.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], - testMatch: ['/__e2e__/**/*.[jt]s?(x)'], - setupFilesAfterEnv: ['./jest.setup.js'], -} diff --git a/packages/xchain-zcash/jest.config.e2e.mjs b/packages/xchain-zcash/jest.config.e2e.mjs new file mode 100644 index 000000000..869267ab9 --- /dev/null +++ b/packages/xchain-zcash/jest.config.e2e.mjs @@ -0,0 +1,7 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], + testMatch: ['/__e2e__/**/*.[jt]s?(x)'], + testTimeout: 60000, +} diff --git a/packages/xchain-zcash/jest.config.js b/packages/xchain-zcash/jest.config.js deleted file mode 100644 index fbc46d7c3..000000000 --- a/packages/xchain-zcash/jest.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - preset: 'ts-jest', - testEnvironment: 'node', - testPathIgnorePatterns: ['/node_modules', '/lib'], -} diff --git a/packages/xchain-zcash/jest.config.mjs b/packages/xchain-zcash/jest.config.mjs new file mode 100644 index 000000000..697e69100 --- /dev/null +++ b/packages/xchain-zcash/jest.config.mjs @@ -0,0 +1,5 @@ +export default { + preset: 'ts-jest', + testEnvironment: 'node', + testPathIgnorePatterns: ['/node_modules', '/lib'], +} diff --git a/packages/xchain-zcash/jest.setup.js b/packages/xchain-zcash/jest.setup.js deleted file mode 100644 index 7f0aeddaa..000000000 --- a/packages/xchain-zcash/jest.setup.js +++ /dev/null @@ -1 +0,0 @@ -jest.setTimeout(60000) diff --git a/packages/xchain-zcash/package.json b/packages/xchain-zcash/package.json index 9cfa5735f..f66d44188 100644 --- a/packages/xchain-zcash/package.json +++ b/packages/xchain-zcash/package.json @@ -28,7 +28,7 @@ "build": "yarn clean && rollup -c --bundleConfigAsCjs", "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"", "test": "jest", - "e2e": "jest --config jest.config.e2e.js", + "e2e": "jest --config jest.config.e2e.mjs", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "postversion": "git push --follow-tags" },