@xchainjs/xchain-thorchain-query 2.0.5 → 2.0.7

package/lib/index.d.ts

@@ -5,4 +5,3 @@ export * from './liquidity-pool';
 export * from './chain-defaults';
 export * from './types';
 export * from './utils';
-export * from './chain-defaults';

package/lib/index.esm.js

@@ -1,5 +1,5 @@
 import { assetFromString, baseAmount, assetFromStringEx, assetToString, CryptoAmount, isSynthAsset, AssetCryptoAmount, eqAsset, CachedValue, isTradeAsset, isSecuredAsset, assetToBase, assetAmount, TRADE_ASSET_DELIMITER, SYNTH_ASSET_DELIMITER, SECURED_ASSET_DELIMITER, TOKEN_ASSET_DELIMITER } from '@xchainjs/xchain-util';
-import { BigNumber } from 'bignumber.js';
+import BigNumber from 'bignumber.js';
 import { MidgardQuery } from '@xchainjs/xchain-midgard-query';
 import { Network } from '@xchainjs/xchain-client';
 import { TransactionsApi, Configuration, QueueApi, NetworkApi, PoolsApi, LiquidityProvidersApi, SaversApi, QuoteApi, MimirApi, ThornamesApi, TradeUnitApi, TradeUnitsApi, TradeAccountApi, TradeAccountsApi, RUNEPoolApi } from '@xchainjs/xchain-thornode';
@@ -88,6 +88,10 @@ const DefaultChainAttributes = {
         blockReward: 0,
         avgBlockTimeInSecs: 4, // Average block time for xrp in seconds
     },
