diff --git a/.changeset/fast-months-sip.md b/.changeset/fast-months-sip.md new file mode 100644 index 000000000..37d377c0a --- /dev/null +++ b/.changeset/fast-months-sip.md @@ -0,0 +1,5 @@ +--- +'@xchainjs/xchain-aggregator': patch +--- + +Add `streamingQuantity` and `streamingInterval` to allow streaming swaps diff --git a/.changeset/mean-cows-deny.md b/.changeset/mean-cows-deny.md new file mode 100644 index 000000000..561e5f891 --- /dev/null +++ b/.changeset/mean-cows-deny.md @@ -0,0 +1,5 @@ +--- +'@xchainjs/xchain-aggregator': patch +--- + +Add arbitrum to chainflip protocol diff --git a/.changeset/polite-flowers-grow.md b/.changeset/polite-flowers-grow.md new file mode 100644 index 000000000..9356cbc14 --- /dev/null +++ b/.changeset/polite-flowers-grow.md @@ -0,0 +1,5 @@ +--- +'@xchainjs/xchain-arbitrum': patch +--- + +Lower fee bound updated to 10000000. diff --git a/.changeset/rotten-toes-doubt.md b/.changeset/rotten-toes-doubt.md new file mode 100644 index 000000000..45a146a8a --- /dev/null +++ b/.changeset/rotten-toes-doubt.md @@ -0,0 +1,5 @@ +--- +'@xchainjs/xchain-cosmos': patch +--- + +Mintscan as explorer. diff --git a/examples/aggregator/.codesandbox/tasks.json b/examples/aggregator/.codesandbox/tasks.json new file mode 100644 index 000000000..fff1c37f8 --- /dev/null +++ b/examples/aggregator/.codesandbox/tasks.json @@ -0,0 +1,9 @@ +{ + // These tasks will run in order when initializing your CodeSandbox project. + "setupTasks": [ + { + "name": "Install Dependencies", + "command": "yarn install" + } + ] +} \ No newline at end of file diff --git a/examples/aggregator/.devcontainer/devcontainer.json b/examples/aggregator/.devcontainer/devcontainer.json new file mode 100644 index 000000000..9cef189a7 --- /dev/null +++ b/examples/aggregator/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Devcontainer", + "image": "ghcr.io/codesandbox/devcontainers/typescript-node:latest" +} \ No newline at end of file diff --git a/examples/aggregator/CHANGELOG.md b/examples/aggregator/CHANGELOG.md new file mode 100644 index 000000000..9764cccd2 --- /dev/null +++ b/examples/aggregator/CHANGELOG.md @@ -0,0 +1 @@ +# xchainjs-aggregator diff --git a/examples/aggregator/README.md b/examples/aggregator/README.md new file mode 100644 index 000000000..bce644523 --- /dev/null +++ b/examples/aggregator/README.md @@ -0,0 +1,32 @@ +# Aggregator + +Aggregator examples to show different use cases + +## Examples + +### Swaps + +#### Estimate swap + +Check out how you should estimate a swap in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/aggregator/swap-do.ts) or run it as + +```sh +yarn estimateSwap fromAsset toAsset amount decimals +``` + +#### Do swap + +Check out how you should do a swap between BTC and ETH in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/aggregator/swap-estimate.ts) or run it as + + +```sh +yarn doSwap phrase amount +``` + +#### Get swap history + +Check out how you should get the swap history of several addresses in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/aggregator/swap-history.ts) or run it as + +```sh +yarn swapHistory chain1:address1 chain2:address2 +``` diff --git a/examples/aggregator/package.json b/examples/aggregator/package.json new file mode 100644 index 000000000..3f856a7f0 --- /dev/null +++ b/examples/aggregator/package.json @@ -0,0 +1,26 @@ +{ + "name": "xchainjs-aggregator", + "private": true, + "version": "0.0.1", + "scripts": { + "swapHistory": "npx ts-node swap-history.ts", + "estimateSwap": "npx ts-node swap-estimate.ts", + "doSwap": "npx ts-node swap-do.ts", + "build": "tsc --noEmit" + }, + "description": "Examples using the Aggregator", + "main": "index.js", + "license": "MIT", + "dependencies": { + "@xchainjs/xchain-aggregator": "workspace:*", + "@xchainjs/xchain-bitcoin": "workspace:*", + "@xchainjs/xchain-ethereum": "workspace:*", + "@xchainjs/xchain-util": "workspace:*", + "@xchainjs/xchain-wallet": "workspace:*" + }, + "devDependencies": { + "@types/node": "20.11.28", + "ts-node": "10.9.2", + "typescript": "^5.0.4" + } +} diff --git a/examples/aggregator/swap-do.ts b/examples/aggregator/swap-do.ts new file mode 100644 index 000000000..84cc44f77 --- /dev/null +++ b/examples/aggregator/swap-do.ts @@ -0,0 +1,33 @@ +import { Aggregator } from '@xchainjs/xchain-aggregator' +import { AssetBTC, BTCChain, Client as BTCClient, defaultBTCParams } from '@xchainjs/xchain-bitcoin' +import { AssetETH, Client as ETHClient, ETHChain, defaultEthParams } from '@xchainjs/xchain-ethereum' +import { CryptoAmount, assetAmount, assetToBase } from '@xchainjs/xchain-util' +import { Wallet } from '@xchainjs/xchain-wallet' + +const main = async () => { + const phrase = process.argv[2] || '' + const amount = assetToBase(assetAmount(process.argv[4], Number(process.argv[5] || 8))) + + const wallet = new Wallet({ + BTCChain: new BTCClient({ ...defaultBTCParams, phrase }), + ETHChain: new ETHClient({ ...defaultEthParams, phrase }), + }) + + const aggregator = new Aggregator({ + wallet, + }) + + const txSubmited = await aggregator.doSwap({ + fromAsset: AssetBTC, + destinationAsset: AssetETH, + fromAddress: await wallet.getAddress(BTCChain), + destinationAddress: await wallet.getAddress(ETHChain), + amount: new CryptoAmount(amount, AssetBTC), + }) + + console.log(txSubmited) +} + +main() + .then(() => process.exit(0)) + .catch((err) => console.error(err)) diff --git a/examples/aggregator/swap-estimate.ts b/examples/aggregator/swap-estimate.ts new file mode 100644 index 000000000..b66eb0ebf --- /dev/null +++ b/examples/aggregator/swap-estimate.ts @@ -0,0 +1,28 @@ +import { Aggregator } from '@xchainjs/xchain-aggregator' +import { CryptoAmount, assetAmount, assetFromStringEx, assetToBase } from '@xchainjs/xchain-util' + +const main = async () => { + const fromAsset = assetFromStringEx(process.argv[2] || '') + const toAsset = assetFromStringEx(process.argv[3] || '') + const amount = assetToBase(assetAmount(process.argv[4], Number(process.argv[5] || 8))) + + const aggregator = new Aggregator() + + const quote = await aggregator.estimateSwap({ + fromAsset, + destinationAsset: toAsset, + amount: new CryptoAmount(amount, fromAsset), + }) + + console.log({ + canSwap: quote.canSwap, + protocol: quote.protocol, + expectedAmount: quote.expectedAmount.assetAmount.amount().toString(), + memo: quote.memo, + toAddress: quote.toAddress, + }) +} + +main() + .then(() => process.exit(0)) + .catch((err) => console.error(err)) diff --git a/examples/aggregator/swap-history.ts b/examples/aggregator/swap-history.ts new file mode 100644 index 000000000..336cee9c6 --- /dev/null +++ b/examples/aggregator/swap-history.ts @@ -0,0 +1,39 @@ +import { Aggregator } from '@xchainjs/xchain-aggregator' +import { assetToString } from '@xchainjs/xchain-util' + +const main = async () => { + const chainAddress1 = process.argv[2] || '' + const chainAddress2 = process.argv[3] || '' + + const aggregator = new Aggregator() + + const swaps = await aggregator.getSwapHistory({ + chainAddresses: [ + { + chain: chainAddress1.split(':')[0], + address: chainAddress1.split(':')[1], + }, + { + chain: chainAddress2.split(':')[0], + address: chainAddress2.split(':')[1], + }, + ], + }) + + console.table( + swaps.swaps.map((swap) => { + return { + protocol: swap.protocol, + fromAsset: assetToString(swap.inboundTx.amount.asset), + toAsset: swap.status === 'success' ? assetToString(swap.outboundTx.amount.asset) : undefined, + hash: swap.inboundTx.hash, + fromAmount: swap.inboundTx.amount.assetAmount.amount().toString(), + toAmount: swap.status === 'success' ? swap.outboundTx.amount.assetAmount.amount().toString() : undefined, + } + }), + ) +} + +main() + .then(() => process.exit(0)) + .catch((err) => console.error(err)) diff --git a/examples/aggregator/tsconfig.json b/examples/aggregator/tsconfig.json new file mode 100644 index 000000000..7b9e0e966 --- /dev/null +++ b/examples/aggregator/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "module": "commonjs", + "target": "es5", + "noEmitOnError": true, + "resolveJsonModule": true, + "esModuleInterop": true, + "lib": [ + "es6", + "dom", + "es2016", + "es2017" + ] + } +} \ No newline at end of file diff --git a/examples/bitcoin/package.json b/examples/bitcoin/package.json index a11793f66..d38b8d886 100644 --- a/examples/bitcoin/package.json +++ b/examples/bitcoin/package.json @@ -18,4 +18,4 @@ "ts-node": "10.9.2", "typescript": "^5.0.4" } -} \ No newline at end of file +} diff --git a/examples/check-tx/CHANGELOG.md b/examples/check-tx/CHANGELOG.md index 3a2d4d9f9..6cb58f432 100644 --- a/examples/check-tx/CHANGELOG.md +++ b/examples/check-tx/CHANGELOG.md @@ -1,5 +1,30 @@ # xchainjs-check-tx +## 1.0.17 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-midgard-query@1.0.6 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-midgard@0.5.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.16 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-midgard-query@1.0.5 + ## 1.0.15 ### Patch Changes diff --git a/examples/check-tx/package.json b/examples/check-tx/package.json index a0d6e2862..a3325a4e2 100644 --- a/examples/check-tx/package.json +++ b/examples/check-tx/package.json @@ -1,7 +1,7 @@ { "name": "xchainjs-check-tx", "private": true, - "version": "1.0.15", + "version": "1.0.17", "scripts": { "checktx": "npx ts-node check-tx.ts", "build": "tsc --noEmit" diff --git a/examples/do-swap/CHANGELOG.md b/examples/do-swap/CHANGELOG.md index 9d571e3e2..f88d771f2 100644 --- a/examples/do-swap/CHANGELOG.md +++ b/examples/do-swap/CHANGELOG.md @@ -1,5 +1,66 @@ # xchainjs-do-swap +## 1.0.32 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-midgard-query@1.0.6 + - @xchainjs/xchain-thorchain-amm@2.0.12 + - @xchainjs/xchain-bitcoincash@1.0.6 + - @xchainjs/xchain-cosmos-sdk@1.0.7 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-litecoin@1.0.6 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-binance@6.0.6 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-midgard@0.5.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-cosmos@2.0.7 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-avax@1.0.10 + - @xchainjs/xchain-dash@1.0.6 + - @xchainjs/xchain-doge@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-utxo@1.0.6 + - @xchainjs/xchain-bsc@1.0.10 + - @xchainjs/xchain-evm@1.0.10 + +## 1.0.31 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-thorchain-amm@2.0.11 + - @xchainjs/xchain-avax@1.0.9 + - @xchainjs/xchain-binance@6.0.5 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-bitcoincash@1.0.5 + - @xchainjs/xchain-bsc@1.0.9 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos@2.0.6 + - @xchainjs/xchain-cosmos-sdk@1.0.6 + - @xchainjs/xchain-dash@1.0.5 + - @xchainjs/xchain-doge@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-evm-providers@1.0.7 + - @xchainjs/xchain-litecoin@1.0.5 + - @xchainjs/xchain-midgard-query@1.0.5 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-utxo@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + - @xchainjs/xchain-wallet@1.0.11 + ## 1.0.30 ### Patch Changes diff --git a/examples/do-swap/package.json b/examples/do-swap/package.json index 026d18687..5ea2ca2eb 100644 --- a/examples/do-swap/package.json +++ b/examples/do-swap/package.json @@ -1,7 +1,7 @@ { "name": "xchainjs-do-swap", "private": true, - "version": "1.0.30", + "version": "1.0.32", "scripts": { "doSwap": "npx ts-node doSwap.ts", "doStreamingSwap": "npx ts-node doStreamingSwap.ts", diff --git a/examples/estimate-swap/CHANGELOG.md b/examples/estimate-swap/CHANGELOG.md index 796813025..2f19a5028 100644 --- a/examples/estimate-swap/CHANGELOG.md +++ b/examples/estimate-swap/CHANGELOG.md @@ -1,5 +1,30 @@ # xchainjs-estimate-swap +## 1.0.17 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-midgard-query@1.0.6 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-midgard@0.5.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.16 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-midgard-query@1.0.5 + ## 1.0.15 ### Patch Changes diff --git a/examples/estimate-swap/package.json b/examples/estimate-swap/package.json index 86e821020..ec6fd1626 100644 --- a/examples/estimate-swap/package.json +++ b/examples/estimate-swap/package.json @@ -1,7 +1,7 @@ { "name": "xchainjs-estimate-swap", "private": true, - "version": "1.0.15", + "version": "1.0.17", "scripts": { "listPools": "npx ts-node listPools.ts", "estimateSwap": "npx ts-node estimateSwap.ts", diff --git a/examples/liquidity/CHANGELOG.md b/examples/liquidity/CHANGELOG.md index 355a9f2d1..27e941596 100644 --- a/examples/liquidity/CHANGELOG.md +++ b/examples/liquidity/CHANGELOG.md @@ -1,5 +1,32 @@ # xchainjs-liquidity +## 1.0.32 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-midgard-query@1.0.6 + - @xchainjs/xchain-thorchain-amm@2.0.12 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-midgard@0.5.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.31 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-thorchain-amm@2.0.11 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-midgard-query@1.0.5 + ## 1.0.30 ### Patch Changes diff --git a/examples/liquidity/package.json b/examples/liquidity/package.json index 9d2e36d7c..127679c0d 100644 --- a/examples/liquidity/package.json +++ b/examples/liquidity/package.json @@ -1,6 +1,6 @@ { "name": "xchainjs-liquidity", - "version": "1.0.30", + "version": "1.0.32", "private": true, "scripts": { "checkLiquidity": "npx ts-node check-liquidity.ts", diff --git a/examples/loans/CHANGELOG.md b/examples/loans/CHANGELOG.md index 65699dea1..812f0fc73 100644 --- a/examples/loans/CHANGELOG.md +++ b/examples/loans/CHANGELOG.md @@ -1,5 +1,40 @@ # xchainjs-loans +## 1.0.32 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-midgard-query@1.0.6 + - @xchainjs/xchain-thorchain-amm@2.0.12 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-midgard@0.5.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-cosmos@2.0.7 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-evm@1.0.10 + +## 1.0.31 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-thorchain-amm@2.0.11 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos@2.0.6 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-evm-providers@1.0.7 + - @xchainjs/xchain-midgard-query@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + ## 1.0.30 ### Patch Changes diff --git a/examples/loans/package.json b/examples/loans/package.json index 3ba0b5d28..7325384c2 100644 --- a/examples/loans/package.json +++ b/examples/loans/package.json @@ -1,6 +1,6 @@ { "name": "xchainjs-loans", - "version": "1.0.30", + "version": "1.0.32", "private": true, "scripts": { "loanQuoteOpen": "npx ts-node loanQuoteOpen.ts", diff --git a/examples/mayachain-amm/CHANGELOG.md b/examples/mayachain-amm/CHANGELOG.md index 0e7d5c1bd..1760cfb7e 100644 --- a/examples/mayachain-amm/CHANGELOG.md +++ b/examples/mayachain-amm/CHANGELOG.md @@ -1,5 +1,49 @@ # xchainjs-maya-do-swap +## 1.0.31 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-mayachain-query@1.0.7 + - @xchainjs/xchain-mayamidgard-query@0.1.22 + - @xchainjs/xchain-mayachain-amm@3.0.12 + - @xchainjs/xchain-mayamidgard@0.1.7 + - @xchainjs/xchain-mayachain@2.0.7 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-mayanode@0.1.10 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-cosmos@2.0.7 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-kujira@1.0.7 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-dash@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.30 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-mayachain-query@1.0.6 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-mayachain-amm@3.0.11 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos@2.0.6 + - @xchainjs/xchain-dash@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + - @xchainjs/xchain-kujira@1.0.6 + - @xchainjs/xchain-mayachain@2.0.6 + - @xchainjs/xchain-mayamidgard-query@0.1.21 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-wallet@1.0.11 + ## 1.0.29 ### Patch Changes diff --git a/examples/mayachain-amm/package.json b/examples/mayachain-amm/package.json index 7fe88801f..4281f3499 100644 --- a/examples/mayachain-amm/package.json +++ b/examples/mayachain-amm/package.json @@ -1,7 +1,7 @@ { "name": "xchainjs-mayachain-amm", "private": true, - "version": "1.0.29", + "version": "1.0.31", "scripts": { "approveRouter": "npx ts-node approve-router.ts", "doSwap": "npx ts-node do-swap.ts", diff --git a/examples/prepareTx/CHANGELOG.md b/examples/prepareTx/CHANGELOG.md index 3affc3873..c423bd56c 100644 --- a/examples/prepareTx/CHANGELOG.md +++ b/examples/prepareTx/CHANGELOG.md @@ -1,5 +1,25 @@ # xchainjs-prepare-tx +## 1.0.19 + +### Patch Changes + +- Updated dependencies [33bfa40] + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.18 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + ## 1.0.17 ### Patch Changes diff --git a/examples/prepareTx/package.json b/examples/prepareTx/package.json index 9c9f3dca3..b78c9aed3 100644 --- a/examples/prepareTx/package.json +++ b/examples/prepareTx/package.json @@ -1,6 +1,6 @@ { "name": "xchainjs-prepare-tx", - "version": "1.0.17", + "version": "1.0.19", "private": true, "scripts": { "preparetx": "npx ts-node prepare-tx.ts", diff --git a/examples/solana/CHANGELOG.md b/examples/solana/CHANGELOG.md index 9f1ccdf3b..40e99ee46 100644 --- a/examples/solana/CHANGELOG.md +++ b/examples/solana/CHANGELOG.md @@ -1,5 +1,21 @@ # xchainjs-solana +## 0.0.5 + +### Patch Changes + +- Updated dependencies [33bfa40] + - @xchainjs/xchain-solana@0.0.4 + - @xchainjs/xchain-util@1.0.5 + +## 0.0.4 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-solana@0.0.3 + ## 0.0.3 ### Patch Changes diff --git a/examples/solana/README.md b/examples/solana/README.md index 194129678..02a160c9a 100644 --- a/examples/solana/README.md +++ b/examples/solana/README.md @@ -1,6 +1,6 @@ # Solana -Solana examples to show different use cases using the its client +Solana examples to show different use cases using its client ## Examples @@ -36,7 +36,7 @@ yarn address phrase index #### Prepare transaction -Check out how you should prepare a transaction to be signed in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/solana/address.ts) or run it as +Check out how you should prepare a transaction to be signed in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/solana/transaction-prepare.ts) or run it as ```sh yarn prepareTx sender recipient asset assetDecimals amount @@ -44,7 +44,7 @@ yarn prepareTx sender recipient asset assetDecimals amount #### Make transaction -Check out how you should make a Solana native asset transaction in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/solana/address.ts) or run it as +Check out how you should make a Solana native asset transaction in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/solana/transaction-transfer.ts) or run it as ```sh yarn transfer phrase recipient amount @@ -52,7 +52,7 @@ yarn transfer phrase recipient amount #### Make token transaction -Check out how you should make a Solana token transaction in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/solana/address.ts) or run it as +Check out how you should make a Solana token transaction in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/solana/transaction-transfer-token.ts) or run it as ```sh yarn transferToken phrase recipient asset assetDecimals amount diff --git a/examples/solana/package.json b/examples/solana/package.json index d893e02c7..9d108a7e4 100644 --- a/examples/solana/package.json +++ b/examples/solana/package.json @@ -1,7 +1,7 @@ { "name": "xchainjs-solana", "private": true, - "version": "0.0.3", + "version": "0.0.5", "scripts": { "allBalances": "npx ts-node balance-all.ts", "tokenBalance": "npx ts-node balance-token.ts", @@ -23,4 +23,4 @@ "ts-node": "10.9.2", "typescript": "^5.0.4" } -} \ No newline at end of file +} diff --git a/examples/thorchain-amm/CHANGELOG.md b/examples/thorchain-amm/CHANGELOG.md index 293efe83b..f0b7894c5 100644 --- a/examples/thorchain-amm/CHANGELOG.md +++ b/examples/thorchain-amm/CHANGELOG.md @@ -1,5 +1,53 @@ # xchainjs-thorchain-amm +## 0.0.12 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-thorchain-amm@2.0.12 + - @xchainjs/xchain-bitcoincash@1.0.6 + - @xchainjs/xchain-cosmos-sdk@1.0.7 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-litecoin@1.0.6 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-cosmos@2.0.7 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-avax@1.0.10 + - @xchainjs/xchain-dash@1.0.6 + - @xchainjs/xchain-doge@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-bsc@1.0.10 + +## 0.0.11 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-thorchain-amm@2.0.11 + - @xchainjs/xchain-avax@1.0.9 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-bitcoincash@1.0.5 + - @xchainjs/xchain-bsc@1.0.9 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos@2.0.6 + - @xchainjs/xchain-cosmos-sdk@1.0.6 + - @xchainjs/xchain-dash@1.0.5 + - @xchainjs/xchain-doge@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + - @xchainjs/xchain-litecoin@1.0.5 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-wallet@1.0.11 + ## 0.0.10 ### Patch Changes diff --git a/examples/thorchain-amm/package.json b/examples/thorchain-amm/package.json index b6b4b205e..914888ca2 100644 --- a/examples/thorchain-amm/package.json +++ b/examples/thorchain-amm/package.json @@ -1,7 +1,7 @@ { "name": "xchainjs-thorchain-amm", "private": true, - "version": "0.0.10", + "version": "0.0.12", "scripts": { "depositRunePool": "npx ts-node runepool-deposit.ts", "withdrawRunePool": "npx ts-node runepool-withdraw.ts", diff --git a/examples/thorchain/.codesandbox/tasks.json b/examples/thorchain/.codesandbox/tasks.json new file mode 100644 index 000000000..fff1c37f8 --- /dev/null +++ b/examples/thorchain/.codesandbox/tasks.json @@ -0,0 +1,9 @@ +{ + // These tasks will run in order when initializing your CodeSandbox project. + "setupTasks": [ + { + "name": "Install Dependencies", + "command": "yarn install" + } + ] +} \ No newline at end of file diff --git a/examples/thorchain/.devcontainer/devcontainer.json b/examples/thorchain/.devcontainer/devcontainer.json new file mode 100644 index 000000000..9cef189a7 --- /dev/null +++ b/examples/thorchain/.devcontainer/devcontainer.json @@ -0,0 +1,4 @@ +{ + "name": "Devcontainer", + "image": "ghcr.io/codesandbox/devcontainers/typescript-node:latest" +} \ No newline at end of file diff --git a/examples/thorchain/CHANGELOG.md b/examples/thorchain/CHANGELOG.md new file mode 100644 index 000000000..2b30ca024 --- /dev/null +++ b/examples/thorchain/CHANGELOG.md @@ -0,0 +1,2 @@ +# xchainjs-thorchain + diff --git a/examples/thorchain/README.md b/examples/thorchain/README.md new file mode 100644 index 000000000..d3f724962 --- /dev/null +++ b/examples/thorchain/README.md @@ -0,0 +1,15 @@ +# Thorchain + +Thorchain examples to show different use cases using its client + +## Examples + +### Transactions + +#### Make transaction + +Check out how you should make a Thorchain native asset transaction in this [example](https://github.com/xchainjs/xchainjs-lib/blob/master/examples/thorchain/transaction-transfer.ts) or run it as + +```sh +yarn transfer phrase recipient amount +``` \ No newline at end of file diff --git a/examples/thorchain/package.json b/examples/thorchain/package.json new file mode 100644 index 000000000..3177a1fe4 --- /dev/null +++ b/examples/thorchain/package.json @@ -0,0 +1,21 @@ +{ + "name": "xchainjs-thorchain", + "private": true, + "version": "0.0.1", + "scripts": { + "transfer": "npx ts-node transaction-transfer.ts", + "build": "tsc --noEmit" + }, + "description": "Examples using Thorchain client", + "main": "index.js", + "license": "MIT", + "dependencies": { + "@xchainjs/xchain-thorchain": "workspace:*", + "@xchainjs/xchain-util": "workspace:*" + }, + "devDependencies": { + "@types/node": "20.11.28", + "ts-node": "10.9.2", + "typescript": "^5.0.4" + } +} diff --git a/examples/thorchain/transaction-transfer.ts b/examples/thorchain/transaction-transfer.ts new file mode 100644 index 000000000..dce0915bf --- /dev/null +++ b/examples/thorchain/transaction-transfer.ts @@ -0,0 +1,27 @@ +import { Client, defaultClientConfig } from '@xchainjs/xchain-thorchain' +import { assetAmount, assetToBase } from '@xchainjs/xchain-util' + +const main = async () => { + const phrase = `${process.argv[2]}` + const recipient = `${process.argv[3]}` + const amount = assetAmount(`${process.argv[4]}`, 8) + + const client = new Client({ + ...defaultClientConfig, + phrase, + }) + + const hash = await client.transfer({ + recipient, + amount: assetToBase(amount), + }) + + console.log({ + hash, + url: client.getExplorerTxUrl(hash), + }) +} + +main() + .then(() => process.exit(0)) + .catch((err) => console.error(err)) diff --git a/examples/thorchain/tsconfig.json b/examples/thorchain/tsconfig.json new file mode 100644 index 000000000..7b9e0e966 --- /dev/null +++ b/examples/thorchain/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "module": "commonjs", + "target": "es5", + "noEmitOnError": true, + "resolveJsonModule": true, + "esModuleInterop": true, + "lib": [ + "es6", + "dom", + "es2016", + "es2017" + ] + } +} \ No newline at end of file diff --git a/examples/wallet/CHANGELOG.md b/examples/wallet/CHANGELOG.md index 647b1cdea..05babe4d7 100644 --- a/examples/wallet/CHANGELOG.md +++ b/examples/wallet/CHANGELOG.md @@ -1,5 +1,42 @@ # xchainjs-wallet +## 1.0.27 + +### Patch Changes + +- Updated dependencies [33bfa40] + - @xchainjs/xchain-mayamidgard-query@0.1.22 + - @xchainjs/xchain-mayamidgard@0.1.7 + - @xchainjs/xchain-mayachain@2.0.7 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-mayanode@0.1.10 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-cosmos@2.0.7 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-kujira@1.0.7 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-dash@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.26 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos@2.0.6 + - @xchainjs/xchain-dash@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + - @xchainjs/xchain-kujira@1.0.6 + - @xchainjs/xchain-mayachain@2.0.6 + - @xchainjs/xchain-mayamidgard-query@0.1.21 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-wallet@1.0.11 + ## 1.0.25 ### Patch Changes diff --git a/examples/wallet/package.json b/examples/wallet/package.json index fa2bdd405..d8e0bb0ab 100644 --- a/examples/wallet/package.json +++ b/examples/wallet/package.json @@ -1,6 +1,6 @@ { "name": "xchainjs-wallet", - "version": "1.0.25", + "version": "1.0.27", "private": true, "scripts": { "wallet": "npx ts-node wallet.ts", diff --git a/package.json b/package.json index 4542e4b8c..aad0bad80 100644 --- a/package.json +++ b/package.json @@ -42,9 +42,9 @@ "@changesets/cli": "2.27.1", "@ledgerhq/types-cryptoassets": "7.11.0", "@ledgerhq/types-devices": "6.24.0", - "@rollup/plugin-commonjs": "^24.1.0", - "@rollup/plugin-json": "^6.0.0", - "@rollup/plugin-node-resolve": "^15.0.2", + "@rollup/plugin-commonjs": "28.0.0", + "@rollup/plugin-json": "6.1.0", + "@rollup/plugin-node-resolve": "15.3.0", "@types/jest": "^29.2.5", "@typescript-eslint/eslint-plugin": "^5.48.0", "@typescript-eslint/parser": "^5.48.0", @@ -58,8 +58,8 @@ "lint-staged": "^13.1.0", "prettier": "^2.2.0", "rimraf": "5.0.0", - "rollup": "2.78.0", - "rollup-plugin-typescript2": "^0.34.1", + "rollup": "4.22.4", + "rollup-plugin-typescript2": "0.36.0", "ts-jest": "^29.0.3", "ts-node": "10.9.2", "tslib": "^2.5.0", diff --git a/packages/xchain-aggregator/CHANGELOG.md b/packages/xchain-aggregator/CHANGELOG.md index 5b4e9f43c..ccfa4fdb8 100644 --- a/packages/xchain-aggregator/CHANGELOG.md +++ b/packages/xchain-aggregator/CHANGELOG.md @@ -1,5 +1,40 @@ # Changelog +## 1.0.12 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-mayachain-query@1.0.7 + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-mayachain-amm@3.0.12 + - @xchainjs/xchain-thorchain-amm@2.0.12 + - @xchainjs/xchain-mayachain@2.0.7 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.11 + +### Patch Changes + +- 73b68ed: `SwapResume` type with new `fromAsset` and `toAsset` properties +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-mayachain-query@1.0.6 + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-mayachain-amm@3.0.11 + - @xchainjs/xchain-thorchain-amm@2.0.11 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-mayachain@2.0.6 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-wallet@1.0.11 + ## 1.0.10 ### Patch Changes diff --git a/packages/xchain-aggregator/README.md b/packages/xchain-aggregator/README.md index 584b1c1dc..f2fdab76d 100644 --- a/packages/xchain-aggregator/README.md +++ b/packages/xchain-aggregator/README.md @@ -1,23 +1,75 @@ -# `@xchainjs/xchain-aggregator` +
+

Aggregator

-Protocol aggregator to make actions in different protocols with the aim to operate with the most optimal protocol for each action +

+ + NPM Version + + + NPM Downloads + +

+
-## Install +
-```sh -yarn install @xchainjs/xchain-aggregator @xchainjs/xchain-mayachain-amm @xchainjs/xchain-thorchain-amm -``` +The Aggregator package has been developed to facilitate interaction with multiple decentralised protocols. It provides a unified interface for developers, with the objective of offering end users the best of each protocol in the most straightforward manner. ## Supported protocols The current supported protocols are: -- Thorchain -- Mayachain +- [Thorchain](https://thorchain.org/) +- [Maya Protocol](https://www.mayaprotocol.com/) +- [Chainflip](https://chainflip.io/) + + +## Installation + +```sh +yarn add @xchainjs/xchain-aggregator +``` + +or + +```sh +npm install @xchainjs/xchain-aggregator +``` + +## Initialization + +Aggregator can be easily initialise providing the [Wallet](https://github.com/xchainjs/xchainjs-lib/tree/master/packages/xchain-wallet) with the XChainJs Clients you are working with. If no protocol is provided, the Aggregator will work with all the supported protocols. + +```ts +import { Aggregator } from '@xchainjs/xchain-aggregator'; + +const aggregator = new Aggregator({ + wallet: new Wallet({ + // Your XChainJS clients + }), + protocols: [ + // The protocols you want to work with + ], + affiliate: { + // Affiliate config + } +}) +``` + +## Features + +### Swaps + +- Estimate the most efficient swap among protocols +- Do swaps +- Get swap history through different protocols + + +## Examples + +You can find examples using the Aggregator package in the [aggregator](https://github.com/xchainjs/xchainjs-lib/tree/master/examples/aggregator) examples folder. -## Supported actions -The current supported actions are: +## Documentation -- Swap -- Get swap history +More information about how to use the Aggregator package can be found on [documentation](https://xchainjs.gitbook.io/xchainjs/aggregator) \ No newline at end of file diff --git a/packages/xchain-aggregator/__e2e__/aggregator.e2e.ts b/packages/xchain-aggregator/__e2e__/aggregator.e2e.ts index 55eaeaee4..ab0599cac 100644 --- a/packages/xchain-aggregator/__e2e__/aggregator.e2e.ts +++ b/packages/xchain-aggregator/__e2e__/aggregator.e2e.ts @@ -178,33 +178,33 @@ describe('Aggregator', () => { console.log(txSubmitted) }) - it('Should get swaps history', async () => { - const swapHistory = await aggregator.getSwapHistory({ - chainAddresses: [{ chain: 'BTC', address: 'address' }], - }) - - console.log( - swapHistory.swaps.map((swap) => { - return { - protocol: swap.protocol, - status: swap.status, - date: swap.date.toDateString(), - inboundTX: { - hash: swap.inboundTx.hash, - address: swap.inboundTx.address, - asset: assetToString(swap.inboundTx.amount.asset), - amount: swap.inboundTx.amount.assetAmount.amount().toString(), - }, - outboundTx: swap.outboundTx - ? { - hash: swap.outboundTx.hash, - address: swap.outboundTx.address, - asset: assetToString(swap.outboundTx.amount.asset), - amount: swap.outboundTx.amount.assetAmount.amount().toString(), - } - : undefined, - } - }), - ) - }) + // it('Should get swaps history', async () => { + // const swapHistory = await aggregator.getSwapHistory({ + // chainAddresses: [{ chain: 'BTC', address: 'address' }], + // }) + + // console.log( + // swapHistory.swaps.map((swap) => { + // return { + // protocol: swap.protocol, + // status: swap.status, + // date: swap.date.toDateString(), + // inboundTX: { + // hash: swap.inboundTx.hash, + // address: swap.inboundTx.address, + // asset: assetToString(swap.inboundTx.amount.asset), + // amount: swap.inboundTx.amount.assetAmount.amount().toString(), + // }, + // outboundTx: swap.outboundTx + // ? { + // hash: swap.outboundTx.hash, + // address: swap.outboundTx.address, + // asset: assetToString(swap.outboundTx.amount.asset), + // amount: swap.outboundTx.amount.assetAmount.amount().toString(), + // } + // : undefined, + // } + // }), + // ) + // }) }) diff --git a/packages/xchain-aggregator/__mocks__/@chainflip/sdk/swap.ts b/packages/xchain-aggregator/__mocks__/@chainflip/sdk/swap.ts index bab1849d3..5868051dd 100644 --- a/packages/xchain-aggregator/__mocks__/@chainflip/sdk/swap.ts +++ b/packages/xchain-aggregator/__mocks__/@chainflip/sdk/swap.ts @@ -18,6 +18,7 @@ class SwapSDK { evmChainId: 11155111, isMainnet: false, requiredBlockConfirmations: 7, + maxRetryDurationBlocks: undefined, }, { chain: 'Polkadot', @@ -25,6 +26,7 @@ class SwapSDK { evmChainId: undefined, isMainnet: false, requiredBlockConfirmations: undefined, + maxRetryDurationBlocks: undefined, }, { chain: 'Bitcoin', @@ -32,6 +34,7 @@ class SwapSDK { evmChainId: undefined, isMainnet: false, requiredBlockConfirmations: 6, + maxRetryDurationBlocks: undefined, }, ] } @@ -126,6 +129,7 @@ class SwapSDK { depositAddress: 'BITCOINfakeaddress', depositChannelId: 'bitcoin-channel-id', brokerCommissionBps: 0, + affiliateBrokers: [], depositChannelExpiryBlock: BigInt(10000), estimatedDepositChannelExpiryTime: 1716889354, channelOpeningFee: BigInt(100), @@ -136,6 +140,7 @@ class SwapSDK { depositAddress: 'ETHEREUMfakeaddress', depositChannelId: 'ethereum-channel-id', brokerCommissionBps: 0, + affiliateBrokers: [], depositChannelExpiryBlock: BigInt(20000), estimatedDepositChannelExpiryTime: 1716889354, channelOpeningFee: BigInt(100), @@ -146,6 +151,7 @@ class SwapSDK { depositAddress: 'POLKADOTfakeaddress', depositChannelId: 'polkadot-channel-id', brokerCommissionBps: 0, + affiliateBrokers: [], depositChannelExpiryBlock: BigInt(30000), estimatedDepositChannelExpiryTime: 1716889354, channelOpeningFee: BigInt(100), @@ -168,6 +174,7 @@ class SwapSDK { destChain, amount, quote: { + type: 'REGULAR', intermediateAmount: '36115119', egressAmount: '51193', includedFees: [ @@ -184,13 +191,13 @@ class SwapSDK { amount: '36115', }, { - type: 'LIQUIDITY', + type: 'NETWORK', chain: 'Ethereum', asset: 'ETH', amount: '4655411871275', }, { - type: 'LIQUIDITY', + type: 'NETWORK', chain: 'Ethereum', asset: 'USDC', amount: '18057', @@ -204,6 +211,8 @@ class SwapSDK { ], lowLiquidityWarning: false, estimatedDurationSeconds: 702, + poolInfo: [], + estimatedPrice: '2300', }, } } @@ -222,6 +231,7 @@ class SwapSDK { destChain, amount, quote: { + type: 'REGULAR', intermediateAmount: '13560635', egressAmount: '2063188201000691', includedFees: [ @@ -237,18 +247,6 @@ class SwapSDK { asset: 'USDC', amount: '13560', }, - { - type: 'LIQUIDITY', - chain: 'Ethereum', - asset: 'USDT', - amount: '6783', - }, - { - type: 'LIQUIDITY', - chain: 'Ethereum', - asset: 'USDC', - amount: '6780', - }, { type: 'EGRESS', chain: 'Ethereum', @@ -258,6 +256,8 @@ class SwapSDK { ], lowLiquidityWarning: false, estimatedDurationSeconds: 114, + poolInfo: [], + estimatedPrice: '1', }, } } @@ -276,6 +276,7 @@ class SwapSDK { destChain, amount, quote: { + type: 'REGULAR', intermediateAmount: '33919877', egressAmount: '24884030', includedFees: [ @@ -291,18 +292,6 @@ class SwapSDK { asset: 'USDC', amount: '33919', }, - { - type: 'LIQUIDITY', - chain: 'Ethereum', - asset: 'ETH', - amount: '4357594332450', - }, - { - type: 'LIQUIDITY', - chain: 'Ethereum', - asset: 'USDC', - amount: '16959', - }, { type: 'EGRESS', chain: 'Ethereum', @@ -312,6 +301,8 @@ class SwapSDK { ], lowLiquidityWarning: false, estimatedDurationSeconds: 114, + poolInfo: [], + estimatedPrice: '2300', }, } } diff --git a/packages/xchain-aggregator/__tests__/aggregator.test.ts b/packages/xchain-aggregator/__tests__/aggregator.test.ts index 00534e2c7..f8c3d4b1d 100644 --- a/packages/xchain-aggregator/__tests__/aggregator.test.ts +++ b/packages/xchain-aggregator/__tests__/aggregator.test.ts @@ -14,7 +14,7 @@ import mockThornodeApi from '../__mocks__/mayachain/mayanode/api' import mockMayaMidgardApi from '../__mocks__/mayachain/midgard/api' import mockThorMidgardApi from '../__mocks__/thorchain/midgard/api' import mockMayanodeApi from '../__mocks__/thorchain/thornode/api' -import { Aggregator } from '../src' +import { Aggregator, SuccessSwap } from '../src' import { SupportedProtocols } from '../src/const' describe('Aggregator', () => { @@ -87,27 +87,26 @@ describe('Aggregator', () => { expect(swapHistory.count).toEqual(swapHistory.swaps.length) const thorchainSwap = swapHistory.swaps.find((swap) => swap.protocol === 'Thorchain') expect(thorchainSwap).not.toBeUndefined() + const successThorchainSwap = thorchainSwap as SuccessSwap expect({ - date: thorchainSwap?.date, - status: thorchainSwap?.status, - protocol: thorchainSwap?.protocol, + date: successThorchainSwap.date, + status: successThorchainSwap.status, + protocol: successThorchainSwap.protocol, in: { - hash: thorchainSwap?.inboundTx.hash, - address: thorchainSwap?.inboundTx.address, - asset: assetToString(thorchainSwap?.inboundTx.amount.asset as Asset), - amount: baseToAsset(thorchainSwap?.inboundTx.amount.baseAmount as BaseAmount) + hash: successThorchainSwap.inboundTx.hash, + address: successThorchainSwap.inboundTx.address, + asset: assetToString(successThorchainSwap.inboundTx.amount.asset as Asset), + amount: baseToAsset(successThorchainSwap.inboundTx.amount.baseAmount as BaseAmount) .amount() .toString(), }, out: { - hash: thorchainSwap?.outboundTx?.hash, - address: thorchainSwap?.outboundTx?.address, - asset: thorchainSwap?.outboundTx ? assetToString(thorchainSwap?.outboundTx.amount.asset as Asset) : undefined, - amount: thorchainSwap?.outboundTx - ? baseToAsset(thorchainSwap?.outboundTx.amount.baseAmount as BaseAmount) - .amount() - .toString() - : undefined, + hash: successThorchainSwap.outboundTx.hash, + address: successThorchainSwap?.outboundTx?.address, + asset: assetToString(successThorchainSwap?.outboundTx.amount.asset as Asset), + amount: baseToAsset(successThorchainSwap?.outboundTx.amount.baseAmount as BaseAmount) + .amount() + .toString(), }, }).toEqual({ date: new Date('2024-03-17T14:29:09.029Z'), @@ -128,27 +127,26 @@ describe('Aggregator', () => { }) const mayachainSwap = swapHistory.swaps.find((swap) => swap.protocol === 'Mayachain') expect(mayachainSwap).not.toBeUndefined() + const successMayachainSwap = mayachainSwap as SuccessSwap expect({ - date: mayachainSwap?.date, - status: mayachainSwap?.status, - protocol: mayachainSwap?.protocol, + date: successMayachainSwap.date, + status: successMayachainSwap.status, + protocol: successMayachainSwap.protocol, in: { - hash: mayachainSwap?.inboundTx.hash, - address: mayachainSwap?.inboundTx.address, - asset: assetToString(mayachainSwap?.inboundTx.amount.asset as Asset), - amount: baseToAsset(mayachainSwap?.inboundTx.amount.baseAmount as BaseAmount) + hash: successMayachainSwap.inboundTx.hash, + address: successMayachainSwap.inboundTx.address, + asset: assetToString(successMayachainSwap.inboundTx.amount.asset as Asset), + amount: baseToAsset(successMayachainSwap.inboundTx.amount.baseAmount as BaseAmount) .amount() .toString(), }, out: { - hash: mayachainSwap?.outboundTx?.hash, - address: mayachainSwap?.outboundTx?.address, - asset: mayachainSwap?.outboundTx ? assetToString(mayachainSwap.outboundTx.amount.asset as Asset) : undefined, - amount: mayachainSwap?.outboundTx - ? baseToAsset(mayachainSwap.outboundTx.amount.baseAmount as BaseAmount) - .amount() - .toString() - : undefined, + hash: successMayachainSwap.outboundTx.hash, + address: successMayachainSwap.outboundTx.address, + asset: assetToString(successMayachainSwap.outboundTx.amount.asset as Asset), + amount: baseToAsset(successMayachainSwap.outboundTx.amount.baseAmount as BaseAmount) + .amount() + .toString(), }, }).toEqual({ date: new Date('2024-03-12T02:28:28.760Z'), diff --git a/packages/xchain-aggregator/__tests__/mayachainProtocol.test.ts b/packages/xchain-aggregator/__tests__/mayachainProtocol.test.ts index 68eb89372..f35f43d65 100644 --- a/packages/xchain-aggregator/__tests__/mayachainProtocol.test.ts +++ b/packages/xchain-aggregator/__tests__/mayachainProtocol.test.ts @@ -15,6 +15,7 @@ import { import mockMidgardApi from '../__mocks__/mayachain/midgard/api' import { MayachainProtocol } from '../src/protocols/mayachain' +import { SuccessSwap } from '../src' describe('Mayachain protocol', () => { let protocol: MayachainProtocol @@ -101,23 +102,22 @@ describe('Mayachain protocol', () => { it('Should get swaps history', async () => { const swapResume = await protocol.getSwapHistory({ chainAddresses: [{ chain: 'chain', address: 'address' }] }) expect(swapResume.count === swapResume.swaps.length) + const sucessSwap = swapResume.swaps[0] as SuccessSwap expect({ - date: swapResume.swaps[0].date, - status: swapResume.swaps[0].status, - protocol: swapResume.swaps[0].protocol, + date: sucessSwap.date, + status: sucessSwap.status, + protocol: sucessSwap.protocol, in: { - hash: swapResume.swaps[0].inboundTx.hash, - address: swapResume.swaps[0].inboundTx.address, - asset: assetToString(swapResume.swaps[0].inboundTx.amount.asset), - amount: baseToAsset(swapResume.swaps[0].inboundTx.amount.baseAmount).amount().toString(), + hash: sucessSwap.inboundTx.hash, + address: sucessSwap.inboundTx.address, + asset: assetToString(sucessSwap.inboundTx.amount.asset), + amount: baseToAsset(sucessSwap.inboundTx.amount.baseAmount).amount().toString(), }, out: { - hash: swapResume.swaps[0].outboundTx?.hash, - address: swapResume.swaps[0].outboundTx?.address, - asset: swapResume.swaps[0].outboundTx ? assetToString(swapResume.swaps[0].outboundTx.amount.asset) : undefined, - amount: swapResume.swaps[0].outboundTx - ? baseToAsset(swapResume.swaps[0].outboundTx.amount.baseAmount).amount().toString() - : undefined, + hash: sucessSwap.outboundTx.hash, + address: sucessSwap.outboundTx.address, + asset: assetToString(sucessSwap.outboundTx.amount.asset), + amount: baseToAsset(sucessSwap.outboundTx.amount.baseAmount).amount().toString(), }, }).toEqual({ date: new Date('2024-03-12T02:28:28.760Z'), diff --git a/packages/xchain-aggregator/__tests__/thorhainProtocol.test.ts b/packages/xchain-aggregator/__tests__/thorhainProtocol.test.ts index 670e2aa88..97322b50d 100644 --- a/packages/xchain-aggregator/__tests__/thorhainProtocol.test.ts +++ b/packages/xchain-aggregator/__tests__/thorhainProtocol.test.ts @@ -17,6 +17,7 @@ import { import mockMidgardApi from '../__mocks__/thorchain/midgard/api' import mockThornodeApi from '../__mocks__/thorchain/thornode/api' import { ThorchainProtocol } from '../src/protocols/thorchain' +import { SuccessSwap } from '../src' describe('Thorchain protocol', () => { let protocol: ThorchainProtocol @@ -109,23 +110,22 @@ describe('Thorchain protocol', () => { it('Should get swaps history', async () => { const swapResume = await protocol.getSwapHistory({ chainAddresses: [{ chain: 'chain', address: 'address' }] }) expect(swapResume.count === swapResume.swaps.length) + const sucessSwap = swapResume.swaps[0] as SuccessSwap expect({ - date: swapResume.swaps[0].date, - protocol: swapResume.swaps[0].protocol, - status: swapResume.swaps[0].status, + date: sucessSwap.date, + protocol: sucessSwap.protocol, + status: sucessSwap.status, in: { - hash: swapResume.swaps[0].inboundTx.hash, - address: swapResume.swaps[0].inboundTx.address, - asset: assetToString(swapResume.swaps[0].inboundTx.amount.asset), - amount: baseToAsset(swapResume.swaps[0].inboundTx.amount.baseAmount).amount().toString(), + hash: sucessSwap.inboundTx.hash, + address: sucessSwap.inboundTx.address, + asset: assetToString(sucessSwap.inboundTx.amount.asset), + amount: baseToAsset(sucessSwap.inboundTx.amount.baseAmount).amount().toString(), }, out: { - hash: swapResume.swaps[0].outboundTx?.hash, - address: swapResume.swaps[0].outboundTx?.address, - asset: swapResume.swaps[0].outboundTx ? assetToString(swapResume.swaps[0].outboundTx.amount.asset) : undefined, - amount: swapResume.swaps[0].outboundTx - ? baseToAsset(swapResume.swaps[0].outboundTx.amount.baseAmount).amount().toString() - : undefined, + hash: sucessSwap.outboundTx.hash, + address: sucessSwap.outboundTx.address, + asset: assetToString(sucessSwap.outboundTx.amount.asset), + amount: baseToAsset(sucessSwap.outboundTx.amount.baseAmount).amount().toString(), }, }).toEqual({ date: new Date('2024-03-17T14:29:09.029Z'), diff --git a/packages/xchain-aggregator/package.json b/packages/xchain-aggregator/package.json index f37042780..10469cb11 100644 --- a/packages/xchain-aggregator/package.json +++ b/packages/xchain-aggregator/package.json @@ -1,7 +1,7 @@ { "name": "@xchainjs/xchain-aggregator", "description": "Protocol aggregator to make actions in different protocols", - "version": "1.0.10", + "version": "1.0.12", "license": "MIT", "main": "lib/index.js", "module": "lib/index.esm.js", @@ -19,7 +19,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", "test": "jest" @@ -29,7 +29,7 @@ "directory": "release/package" }, "dependencies": { - "@chainflip/sdk": "1.3.0", + "@chainflip/sdk": "1.6.0", "@xchainjs/xchain-client": "workspace:*", "@xchainjs/xchain-mayachain": "workspace:*", "@xchainjs/xchain-mayachain-amm": "workspace:*", diff --git a/packages/xchain-aggregator/src/index.ts b/packages/xchain-aggregator/src/index.ts index 9fa9bde04..32ee0916e 100644 --- a/packages/xchain-aggregator/src/index.ts +++ b/packages/xchain-aggregator/src/index.ts @@ -7,6 +7,8 @@ export { SwapHistory, SwapHistoryParams, SwapResume, + SuccessSwap, + PendingSwap, Config, ApproveParams, IsApprovedParams, diff --git a/packages/xchain-aggregator/src/protocols/chainflip/chainflipProtocol.ts b/packages/xchain-aggregator/src/protocols/chainflip/chainflipProtocol.ts index dd218270b..fb4f686ec 100644 --- a/packages/xchain-aggregator/src/protocols/chainflip/chainflipProtocol.ts +++ b/packages/xchain-aggregator/src/protocols/chainflip/chainflipProtocol.ts @@ -37,11 +37,15 @@ export class ChainflipProtocol implements IProtocol { return this.sdk.getAssets() }, 24 * 60 * 60 * 1000) } - approveRouterToSpend(_params: { asset: TokenAsset; amount?: CryptoAmount }): Promise { - throw new Error('Method not implemented.') + public approveRouterToSpend(_params: { asset: TokenAsset; amount?: CryptoAmount }): Promise { + throw new Error('Not implemented') } - shouldBeApproved(_params: { asset: TokenAsset; amount: CryptoAmount; address: string }): Promise { - throw new Error('Method not implemented.') + public async shouldBeApproved(_params: { + asset: TokenAsset + amount: CryptoAmount + address: string + }): Promise { + return Promise.resolve(false) } /** @@ -209,11 +213,7 @@ export class ChainflipProtocol implements IProtocol { } const chainAssets = await this.assetsData.getValue() const assetData = chainAssets.find((chainAsset) => { - const contractAddress = asset.symbol.split('-').length > 1 ? asset.symbol.split('-')[1] : undefined - return ( - chainAsset.asset === xAssetToCAsset(asset) && - chainAsset.contractAddress?.toLowerCase() === contractAddress?.toLowerCase() - ) + return chainAsset.asset === xAssetToCAsset(asset) && asset.chain === cChainToXChain(chainAsset.chain) }) if (!assetData) throw Error(`${asset.ticker} asset not supported in ${asset.chain} chain`) return assetData diff --git a/packages/xchain-aggregator/src/protocols/chainflip/utils.ts b/packages/xchain-aggregator/src/protocols/chainflip/utils.ts index 6d042f5b6..a21fc7182 100644 --- a/packages/xchain-aggregator/src/protocols/chainflip/utils.ts +++ b/packages/xchain-aggregator/src/protocols/chainflip/utils.ts @@ -9,6 +9,10 @@ export const cChainToXChain = (chain: CChain): XChain => { return 'ETH' case 'Polkadot': return 'POL' + case 'Arbitrum': + return 'ARB' + case 'Solana': + return 'SOL' default: throw Error('Unsupported chain in XChainJS') } @@ -22,6 +26,10 @@ export const xChainToCChain = (chain: XChain): CChain => { return Chains.Ethereum case 'POL': return Chains.Polkadot + case 'ARB': + return Chains.Arbitrum + case 'SOL': + return Chains.Solana default: throw Error('Unsupported chain in Chainflip') } diff --git a/packages/xchain-aggregator/src/types.ts b/packages/xchain-aggregator/src/types.ts index 0dcb3d24a..5c2ff6bf4 100644 --- a/packages/xchain-aggregator/src/types.ts +++ b/packages/xchain-aggregator/src/types.ts @@ -103,6 +103,8 @@ type QuoteSwapParams = { destinationAddress?: string // The destination address for the swap height?: number // The block height for the swap toleranceBps?: number // The tolerance basis points for the swap + streamingQuantity?: number // The streaming quantity for the swap + streamingInterval?: number // The streaming interval for the swap } type SwapHistoryParams = { @@ -115,14 +117,27 @@ type TransactionAction = { amount: CryptoAmount } -type SwapResume = { +type SuccessSwap = { protocol: Protocol date: Date - status: 'success' | 'pending' + fromAsset: AnyAsset + toAsset: AnyAsset + status: 'success' inboundTx: TransactionAction - outboundTx?: TransactionAction + outboundTx: TransactionAction } +type PendingSwap = { + protocol: Protocol + date: Date + fromAsset: AnyAsset + toAsset: AnyAsset + status: 'pending' + inboundTx: TransactionAction +} + +type SwapResume = SuccessSwap | PendingSwap + type SwapHistory = { count: number swaps: SwapResume[] @@ -157,6 +172,8 @@ export { TxSubmitted, Protocol, SwapHistory, + SuccessSwap, + PendingSwap, SwapResume, SwapHistoryParams, ApproveParams, diff --git a/packages/xchain-arbitrum/CHANGELOG.md b/packages/xchain-arbitrum/CHANGELOG.md index 1d3dc81e5..f9e3ad473 100644 --- a/packages/xchain-arbitrum/CHANGELOG.md +++ b/packages/xchain-arbitrum/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## 1.0.10 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-evm@1.0.10 + +## 1.0.9 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-evm-providers@1.0.7 + ## 1.0.8 ### Patch Changes diff --git a/packages/xchain-arbitrum/package.json b/packages/xchain-arbitrum/package.json index 2114af769..4e0ddf44b 100644 --- a/packages/xchain-arbitrum/package.json +++ b/packages/xchain-arbitrum/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-arbitrum", - "version": "1.0.8", + "version": "1.0.10", "description": "Arbitrum EVM client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-arbitrum/src/const.ts b/packages/xchain-arbitrum/src/const.ts index 5658b8f14..6ee0f973f 100644 --- a/packages/xchain-arbitrum/src/const.ts +++ b/packages/xchain-arbitrum/src/const.ts @@ -7,7 +7,7 @@ import { BigNumber, ethers } from 'ethers' // Define constants related to Arbitrum export const ARB_DECIMAL = 18 -export const LOWER_FEE_BOUND = 100_000_000 +export const LOWER_FEE_BOUND = 100_000_00 export const UPPER_FEE_BOUND = 1_000_000_000 export const ARB_GAS_ASSET_DECIMAL = 18 export const ARBChain = 'ARB' as const diff --git a/packages/xchain-avax/CHANGELOG.md b/packages/xchain-avax/CHANGELOG.md index 2fb058cc8..f282c7501 100644 --- a/packages/xchain-avax/CHANGELOG.md +++ b/packages/xchain-avax/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## 1.0.10 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-evm@1.0.10 + +## 1.0.9 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-evm-providers@1.0.7 + ## 1.0.8 ### Patch Changes diff --git a/packages/xchain-avax/package.json b/packages/xchain-avax/package.json index 55d9778a3..2bd31df57 100644 --- a/packages/xchain-avax/package.json +++ b/packages/xchain-avax/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-avax", - "version": "1.0.8", + "version": "1.0.10", "description": "Avax EVM client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-base/CHANGELOG.md b/packages/xchain-base/CHANGELOG.md index 02a03511f..f0bdc4200 100644 --- a/packages/xchain-base/CHANGELOG.md +++ b/packages/xchain-base/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## 0.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-evm@1.0.10 + +## 0.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-evm-providers@1.0.7 + ## 0.0.4 ### Patch Changes diff --git a/packages/xchain-base/package.json b/packages/xchain-base/package.json index 7fff32ec0..1d573134a 100644 --- a/packages/xchain-base/package.json +++ b/packages/xchain-base/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-base", - "version": "0.0.4", + "version": "0.0.6", "description": "Base EVM client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-binance/CHANGELOG.md b/packages/xchain-binance/CHANGELOG.md index 7cd4a1805..662d2f466 100644 --- a/packages/xchain-binance/CHANGELOG.md +++ b/packages/xchain-binance/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## 6.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 6.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 6.0.4 ### Patch Changes diff --git a/packages/xchain-binance/package.json b/packages/xchain-binance/package.json index 3009922ee..681fd100a 100644 --- a/packages/xchain-binance/package.json +++ b/packages/xchain-binance/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-binance", - "version": "6.0.4", + "version": "6.0.6", "description": "Custom Binance client and utilities used by XChainJS clients", "keywords": [ "BNB", @@ -26,7 +26,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", "compile": "tsc -p tsconfig.build.json", diff --git a/packages/xchain-bitcoin/CHANGELOG.md b/packages/xchain-bitcoin/CHANGELOG.md index 9f27c760d..f37cf6aca 100644 --- a/packages/xchain-bitcoin/CHANGELOG.md +++ b/packages/xchain-bitcoin/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## 1.1.2 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-utxo@1.0.6 + +## 1.1.1 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-utxo@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + ## 1.1.0 ### Minor Changes diff --git a/packages/xchain-bitcoin/package.json b/packages/xchain-bitcoin/package.json index 29e6b6274..a58d66ff4 100644 --- a/packages/xchain-bitcoin/package.json +++ b/packages/xchain-bitcoin/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-bitcoin", - "version": "1.1.0", + "version": "1.1.2", "description": "Custom Bitcoin client and utilities used by XChainJS clients", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-bitcoincash/CHANGELOG.md b/packages/xchain-bitcoincash/CHANGELOG.md index 661d25805..876bd1540 100644 --- a/packages/xchain-bitcoincash/CHANGELOG.md +++ b/packages/xchain-bitcoincash/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-utxo@1.0.6 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-utxo@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-bitcoincash/package.json b/packages/xchain-bitcoincash/package.json index 93f15a7e2..da9146caa 100644 --- a/packages/xchain-bitcoincash/package.json +++ b/packages/xchain-bitcoincash/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-bitcoincash", - "version": "1.0.4", + "version": "1.0.6", "description": "Custom bitcoincash client and utilities used by XChainJS clients", "keywords": [ "XChain", @@ -26,7 +26,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-bsc/CHANGELOG.md b/packages/xchain-bsc/CHANGELOG.md index df8887bc9..ecffcf0d9 100644 --- a/packages/xchain-bsc/CHANGELOG.md +++ b/packages/xchain-bsc/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## 1.0.10 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-evm@1.0.10 + +## 1.0.9 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-evm-providers@1.0.7 + ## 1.0.8 ### Patch Changes diff --git a/packages/xchain-bsc/package.json b/packages/xchain-bsc/package.json index 1e9c199f9..3ae3daa0d 100644 --- a/packages/xchain-bsc/package.json +++ b/packages/xchain-bsc/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-bsc", - "version": "1.0.8", + "version": "1.0.10", "description": "Binance Smart Chain EVM client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-client/CHANGELOG.md b/packages/xchain-client/CHANGELOG.md index bfaee4d42..6743e2b7b 100644 --- a/packages/xchain-client/CHANGELOG.md +++ b/packages/xchain-client/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-client/package.json b/packages/xchain-client/package.json index d6ad2f731..f0f75cbef 100644 --- a/packages/xchain-client/package.json +++ b/packages/xchain-client/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-client", - "version": "1.0.4", + "version": "1.0.6", "license": "MIT", "main": "lib/index.js", "module": "lib/index.esm.js", @@ -13,7 +13,7 @@ ], "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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\"", "compile": "tsc -p tsconfig.build.json", "test": "jest --passWithNoTests" diff --git a/packages/xchain-cosmos-sdk/CHANGELOG.md b/packages/xchain-cosmos-sdk/CHANGELOG.md index 23f70f7b0..227f40691 100644 --- a/packages/xchain-cosmos-sdk/CHANGELOG.md +++ b/packages/xchain-cosmos-sdk/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## 1.0.7 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.6 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 1.0.5 ### Patch Changes diff --git a/packages/xchain-cosmos-sdk/package.json b/packages/xchain-cosmos-sdk/package.json index 7c9b27fca..482ca5cf8 100644 --- a/packages/xchain-cosmos-sdk/package.json +++ b/packages/xchain-cosmos-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-cosmos-sdk", - "version": "1.0.5", + "version": "1.0.7", "description": "Genereic Cosmos SDK client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-cosmos/CHANGELOG.md b/packages/xchain-cosmos/CHANGELOG.md index 4ddcef071..afcea917c 100644 --- a/packages/xchain-cosmos/CHANGELOG.md +++ b/packages/xchain-cosmos/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## 2.0.7 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-cosmos-sdk@1.0.7 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 2.0.6 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos-sdk@1.0.6 + ## 2.0.5 ### Patch Changes diff --git a/packages/xchain-cosmos/__tests__/client.test.ts b/packages/xchain-cosmos/__tests__/client.test.ts index 7e8e5f0e5..f55d0a9a5 100644 --- a/packages/xchain-cosmos/__tests__/client.test.ts +++ b/packages/xchain-cosmos/__tests__/client.test.ts @@ -29,16 +29,16 @@ describe('Cosmos client', () => { client = new Client() }) it('Should get explorer url', () => { - expect(client.getExplorerUrl()).toBe('https://bigdipper.live/cosmos') + expect(client.getExplorerUrl()).toBe('https://www.mintscan.io/cosmos') }) it('Should get address url', () => { expect(client.getExplorerAddressUrl('cosmos1p9axwnsmnzhn0haaerzae9y2adv8q2nslnyzz3')).toBe( - 'https://bigdipper.live/cosmos/accounts/cosmos1p9axwnsmnzhn0haaerzae9y2adv8q2nslnyzz3', + 'https://www.mintscan.io/cosmos/accounts/cosmos1p9axwnsmnzhn0haaerzae9y2adv8q2nslnyzz3', ) }) it('Should get transaction url', () => { expect(client.getExplorerTxUrl('D31925DD10D19AE2FEA4E8C88273238198B3503032540DBDB43080730B971DE4')).toBe( - 'https://bigdipper.live/cosmos/transactions/D31925DD10D19AE2FEA4E8C88273238198B3503032540DBDB43080730B971DE4', + 'https://www.mintscan.io/cosmos/transactions/D31925DD10D19AE2FEA4E8C88273238198B3503032540DBDB43080730B971DE4', ) }) }) @@ -71,16 +71,16 @@ describe('Cosmos client', () => { }) }) it('Should get explorer url', () => { - expect(client.getExplorerUrl()).toBe('https://bigdipper.live/cosmos') + expect(client.getExplorerUrl()).toBe('https://www.mintscan.io/cosmos') }) it('Should get address url', () => { expect(client.getExplorerAddressUrl('cosmos1p9axwnsmnzhn0haaerzae9y2adv8q2nslnyzz3')).toBe( - 'https://bigdipper.live/cosmos/accounts/cosmos1p9axwnsmnzhn0haaerzae9y2adv8q2nslnyzz3', + 'https://www.mintscan.io/cosmos/accounts/cosmos1p9axwnsmnzhn0haaerzae9y2adv8q2nslnyzz3', ) }) it('Should get transaction url', () => { expect(client.getExplorerTxUrl('D31925DD10D19AE2FEA4E8C88273238198B3503032540DBDB43080730B971DE4')).toBe( - 'https://bigdipper.live/cosmos/transactions/D31925DD10D19AE2FEA4E8C88273238198B3503032540DBDB43080730B971DE4', + 'https://www.mintscan.io/cosmos/transactions/D31925DD10D19AE2FEA4E8C88273238198B3503032540DBDB43080730B971DE4', ) }) }) diff --git a/packages/xchain-cosmos/package.json b/packages/xchain-cosmos/package.json index e516b13ea..a5221b405 100644 --- a/packages/xchain-cosmos/package.json +++ b/packages/xchain-cosmos/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-cosmos", - "version": "2.0.5", + "version": "2.0.7", "description": "Custom Cosmos client and utilities used by XChainJS clients", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-cosmos/src/utils.ts b/packages/xchain-cosmos/src/utils.ts index d9bb790d4..5baa25cc6 100644 --- a/packages/xchain-cosmos/src/utils.ts +++ b/packages/xchain-cosmos/src/utils.ts @@ -6,7 +6,7 @@ import { ATOM_DENOM, AssetATOM } from './const' import { CompatibleAsset } from './types' // Explorer URLs for Mainnet and Testnet -const MAINNET_EXPLORER_URL = 'https://bigdipper.live/cosmos' +const MAINNET_EXPLORER_URL = 'https://www.mintscan.io/cosmos' const TESTNET_EXPLORER_URL = 'https://explorer.theta-testnet.polypore.xyz' /** diff --git a/packages/xchain-crypto/CHANGELOG.md b/packages/xchain-crypto/CHANGELOG.md index 1219b991b..a511d5873 100755 --- a/packages/xchain-crypto/CHANGELOG.md +++ b/packages/xchain-crypto/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.3.5 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. + ## 0.3.4 ### Patch Changes diff --git a/packages/xchain-crypto/package.json b/packages/xchain-crypto/package.json index d823766cc..777421554 100755 --- a/packages/xchain-crypto/package.json +++ b/packages/xchain-crypto/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-crypto", - "version": "0.3.4", + "version": "0.3.5", "description": "XChain Crypto is a crypto module needed by all XChain clients.", "main": "lib/index.js", "module": "lib/index.es.js", @@ -15,7 +15,7 @@ ], "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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\"", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "test": "jest --coverage" diff --git a/packages/xchain-dash/CHANGELOG.md b/packages/xchain-dash/CHANGELOG.md index 710d01cc0..b90ce3e67 100644 --- a/packages/xchain-dash/CHANGELOG.md +++ b/packages/xchain-dash/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-utxo@1.0.6 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-utxo@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-dash/package.json b/packages/xchain-dash/package.json index d5e1c648e..763424ca4 100644 --- a/packages/xchain-dash/package.json +++ b/packages/xchain-dash/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-dash", - "version": "1.0.4", + "version": "1.0.6", "description": "Custom Dash client and utilities used by XChainJS clients", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-doge/CHANGELOG.md b/packages/xchain-doge/CHANGELOG.md index 906b9da31..fd4163788 100644 --- a/packages/xchain-doge/CHANGELOG.md +++ b/packages/xchain-doge/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-utxo@1.0.6 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-utxo@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-doge/package.json b/packages/xchain-doge/package.json index 12f2a9261..cce919e06 100644 --- a/packages/xchain-doge/package.json +++ b/packages/xchain-doge/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-doge", - "version": "1.0.4", + "version": "1.0.6", "description": "Custom Doge client and utilities used by XChain clients", "keywords": [ "Xchain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-ethereum/CHANGELOG.md b/packages/xchain-ethereum/CHANGELOG.md index e82b44310..af4f2ad49 100644 --- a/packages/xchain-ethereum/CHANGELOG.md +++ b/packages/xchain-ethereum/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## 1.0.10 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-evm@1.0.10 + +## 1.0.9 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-evm-providers@1.0.7 + ## 1.0.8 ### Patch Changes diff --git a/packages/xchain-ethereum/package.json b/packages/xchain-ethereum/package.json index 70ec6929c..7235dcf77 100644 --- a/packages/xchain-ethereum/package.json +++ b/packages/xchain-ethereum/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-ethereum", - "version": "1.0.8", + "version": "1.0.10", "description": "Ethereum EVM client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-evm-providers/CHANGELOG.md b/packages/xchain-evm-providers/CHANGELOG.md index 4186c4e47..49a478baa 100644 --- a/packages/xchain-evm-providers/CHANGELOG.md +++ b/packages/xchain-evm-providers/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## 1.0.8 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.7 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 1.0.6 ### Patch Changes diff --git a/packages/xchain-evm-providers/package.json b/packages/xchain-evm-providers/package.json index c3468c73a..6ed70cafc 100644 --- a/packages/xchain-evm-providers/package.json +++ b/packages/xchain-evm-providers/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-evm-providers", - "version": "1.0.6", + "version": "1.0.8", "license": "MIT", "main": "lib/index.js", "module": "lib/index.esm.js", @@ -17,7 +17,7 @@ "url": "git@github.com:xchainjs/xchainjs-lib.git" }, "scripts": { - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-evm/CHANGELOG.md b/packages/xchain-evm/CHANGELOG.md index 32b00533f..f8420f257 100644 --- a/packages/xchain-evm/CHANGELOG.md +++ b/packages/xchain-evm/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## 1.0.10 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-evm-providers@1.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.9 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-evm-providers@1.0.7 + ## 1.0.8 ### Patch Changes diff --git a/packages/xchain-evm/package.json b/packages/xchain-evm/package.json index 755c94269..a86542caa 100644 --- a/packages/xchain-evm/package.json +++ b/packages/xchain-evm/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-evm", - "version": "1.0.8", + "version": "1.0.10", "description": "Genereic EVM client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-kujira/CHANGELOG.md b/packages/xchain-kujira/CHANGELOG.md index 8ed9c6073..ad771b87f 100644 --- a/packages/xchain-kujira/CHANGELOG.md +++ b/packages/xchain-kujira/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## 1.0.7 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-cosmos-sdk@1.0.7 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.6 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos-sdk@1.0.6 + ## 1.0.5 ### Patch Changes diff --git a/packages/xchain-kujira/package.json b/packages/xchain-kujira/package.json index 818a15036..53b0c6da4 100644 --- a/packages/xchain-kujira/package.json +++ b/packages/xchain-kujira/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-kujira", - "version": "1.0.5", + "version": "1.0.7", "description": "Custom Kujira client", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-litecoin/CHANGELOG.md b/packages/xchain-litecoin/CHANGELOG.md index 576820263..a9c07ecb1 100644 --- a/packages/xchain-litecoin/CHANGELOG.md +++ b/packages/xchain-litecoin/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-utxo@1.0.6 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-utxo@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-litecoin/package.json b/packages/xchain-litecoin/package.json index fef610bf5..1cbaecc6a 100644 --- a/packages/xchain-litecoin/package.json +++ b/packages/xchain-litecoin/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-litecoin", - "version": "1.0.4", + "version": "1.0.6", "description": "Custom Litecoin client and utilities used by XChainJS clients", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", diff --git a/packages/xchain-mayachain-amm/CHANGELOG.md b/packages/xchain-mayachain-amm/CHANGELOG.md index f59359a65..68a1f3eb4 100644 --- a/packages/xchain-mayachain-amm/CHANGELOG.md +++ b/packages/xchain-mayachain-amm/CHANGELOG.md @@ -1,5 +1,43 @@ # Changelog +## 3.0.12 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [3e16734] +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-radix@1.1.4 + - @xchainjs/xchain-mayachain-query@1.0.7 + - @xchainjs/xchain-mayachain@2.0.7 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-arbitrum@1.0.10 + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-kujira@1.0.7 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-dash@1.0.6 + +## 3.0.11 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-mayachain-query@1.0.6 + - @xchainjs/xchain-arbitrum@1.0.9 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-dash@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + - @xchainjs/xchain-kujira@1.0.6 + - @xchainjs/xchain-mayachain@2.0.6 + - @xchainjs/xchain-radix@1.1.3 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-wallet@1.0.11 + ## 3.0.10 ### Patch Changes diff --git a/packages/xchain-mayachain-amm/package.json b/packages/xchain-mayachain-amm/package.json index 51aecf526..89b20a28e 100644 --- a/packages/xchain-mayachain-amm/package.json +++ b/packages/xchain-mayachain-amm/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-mayachain-amm", - "version": "3.0.10", + "version": "3.0.12", "description": "module that exposes estimating & swapping cryptocurrency assets on mayachain", "keywords": [ "MAYAChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-mayachain-query/CHANGELOG.md b/packages/xchain-mayachain-query/CHANGELOG.md index f8b5deb1a..b30dfa3a6 100644 --- a/packages/xchain-mayachain-query/CHANGELOG.md +++ b/packages/xchain-mayachain-query/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## 1.0.7 + +### Patch Changes + +- cf78958: Swap history bug fix. +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-mayamidgard-query@0.1.22 + - @xchainjs/xchain-mayamidgard@0.1.7 + - @xchainjs/xchain-mayanode@0.1.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.6 + +### Patch Changes + +- 73b68ed: Bug fix with duplicated swaps from Midgard +- 73b68ed: `SwapResume` type with new `fromAsset` and `toAsset` properties +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-mayamidgard-query@0.1.21 + ## 1.0.5 ### Patch Changes diff --git a/packages/xchain-mayachain-query/__mocks__/midgard-api.ts b/packages/xchain-mayachain-query/__mocks__/midgard-api.ts index 086824e6c..08a09cafd 100644 --- a/packages/xchain-mayachain-query/__mocks__/midgard-api.ts +++ b/packages/xchain-mayachain-query/__mocks__/midgard-api.ts @@ -8,6 +8,10 @@ export default { const resp = require(`./responses/midgard/actions.json`) return [200, resp] }) + mock.onGet(/\/v2\/pools/).reply(function () { + const resp = require(`./responses/midgard/pools.json`) + return [200, resp] + }) mock.onGet(/\/v2\/mayaname\/lookup\/eld/).reply(function () { const resp = require(`./responses/midgard/mayaname.json`) return [200, resp] diff --git a/packages/xchain-mayachain-query/__mocks__/responses/midgard/actions.json b/packages/xchain-mayachain-query/__mocks__/responses/midgard/actions.json index 83aedcbf0..55384760d 100644 --- a/packages/xchain-mayachain-query/__mocks__/responses/midgard/actions.json +++ b/packages/xchain-mayachain-query/__mocks__/responses/midgard/actions.json @@ -1,5 +1,58 @@ { "actions": [ + { + "date": "1726832784224971813", + "height": "7861337", + "in": [ + { + "address": "0xd1f7112354055160d58fa1b1e7cfd15c0bfee464", + "coins": [ + { + "amount": "10434782608", + "asset": "ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7" + } + ], + "txID": "4C8A83C316B0247AE293F3D5A0B07974DE4083F220BF5551ACF20E66D17BC252" + } + ], + "metadata": { + "swap": { + "affiliateAddress": "", + "affiliateFee": "0", + "isStreamingSwap": true, + "liquidityFee": "938799839", + "memo": "=:THOR.RUNE:thor1qvlul0ujfrq27ja7uxrp8r7my9juegz0ug3nsg:0/4/0", + "networkFees": [], + "streamingSwapMeta": { + "count": "4", + "depositedCoin": { + "amount": "0", + "asset": "" + }, + "inCoin": { + "amount": "0", + "asset": "" + }, + "interval": "0", + "lastHeight": "0", + "outCoin": { + "amount": "0", + "asset": "" + }, + "quantity": "23" + }, + "swapSlip": "10", + "swapTarget": "0" + } + }, + "out": [], + "pools": [ + "ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7", + "THOR.RUNE" + ], + "status": "pending", + "type": "swap" + }, { "date": "1710210508760883749", "height": "5275978", @@ -8,7 +61,7 @@ "address": "0xaa278b62225f6dbc4436de8fa3dd195e1542d159", "coins": [ { - "amount": "99000000", + "amount": "1000000", "asset": "ETH.ETH" } ], @@ -131,9 +184,76 @@ ], "status": "success", "type": "swap" + }, + { + "date": "1715163259088137659", + "height": "6040388", + "in": [ + { + "address": "0xaa278b62225f6dbc4436de8fa3dd195e1542d159", + "coins": [ + { + "amount": "99000000", + "asset": "ETH.ETH" + } + ], + "txID": "4CC77E1FC51E9F99F0EE2AAC42FA2FD38A149796E9AD0B8368A1B3EB80AA4C85" + } + ], + "metadata": { + "swap": { + "affiliateAddress": "wr", + "affiliateFee": "100", + "isStreamingSwap": false, + "liquidityFee": "1612497385855", + "memo": "=:ARB.TGT-341:::wr:100", + "networkFees": [ + { + "amount": "45709242", + "asset": "ARB.TGT-0X429FED88F10285E61B12BDF00848315FBDFCC341" + }, + { + "amount": "2000000000", + "asset": "MAYA.CACAO" + } + ], + "swapSlip": "548", + "swapTarget": "0" + } + }, + "out": [ + { + "address": "maya1a427q3v96psuj4fnughdw8glt5r7j38ljfa6hh", + "coins": [ + { + "amount": "317142897868", + "asset": "MAYA.CACAO" + } + ], + "height": "6040388", + "txID": "" + }, + { + "address": "0xAA278b62225f6dbc4436De8Fa3dD195e1542d159", + "coins": [ + { + "amount": "7720844802738", + "asset": "ARB.TGT-0X429FED88F10285E61B12BDF00848315FBDFCC341" + } + ], + "height": "6040468", + "txID": "1E9F450E6174407FE846929BD16D057547DFB3BD1918176E12AACDAF6C753A8B" + } + ], + "pools": [ + "ETH.ETH", + "ARB.TGT-0X429FED88F10285E61B12BDF00848315FBDFCC341" + ], + "status": "success", + "type": "swap" } ], - "count": "2", + "count": "4", "meta": { "nextPageToken": "52759789000000001", "prevPageToken": "52759789000000012" diff --git a/packages/xchain-mayachain-query/__mocks__/responses/midgard/pools.json b/packages/xchain-mayachain-query/__mocks__/responses/midgard/pools.json new file mode 100644 index 000000000..0d6992a3c --- /dev/null +++ b/packages/xchain-mayachain-query/__mocks__/responses/midgard/pools.json @@ -0,0 +1,590 @@ +[ + { + "annualPercentageRate": "-0.23484892627162826", + "asset": "ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7", + "assetDepth": "5182691759638", + "assetPrice": "1.7327226317167521", + "assetPriceUSD": "1.0101773901646753", + "liquidityUnits": "1493675491164086", + "nativeDecimal": "6", + "poolAPY": "0", + "runeDepth": "898016730513668", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "700628295223", + "synthUnits": "108281202030464", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "1601956693194550", + "volume24h": "2391226113844944" + }, + { + "annualPercentageRate": "-0.007047305333922854", + "asset": "ARB.GNS-0X18C11FD286C5EC11C3B683CAA813B77F5163A122", + "assetDepth": "26520128069", + "assetPrice": "3.4860211263235437", + "assetPriceUSD": "2.032350509532733", + "liquidityUnits": "10000000000000", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "9244972672134", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "staged", + "synthSupply": "0", + "synthUnits": "0", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "10000000000000", + "volume24h": "0" + }, + { + "annualPercentageRate": "0.007057922409003223", + "asset": "ARB.GLD-0XAFD091F140C21770F4E5D53D26B2859AE97555AA", + "assetDepth": "2238392246427573", + "assetPrice": "0.008944647520091704", + "assetPriceUSD": "0.005214729999132506", + "liquidityUnits": "3351790915768571", + "nativeDecimal": "-1", + "poolAPY": "0.007057922409003223", + "runeDepth": "2002162965600089", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "843435763758", + "synthUnits": "631603565583", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "3352422519334154", + "volume24h": "1108866980503" + }, + { + "annualPercentageRate": "-0.000499985156017156", + "asset": "ARB.PEPE-0X25D887CE7A35172C62FEBFD67A1856F20FAEBB00", + "assetDepth": "51528249246148366", + "assetPrice": "0.000013953958739086707", + "assetPriceUSD": "0.000008135158716978333", + "liquidityUnits": "50714139662396", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "71902306387813", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "368693992848071", + "synthUnits": "182085874141", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "50896225536537", + "volume24h": "0" + }, + { + "annualPercentageRate": "0.017119740060032584", + "asset": "KUJI.USK", + "assetDepth": "442260626101", + "assetPrice": "1.7186369738706235", + "assetPriceUSD": "1.0019654508610043", + "liquidityUnits": "113072259416572", + "nativeDecimal": "-1", + "poolAPY": "0.017119740060032584", + "runeDepth": "76008546410435", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "1362069469", + "synthUnits": "174387896715", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "113246647313287", + "volume24h": "25152796777529" + }, + { + "annualPercentageRate": "-0.006400241659698064", + "asset": "ARB.GMX-0XFC5A1A6EB076A2C7AD06ED22C90D7E710E35AD0A", + "assetDepth": "2988163656", + "assetPrice": "34.06780410610817", + "assetPriceUSD": "19.861531678877206", + "liquidityUnits": "10000000000000", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "10180017406960", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "staged", + "synthSupply": "0", + "synthUnits": "0", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "10000000000000", + "volume24h": "0" + }, + { + "annualPercentageRate": "0.04909229160060591", + "asset": "ARB.USDT-0XFD086BC7CD5C481DCC9C85EBE478A1C0B69FCBB9", + "assetDepth": "6930753999861", + "assetPrice": "1.7216266146800994", + "assetPriceUSD": "1.0037084116183494", + "liquidityUnits": "861417546931683", + "nativeDecimal": "-1", + "poolAPY": "0.04909229160060591", + "runeDepth": "1193217054596125", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "221393286378", + "synthUnits": "13981705115156", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "875399252046839", + "volume24h": "264285300211772" + }, + { + "annualPercentageRate": "-0.006257401061163634", + "asset": "ARB.UNI-0XFA7F8980B0F1E64A2062791CC3B0871572F1F7F0", + "assetDepth": "9965861642", + "assetPrice": "10.448155272163069", + "assetPriceUSD": "6.091275101781162", + "liquidityUnits": "10000000000000", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "10412486985651", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "staged", + "synthSupply": "0", + "synthUnits": "0", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "10000000000000", + "volume24h": "0" + }, + { + "annualPercentageRate": "-0.0010724863099401524", + "asset": "ETH.WSTETH-0X7F39C581F595B53C5CB19BD0B3F8DA6C935E2CA0", + "assetDepth": "991464542", + "assetPrice": "5290.247106792065", + "assetPriceUSD": "3084.2143559760634", + "liquidityUnits": "266658165336729", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "524509242480242", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "8239503", + "synthUnits": "1112646146719", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "267770811483448", + "volume24h": "0" + }, + { + "annualPercentageRate": "NaN", + "asset": "ETH.MOG-0XAAEE1A9723AADB7AFA2810263653A34BA2C21C7A", + "assetDepth": "941295451943311686", + "assetPrice": "0.000001960799850106122", + "assetPriceUSD": "0.0000011431464211054885", + "liquidityUnits": "170000000000000", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "184569198107602", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "11774278284633595", + "synthUnits": "1069921702103", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "171069921702103", + "volume24h": "1991000000000" + }, + { + "annualPercentageRate": "-0.0003499393276061778", + "asset": "ETH.PEPE-0X6982508145454CE325DDBE47A25D4EC3D2311933", + "assetDepth": "582318199729437195", + "assetPrice": "0.000014290690857557946", + "assetPriceUSD": "0.000008331473560678893", + "liquidityUnits": "434551457042068", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "832172937306307", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "3761317820988328", + "synthUnits": "1407977624261", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "435959434666329", + "volume24h": "8293981994251" + }, + { + "annualPercentageRate": "0.03608452341140243", + "asset": "ARB.ETH", + "assetDepth": "2032477312", + "assetPrice": "4532.021988031589", + "assetPriceUSD": "2642.1690697851186", + "liquidityUnits": "664510336038319", + "nativeDecimal": "-1", + "poolAPY": "0.03608452341140243", + "runeDepth": "921123186815934", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "17738308", + "synthUnits": "2912443538842", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "667422779577161", + "volume24h": "90837019364449" + }, + { + "annualPercentageRate": "-1.5140589993807236", + "asset": "ARB.WBTC-0X2F2A2543B76A4166549F7AAB2E75BEF0AEFC5B0F", + "assetDepth": "54438232", + "assetPrice": "109085.98720266006", + "assetPriceUSD": "63597.13657502112", + "liquidityUnits": "111921466046539", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "593844827928744", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "79436687", + "synthUnits": "301995170239232", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "413916636285771", + "volume24h": "11792991852190" + }, + { + "annualPercentageRate": "0.003951399117000217", + "asset": "ARB.WSTETH-0X5979D7B546E38E414F7E9822514BE443A4800529", + "assetDepth": "267061281", + "assetPrice": "5334.5938131927105", + "assetPriceUSD": "3110.068488261401", + "liquidityUnits": "102169299343967", + "nativeDecimal": "-1", + "poolAPY": "0.003951399117000217", + "runeDepth": "142466345736592", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "2", + "synthUnits": "382568", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "102169299726535", + "volume24h": "883119917900" + }, + { + "annualPercentageRate": "0.016426266179049378", + "asset": "XRD.XRD", + "assetDepth": "1178659303553615", + "assetPrice": "0.03593690407241611", + "assetPriceUSD": "0.020951217062654483", + "liquidityUnits": "339311004418720", + "nativeDecimal": "-1", + "poolAPY": "0.016426266179049378", + "runeDepth": "4235736632586705", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "30756924517166", + "synthUnits": "4485659257970", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "343796663676690", + "volume24h": "575095902003283" + }, + { + "annualPercentageRate": "-0.07454345882845556", + "asset": "BTC.BTC", + "assetDepth": "10029992792", + "assetPrice": "109122.6007532084", + "assetPriceUSD": "63618.48227701668", + "liquidityUnits": "147813428905131562", + "nativeDecimal": "8", + "poolAPY": "0", + "runeDepth": "109449889899897406", + "saversAPR": "0", + "saversDepth": "461996", + "saversUnits": "461660", + "status": "available", + "synthSupply": "934057036", + "synthUnits": "7218795831931595", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "155032224737063157", + "volume24h": "7041563196524342" + }, + { + "annualPercentageRate": "0.29121439116609305", + "asset": "ARB.USDC-0XAF88D065E77C8CC2239327C5EDB3A432268E5831", + "assetDepth": "1870491795454", + "assetPrice": "1.7186626943469951", + "assetPriceUSD": "1.0019804459001522", + "liquidityUnits": "188485357370556", + "nativeDecimal": "-1", + "poolAPY": "0.29121439116609305", + "runeDepth": "321474446892892", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "509635022146", + "synthUnits": "29727136281847", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "218212493652403", + "volume24h": "116331287071126" + }, + { + "annualPercentageRate": "0.03919534292011417", + "asset": "ARB.ARB-0X912CE59144191C1204E64559FE8253A0E49E6548", + "assetDepth": "677001640605", + "assetPrice": "1.0196542028140865", + "assetPriceUSD": "0.5944584566594127", + "liquidityUnits": "76394124160005", + "nativeDecimal": "-1", + "poolAPY": "0.03919534292011417", + "runeDepth": "69030756815492", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "770374755", + "synthUnits": "43490004124", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "76437614164129", + "volume24h": "6678132634766" + }, + { + "annualPercentageRate": "-0.008303107374878415", + "asset": "ETH.ETH", + "assetDepth": "105089559803", + "assetPrice": "4518.482838250627", + "assetPriceUSD": "2634.2757447136787", + "liquidityUnits": "81545036224479115", + "nativeDecimal": "18", + "poolAPY": "0", + "runeDepth": "47484537244916843", + "saversAPR": "0.006154085034056429", + "saversDepth": "123890112", + "saversUnits": "123044644", + "status": "available", + "synthSupply": "2326049395", + "synthUnits": "912557038405317", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "82457593262884432", + "volume24h": "5595643804034020" + }, + { + "annualPercentageRate": "0.0002949819672984752", + "asset": "THOR.RUNE", + "assetDepth": "190478326683969", + "assetPrice": "8.046213364649889", + "assetPriceUSD": "4.690942836798391", + "liquidityUnits": "181806596805040544", + "nativeDecimal": "-1", + "poolAPY": "0.0002949819672984752", + "runeDepth": "153262925784069896", + "saversAPR": "0.0008566274775858643", + "saversDepth": "781657830478", + "saversUnits": "780288770460", + "status": "available", + "synthSupply": "2147534338388", + "synthUnits": "1030693005977582", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "182837289811018126", + "volume24h": "11709286010672233" + }, + { + "annualPercentageRate": "0.0013693480766529306", + "asset": "ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48", + "assetDepth": "16849797588389", + "assetPrice": "1.7152657034169911", + "assetPriceUSD": "0.9999999999999999", + "liquidityUnits": "4649451454129796", + "nativeDecimal": "6", + "poolAPY": "0.0013693480766529306", + "runeDepth": "2890187991288198", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "1844347497142", + "synthUnits": "269192826210212", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "4918644280340008", + "volume24h": "1177805563644862" + }, + { + "annualPercentageRate": "0.0896929923359896", + "asset": "ARB.TGT-0X429FED88F10285E61B12BDF00848315FBDFCC341", + "assetDepth": "139039539757925", + "assetPrice": "0.04588993868061651", + "assetPriceUSD": "0.026753836789949734", + "liquidityUnits": "538488101498986", + "nativeDecimal": "-1", + "poolAPY": "0.0896929923359896", + "runeDepth": "638051595367232", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "57013179347", + "synthUnits": "110426194264", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "538598527693250", + "volume24h": "390301357776570" + }, + { + "annualPercentageRate": "0.004133471310898061", + "asset": "ARB.LINK-0XF97F4DF75117A78C1A5A0DBB814AF92458539FB4", + "assetDepth": "27953553344", + "assetPrice": "19.623605918809304", + "assetPriceUSD": "11.440563336465598", + "liquidityUnits": "51084990145545", + "nativeDecimal": "-1", + "poolAPY": "0.004133471310898061", + "runeDepth": "54854951485307", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "20810524", + "synthUnits": "19022649315", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "51104012794860", + "volume24h": "0" + }, + { + "annualPercentageRate": "-0.009411723796535092", + "asset": "ARB.SUSHI-0XD4D42F0B6DEF4CE0383636770EF773390D85C61A", + "assetDepth": "96318097000", + "assetPrice": "0.7186088343691011", + "assetPriceUSD": "0.4189489901987523", + "liquidityUnits": "7539767441860", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "6921503541382", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "staged", + "synthSupply": "0", + "synthUnits": "0", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "7539767441860", + "volume24h": "0" + }, + { + "annualPercentageRate": "0.00492662661159168", + "asset": "ARB.DAI-0XDA10009CBD5D07DD0CECC66161FC93D7C9000DA1", + "assetDepth": "802936000924", + "assetPrice": "1.7004846376767169", + "assetPriceUSD": "0.9913826378555644", + "liquidityUnits": "102410752404937", + "nativeDecimal": "-1", + "poolAPY": "0.00492662661159168", + "runeDepth": "136538033460884", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "10329832448", + "synthUnits": "663025981704", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "103073778386641", + "volume24h": "7106760526798" + }, + { + "annualPercentageRate": "-0.001556726853283611", + "asset": "ARB.LEO-0X93864D81175095DD93360FFA2A529B8642F76A6E", + "assetDepth": "90311103734340", + "assetPrice": "0.050556131538814233", + "assetPriceUSD": "0.029474227484465557", + "liquidityUnits": "588213816868727", + "nativeDecimal": "-1", + "poolAPY": "0", + "runeDepth": "456578003980879", + "saversAPR": "0", + "saversDepth": "0", + "saversUnits": "0", + "status": "available", + "synthSupply": "593109000000", + "synthUnits": "1937880663052", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "590151697531779", + "volume24h": "27473016150862" + }, + { + "annualPercentageRate": "0.03078391726237465", + "asset": "DASH.DASH", + "assetDepth": "911989668645", + "assetPrice": "44.14476797001595", + "assetPriceUSD": "25.73640216910703", + "liquidityUnits": "3286158126131687", + "nativeDecimal": "-1", + "poolAPY": "0.03078391726237465", + "runeDepth": "4025957231338525", + "saversAPR": "0.01940510020264142", + "saversDepth": "3216510576", + "saversUnits": "3197972244", + "status": "available", + "synthSupply": "18806138682", + "synthUnits": "34234911917963", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "3320393038049650", + "volume24h": "1998431877800193" + }, + { + "annualPercentageRate": "0.11579165486740238", + "asset": "KUJI.KUJI", + "assetDepth": "57301952579387", + "assetPrice": "0.5319595841438047", + "assetPriceUSD": "0.31013246698985747", + "liquidityUnits": "4699981403343095", + "nativeDecimal": "-1", + "poolAPY": "0.11579165486740238", + "runeDepth": "3048232286475873", + "saversAPR": "0.004190185003853973", + "saversDepth": "41230671746", + "saversUnits": "41007694003", + "status": "available", + "synthSupply": "2510107856958", + "synthUnits": "105246325238879", + "totalCollateral": "0", + "totalDebtTor": "0", + "units": "4805227728581974", + "volume24h": "73167692269275" + } +] \ No newline at end of file diff --git a/packages/xchain-mayachain-query/__tests__/mayachain-query.test.ts b/packages/xchain-mayachain-query/__tests__/mayachain-query.test.ts index 712822be6..d4f053a4c 100644 --- a/packages/xchain-mayachain-query/__tests__/mayachain-query.test.ts +++ b/packages/xchain-mayachain-query/__tests__/mayachain-query.test.ts @@ -14,7 +14,7 @@ import { import mockMayanodeApi from '../__mocks__/mayanode-api' import mockMayamidgardApi from '../__mocks__/midgard-api' -import { BtcAsset, EthAsset, RuneAsset } from '../src/' +import { BtcAsset, EthAsset, PendingSwap, RuneAsset, SuccessSwap } from '../src/' import { MayachainCache } from '../src/mayachain-cache' import { MayachainQuery } from '../src/mayachain-query' @@ -181,31 +181,59 @@ describe('Mayachain-query tests', () => { it('Should get swaps history', async () => { const swapResume = await mayachainQuery.getSwapHistory({ addresses: ['address'] }) expect(swapResume.count === swapResume.swaps.length) + expect(swapResume.count).toBe(4) + const pendingSwap = swapResume.swaps[0] as PendingSwap expect({ - date: swapResume.swaps[0].date, - status: swapResume.swaps[0].status, + date: pendingSwap.date, + status: pendingSwap.status, + fromAsset: assetToString(pendingSwap.fromAsset), + toAsset: assetToString(pendingSwap.toAsset), in: { - hash: swapResume.swaps[0].inboundTx.hash, - address: swapResume.swaps[0].inboundTx.address, - asset: assetToString(swapResume.swaps[0].inboundTx.amount.asset), - amount: baseToAsset(swapResume.swaps[0].inboundTx.amount.baseAmount).amount().toString(), + hash: pendingSwap.inboundTx.hash, + address: pendingSwap.inboundTx.address, + asset: assetToString(pendingSwap.inboundTx.amount.asset), + amount: baseToAsset(pendingSwap.inboundTx.amount.baseAmount).amount().toString(), + }, + }).toEqual({ + date: new Date('2024-09-20T11:46:24.224Z'), + status: 'pending', + fromAsset: 'ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7', + toAsset: 'THOR.RUNE', + in: { + hash: '4C8A83C316B0247AE293F3D5A0B07974DE4083F220BF5551ACF20E66D17BC252', + address: '0xd1f7112354055160d58fa1b1e7cfd15c0bfee464', + asset: 'ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7', + amount: '104.34782608', + }, + }) + let successSwap = swapResume.swaps[1] as SuccessSwap + expect({ + date: successSwap.date, + status: successSwap.status, + fromAsset: assetToString(successSwap.fromAsset), + toAsset: assetToString(successSwap.toAsset), + in: { + hash: successSwap.inboundTx.hash, + address: successSwap.inboundTx.address, + asset: assetToString(successSwap.inboundTx.amount.asset), + amount: baseToAsset(successSwap.inboundTx.amount.baseAmount).amount().toString(), }, out: { - hash: swapResume.swaps[0].outboundTx?.hash, - address: swapResume.swaps[0].outboundTx?.address, - asset: swapResume.swaps[0].outboundTx ? assetToString(swapResume.swaps[0].outboundTx.amount.asset) : undefined, - amount: swapResume.swaps[0].outboundTx - ? baseToAsset(swapResume.swaps[0].outboundTx.amount.baseAmount).amount().toString() - : undefined, + hash: successSwap.outboundTx.hash, + address: successSwap.outboundTx.address, + asset: assetToString(successSwap.outboundTx.amount.asset), + amount: baseToAsset(successSwap.outboundTx.amount.baseAmount).amount().toString(), }, }).toEqual({ date: new Date('2024-03-12T02:28:28.760Z'), status: 'success', + fromAsset: 'ETH.ETH', + toAsset: 'MAYA.CACAO', in: { hash: '224CAF4D502A0A415F1312AFD16C0E7A2E3E79840AF593C2F875C806AA12E020', address: '0xaa278b62225f6dbc4436de8fa3dd195e1542d159', asset: 'ETH.ETH', - amount: '0.99', + amount: '1', }, out: { hash: '', @@ -214,6 +242,42 @@ describe('Mayachain-query tests', () => { amount: '3329.7336036086', }, }) + successSwap = swapResume.swaps[2] as SuccessSwap + expect({ + date: successSwap.date, + status: successSwap.status, + fromAsset: assetToString(successSwap.fromAsset), + toAsset: assetToString(successSwap.toAsset), + in: { + hash: successSwap.inboundTx.hash, + address: successSwap.inboundTx.address, + asset: assetToString(successSwap.inboundTx.amount.asset), + amount: baseToAsset(successSwap.inboundTx.amount.baseAmount).amount().toString(), + }, + out: { + hash: successSwap.outboundTx.hash, + address: successSwap.outboundTx.address, + asset: assetToString(successSwap.outboundTx.amount.asset), + amount: baseToAsset(successSwap.outboundTx.amount.baseAmount).amount().toString(), + }, + }).toEqual({ + date: new Date('2024-05-08T10:14:19.088Z'), + status: 'success', + fromAsset: 'ETH.ETH', + toAsset: 'ARB.TGT-0X429FED88F10285E61B12BDF00848315FBDFCC341', + in: { + hash: '4CC77E1FC51E9F99F0EE2AAC42FA2FD38A149796E9AD0B8368A1B3EB80AA4C85', + address: '0xaa278b62225f6dbc4436de8fa3dd195e1542d159', + asset: 'ETH.ETH', + amount: '0.99', + }, + out: { + hash: '1E9F450E6174407FE846929BD16D057547DFB3BD1918176E12AACDAF6C753A8B', + address: '0xAA278b62225f6dbc4436De8Fa3dD195e1542d159', + asset: 'ARB.TGT-0X429FED88F10285E61B12BDF00848315FBDFCC341', + amount: '77208.44802738', + }, + }) }) it('Should get MAYAName details', async () => { diff --git a/packages/xchain-mayachain-query/package.json b/packages/xchain-mayachain-query/package.json index 0e8a70660..715f17662 100644 --- a/packages/xchain-mayachain-query/package.json +++ b/packages/xchain-mayachain-query/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-mayachain-query", - "version": "1.0.5", + "version": "1.0.7", "license": "MIT", "description": "Mayachain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain", "keywords": [ @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-mayachain-query/src/mayachain-query.ts b/packages/xchain-mayachain-query/src/mayachain-query.ts index 9a1161c08..9afa93959 100644 --- a/packages/xchain-mayachain-query/src/mayachain-query.ts +++ b/packages/xchain-mayachain-query/src/mayachain-query.ts @@ -1,10 +1,13 @@ import { Network } from '@xchainjs/xchain-client' -import { PoolDetail, Transaction } from '@xchainjs/xchain-mayamidgard' +import { Action, PoolDetail, SwapMetadata, Transaction } from '@xchainjs/xchain-mayamidgard' import { QuoteSwapResponse } from '@xchainjs/xchain-mayanode' import { Address, AssetCryptoAmount, CryptoAmount, + SYNTH_ASSET_DELIMITER, + TOKEN_ASSET_DELIMITER, + TRADE_ASSET_DELIMITER, assetFromStringEx, assetToString, baseAmount, @@ -23,6 +26,7 @@ import { QuoteSwapParams, SwapHistoryParams, SwapsHistory, + TransactionAction, } from './types' import { ArbAsset, @@ -285,6 +289,7 @@ export class MayachainQuery { type: 'swap', }) const assetDecimals = await this.mayachainCache.getAssetDecimals() + const poolDetails = await this.mayachainCache.getPools() const getCryptoAmount = ( assetDecimals: Record, @@ -300,32 +305,92 @@ export class MayachainQuery { return { count: actionsResume.count ? Number(actionsResume.count) : 0, - swaps: actionsResume.actions.map((action) => { - let transaction: Transaction | undefined = action.out.filter((out) => out.txID !== '')[0] // For non to protocol asset swap - if (!transaction) { - // For to protocol asset swap - transaction = action.out.sort((out1, out2) => Number(out2.coins[0].amount) - Number(out1.coins[0].amount))[0] - } - return { - date: new Date(Number(action.date) / 10 ** 6), - status: action.status, - inboundTx: { + swaps: actionsResume.actions + // Merge duplicated swaps in just one + .reduce((prev, current) => { + const index = prev.findIndex((action) => action.in[0].txID === current.in[0].txID) + if (index === -1) return [...prev, current] + + for (let i = 0; i < current.in.length; i++) { + prev[index].in[i].coins[0].amount = String( + Number(prev[index].in[i].coins[0].amount) + Number(current.in[i].coins[0].amount), + ) + } + return prev + }, [] as Action[]) + .map((action) => { + const inboundTx: TransactionAction = { hash: action.in[0].txID, address: action.in[0].address, amount: getCryptoAmount(assetDecimals, action.in[0].coins[0].asset, action.in[0].coins[0].amount), - }, - outboundTx: transaction - ? { - hash: transaction.txID, - address: transaction.address, - amount: getCryptoAmount(assetDecimals, transaction.coins[0].asset, transaction.coins[0].amount), - } - : undefined, - } - }), + } + + const fromAsset: CompatibleAsset = inboundTx.amount.asset + const toAsset: CompatibleAsset = this.getAssetFromMemo( + (action.metadata.swap as SwapMetadata).memo, + poolDetails, + ) + + if (action.status === 'pending') { + return { + date: new Date(Number(action.date) / 10 ** 6), + status: 'pending', + fromAsset, + toAsset, + inboundTx, + } + } + + const transaction: Transaction = action.out + .filter((out) => out.coins[0].asset === assetToString(toAsset)) + .sort((out1, out2) => Number(out2.coins[0].amount) - Number(out1.coins[0].amount))[0] + + return { + date: new Date(Number(action.date) / 10 ** 6), + status: 'success', + fromAsset, + toAsset, + inboundTx, + outboundTx: { + hash: transaction.txID, + address: transaction.address, + amount: getCryptoAmount(assetDecimals, transaction.coins[0].asset, transaction.coins[0].amount), + }, + } + }), } } + private getAssetFromMemo(memo: string, pools: PoolDetail[]): CompatibleAsset { + const getAssetFromAliasIfNeeded = (alias: string, pools: PoolDetail[]): string => { + let delimiter: string = TOKEN_ASSET_DELIMITER + + if (alias.includes(TRADE_ASSET_DELIMITER)) { + delimiter = TRADE_ASSET_DELIMITER + } else if (alias.includes(SYNTH_ASSET_DELIMITER)) { + delimiter = SYNTH_ASSET_DELIMITER + } + + const splitedAlias = alias.split(delimiter) + const pool = pools.find((pool) => pool.asset.includes(`${splitedAlias[0]}.${splitedAlias[1].split('-')[0]}`)) + + if (pool) return pool.asset.replace('.', delimiter) + + return alias + } + + const attributes = memo.split(':') + if (!attributes[0]) throw Error(`Invalid memo: ${memo}`) + + switch (attributes[0]) { + case 'SWAP': + case '=': + if (!attributes[1]) throw Error('Asset not defined') + return assetFromStringEx(getAssetFromAliasIfNeeded(attributes[1], pools)) as CompatibleAsset + default: + throw Error(`Get asset from memo unsupported for ${attributes[0]} operation`) + } + } /** * Get the MAYANames owned by an address * @param {Address} owner - Thorchain address diff --git a/packages/xchain-mayachain-query/src/types.ts b/packages/xchain-mayachain-query/src/types.ts index a958d66ce..ad937f79d 100644 --- a/packages/xchain-mayachain-query/src/types.ts +++ b/packages/xchain-mayachain-query/src/types.ts @@ -119,16 +119,28 @@ export type TransactionAction = { amount: CryptoAmount } -/** - * Swap resume - */ -export type Swap = { +export type SuccessSwap = { date: Date - status: 'success' | 'pending' + fromAsset: CompatibleAsset + toAsset: CompatibleAsset + status: 'success' inboundTx: TransactionAction - outboundTx?: TransactionAction + outboundTx: TransactionAction } +export type PendingSwap = { + date: Date + fromAsset: CompatibleAsset + toAsset: CompatibleAsset + status: 'pending' + inboundTx: TransactionAction +} + +/** + * Swap resume + */ +export type Swap = SuccessSwap | PendingSwap + /** * Swap history */ diff --git a/packages/xchain-mayachain/CHANGELOG.md b/packages/xchain-mayachain/CHANGELOG.md index 4dcd42f52..ca0a3d7d9 100644 --- a/packages/xchain-mayachain/CHANGELOG.md +++ b/packages/xchain-mayachain/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## 2.0.7 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-cosmos-sdk@1.0.7 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 2.0.6 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos-sdk@1.0.6 + ## 2.0.5 ### Patch Changes diff --git a/packages/xchain-mayachain/package.json b/packages/xchain-mayachain/package.json index 7bb435787..6834da793 100644 --- a/packages/xchain-mayachain/package.json +++ b/packages/xchain-mayachain/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-mayachain", - "version": "2.0.5", + "version": "2.0.7", "description": "Custom Mayachain client and utilities used by XChainJS clients", "keywords": [ "MAYAChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-mayamidgard-query/CHANGELOG.md b/packages/xchain-mayamidgard-query/CHANGELOG.md index 8f6277e2a..bfc6efd30 100644 --- a/packages/xchain-mayamidgard-query/CHANGELOG.md +++ b/packages/xchain-mayamidgard-query/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## 0.1.22 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-mayamidgard@0.1.7 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 0.1.21 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 0.1.20 ### Patch Changes diff --git a/packages/xchain-mayamidgard-query/package.json b/packages/xchain-mayamidgard-query/package.json index 12e392dd2..783268250 100644 --- a/packages/xchain-mayamidgard-query/package.json +++ b/packages/xchain-mayamidgard-query/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-mayamidgard-query", - "version": "0.1.20", + "version": "0.1.22", "license": "MIT", "description": "Module that is responsible for get data from Mayachain Midgard API", "keywords": [ @@ -24,7 +24,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-mayamidgard/CHANGELOG.md b/packages/xchain-mayamidgard/CHANGELOG.md index c547606eb..89f0b191a 100644 --- a/packages/xchain-mayamidgard/CHANGELOG.md +++ b/packages/xchain-mayamidgard/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.1.7 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. + ## 0.1.6 ### Patch Changes diff --git a/packages/xchain-mayamidgard/package.json b/packages/xchain-mayamidgard/package.json index 41dbe78e5..5f33165b7 100644 --- a/packages/xchain-mayamidgard/package.json +++ b/packages/xchain-mayamidgard/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-mayamidgard", - "version": "0.1.6", + "version": "0.1.7", "license": "MIT", "description": "Midgard module that exposes all midgard functions used by Mayachain using openapi-generator-cli", "keywords": [ @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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\"", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "test": "jest --passWithNoTests", diff --git a/packages/xchain-mayanode/CHANGELOG.md b/packages/xchain-mayanode/CHANGELOG.md index 97f7a210b..4270a7521 100644 --- a/packages/xchain-mayanode/CHANGELOG.md +++ b/packages/xchain-mayanode/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.1.10 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. + ## 0.1.9 ### Patch Changes diff --git a/packages/xchain-mayanode/package.json b/packages/xchain-mayanode/package.json index b26e5a5aa..fab2d4f18 100644 --- a/packages/xchain-mayanode/package.json +++ b/packages/xchain-mayanode/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-mayanode", - "version": "0.1.9", + "version": "0.1.10", "license": "MIT", "description": "Mayanode module that exposes all mayanode functions using openapi-generator-cli", "keywords": [ @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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\"", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "test": "jest --passWithNoTests", diff --git a/packages/xchain-midgard-query/CHANGELOG.md b/packages/xchain-midgard-query/CHANGELOG.md index 4f777ceea..bcc34c36d 100644 --- a/packages/xchain-midgard-query/CHANGELOG.md +++ b/packages/xchain-midgard-query/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-midgard@0.5.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-midgard-query/package.json b/packages/xchain-midgard-query/package.json index db4828401..1ea67cdd5 100644 --- a/packages/xchain-midgard-query/package.json +++ b/packages/xchain-midgard-query/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-midgard-query", - "version": "1.0.4", + "version": "1.0.6", "license": "MIT", "description": "Module that is responsible for get data from Midgard API", "keywords": [ @@ -24,7 +24,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-midgard/CHANGELOG.md b/packages/xchain-midgard/CHANGELOG.md index 82346bcca..354c52bcb 100644 --- a/packages/xchain-midgard/CHANGELOG.md +++ b/packages/xchain-midgard/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.5.10 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. + ## 0.5.9 ### Patch Changes diff --git a/packages/xchain-midgard/package.json b/packages/xchain-midgard/package.json index 98284b1cf..f4c740e90 100644 --- a/packages/xchain-midgard/package.json +++ b/packages/xchain-midgard/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-midgard", - "version": "0.5.9", + "version": "0.5.10", "license": "MIT", "description": "Midgard module that exposes all midgard functions using openapi-generator-cli", "keywords": [ @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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\"", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "test": "jest --passWithNoTests", diff --git a/packages/xchain-radix/CHANGELOG.md b/packages/xchain-radix/CHANGELOG.md index edbcf25d0..11e9901ec 100644 --- a/packages/xchain-radix/CHANGELOG.md +++ b/packages/xchain-radix/CHANGELOG.md @@ -1,5 +1,24 @@ # @xchainjs/xchain-radix +## 1.1.4 + +### Patch Changes + +- 3e16734: Native asset balance always returned for empty addresses. +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 1.1.3 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 1.1.2 ### Patch Changes diff --git a/packages/xchain-radix/package.json b/packages/xchain-radix/package.json index ce819149a..b948c69cc 100644 --- a/packages/xchain-radix/package.json +++ b/packages/xchain-radix/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-radix", - "version": "1.1.2", + "version": "1.1.4", "description": "Custom Radix client and utilities used by XChainJS clients", "keywords": [ "XRD", @@ -26,7 +26,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", "compile": "tsc -p tsconfig.build.json", diff --git a/packages/xchain-radix/src/client.ts b/packages/xchain-radix/src/client.ts index 189203179..8edc95725 100644 --- a/packages/xchain-radix/src/client.ts +++ b/packages/xchain-radix/src/client.ts @@ -254,6 +254,15 @@ export default class Client extends BaseXChainClient { */ async getBalance(address: Address, assets?: TokenAsset[]): Promise { const balances: Balance[] = await this.radixSpecificClient.fetchBalances(address) + + // Return native asset even if there is no balance + if (balances.findIndex((balance) => eqAsset(balance.asset, this.getAssetInfo().asset)) === -1) { + balances.push({ + asset: this.getAssetInfo().asset, + amount: baseAmount(0, this.getAssetInfo().decimal), + }) + } + // If assets is undefined, return all balances if (!assets) { return balances diff --git a/packages/xchain-solana/CHANGELOG.md b/packages/xchain-solana/CHANGELOG.md index f4f733a0c..81568e1bc 100644 --- a/packages/xchain-solana/CHANGELOG.md +++ b/packages/xchain-solana/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## 0.0.4 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-util@1.0.5 + +## 0.0.3 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 0.0.2 ### Patch Changes diff --git a/packages/xchain-solana/package.json b/packages/xchain-solana/package.json index 6bb593854..81434e7c0 100644 --- a/packages/xchain-solana/package.json +++ b/packages/xchain-solana/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-solana", - "version": "0.0.2", + "version": "0.0.4", "description": "Solana client for XChainJS", "keywords": [ "Solana", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", @@ -48,4 +48,4 @@ "access": "public", "directory": "release/package" } -} \ No newline at end of file +} diff --git a/packages/xchain-thorchain-amm/CHANGELOG.md b/packages/xchain-thorchain-amm/CHANGELOG.md index 08941ea02..9271978b9 100644 --- a/packages/xchain-thorchain-amm/CHANGELOG.md +++ b/packages/xchain-thorchain-amm/CHANGELOG.md @@ -1,5 +1,50 @@ # Changelog +## 2.0.12 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-bitcoincash@1.0.6 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-litecoin@1.0.6 + - @xchainjs/xchain-binance@6.0.6 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-cosmos@2.0.7 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-avax@1.0.10 + - @xchainjs/xchain-doge@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-bsc@1.0.10 + - @xchainjs/xchain-evm@1.0.10 + +## 2.0.11 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-avax@1.0.9 + - @xchainjs/xchain-binance@6.0.5 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-bitcoincash@1.0.5 + - @xchainjs/xchain-bsc@1.0.9 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos@2.0.6 + - @xchainjs/xchain-doge@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-litecoin@1.0.5 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-wallet@1.0.11 + ## 2.0.10 ### Patch Changes diff --git a/packages/xchain-thorchain-amm/package.json b/packages/xchain-thorchain-amm/package.json index 1c11da456..0282d4f23 100644 --- a/packages/xchain-thorchain-amm/package.json +++ b/packages/xchain-thorchain-amm/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-thorchain-amm", - "version": "2.0.10", + "version": "2.0.12", "description": "module that exposes estimating & swappping cryptocurrency assets on thorchain", "keywords": [ "THORChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-thorchain-query/CHANGELOG.md b/packages/xchain-thorchain-query/CHANGELOG.md index 15d42e250..9d6b78b89 100644 --- a/packages/xchain-thorchain-query/CHANGELOG.md +++ b/packages/xchain-thorchain-query/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- cf78958: Swap history bug fix. +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-midgard-query@1.0.6 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.5 + +### Patch Changes + +- 73b68ed: `SwapResume` type with new `fromAsset` and `toAsset` properties +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-midgard-query@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-thorchain-query/__mocks__/responses/midgard/actions.json b/packages/xchain-thorchain-query/__mocks__/responses/midgard/actions.json index 278dfd1dd..52cd76842 100644 --- a/packages/xchain-thorchain-query/__mocks__/responses/midgard/actions.json +++ b/packages/xchain-thorchain-query/__mocks__/responses/midgard/actions.json @@ -1,5 +1,41 @@ { "actions": [ + { + "date": "1726829842493647576", + "height": "17788072", + "in": [ + { + "address": "thor14mh37ua4vkyur0l5ra297a4la6tmf95mt96a55", + "coins": [ + { + "amount": "417596871027", + "asset": "ETH~USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7" + } + ], + "txID": "4A60B30CBC1EDF2C9A761285EF301C84A6CC8015197E81F12B05B05AE5470AE8" + } + ], + "metadata": { + "swap": { + "affiliateAddress": "", + "affiliateFee": "0", + "isStreamingSwap": false, + "liquidityFee": "185464777", + "memo": "=:ETH~ETH:thor14mh37ua4vkyur0l5ra297a4la6tmf95mt96a55:163442245", + "networkFees": [], + "swapSlip": "20", + "swapTarget": "163442245", + "txType": "swap" + } + }, + "out": [], + "pools": [ + "ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7", + "ETH.ETH" + ], + "status": "pending", + "type": "swap" + }, { "date": "1710685749029840134", "height": "15151326", @@ -138,9 +174,61 @@ ], "status": "success", "type": "swap" + }, + { + "date": "1726236032211273578", + "height": "17688300", + "in": [ + { + "address": "thor1qpf7u5qzeuddram3eyrud2emm9expnu7fsyycm", + "coins": [ + { + "amount": "101000000000", + "asset": "THOR.RUNE" + } + ], + "txID": "B27909B53D73DB86753EDBDEBD5F6EE99498A25C57A8AD01F8F3217E232A7121" + } + ], + "metadata": { + "swap": { + "affiliateAddress": "", + "affiliateFee": "0", + "isStreamingSwap": false, + "liquidityFee": "151418460", + "memo": "=:ETH/USDT:thor1qpf7u5qzeuddram3eyrud2emm9expnu7fsyycm:0/1/0", + "networkFees": [ + { + "amount": "7925800", + "asset": "ETH/USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7" + } + ], + "swapSlip": "15", + "swapTarget": "0", + "txType": "swap" + } + }, + "out": [ + { + "address": "thor1qpf7u5qzeuddram3eyrud2emm9expnu7fsyycm", + "coins": [ + { + "amount": "399649228400", + "asset": "ETH/USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7" + } + ], + "height": "17688300", + "txID": "" + } + ], + "pools": [ + "ETH.USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7" + ], + "status": "success", + "type": "swap" } ], - "count": "2", + "count": "4", "meta": { "nextPageToken": "151512749000000078", "prevPageToken": "151513269000000082" diff --git a/packages/xchain-thorchain-query/__tests__/thorchain-query.test.ts b/packages/xchain-thorchain-query/__tests__/thorchain-query.test.ts index c508a4beb..26493e5d9 100644 --- a/packages/xchain-thorchain-query/__tests__/thorchain-query.test.ts +++ b/packages/xchain-thorchain-query/__tests__/thorchain-query.test.ts @@ -13,7 +13,7 @@ import mockMidgardApi from '../__mocks__/midgard-api' import mockThornodeApi from '../__mocks__/thornode-api' import { ThorchainCache } from '../src/thorchain-cache' import { ThorchainQuery } from '../src/thorchain-query' -import { QuoteSwapParams, TxDetails } from '../src/types' +import { PendingSwap, QuoteSwapParams, SuccessSwap, TxDetails } from '../src/types' //import { AssetRuneNative } from '../src/utils' const thorchainCache = new ThorchainCache() @@ -107,27 +107,54 @@ describe('Thorchain-query tests', () => { it('Should get swaps history', async () => { const swapResume = await thorchainQuery.getSwapHistory({ addresses: ['address'] }) - expect(swapResume.count === swapResume.swaps.length) + expect(swapResume.count).toBe(4) + const pendingSwap = swapResume.swaps[0] as PendingSwap expect({ - date: swapResume.swaps[0].date, - status: swapResume.swaps[0].status, + date: pendingSwap.date, + status: pendingSwap.status, + fromAsset: assetToString(pendingSwap.fromAsset), + toAsset: assetToString(pendingSwap.toAsset), in: { - hash: swapResume.swaps[0].inboundTx.hash, - address: swapResume.swaps[0].inboundTx.address, - asset: assetToString(swapResume.swaps[0].inboundTx.amount.asset), - amount: baseToAsset(swapResume.swaps[0].inboundTx.amount.baseAmount).amount().toString(), + hash: pendingSwap.inboundTx.hash, + address: pendingSwap.inboundTx.address, + asset: assetToString(pendingSwap.inboundTx.amount.asset), + amount: baseToAsset(pendingSwap.inboundTx.amount.baseAmount).amount().toString(), + }, + }).toEqual({ + date: new Date('2024-09-20T10:57:22.493Z'), + status: 'pending', + fromAsset: 'ETH~USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7', + toAsset: 'ETH~ETH', + in: { + hash: '4A60B30CBC1EDF2C9A761285EF301C84A6CC8015197E81F12B05B05AE5470AE8', + address: 'thor14mh37ua4vkyur0l5ra297a4la6tmf95mt96a55', + asset: 'ETH~USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7', + amount: '4175.96871027', + }, + }) + let successSwap = swapResume.swaps[1] as SuccessSwap + expect({ + date: successSwap.date, + status: successSwap.status, + fromAsset: assetToString(successSwap.fromAsset), + toAsset: assetToString(successSwap.toAsset), + in: { + hash: successSwap.inboundTx.hash, + address: successSwap.inboundTx.address, + asset: assetToString(successSwap.inboundTx.amount.asset), + amount: baseToAsset(successSwap.inboundTx.amount.baseAmount).amount().toString(), }, out: { - hash: swapResume.swaps[0].outboundTx?.hash, - address: swapResume.swaps[0].outboundTx?.address, - asset: swapResume.swaps[0].outboundTx ? assetToString(swapResume.swaps[0].outboundTx.amount.asset) : undefined, - amount: swapResume.swaps[0].outboundTx - ? baseToAsset(swapResume.swaps[0].outboundTx?.amount.baseAmount).amount().toString() - : undefined, + hash: successSwap.outboundTx.hash, + address: successSwap.outboundTx.address, + asset: assetToString(successSwap.outboundTx.amount.asset), + amount: baseToAsset(successSwap.outboundTx?.amount.baseAmount).amount().toString(), }, }).toEqual({ date: new Date('2024-03-17T14:29:09.029Z'), status: 'success', + fromAsset: 'DOGE/DOGE', + toAsset: 'ETH/USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE3606EB48', in: { hash: 'EA7F60B6EB355A40FA7DAA030A0F09F27B7C3AE18E8AE8AB55A7C87DA80F0446', address: 'thor14mh37ua4vkyur0l5ra297a4la6tmf95mt96a55', @@ -141,5 +168,41 @@ describe('Thorchain-query tests', () => { amount: '1355.86901', }, }) + successSwap = swapResume.swaps[3] as SuccessSwap + expect({ + date: successSwap.date, + status: successSwap.status, + fromAsset: assetToString(successSwap.fromAsset), + toAsset: assetToString(successSwap.toAsset), + in: { + hash: successSwap.inboundTx.hash, + address: successSwap.inboundTx.address, + asset: assetToString(successSwap.inboundTx.amount.asset), + amount: baseToAsset(successSwap.inboundTx.amount.baseAmount).amount().toString(), + }, + out: { + hash: successSwap.outboundTx.hash, + address: successSwap.outboundTx.address, + asset: assetToString(successSwap.outboundTx.amount.asset), + amount: baseToAsset(successSwap.outboundTx?.amount.baseAmount).amount().toString(), + }, + }).toEqual({ + date: new Date('2024-09-13T14:00:32.211Z'), + status: 'success', + fromAsset: 'THOR.RUNE', + toAsset: 'ETH/USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7', + in: { + hash: 'B27909B53D73DB86753EDBDEBD5F6EE99498A25C57A8AD01F8F3217E232A7121', + address: 'thor1qpf7u5qzeuddram3eyrud2emm9expnu7fsyycm', + asset: 'THOR.RUNE', + amount: '1010', + }, + out: { + hash: '', + address: 'thor1qpf7u5qzeuddram3eyrud2emm9expnu7fsyycm', + asset: 'ETH/USDT-0XDAC17F958D2EE523A2206206994597C13D831EC7', + amount: '3996.492284', + }, + }) }) }) diff --git a/packages/xchain-thorchain-query/package.json b/packages/xchain-thorchain-query/package.json index bb826aab2..278974a5a 100644 --- a/packages/xchain-thorchain-query/package.json +++ b/packages/xchain-thorchain-query/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-thorchain-query", - "version": "1.0.4", + "version": "1.0.6", "license": "MIT", "description": "Thorchain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain ", "keywords": [ @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-thorchain-query/src/thorchain-query.ts b/packages/xchain-thorchain-query/src/thorchain-query.ts index f61e8e15b..0a72c4e9e 100644 --- a/packages/xchain-thorchain-query/src/thorchain-query.ts +++ b/packages/xchain-thorchain-query/src/thorchain-query.ts @@ -1,4 +1,4 @@ -import { Transaction } from '@xchainjs/xchain-midgard' +import { SwapMetadata, Transaction } from '@xchainjs/xchain-midgard' import { LastBlock, TradeAccountResponse, TradeUnitResponse } from '@xchainjs/xchain-thornode' import { Address, @@ -6,7 +6,10 @@ import { AssetCryptoAmount, Chain, CryptoAmount, + SYNTH_ASSET_DELIMITER, SynthAsset, + TOKEN_ASSET_DELIMITER, + TRADE_ASSET_DELIMITER, TokenAsset, TradeAsset, assetAmount, @@ -62,6 +65,7 @@ import { TradeAssetUnits, TradeAssetUnitsParams, TradeAssetsUnitsParams, + TransactionAction, TxDetails, UnitData, WithdrawLiquidityPosition, @@ -1401,27 +1405,40 @@ export class ThorchainQuery { return { count: actionsResume.count ? Number(actionsResume.count) : 0, swaps: actionsResume.actions.map((action) => { - let transaction: Transaction | undefined = action.out.filter((out) => out.txID !== '')[0] // For non to protocol asset swap + const inboundTx: TransactionAction = { + hash: action.in[0].txID, + address: action.in[0].address, + amount: getInboundCryptoAmount(pools, action.in[0].coins[0].asset, action.in[0].coins[0].amount), + } - if (!transaction) { - // For to protocol asset swap - transaction = action.out.sort((out1, out2) => Number(out2.coins[0].amount) - Number(out1.coins[0].amount))[0] + const fromAsset: CompatibleAsset = inboundTx.amount.asset + const toAsset: CompatibleAsset = this.getAssetFromMemo((action.metadata.swap as SwapMetadata).memo, pools) + + if (action.status === 'pending') { + return { + date: new Date(Number(action.date) / 10 ** 6), + status: 'pending', + fromAsset, + toAsset, + inboundTx, + } } + + const transaction: Transaction = action.out + .filter((out) => out.coins[0].asset === assetToString(toAsset)) + .sort((out1, out2) => Number(out2.coins[0].amount) - Number(out1.coins[0].amount))[0] + return { date: new Date(Number(action.date) / 10 ** 6), - status: action.status, - inboundTx: { - hash: action.in[0].txID, - address: action.in[0].address, - amount: getInboundCryptoAmount(pools, action.in[0].coins[0].asset, action.in[0].coins[0].amount), + status: 'success', + fromAsset, + toAsset, + inboundTx, + outboundTx: { + hash: transaction.txID, + address: transaction.address, + amount: getInboundCryptoAmount(pools, transaction.coins[0].asset, transaction.coins[0].amount), }, - outboundTx: transaction - ? { - hash: transaction.txID, - address: transaction.address, - amount: getInboundCryptoAmount(pools, transaction.coins[0].asset, transaction.coins[0].amount), - } - : undefined, } }), } @@ -1588,4 +1605,51 @@ export class ThorchainQuery { } }) } + + private getAssetFromMemo(memo: string, pools: Record): CompatibleAsset { + const getAssetFromAliasIfNeeded = (alias: string, pools: Record): string => { + const nativeAlias = new Map([ + ['r', 'THOR.RUNE'], + ['rune', 'THOR.RUNE'], + ['b', 'BTC.BTC'], + ['e', 'ETH.ETH'], + ['g', 'GAIA.ATOM'], + ['d', 'DOGE.DOGE'], + ['l', 'LTC.LTC'], + ['c', 'BCH.BCH'], + ['a', 'AVAX.AVAX'], + ['s', 'BSC.BNB'], + ]) + + const nativeAsset = nativeAlias.get(alias.toLowerCase()) + if (nativeAsset) return nativeAsset + + let delimiter: string = TOKEN_ASSET_DELIMITER + + if (alias.includes(TRADE_ASSET_DELIMITER)) { + delimiter = TRADE_ASSET_DELIMITER + } else if (alias.includes(SYNTH_ASSET_DELIMITER)) { + delimiter = SYNTH_ASSET_DELIMITER + } + + const splitedAlias = alias.split(delimiter) + const poolId = Object.keys(pools).find((pool) => pool === `${splitedAlias[0]}.${splitedAlias[1].split('-')[0]}`) + + if (poolId) return pools[poolId].assetString.replace('.', delimiter) + + return alias + } + + const attributes = memo.split(':') + if (!attributes[0]) throw Error(`Invalid memo: ${memo}`) + + switch (attributes[0]) { + case 'SWAP': + case '=': + if (!attributes[1]) throw Error('Asset not defined') + return assetFromStringEx(getAssetFromAliasIfNeeded(attributes[1], pools)) as CompatibleAsset + default: + throw Error(`Get asset from memo unsupported for ${attributes[0]} operation`) + } + } } diff --git a/packages/xchain-thorchain-query/src/types.ts b/packages/xchain-thorchain-query/src/types.ts index 5bf12f7e5..79c5486c5 100644 --- a/packages/xchain-thorchain-query/src/types.ts +++ b/packages/xchain-thorchain-query/src/types.ts @@ -488,16 +488,28 @@ export type TransactionAction = { amount: CryptoAmount } -/** - * Swap resume - */ -export type Swap = { +export type SuccessSwap = { date: Date - status: 'success' | 'pending' + fromAsset: CompatibleAsset + toAsset: CompatibleAsset + status: 'success' inboundTx: TransactionAction - outboundTx?: TransactionAction + outboundTx: TransactionAction } +export type PendingSwap = { + date: Date + fromAsset: CompatibleAsset + toAsset: CompatibleAsset + status: 'pending' + inboundTx: TransactionAction +} + +/** + * Swap resume + */ +export type Swap = SuccessSwap | PendingSwap + /** * Swap history */ diff --git a/packages/xchain-thorchain/CHANGELOG.md b/packages/xchain-thorchain/CHANGELOG.md index 89ed04572..fdc51e172 100644 --- a/packages/xchain-thorchain/CHANGELOG.md +++ b/packages/xchain-thorchain/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## 2.0.8 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-cosmos-sdk@1.0.7 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 2.0.7 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos-sdk@1.0.6 + ## 2.0.6 ### Patch Changes diff --git a/packages/xchain-thorchain/package.json b/packages/xchain-thorchain/package.json index e3b5fe1bc..977f8939a 100644 --- a/packages/xchain-thorchain/package.json +++ b/packages/xchain-thorchain/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-thorchain", - "version": "2.0.6", + "version": "2.0.8", "description": "Custom Thorchain client and utilities used by XChainJS clients", "keywords": [ "THORChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-thornode/CHANGELOG.md b/packages/xchain-thornode/CHANGELOG.md index 828320b9c..7388b6983 100644 --- a/packages/xchain-thornode/CHANGELOG.md +++ b/packages/xchain-thornode/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.3.20 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. + ## 0.3.19 ### Patch Changes diff --git a/packages/xchain-thornode/package.json b/packages/xchain-thornode/package.json index c4984efd8..228708a04 100644 --- a/packages/xchain-thornode/package.json +++ b/packages/xchain-thornode/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-thornode", - "version": "0.3.19", + "version": "0.3.20", "license": "MIT", "description": "Thornode module that exposes all thornode functions using openapi-generator-cli", "keywords": [ @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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\"", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0", "test": "jest --passWithNoTests", diff --git a/packages/xchain-util/CHANGELOG.md b/packages/xchain-util/CHANGELOG.md index ffc0220ef..094db33db 100755 --- a/packages/xchain-util/CHANGELOG.md +++ b/packages/xchain-util/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## 1.0.5 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. + +## 1.0.4 + +### Patch Changes + +- 73b68ed: `assetFromString` can work with 'RUNE' alias + ## 1.0.3 ### Patch Changes diff --git a/packages/xchain-util/__tests__/asset.test.ts b/packages/xchain-util/__tests__/asset.test.ts index 21c9ac48f..65fe98073 100755 --- a/packages/xchain-util/__tests__/asset.test.ts +++ b/packages/xchain-util/__tests__/asset.test.ts @@ -287,10 +287,18 @@ describe('asset', () => { type: AssetType.TOKEN, }) }) - it('RUNE', () => { + it('BNB.RUNE-67C', () => { const result = assetFromString('BNB.RUNE-67C') expect(result).toEqual({ chain: 'BNB', symbol: 'RUNE-67C', ticker: 'RUNE', type: AssetType.TOKEN }) }) + it('RUNE', () => { + expect(assetFromString('RUNE')).toEqual({ + chain: 'THOR', + symbol: 'RUNE', + ticker: 'RUNE', + type: AssetType.NATIVE, + }) + }) it('BTCB', () => { const result = assetFromString('BNB.BTCB-123') expect(result).toEqual({ chain: 'BNB', symbol: 'BTCB-123', ticker: 'BTCB', type: AssetType.TOKEN }) diff --git a/packages/xchain-util/package.json b/packages/xchain-util/package.json index 82db5fae4..c227ff0ef 100755 --- a/packages/xchain-util/package.json +++ b/packages/xchain-util/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-util", - "version": "1.0.3", + "version": "1.0.5", "description": "Helper utilities for XChain clients", "keywords": [ "THORChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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", "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0" diff --git a/packages/xchain-util/src/asset.ts b/packages/xchain-util/src/asset.ts index f02cf0f01..e1ecd262a 100755 --- a/packages/xchain-util/src/asset.ts +++ b/packages/xchain-util/src/asset.ts @@ -261,6 +261,7 @@ export const isTokenAsset = (asset: AnyAsset): asset is TokenAsset => asset.type const assetConfigs = new Map([ ['KUJI.USK', { chain: 'KUJI', symbol: 'USK', ticker: 'USK', type: AssetType.TOKEN }], ['MAYA.MAYA', { chain: 'MAYA', symbol: 'MAYA', ticker: 'MAYA', type: AssetType.TOKEN }], + ['RUNE', { chain: 'THOR', symbol: 'RUNE', ticker: 'RUNE', type: AssetType.NATIVE }], ]) const createAsset = (chain: string, symbol: string, ticker: string, type: AssetType) => { diff --git a/packages/xchain-utxo-providers/CHANGELOG.md b/packages/xchain-utxo-providers/CHANGELOG.md index 07a479480..da5d05168 100644 --- a/packages/xchain-utxo-providers/CHANGELOG.md +++ b/packages/xchain-utxo-providers/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-utxo-providers/package.json b/packages/xchain-utxo-providers/package.json index de7747fd1..4d787d152 100644 --- a/packages/xchain-utxo-providers/package.json +++ b/packages/xchain-utxo-providers/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-utxo-providers", - "version": "1.0.4", + "version": "1.0.6", "license": "MIT", "main": "lib/index.js", "module": "lib/index.esm.js", @@ -17,7 +17,7 @@ "url": "git@github.com:xchainjs/xchainjs-lib.git" }, "scripts": { - "build": "yarn clean && rollup -c", + "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", diff --git a/packages/xchain-utxo/CHANGELOG.md b/packages/xchain-utxo/CHANGELOG.md index 629502532..ccb7057a5 100644 --- a/packages/xchain-utxo/CHANGELOG.md +++ b/packages/xchain-utxo/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## 1.0.6 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [33bfa40] + - @xchainjs/xchain-utxo-providers@1.0.6 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + +## 1.0.5 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-utxo-providers@1.0.5 + ## 1.0.4 ### Patch Changes diff --git a/packages/xchain-utxo/package.json b/packages/xchain-utxo/package.json index dd94d0baa..c22a97f20 100644 --- a/packages/xchain-utxo/package.json +++ b/packages/xchain-utxo/package.json @@ -1,6 +1,6 @@ { "name": "@xchainjs/xchain-utxo", - "version": "1.0.4", + "version": "1.0.6", "description": "Genereic UTXO client for XChainJS", "keywords": [ "XChain", @@ -25,7 +25,7 @@ }, "scripts": { "clean": "rm -rf .turbo && rm -rf lib", - "build": "yarn clean && rollup -c", + "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\"", "lint": "eslint \"{src,__tests__, __mocks__}/**/*.ts\" --fix --max-warnings 0" }, diff --git a/packages/xchain-wallet/CHANGELOG.md b/packages/xchain-wallet/CHANGELOG.md index 49820b87e..1f729629a 100644 --- a/packages/xchain-wallet/CHANGELOG.md +++ b/packages/xchain-wallet/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## 1.0.12 + +### Patch Changes + +- 33bfa40: Rollup update to latest version. +- Updated dependencies [3e16734] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-radix@1.1.4 + - @xchainjs/xchain-mayachain@2.0.7 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-utxo@1.0.6 + - @xchainjs/xchain-evm@1.0.10 + +## 1.0.11 + +### Patch Changes + +- Updated dependencies [73b68ed] + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-evm@1.0.9 + - @xchainjs/xchain-mayachain@2.0.6 + - @xchainjs/xchain-radix@1.1.3 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-utxo@1.0.5 + ## 1.0.10 ### Patch Changes diff --git a/packages/xchain-wallet/package.json b/packages/xchain-wallet/package.json index c7d7af8ea..9083949c1 100644 --- a/packages/xchain-wallet/package.json +++ b/packages/xchain-wallet/package.json @@ -1,7 +1,7 @@ { "name": "@xchainjs/xchain-wallet", "description": "XChainjs clients wrapper to work with several chains at the same time", - "version": "1.0.10", + "version": "1.0.12", "license": "MIT", "main": "lib/index.js", "module": "lib/index.esm.js", @@ -18,7 +18,7 @@ "url": "git@github.com:xchainjs/xchainjs-lib.git" }, "scripts": { - "build": "yarn clean && rollup -c", + "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", diff --git a/tools/txJammer/CHANGELOG.md b/tools/txJammer/CHANGELOG.md index aac07da0a..2aeec3287 100644 --- a/tools/txJammer/CHANGELOG.md +++ b/tools/txJammer/CHANGELOG.md @@ -1,5 +1,52 @@ # txJammer +## 1.0.26 + +### Patch Changes + +- Updated dependencies [cf78958] +- Updated dependencies [33bfa40] + - @xchainjs/xchain-thorchain-query@1.0.6 + - @xchainjs/xchain-thorchain-amm@2.0.12 + - @xchainjs/xchain-bitcoincash@1.0.6 + - @xchainjs/xchain-thorchain@2.0.8 + - @xchainjs/xchain-ethereum@1.0.10 + - @xchainjs/xchain-litecoin@1.0.6 + - @xchainjs/xchain-thornode@0.3.20 + - @xchainjs/xchain-binance@6.0.6 + - @xchainjs/xchain-bitcoin@1.1.2 + - @xchainjs/xchain-midgard@0.5.10 + - @xchainjs/xchain-client@1.0.6 + - @xchainjs/xchain-cosmos@2.0.7 + - @xchainjs/xchain-crypto@0.3.5 + - @xchainjs/xchain-wallet@1.0.12 + - @xchainjs/xchain-avax@1.0.10 + - @xchainjs/xchain-doge@1.0.6 + - @xchainjs/xchain-util@1.0.5 + - @xchainjs/xchain-bsc@1.0.10 + +## 1.0.25 + +### Patch Changes + +- Updated dependencies [73b68ed] +- Updated dependencies [73b68ed] + - @xchainjs/xchain-thorchain-query@1.0.5 + - @xchainjs/xchain-util@1.0.4 + - @xchainjs/xchain-thorchain-amm@2.0.11 + - @xchainjs/xchain-avax@1.0.9 + - @xchainjs/xchain-binance@6.0.5 + - @xchainjs/xchain-bitcoin@1.1.1 + - @xchainjs/xchain-bitcoincash@1.0.5 + - @xchainjs/xchain-bsc@1.0.9 + - @xchainjs/xchain-client@1.0.5 + - @xchainjs/xchain-cosmos@2.0.6 + - @xchainjs/xchain-doge@1.0.5 + - @xchainjs/xchain-ethereum@1.0.9 + - @xchainjs/xchain-litecoin@1.0.5 + - @xchainjs/xchain-thorchain@2.0.7 + - @xchainjs/xchain-wallet@1.0.11 + ## 1.0.24 ### Patch Changes diff --git a/tools/txJammer/package.json b/tools/txJammer/package.json index 48aa2aec9..f6f8091ee 100644 --- a/tools/txJammer/package.json +++ b/tools/txJammer/package.json @@ -1,6 +1,6 @@ { "name": "txJammer", - "version": "1.0.24", + "version": "1.0.26", "private": true, "description": "A simple script to test all types of transactions broadcasted to a thornode but on stagenet", "main": "index.js", diff --git a/yarn.lock b/yarn.lock index 8b5264647..347782fc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -710,15 +710,39 @@ __metadata: languageName: node linkType: hard -"@chainflip/sdk@npm:1.3.0": - version: 1.3.0 - resolution: "@chainflip/sdk@npm:1.3.0" +"@chainflip/rpc@npm:^1.6.6": + version: 1.6.6 + resolution: "@chainflip/rpc@npm:1.6.6" dependencies: - "@polkadot/util": "npm:^12.6.2" - "@polkadot/util-crypto": "npm:^12.6.2" - axios: "npm:^1.6.8" - ethers: "npm:^6.11.1" - checksum: 10c0/18690f1a2eb070339221bc7c1bd9fa9c05d8d69e5c04e156355ad138a89d6013f131e290398c9a8e766307644ee12f346d4e3cb1dae7e6b12f2f321c3f50d61f + "@chainflip/utils": "npm:^0.3.0" + zod: "npm:^3.22.8" + checksum: 10c0/bb87a38883989f12a7e408cd6f51fa0bf81350b386f3ca75be17714e611d1ab59680ad893efb09b68b3cb657ebc444f001e97bf6b5607e24d105b125cfe839bf + languageName: node + linkType: hard + +"@chainflip/sdk@npm:1.6.0": + version: 1.6.0 + resolution: "@chainflip/sdk@npm:1.6.0" + dependencies: + "@chainflip/rpc": "npm:^1.6.6" + "@chainflip/utils": "npm:^0.4.0" + axios: "npm:^1.7.7" + ethers: "npm:^6.13.2" + checksum: 10c0/a1a9937597bdfaaa93e1ce169e487042a6a305a023a1601ee6ed964e84626551999caa894f3f4f9d86a416e93942474e8f4cc1652d2d2da77b61a8767658c0fb + languageName: node + linkType: hard + +"@chainflip/utils@npm:^0.3.0": + version: 0.3.0 + resolution: "@chainflip/utils@npm:0.3.0" + checksum: 10c0/4cba70b9a4ac1c298dcc4a8467a86345c26192ac910c15ea3c7f6eaaa442411b3e258a0a56b208b2c39f089fa6f09d574ef7f35cba737cbd64c915d3d82b9c3d + languageName: node + linkType: hard + +"@chainflip/utils@npm:^0.4.0": + version: 0.4.0 + resolution: "@chainflip/utils@npm:0.4.0" + checksum: 10c0/77dda4c19e02b3f6ab6b1ab58593368685d35c02229f918dc8169dbd7d61c8e77bbb9fa3d3d82d1b19cf401b72539accabf743a5977025d44e1737fef3431f85 languageName: node linkType: hard @@ -1961,13 +1985,20 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13": +"@jridgewell/sourcemap-codec@npm:^1.4.10": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5 languageName: node linkType: hard +"@jridgewell/sourcemap-codec@npm:^1.5.0": + version: 1.5.0 + resolution: "@jridgewell/sourcemap-codec@npm:1.5.0" + checksum: 10c0/2eb864f276eb1096c3c11da3e9bb518f6d9fc0023c78344cdc037abadc725172c70314bdb360f2d4b7bffec7f5d657ce006816bc5d4ecb35e61b66132db00c18 + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:0.3.9": version: 0.3.9 resolution: "@jridgewell/trace-mapping@npm:0.3.9" @@ -2680,15 +2711,6 @@ __metadata: languageName: node linkType: hard -"@noble/curves@npm:^1.3.0": - version: 1.4.0 - resolution: "@noble/curves@npm:1.4.0" - dependencies: - "@noble/hashes": "npm:1.4.0" - checksum: 10c0/31fbc370df91bcc5a920ca3f2ce69c8cf26dc94775a36124ed8a5a3faf0453badafd2ee4337061ffea1b43c623a90ee8b286a5a81604aaf9563bdad7ff795d18 - languageName: node - linkType: hard - "@noble/ed25519@npm:2.0.0": version: 2.0.0 resolution: "@noble/ed25519@npm:2.0.0" @@ -2717,7 +2739,7 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.3.3, @noble/hashes@npm:^1.4.0": +"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.4.0": version: 1.4.0 resolution: "@noble/hashes@npm:1.4.0" checksum: 10c0/8c3f005ee72e7b8f9cff756dfae1241485187254e3f743873e22073d63906863df5d4f13d441b7530ea614b7a093f0d889309f28b59850f33b66cb26a779a4a5 @@ -2826,184 +2848,6 @@ __metadata: languageName: node linkType: hard -"@polkadot/networks@npm:12.6.2": - version: 12.6.2 - resolution: "@polkadot/networks@npm:12.6.2" - dependencies: - "@polkadot/util": "npm:12.6.2" - "@substrate/ss58-registry": "npm:^1.44.0" - tslib: "npm:^2.6.2" - checksum: 10c0/44a482c46900058e6d5b25110cb5396382036057240cd4a8e0dae325fab54e689ec81bc43b047570581f14ce456b67310c05c1fe34c4b7f7d4e064f095f4c276 - languageName: node - linkType: hard - -"@polkadot/util-crypto@npm:^12.6.2": - version: 12.6.2 - resolution: "@polkadot/util-crypto@npm:12.6.2" - dependencies: - "@noble/curves": "npm:^1.3.0" - "@noble/hashes": "npm:^1.3.3" - "@polkadot/networks": "npm:12.6.2" - "@polkadot/util": "npm:12.6.2" - "@polkadot/wasm-crypto": "npm:^7.3.2" - "@polkadot/wasm-util": "npm:^7.3.2" - "@polkadot/x-bigint": "npm:12.6.2" - "@polkadot/x-randomvalues": "npm:12.6.2" - "@scure/base": "npm:^1.1.5" - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": 12.6.2 - checksum: 10c0/b25f1574a2d4298c32b7a3cf3fa9f1b1237af3cc9e4ac16e75840097e9bcea11c8188abd5c46522d46d350edceb1e3e54fe8cbb01111e4eb643df4040ff41e2a - languageName: node - linkType: hard - -"@polkadot/util@npm:12.6.2, @polkadot/util@npm:^12.6.2": - version: 12.6.2 - resolution: "@polkadot/util@npm:12.6.2" - dependencies: - "@polkadot/x-bigint": "npm:12.6.2" - "@polkadot/x-global": "npm:12.6.2" - "@polkadot/x-textdecoder": "npm:12.6.2" - "@polkadot/x-textencoder": "npm:12.6.2" - "@types/bn.js": "npm:^5.1.5" - bn.js: "npm:^5.2.1" - tslib: "npm:^2.6.2" - checksum: 10c0/e426d31f8a6b8e8c57b86c18b419312906c5a169e5b2d89c15b54a5d6cf297912250d336f81926e07511ce825d36222d9e6387a01240aa6a20b11aa25dc8226a - languageName: node - linkType: hard - -"@polkadot/wasm-bridge@npm:7.3.2": - version: 7.3.2 - resolution: "@polkadot/wasm-bridge@npm:7.3.2" - dependencies: - "@polkadot/wasm-util": "npm:7.3.2" - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": "*" - "@polkadot/x-randomvalues": "*" - checksum: 10c0/8becfcd4efbabe8ea536c353164c8b767a5510d6d62e376813ab1dc0dd4560906f1dfdb1b349d56b4da657ba7c88bc9f074b658218dcae9b1edbd36f4508b710 - languageName: node - linkType: hard - -"@polkadot/wasm-crypto-asmjs@npm:7.3.2": - version: 7.3.2 - resolution: "@polkadot/wasm-crypto-asmjs@npm:7.3.2" - dependencies: - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": "*" - checksum: 10c0/c4eb0b2c6bae2cd7b4ada5211c877a0f0cff4d4a4f2716817430c5aab74f4e8d37099add57c809a098033028378ed3e88ba1c56fd85b6fd0a80b181742f7a3f9 - languageName: node - linkType: hard - -"@polkadot/wasm-crypto-init@npm:7.3.2": - version: 7.3.2 - resolution: "@polkadot/wasm-crypto-init@npm:7.3.2" - dependencies: - "@polkadot/wasm-bridge": "npm:7.3.2" - "@polkadot/wasm-crypto-asmjs": "npm:7.3.2" - "@polkadot/wasm-crypto-wasm": "npm:7.3.2" - "@polkadot/wasm-util": "npm:7.3.2" - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": "*" - "@polkadot/x-randomvalues": "*" - checksum: 10c0/4813a87bf44065d4ec7cdc29b00f37cc6859974969710c6a6fefba8e42f5bb0c7e102293a8418b1c6e1b5fd55540d13beebdff777200b69420ce50b8fad803ed - languageName: node - linkType: hard - -"@polkadot/wasm-crypto-wasm@npm:7.3.2": - version: 7.3.2 - resolution: "@polkadot/wasm-crypto-wasm@npm:7.3.2" - dependencies: - "@polkadot/wasm-util": "npm:7.3.2" - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": "*" - checksum: 10c0/546ebc5c42929f2f37565190014ff26f6817024e087c56053c1d8c1dcffd1f02014c4638ca70c79145d540f760339699209bb1dc939c235085a7c78efd56bc60 - languageName: node - linkType: hard - -"@polkadot/wasm-crypto@npm:^7.3.2": - version: 7.3.2 - resolution: "@polkadot/wasm-crypto@npm:7.3.2" - dependencies: - "@polkadot/wasm-bridge": "npm:7.3.2" - "@polkadot/wasm-crypto-asmjs": "npm:7.3.2" - "@polkadot/wasm-crypto-init": "npm:7.3.2" - "@polkadot/wasm-crypto-wasm": "npm:7.3.2" - "@polkadot/wasm-util": "npm:7.3.2" - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": "*" - "@polkadot/x-randomvalues": "*" - checksum: 10c0/ff3ef6a2a4dcbbdeb257e7a42f906f1bb7e31292600482c1acf9267406011ea75bd9d3d6ceaf4c011f986e25a2416768775ee59ccc7dbfa6c529b11b8ea91eb4 - languageName: node - linkType: hard - -"@polkadot/wasm-util@npm:7.3.2, @polkadot/wasm-util@npm:^7.3.2": - version: 7.3.2 - resolution: "@polkadot/wasm-util@npm:7.3.2" - dependencies: - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": "*" - checksum: 10c0/58ef58d357e7983c3bb4008b0159262d5c588234d7be64155c031f452fc0daeb078ff0ac8bb4b0377dac307130b0b548c01fd466968869ed308d50e2c162d23b - languageName: node - linkType: hard - -"@polkadot/x-bigint@npm:12.6.2": - version: 12.6.2 - resolution: "@polkadot/x-bigint@npm:12.6.2" - dependencies: - "@polkadot/x-global": "npm:12.6.2" - tslib: "npm:^2.6.2" - checksum: 10c0/78123efa2a5fad7fccb79dbe0c44f5506b70405a2b9b1dc9db9450ddd2f01791b011a46c9fff31ed8b21aace6f676179c4b7746c97ca254e8822bcf543e4d779 - languageName: node - linkType: hard - -"@polkadot/x-global@npm:12.6.2": - version: 12.6.2 - resolution: "@polkadot/x-global@npm:12.6.2" - dependencies: - tslib: "npm:^2.6.2" - checksum: 10c0/63738eb46465e3e43151d746321c178131385a734e1d3865fc76667fec9d4b1fb8b35a0d8ee75834035b54a4047e0bae86c4f2e465b16c73d4fc15ec4426446f - languageName: node - linkType: hard - -"@polkadot/x-randomvalues@npm:12.6.2": - version: 12.6.2 - resolution: "@polkadot/x-randomvalues@npm:12.6.2" - dependencies: - "@polkadot/x-global": "npm:12.6.2" - tslib: "npm:^2.6.2" - peerDependencies: - "@polkadot/util": 12.6.2 - "@polkadot/wasm-util": "*" - checksum: 10c0/44920ec7a93ca0b5b0d2abae493fe5a9fb8cdb44b70029d431c1244a11dea0a9f14d216b4d14bde8b984199b9dd364a3ae68b51937784645343f686b3613c223 - languageName: node - linkType: hard - -"@polkadot/x-textdecoder@npm:12.6.2": - version: 12.6.2 - resolution: "@polkadot/x-textdecoder@npm:12.6.2" - dependencies: - "@polkadot/x-global": "npm:12.6.2" - tslib: "npm:^2.6.2" - checksum: 10c0/d1aa46dc0c4f88bce3cb7aaadbede99c2fb159c0fd317fb9fe5b54bdbb83da9cce3a5d628e25892028b34cc4eeef72669c344f0af12e21f05429142cc7b4732d - languageName: node - linkType: hard - -"@polkadot/x-textencoder@npm:12.6.2": - version: 12.6.2 - resolution: "@polkadot/x-textencoder@npm:12.6.2" - dependencies: - "@polkadot/x-global": "npm:12.6.2" - tslib: "npm:^2.6.2" - checksum: 10c0/fa234ce4d164991ea98f34e9eae2adf0c4d2b0806e2e30b11c41a52b432f8cbd91fb16945243809fd9433c513b8c7ab4c16d902b92faf7befaa523daae7459f4 - languageName: node - linkType: hard - "@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2": version: 1.1.2 resolution: "@protobufjs/aspromise@npm:1.1.2" @@ -3140,55 +2984,55 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-commonjs@npm:^24.1.0": - version: 24.1.0 - resolution: "@rollup/plugin-commonjs@npm:24.1.0" +"@rollup/plugin-commonjs@npm:28.0.0": + version: 28.0.0 + resolution: "@rollup/plugin-commonjs@npm:28.0.0" dependencies: "@rollup/pluginutils": "npm:^5.0.1" commondir: "npm:^1.0.1" estree-walker: "npm:^2.0.2" - glob: "npm:^8.0.3" + fdir: "npm:^6.1.1" is-reference: "npm:1.2.1" - magic-string: "npm:^0.27.0" + magic-string: "npm:^0.30.3" + picomatch: "npm:^2.3.1" peerDependencies: - rollup: ^2.68.0||^3.0.0 + rollup: ^2.68.0||^3.0.0||^4.0.0 peerDependenciesMeta: rollup: optional: true - checksum: 10c0/45dc17cc1bd92a742227c0437af69a73d97ebe18485ffdfa39f44a14107464e1e143c1c2c0df34c9e6a653cbe922373e2f95903f6711a28d4bb75b1e7f0fa0fa + checksum: 10c0/2dd5e56bb61b097697965e48f7bcccab2c6a453a783d1a0c6a599c1bdf9bb07ce8952b9ba88ae190a07c8819f774d72173a633f9f4a914727f2fd28f670fd649 languageName: node linkType: hard -"@rollup/plugin-json@npm:^6.0.0": - version: 6.0.0 - resolution: "@rollup/plugin-json@npm:6.0.0" +"@rollup/plugin-json@npm:6.1.0": + version: 6.1.0 + resolution: "@rollup/plugin-json@npm:6.1.0" dependencies: - "@rollup/pluginutils": "npm:^5.0.1" + "@rollup/pluginutils": "npm:^5.1.0" peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 peerDependenciesMeta: rollup: optional: true - checksum: 10c0/acdfc51a58c228452d40ba7db076ed463d6828f4b517dc259ef8fa6ffdb7841c9eaef805070fc9360356d82895ce7e4cbca568808e6e1c13fb1f746f15033ebf + checksum: 10c0/9400c431b5e0cf3088ba2eb2d038809a2b0fb2a84ed004997da85582f48cd64958ed3168893c4f2c8109e38652400ed68282d0c92bf8ec07a3b2ef2e1ceab0b7 languageName: node linkType: hard -"@rollup/plugin-node-resolve@npm:^15.0.2": - version: 15.0.2 - resolution: "@rollup/plugin-node-resolve@npm:15.0.2" +"@rollup/plugin-node-resolve@npm:15.3.0": + version: 15.3.0 + resolution: "@rollup/plugin-node-resolve@npm:15.3.0" dependencies: "@rollup/pluginutils": "npm:^5.0.1" "@types/resolve": "npm:1.20.2" deepmerge: "npm:^4.2.2" - is-builtin-module: "npm:^3.2.1" is-module: "npm:^1.0.0" resolve: "npm:^1.22.1" peerDependencies: - rollup: ^2.78.0||^3.0.0 + rollup: ^2.78.0||^3.0.0||^4.0.0 peerDependenciesMeta: rollup: optional: true - checksum: 10c0/836d9f41cbf602f7deb1c0138d531ea5a2bd1da3886113b049c410b090e20f18805e6d2c77d1bc7a0dcb2fb274e1478db2bfaf33c598f009774692542c63c64f + checksum: 10c0/5f3b11f9f6d00fe9fd3fe1977cc71f6a99c2b13d0ee82ad6822c4c4ecfc98854791c5a505798762f7e2332d9d67568a561e89aa8268ed3b1668563be1845109e languageName: node linkType: hard @@ -3218,6 +3062,134 @@ __metadata: languageName: node linkType: hard +"@rollup/pluginutils@npm:^5.1.0": + version: 5.1.2 + resolution: "@rollup/pluginutils@npm:5.1.2" + dependencies: + "@types/estree": "npm:^1.0.0" + estree-walker: "npm:^2.0.2" + picomatch: "npm:^2.3.1" + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + rollup: + optional: true + checksum: 10c0/30f4a98e91a8699b6666b64ecdc665439bd53dddbe964bbeca56da81ff889cfde3a3e059144b80c5a2d9b48aa158df18a45e9a847a33b757d3e8336b278b8836 + languageName: node + linkType: hard + +"@rollup/rollup-android-arm-eabi@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-android-arm-eabi@npm:4.22.4" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@rollup/rollup-android-arm64@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-android-arm64@npm:4.22.4" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-arm64@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-darwin-arm64@npm:4.22.4" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-darwin-x64@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-darwin-x64@npm:4.22.4" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-gnueabihf@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.22.4" + conditions: os=linux & cpu=arm & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm-musleabihf@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.22.4" + conditions: os=linux & cpu=arm & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.22.4" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-arm64-musl@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-arm64-musl@npm:4.22.4" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-linux-powerpc64le-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.22.4" + conditions: os=linux & cpu=ppc64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-riscv64-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.22.4" + conditions: os=linux & cpu=riscv64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-s390x-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.22.4" + conditions: os=linux & cpu=s390x & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-gnu@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-x64-gnu@npm:4.22.4" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + +"@rollup/rollup-linux-x64-musl@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-linux-x64-musl@npm:4.22.4" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + +"@rollup/rollup-win32-arm64-msvc@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.22.4" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@rollup/rollup-win32-ia32-msvc@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.22.4" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@rollup/rollup-win32-x64-msvc@npm:4.22.4": + version: 4.22.4 + resolution: "@rollup/rollup-win32-x64-msvc@npm:4.22.4" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@scure/base@npm:1.1.5": version: 1.1.5 resolution: "@scure/base@npm:1.1.5" @@ -3225,7 +3197,7 @@ __metadata: languageName: node linkType: hard -"@scure/base@npm:^1.1.1, @scure/base@npm:^1.1.5": +"@scure/base@npm:^1.1.1": version: 1.1.6 resolution: "@scure/base@npm:1.1.6" checksum: 10c0/237a46a1f45391fc57719154f14295db936a0b1562ea3e182dd42d7aca082dbb7062a28d6c49af16a7e478b12dae8a0fe678d921ea5056bcc30238d29eb05c55 @@ -3620,13 +3592,6 @@ __metadata: languageName: node linkType: hard -"@substrate/ss58-registry@npm:^1.44.0": - version: 1.48.0 - resolution: "@substrate/ss58-registry@npm:1.48.0" - checksum: 10c0/b2ff1bd7688a3f72353f05dd47676a0127be346d0516a0dd2214118d4085637e35a37b115f4bd9101772a9723f6111e4e77dc008cf69ad45b64c806de419547c - languageName: node - linkType: hard - "@supercharge/promise-pool@npm:2.4.0": version: 2.4.0 resolution: "@supercharge/promise-pool@npm:2.4.0" @@ -3778,15 +3743,6 @@ __metadata: languageName: node linkType: hard -"@types/bn.js@npm:^5.1.5": - version: 5.1.5 - resolution: "@types/bn.js@npm:5.1.5" - dependencies: - "@types/node": "npm:*" - checksum: 10c0/e9f375b43d8119ed82aed2090f83d4cda8afbb63ba13223afb02fa7550258ff90acd76d65cd7186838644048f085241cd98a3a512d8d187aa497c6039c746ac8 - languageName: node - linkType: hard - "@types/connect@npm:^3.4.33": version: 3.4.38 resolution: "@types/connect@npm:3.4.38" @@ -3835,6 +3791,13 @@ __metadata: languageName: node linkType: hard +"@types/estree@npm:1.0.5": + version: 1.0.5 + resolution: "@types/estree@npm:1.0.5" + checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d + languageName: node + linkType: hard + "@types/graceful-fs@npm:^4.1.3": version: 4.1.6 resolution: "@types/graceful-fs@npm:4.1.6" @@ -4285,11 +4248,11 @@ __metadata: languageName: node linkType: hard -"@xchainjs/xchain-aggregator@workspace:packages/xchain-aggregator": +"@xchainjs/xchain-aggregator@workspace:*, @xchainjs/xchain-aggregator@workspace:packages/xchain-aggregator": version: 0.0.0-use.local resolution: "@xchainjs/xchain-aggregator@workspace:packages/xchain-aggregator" dependencies: - "@chainflip/sdk": "npm:1.3.0" + "@chainflip/sdk": "npm:1.6.0" "@xchainjs/xchain-avax": "workspace:*" "@xchainjs/xchain-binance": "workspace:*" "@xchainjs/xchain-bitcoin": "workspace:*" @@ -5306,14 +5269,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.6.8": - version: 1.7.2 - resolution: "axios@npm:1.7.2" +"axios@npm:^1.7.7": + version: 1.7.7 + resolution: "axios@npm:1.7.7" dependencies: follow-redirects: "npm:^1.15.6" form-data: "npm:^4.0.0" proxy-from-env: "npm:^1.1.0" - checksum: 10c0/cbd47ce380fe045313364e740bb03b936420b8b5558c7ea36a4563db1258c658f05e40feb5ddd41f6633fdd96d37ac2a76f884dad599c5b0224b4c451b3fa7ae + checksum: 10c0/4499efc89e86b0b49ffddc018798de05fab26e3bf57913818266be73279a6418c3ce8f9e934c7d2d707ab8c095e837fc6c90608fb7715b94d357720b5f568af7 languageName: node linkType: hard @@ -5974,13 +5937,6 @@ __metadata: languageName: node linkType: hard -"builtin-modules@npm:^3.3.0": - version: 3.3.0 - resolution: "builtin-modules@npm:3.3.0" - checksum: 10c0/2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a - languageName: node - linkType: hard - "cacache@npm:^18.0.0": version: 18.0.3 resolution: "cacache@npm:18.0.3" @@ -7490,9 +7446,9 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^6.11.1": - version: 6.12.1 - resolution: "ethers@npm:6.12.1" +"ethers@npm:^6.13.2": + version: 6.13.2 + resolution: "ethers@npm:6.13.2" dependencies: "@adraffy/ens-normalize": "npm:1.10.1" "@noble/curves": "npm:1.2.0" @@ -7500,8 +7456,8 @@ __metadata: "@types/node": "npm:18.15.13" aes-js: "npm:4.0.0-beta.5" tslib: "npm:2.4.0" - ws: "npm:8.5.0" - checksum: 10c0/7686e1efdb0a831578f35d69188783c225de5a6fbb1b422327bc45cee04d49a2707e73c9342a6a5eb2870ce35668c71372737439ec3993d31d83f4a0e2446cc7 + ws: "npm:8.17.1" + checksum: 10c0/5956389a180992f8b6d90bc21b2e0f28619a098513d3aeb7a350a0b7c5852d635a9d7fd4ced1af50c985dd88398716f66dfd4a2de96c5c3a67150b93543d92af languageName: node linkType: hard @@ -7696,6 +7652,18 @@ __metadata: languageName: node linkType: hard +"fdir@npm:^6.1.1": + version: 6.3.0 + resolution: "fdir@npm:6.3.0" + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + checksum: 10c0/be91cd6ab2edbc6df457a69b79672ee9345996986821918ef01908ce9619b8cbecd9c6c13d4ca5d0aeb548b162050d68c599f45bb3fbff194a91e16f25e646b5 + languageName: node + linkType: hard + "figures@npm:^3.0.0": version: 3.2.0 resolution: "figures@npm:3.2.0" @@ -8134,19 +8102,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.3": - version: 8.1.0 - resolution: "glob@npm:8.1.0" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^5.0.1" - once: "npm:^1.3.0" - checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f - languageName: node - linkType: hard - "globals@npm:^11.1.0": version: 11.12.0 resolution: "globals@npm:11.12.0" @@ -8641,15 +8596,6 @@ __metadata: languageName: node linkType: hard -"is-builtin-module@npm:^3.2.1": - version: 3.2.1 - resolution: "is-builtin-module@npm:3.2.1" - dependencies: - builtin-modules: "npm:^3.3.0" - checksum: 10c0/5a66937a03f3b18803381518f0ef679752ac18cdb7dd53b5e23ee8df8d440558737bd8dcc04d2aae555909d2ecb4a81b5c0d334d119402584b61e6a003e31af1 - languageName: node - linkType: hard - "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": version: 1.2.7 resolution: "is-callable@npm:1.2.7" @@ -9927,12 +9873,12 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.27.0": - version: 0.27.0 - resolution: "magic-string@npm:0.27.0" +"magic-string@npm:^0.30.3": + version: 0.30.11 + resolution: "magic-string@npm:0.30.11" dependencies: - "@jridgewell/sourcemap-codec": "npm:^1.4.13" - checksum: 10c0/cddacfea14441ca57ae8a307bc3cf90bac69efaa4138dd9a80804cffc2759bf06f32da3a293fb13eaa96334b7d45b7768a34f1d226afae25d2f05b05a3bb37d8 + "@jridgewell/sourcemap-codec": "npm:^1.5.0" + checksum: 10c0/b9eb370773d0bd90ca11a848753409d8e5309b1ad56d2a1aa49d6649da710a6d2fe7237ad1a643c5a5d3800de2b9946ed9690acdfc00e6cc1aeafff3ab1752c4 languageName: node linkType: hard @@ -10152,15 +10098,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^5.0.1": - version: 5.1.6 - resolution: "minimatch@npm:5.1.6" - dependencies: - brace-expansion: "npm:^2.0.1" - checksum: 10c0/3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3 - languageName: node - linkType: hard - "minimatch@npm:^9.0.0": version: 9.0.0 resolution: "minimatch@npm:9.0.0" @@ -11681,33 +11618,82 @@ __metadata: languageName: node linkType: hard -"rollup-plugin-typescript2@npm:^0.34.1": - version: 0.34.1 - resolution: "rollup-plugin-typescript2@npm:0.34.1" +"rollup-plugin-typescript2@npm:0.36.0": + version: 0.36.0 + resolution: "rollup-plugin-typescript2@npm:0.36.0" dependencies: "@rollup/pluginutils": "npm:^4.1.2" find-cache-dir: "npm:^3.3.2" fs-extra: "npm:^10.0.0" - semver: "npm:^7.3.7" - tslib: "npm:^2.4.0" + semver: "npm:^7.5.4" + tslib: "npm:^2.6.2" peerDependencies: rollup: ">=1.26.3" typescript: ">=2.4.0" - checksum: 10c0/957171f167e6bbefab68bd05ed2796aafd14c8d47bf544b92532bcea056b5a63fe300816a428c49361736160b2ffc7e8b1109bf4fa9de95e54a9fdd161e0bf62 - languageName: node - linkType: hard - -"rollup@npm:2.78.0": - version: 2.78.0 - resolution: "rollup@npm:2.78.0" - dependencies: + checksum: 10c0/3c8d17cd852ded36eaad2759caf170f90e091d8f86ff7b016d1823bc8b507b8f689156bcccda348fc88471681dc79cc9eb13ddb09a4dfcf0d07ac9a249e2d79b + languageName: node + linkType: hard + +"rollup@npm:4.22.4": + version: 4.22.4 + resolution: "rollup@npm:4.22.4" + dependencies: + "@rollup/rollup-android-arm-eabi": "npm:4.22.4" + "@rollup/rollup-android-arm64": "npm:4.22.4" + "@rollup/rollup-darwin-arm64": "npm:4.22.4" + "@rollup/rollup-darwin-x64": "npm:4.22.4" + "@rollup/rollup-linux-arm-gnueabihf": "npm:4.22.4" + "@rollup/rollup-linux-arm-musleabihf": "npm:4.22.4" + "@rollup/rollup-linux-arm64-gnu": "npm:4.22.4" + "@rollup/rollup-linux-arm64-musl": "npm:4.22.4" + "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.22.4" + "@rollup/rollup-linux-riscv64-gnu": "npm:4.22.4" + "@rollup/rollup-linux-s390x-gnu": "npm:4.22.4" + "@rollup/rollup-linux-x64-gnu": "npm:4.22.4" + "@rollup/rollup-linux-x64-musl": "npm:4.22.4" + "@rollup/rollup-win32-arm64-msvc": "npm:4.22.4" + "@rollup/rollup-win32-ia32-msvc": "npm:4.22.4" + "@rollup/rollup-win32-x64-msvc": "npm:4.22.4" + "@types/estree": "npm:1.0.5" fsevents: "npm:~2.3.2" dependenciesMeta: + "@rollup/rollup-android-arm-eabi": + optional: true + "@rollup/rollup-android-arm64": + optional: true + "@rollup/rollup-darwin-arm64": + optional: true + "@rollup/rollup-darwin-x64": + optional: true + "@rollup/rollup-linux-arm-gnueabihf": + optional: true + "@rollup/rollup-linux-arm-musleabihf": + optional: true + "@rollup/rollup-linux-arm64-gnu": + optional: true + "@rollup/rollup-linux-arm64-musl": + optional: true + "@rollup/rollup-linux-powerpc64le-gnu": + optional: true + "@rollup/rollup-linux-riscv64-gnu": + optional: true + "@rollup/rollup-linux-s390x-gnu": + optional: true + "@rollup/rollup-linux-x64-gnu": + optional: true + "@rollup/rollup-linux-x64-musl": + optional: true + "@rollup/rollup-win32-arm64-msvc": + optional: true + "@rollup/rollup-win32-ia32-msvc": + optional: true + "@rollup/rollup-win32-x64-msvc": + optional: true fsevents: optional: true bin: rollup: dist/bin/rollup - checksum: 10c0/5bc5f0298f4c9eb9de0906c318cf396d24a32db0d1f21d46aaea04d4fad5c4a49c475cf49cde346bf3cb6ef5f0668d2451e83f96352639d186c3e34ef88f663e + checksum: 10c0/4c96b6e2e0c5dbe73b4ba899cea894a05115ab8c65ccff631fbbb944e2b3a9f2eb3b99c2dce3dd91b179647df1892ffc44ecee29381ccf155ba8000b22712a32 languageName: node linkType: hard @@ -11719,9 +11705,9 @@ __metadata: "@changesets/cli": "npm:2.27.1" "@ledgerhq/types-cryptoassets": "npm:7.11.0" "@ledgerhq/types-devices": "npm:6.24.0" - "@rollup/plugin-commonjs": "npm:^24.1.0" - "@rollup/plugin-json": "npm:^6.0.0" - "@rollup/plugin-node-resolve": "npm:^15.0.2" + "@rollup/plugin-commonjs": "npm:28.0.0" + "@rollup/plugin-json": "npm:6.1.0" + "@rollup/plugin-node-resolve": "npm:15.3.0" "@types/jest": "npm:^29.2.5" "@typescript-eslint/eslint-plugin": "npm:^5.48.0" "@typescript-eslint/parser": "npm:^5.48.0" @@ -11735,8 +11721,8 @@ __metadata: lint-staged: "npm:^13.1.0" prettier: "npm:^2.2.0" rimraf: "npm:5.0.0" - rollup: "npm:2.78.0" - rollup-plugin-typescript2: "npm:^0.34.1" + rollup: "npm:4.22.4" + rollup-plugin-typescript2: "npm:0.36.0" ts-jest: "npm:^29.0.3" ts-node: "npm:10.9.2" tslib: "npm:^2.5.0" @@ -11954,6 +11940,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.5.4": + version: 7.6.3 + resolution: "semver@npm:7.6.3" + bin: + semver: bin/semver.js + checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf + languageName: node + linkType: hard + "sentence-case@npm:^3.0.4": version: 3.0.4 resolution: "sentence-case@npm:3.0.4" @@ -12820,13 +12815,20 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^2.0.3, tslib@npm:^2.6.2": +"tslib@npm:^2.0.3": version: 2.6.2 resolution: "tslib@npm:2.6.2" checksum: 10c0/e03a8a4271152c8b26604ed45535954c0a45296e32445b4b87f8a5abdb2421f40b59b4ca437c4346af0f28179780d604094eb64546bee2019d903d01c6c19bdb languageName: node linkType: hard +"tslib@npm:^2.6.2": + version: 2.7.0 + resolution: "tslib@npm:2.7.0" + checksum: 10c0/469e1d5bf1af585742128827000711efa61010b699cb040ab1800bcd3ccdd37f63ec30642c9e07c4439c1db6e46345582614275daca3e0f4abae29b0083f04a6 + languageName: node + linkType: hard + "tsutils@npm:^3.21.0": version: 3.21.0 resolution: "tsutils@npm:3.21.0" @@ -13597,18 +13599,18 @@ __metadata: languageName: node linkType: hard -"ws@npm:8.5.0": - version: 8.5.0 - resolution: "ws@npm:8.5.0" +"ws@npm:8.17.1": + version: 8.17.1 + resolution: "ws@npm:8.17.1" peerDependencies: bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 + utf-8-validate: ">=5.0.2" peerDependenciesMeta: bufferutil: optional: true utf-8-validate: optional: true - checksum: 10c0/0baeee03e97865accda8fad51e8e5fa17d19b8e264529efdf662bbba2acc1c7f1de8316287e6df5cb639231a96009e6d5234b57e6ff36ee2d04e49a0995fec2f + checksum: 10c0/f4a49064afae4500be772abdc2211c8518f39e1c959640457dcee15d4488628620625c783902a52af2dd02f68558da2868fd06e6fd0e67ebcd09e6881b1b5bfe languageName: node linkType: hard @@ -13668,6 +13670,21 @@ __metadata: languageName: node linkType: hard +"xchainjs-aggregator@workspace:examples/aggregator": + version: 0.0.0-use.local + resolution: "xchainjs-aggregator@workspace:examples/aggregator" + dependencies: + "@types/node": "npm:20.11.28" + "@xchainjs/xchain-aggregator": "workspace:*" + "@xchainjs/xchain-bitcoin": "workspace:*" + "@xchainjs/xchain-ethereum": "workspace:*" + "@xchainjs/xchain-util": "workspace:*" + "@xchainjs/xchain-wallet": "workspace:*" + ts-node: "npm:10.9.2" + typescript: "npm:^5.0.4" + languageName: unknown + linkType: soft + "xchainjs-bitcoin@workspace:examples/bitcoin": version: 0.0.0-use.local resolution: "xchainjs-bitcoin@workspace:examples/bitcoin" @@ -13908,6 +13925,18 @@ __metadata: languageName: unknown linkType: soft +"xchainjs-thorchain@workspace:examples/thorchain": + version: 0.0.0-use.local + resolution: "xchainjs-thorchain@workspace:examples/thorchain" + dependencies: + "@types/node": "npm:20.11.28" + "@xchainjs/xchain-thorchain": "workspace:*" + "@xchainjs/xchain-util": "workspace:*" + ts-node: "npm:10.9.2" + typescript: "npm:^5.0.4" + languageName: unknown + linkType: soft + "xchainjs-wallet@workspace:examples/wallet": version: 0.0.0-use.local resolution: "xchainjs-wallet@workspace:examples/wallet" @@ -14110,3 +14139,10 @@ __metadata: checksum: 10c0/dceb44c28578b31641e13695d200d34ec4ab3966a5729814d5445b194933c096b7ced71494ce53a0e8820685d1d010df8b2422e5bf2cdea7e469d97ffbea306f languageName: node linkType: hard + +"zod@npm:^3.22.8": + version: 3.23.8 + resolution: "zod@npm:3.23.8" + checksum: 10c0/8f14c87d6b1b53c944c25ce7a28616896319d95bc46a9660fe441adc0ed0a81253b02b5abdaeffedbeb23bdd25a0bf1c29d2c12dd919aef6447652dd295e3e69 + languageName: node + linkType: hard