+    SOL: {
+        blockReward: 0,
+        avgBlockTimeInSecs: 0.4, // Average block time for sol in seconds
+    },
 };
 
 /**
@@ -131,6 +135,7 @@ const assetUSDC = assetFromStringEx('ETH.USDC-0XA0B86991C6218B36C1D19D4A2E9EB0CE
 const AssetBNB = assetFromStringEx('BSC.BNB');
 const AssetBASE = assetFromStringEx('BASE.ETH');
 const AssetXRP = assetFromStringEx('XRP.XRP');
+const AssetSOL = assetFromStringEx('SOL.SOL');
 const BNBChain = 'BNB';
 const BTCChain = 'BTC';
 const BCHChain = 'BCH';
@@ -144,6 +149,7 @@ const BSCChain = 'BSC';
 const THORChain = 'THOR';
 const BASEChain = 'BASE';
 const XRPChain = 'XRP';
+const SOLChain = 'SOL';
 const THORCHAIN_DECIMAL = 8;
 const isAssetRuneNative = (asset) => assetToString(asset) === assetToString(AssetRuneNative);
 
@@ -190,6 +196,8 @@ const getChainAsset = (chain) => {
             return AssetBASE;
         case XRPChain:
             return AssetXRP;
+        case SOLChain:
+            return AssetSOL;
         default:
             throw Error('Unknown chain');
     }
@@ -249,6 +257,8 @@ const calcNetworkFee = (asset, inbound) => {
             return new AssetCryptoAmount(baseAmount(inbound.gasRate), AssetBASE);
         case XRPChain:
             return new AssetCryptoAmount(baseAmount(inbound.gasRate), AssetXRP);
+        case SOLChain:
+            return new AssetCryptoAmount(baseAmount(inbound.gasRate), AssetSOL);
     }
     throw new Error(`could not calculate inbound fee for ${asset.chain}`);
 };
@@ -287,7 +297,11 @@ const calcOutboundFee = (asset, inbound) => {
         case MAYAChain:
             return new AssetCryptoAmount(baseAmount(2000000), AssetMAYA);
         case BASEChain:
-            return new AssetCryptoAmount(baseAmount(2000000), AssetBASE);
+            return new AssetCryptoAmount(baseAmount(inbound.outboundFee), AssetBASE);
+        case XRPChain:
+            return new AssetCryptoAmount(baseAmount(inbound.outboundFee), AssetXRP);
+        case SOLChain:
+            return new AssetCryptoAmount(baseAmount(inbound.outboundFee), AssetSOL);
     }
     throw new Error(`could not calculate outbound fee for ${asset.chain}`);
 };
@@ -3165,4 +3179,4 @@ class TransactionStage {
     }
 }
 
-export { AVAXChain, AddLpStatus, AddSaverStatus, AssetATOM, AssetAVAX, AssetBASE, AssetBCH, AssetBNB, AssetBSC, AssetBTC, AssetDOGE, AssetETH, AssetLTC, AssetMAYA, AssetRuneNative, AssetXRP, BASEChain, BCHChain, BNBChain, BSCChain, BTCChain, DOGEChain, DefaultChainAttributes, ETHChain, GAIAChain, InboundStatus, LTCChain, LiquidityPool, MAYAChain, RefundStatus, SwapStatus, THORCHAIN_DECIMAL, THORChain, ThorchainCache, ThorchainQuery, Thornode, TransactionStage, TxType, WithdrawStatus, XRPChain, assetUSDC, calcNetworkFee, getCryptoAmountWithNotation, getLiquidityProtectionData, getLiquidityUnits, getPoolShare, getSlipOnLiquidity, isAssetRuneNative };
+export { AVAXChain, AddLpStatus, AddSaverStatus, AssetATOM, AssetAVAX, AssetBASE, AssetBCH, AssetBNB, AssetBSC, AssetBTC, AssetDOGE, AssetETH, AssetLTC, AssetMAYA, AssetRuneNative, AssetSOL, AssetXRP, BASEChain, BCHChain, BNBChain, BSCChain, BTCChain, DOGEChain, DefaultChainAttributes, ETHChain, GAIAChain, InboundStatus, LTCChain, LiquidityPool, MAYAChain, RefundStatus, SOLChain, SwapStatus, THORCHAIN_DECIMAL, THORChain, ThorchainCache, ThorchainQuery, Thornode, TransactionStage, TxType, WithdrawStatus, XRPChain, assetUSDC, calcNetworkFee, getCryptoAmountWithNotation, getLiquidityProtectionData, getLiquidityUnits, getPoolShare, getSlipOnLiquidity, isAssetRuneNative };

package/lib/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var xchainUtil = require('@xchainjs/xchain-util');
-var bignumber_js = require('bignumber.js');
+var BigNumber = require('bignumber.js');
 var xchainMidgardQuery = require('@xchainjs/xchain-midgard-query');
 var xchainClient = require('@xchainjs/xchain-client');
 var xchainThornode = require('@xchainjs/xchain-thornode');
@@ -10,6 +10,7 @@ var axiosRetry = require('axios-retry');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
+var BigNumber__default = /*#__PURE__*/_interopDefault(BigNumber);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var axiosRetry__default = /*#__PURE__*/_interopDefault(axiosRetry);
 
@@ -95,6 +96,10 @@ const DefaultChainAttributes = {
         blockReward: 0,
         avgBlockTimeInSecs: 4, // Average block time for xrp in seconds
     },
+    SOL: {
+        blockReward: 0,
+        avgBlockTimeInSecs: 0.4, // Average block time for sol in seconds
+    },
 };
 
 /**
@@ -138,6 +143,7 @@ const assetUSDC = xchainUtil.assetFromStringEx('ETH.USDC-0XA0B86991C6218B36C1D19
 const AssetBNB = xchainUtil.assetFromStringEx('BSC.BNB');
 const AssetBASE = xchainUtil.assetFromStringEx('BASE.ETH');
 const AssetXRP = xchainUtil.assetFromStringEx('XRP.XRP');
+const AssetSOL = xchainUtil.assetFromStringEx('SOL.SOL');
 const BNBChain = 'BNB';
 const BTCChain = 'BTC';
 const BCHChain = 'BCH';
@@ -151,6 +157,7 @@ const BSCChain = 'BSC';
 const THORChain = 'THOR';
 const BASEChain = 'BASE';
 const XRPChain = 'XRP';
+const SOLChain = 'SOL';
 const THORCHAIN_DECIMAL = 8;
 const isAssetRuneNative = (asset) => xchainUtil.assetToString(asset) === xchainUtil.assetToString(AssetRuneNative);
 
@@ -197,6 +204,8 @@ const getChainAsset = (chain) => {
             return AssetBASE;
         case XRPChain:
             return AssetXRP;
+        case SOLChain:
+            return AssetSOL;
         default:
             throw Error('Unknown chain');
     }
@@ -256,6 +265,8 @@ const calcNetworkFee = (asset, inbound) => {
             return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(inbound.gasRate), AssetBASE);
         case XRPChain:
             return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(inbound.gasRate), AssetXRP);
+        case SOLChain:
+            return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(inbound.gasRate), AssetSOL);
     }
     throw new Error(`could not calculate inbound fee for ${asset.chain}`);
 };
@@ -294,7 +305,11 @@ const calcOutboundFee = (asset, inbound) => {
         case MAYAChain:
             return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(2000000), AssetMAYA);
         case BASEChain:
-            return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(2000000), AssetBASE);
+            return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(inbound.outboundFee), AssetBASE);
+        case XRPChain:
+            return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(inbound.outboundFee), AssetXRP);
+        case SOLChain:
+            return new xchainUtil.AssetCryptoAmount(xchainUtil.baseAmount(inbound.outboundFee), AssetSOL);
     }
     throw new Error(`could not calculate outbound fee for ${asset.chain}`);
 };
@@ -307,7 +322,7 @@ const calcOutboundFee = (asset, inbound) => {
  */
 const getLiquidityUnits = (liquidity, pool) => {
     const baseAmount8decimals = getBaseAmountWithDiffDecimals(liquidity.asset, 8);
-    const P = new bignumber_js.BigNumber(pool.thornodeDetails.LP_units);
+    const P = new BigNumber__default.default(pool.thornodeDetails.LP_units);
     const r = liquidity.rune.baseAmount.amount();
     const a = baseAmount8decimals;
     const R = pool.runeBalance.amount();
@@ -382,7 +397,7 @@ const getLiquidityProtectionData = (depositValue, poolShare, block) => {
     const fractionOfFullILPProtection = (currentHeight - heightLastAdded) / blocksforfullprotection;
     const protectionProgress = Math.min(fractionOfFullILPProtection, 1); // percentage of entitlement, max 100%
     const result = coverage.times(protectionProgress); // impermanent loss protection result
-    const maxILP = result.lt(0) ? new bignumber_js.BigNumber(0) : result; // max negative ILP to 0
+    const maxILP = result.lt(0) ? new BigNumber__default.default(0) : result; // max negative ILP to 0
     const ILProtection = {
         ILProtection: new xchainUtil.CryptoAmount(xchainUtil.baseAmount(maxILP), AssetRuneNative),
         totalDays: (fractionOfFullILPProtection * 100).toFixed(2),
@@ -969,7 +984,7 @@ class Thornode {
 }
 
 // Constants
-const SAME_ASSET_EXCHANGE_RATE = new bignumber_js.BigNumber(1);
+const SAME_ASSET_EXCHANGE_RATE = new BigNumber__default.default(1);
 const TEN_MINUTES = 10 * 60 * 1000;
 // Default instances
 const defaultThornode = new Thornode();
@@ -1125,10 +1140,10 @@ class ThorchainCache {
                     chain: chain,
                     address: inbound.address,
                     router: inbound.router,
-                    gasRate: new bignumber_js.BigNumber(inbound.gas_rate),
+                    gasRate: new BigNumber__default.default(inbound.gas_rate),
                     gasRateUnits: inbound.gas_rate_units,
-                    outboundTxSize: new bignumber_js.BigNumber(inbound.outbound_tx_size),
-                    outboundFee: new bignumber_js.BigNumber(inbound.outbound_fee),
+                    outboundTxSize: new BigNumber__default.default(inbound.outbound_tx_size),
+                    outboundFee: new BigNumber__default.default(inbound.outbound_fee),
                     haltedChain: (inbound === null || inbound === void 0 ? void 0 : inbound.halted) || !!mimirDetails[`HALT${chain}CHAIN`] || !!mimirDetails['HALTCHAINGLOBAL'],
                     haltedTrading: !!mimirDetails['HALTTRADING'] || !!mimirDetails[`HALT${chain}TRADING`],
                     haltedLP: !!mimirDetails['PAUSELP'] || !!mimirDetails[`PAUSELP${chain}`],
@@ -1140,10 +1155,10 @@ class ThorchainCache {
                 chain: THORChain,
                 address: '',
                 router: '',
-                gasRate: new bignumber_js.BigNumber(0),
+                gasRate: new BigNumber__default.default(0),
                 gasRateUnits: '',
-                outboundTxSize: new bignumber_js.BigNumber(0),
-                outboundFee: new bignumber_js.BigNumber(0),
+                outboundTxSize: new BigNumber__default.default(0),
+                outboundFee: new BigNumber__default.default(0),
                 haltedChain: false,
                 haltedTrading: !!mimirDetails['HALTTRADING'],
                 haltedLP: false, //
@@ -1490,7 +1505,7 @@ class ThorchainQuery {
             // Create unit data
             const unitData = {
                 liquidityUnits: lpUnits,
-                totalUnits: new bignumber_js.BigNumber(assetPool.thornodeDetails.LP_units),
+                totalUnits: new BigNumber__default.default(assetPool.thornodeDetails.LP_units),
             };
             // Calculate pool share
             const poolShare = getPoolShare(unitData, assetPool);
@@ -1558,8 +1573,8 @@ class ThorchainQuery {
                 throw Error(`Could not get block data`);
             // Pools total units & Lp's total units
             const unitData = {
-                totalUnits: new bignumber_js.BigNumber(poolAsset.thornodeDetails.LP_units),
-                liquidityUnits: new bignumber_js.BigNumber(liquidityProvider.units),
+                totalUnits: new BigNumber__default.default(poolAsset.thornodeDetails.LP_units),
+                liquidityUnits: new BigNumber__default.default(liquidityProvider.units),
             };
             const networkValues = yield this.thorchainCache.thornode.getNetworkValues();
             // Create block object
@@ -1634,8 +1649,8 @@ class ThorchainQuery {
             const assetPool = yield this.thorchainCache.getPoolForAsset(params.asset);
             // Calculate pool share
             const poolShare = getPoolShare({
-                liquidityUnits: new bignumber_js.BigNumber(memberDetail.position.units),
-                totalUnits: new bignumber_js.BigNumber(assetPool.thornodeDetails.LP_units),
+                liquidityUnits: new BigNumber__default.default(memberDetail.position.units),
+                totalUnits: new BigNumber__default.default(assetPool.thornodeDetails.LP_units),
             }, assetPool);
             // Calculate slip on liquidity removal
             const slip = getSlipOnLiquidity({
@@ -3185,6 +3200,7 @@ exports.AssetETH = AssetETH;
 exports.AssetLTC = AssetLTC;
 exports.AssetMAYA = AssetMAYA;
 exports.AssetRuneNative = AssetRuneNative;
+exports.AssetSOL = AssetSOL;
 exports.AssetXRP = AssetXRP;
 exports.BASEChain = BASEChain;
 exports.BCHChain = BCHChain;
@@ -3198,6 +3214,7 @@ exports.GAIAChain = GAIAChain;
 exports.LTCChain = LTCChain;
 exports.LiquidityPool = LiquidityPool;
 exports.MAYAChain = MAYAChain;
+exports.SOLChain = SOLChain;
 exports.THORCHAIN_DECIMAL = THORCHAIN_DECIMAL;
 exports.THORChain = THORChain;
 exports.ThorchainCache = ThorchainCache;

package/lib/liquidity-pool.d.ts

@@ -1,6 +1,6 @@
-import { Pool } from '@xchainjs/xchain-thornode/lib';
+import { Pool } from '@xchainjs/xchain-thornode';
 import { Asset, BaseAmount, TokenAsset } from '@xchainjs/xchain-util';
-import { BigNumber } from 'bignumber.js';
+import type BigNumber from 'bignumber.js';
 /**
  * Represents a Liquidity Pool in Thorchain
  */

package/lib/thorchain-cache.d.ts

@@ -1,6 +1,6 @@
 import { MidgardQuery } from '@xchainjs/xchain-midgard-query';
 import { Address, Asset, Chain, CryptoAmount, SecuredAsset, SynthAsset, TokenAsset, TradeAsset } from '@xchainjs/xchain-util';
-import { BigNumber } from 'bignumber.js';
+import BigNumber from 'bignumber.js';
 import { LiquidityPool } from './liquidity-pool';
 import { InboundDetail } from './types';
 import { Thornode } from './utils/thornode';

package/lib/types.d.ts

@@ -1,7 +1,7 @@
 import { FeeOption, TxHash } from '@xchainjs/xchain-client';
 import { LiquidityProviderSummary } from '@xchainjs/xchain-thornode';
 import { Address, Asset, AssetCryptoAmount, BaseAmount, Chain, CryptoAmount, SecuredAsset, SynthAsset, TokenAsset, TradeAsset, TradeCryptoAmount } from '@xchainjs/xchain-util';
-import { BigNumber } from 'bignumber.js';
+import type BigNumber from 'bignumber.js';
 export type CompatibleAsset = Asset | TokenAsset | SynthAsset | TradeAsset | SecuredAsset;
 /**
  * Represents the total fees associated with a swap.

package/lib/utils/const.d.ts

@@ -13,6 +13,7 @@ export declare const assetUSDC: TokenAsset;
 export declare const AssetBNB: Asset;
 export declare const AssetBASE: Asset;
 export declare const AssetXRP: Asset;
+export declare const AssetSOL: Asset;
 export declare const BNBChain = "BNB";
 export declare const BTCChain = "BTC";
 export declare const BCHChain = "BCH";
@@ -26,5 +27,6 @@ export declare const BSCChain = "BSC";
 export declare const THORChain = "THOR";
 export declare const BASEChain = "BASE";
 export declare const XRPChain = "XRP";
+export declare const SOLChain = "SOL";
 export declare const THORCHAIN_DECIMAL = 8;
 export declare const isAssetRuneNative: (asset: AnyAsset) => boolean;

package/lib/utils/liquidity.d.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from 'bignumber.js';
+import BigNumber from 'bignumber.js';
 import { LiquidityPool } from '../liquidity-pool';
 import { Block, ILProtectionData, LiquidityToAdd, PoolShareDetail, PostionDepositValue, UnitData } from '../types';
 /**

package/lib/utils/utils.d.ts

@@ -1,5 +1,5 @@
 import { Asset, AssetCryptoAmount, Chain, CryptoAmount } from '@xchainjs/xchain-util';
-import { BigNumber } from 'bignumber.js';
+import type BigNumber from 'bignumber.js';
 import { CompatibleAsset, InboundDetail } from '../types';
 export declare const getBaseAmountWithDiffDecimals: (inputAmount: CryptoAmount, outDecimals: number) => BigNumber;
 export declare const getCryptoAmountWithNotation: <T extends CompatibleAsset>(amount: CryptoAmount<T>, notation: number) => CryptoAmount<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-query",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "license": "MIT",
   "description": "Thorchain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain ",
   "keywords": [
@@ -28,15 +28,15 @@
     "build": "yarn clean && rollup -c --bundleConfigAsCjs",
     "build:release": "yarn exec rm -rf release && yarn pack && yarn exec \"mkdir release && tar zxvf package.tgz --directory release && rm package.tgz\"",
     "test": "jest",
-    "e2e": "jest --config jest.config.e2e.js",
+    "e2e": "jest --config jest.config.e2e.mjs",
     "lint": "eslint \"{src,__tests__}/**/*.ts\" --fix --max-warnings 0",
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@xchainjs/xchain-client": "2.0.3",
-    "@xchainjs/xchain-midgard-query": "2.0.3",
-    "@xchainjs/xchain-thornode": "1.0.2",
-    "@xchainjs/xchain-util": "2.0.2",
+    "@xchainjs/xchain-client": "2.0.5",
+    "@xchainjs/xchain-midgard-query": "2.0.5",
+    "@xchainjs/xchain-thornode": "1.0.4",
+    "@xchainjs/xchain-util": "2.0.3",
     "axios": "1.8.4",
     "axios-retry": "3.2.5",
     "bignumber.js": "^9.0.0"