@xchainjs/xchain-aggregator 0.2.6 → 1.0.0

package/lib/protocols/chainflip/chainflipProtocol.d.ts

@@ -1,4 +1,4 @@
-import { Asset, Chain } from '@xchainjs/xchain-util';
+import { AnyAsset, Chain } from '@xchainjs/xchain-util';
 import { IProtocol, ProtocolConfig, QuoteSwap, QuoteSwapParams, SwapHistory, TxSubmitted } from '../../types';
 /**
  * Chainflip protocol
@@ -14,7 +14,7 @@ export declare class ChainflipProtocol implements IProtocol {
      * @param {Asset} asset Asset to check if it is supported
      * @returns {boolean} True if the asset is supported, otherwise false
      */
-    isAssetSupported(asset: Asset): Promise<boolean>;
+    isAssetSupported(asset: AnyAsset): Promise<boolean>;
     /**
      * Retrieve the supported chains by the protocol
      * @returns {Chain[]} the supported chains by the protocol

package/lib/protocols/chainflip/types.d.ts

@@ -0,0 +1,2 @@
+import { Asset, TokenAsset } from '@xchainjs/xchain-util';
+export type CompatibleAsset = Asset | TokenAsset;

package/lib/protocols/chainflip/utils.d.ts

@@ -1,6 +1,6 @@
 import { Asset as CAsset, AssetData, Chain as CChain } from '@chainflip/sdk/swap';
-import { Asset as XAsset, Chain as XChain } from '@xchainjs/xchain-util';
+import { Asset as XAsset, Chain as XChain, TokenAsset as XTokenAsset } from '@xchainjs/xchain-util';
 export declare const cChainToXChain: (chain: CChain) => XChain;
 export declare const xChainToCChain: (chain: XChain) => CChain;
-export declare const cAssetToXAsset: (asset: AssetData) => XAsset;
-export declare const xAssetToCAsset: (asset: XAsset) => CAsset;
+export declare const cAssetToXAsset: (asset: AssetData) => XAsset | XTokenAsset;
+export declare const xAssetToCAsset: (asset: XAsset | XTokenAsset) => CAsset;

package/lib/protocols/mayachain/mayachainProtocol.d.ts

@@ -1,4 +1,4 @@
-import { Asset, Chain } from '@xchainjs/xchain-util';
+import { AnyAsset, Chain } from '@xchainjs/xchain-util';
 import { IProtocol, ProtocolConfig, QuoteSwap, QuoteSwapParams, SwapHistory, SwapHistoryParams, TxSubmitted } from '../../types';
 export declare class MayachainProtocol implements IProtocol {
     readonly name = "Mayachain";
@@ -11,7 +11,7 @@ export declare class MayachainProtocol implements IProtocol {
      * @param {Asset} asset Asset to check if it is supported
      * @returns {boolean} True if the asset is supported, otherwise false
      */
-    isAssetSupported(asset: Asset): Promise<boolean>;
+    isAssetSupported(asset: AnyAsset): Promise<boolean>;
     /**
      * Retrieve the supported chains by the protocol
      * @returns {Chain[]} the supported chains by the protocol

package/lib/protocols/mayachain/types.d.ts

@@ -0,0 +1,2 @@
+import { Asset, SynthAsset, TokenAsset } from '@xchainjs/xchain-util';
+export type CompatibleAsset = Asset | TokenAsset | SynthAsset;

package/lib/protocols/thorchain/thorchainProtocol.d.ts

@@ -1,4 +1,4 @@
-import { Asset, Chain } from '@xchainjs/xchain-util';
+import { AnyAsset, Chain } from '@xchainjs/xchain-util';
 import { IProtocol, ProtocolConfig, QuoteSwap, QuoteSwapParams, SwapHistory, SwapHistoryParams, TxSubmitted } from '../../types';
 export declare class ThorchainProtocol implements IProtocol {
     readonly name = "Thorchain";
@@ -11,7 +11,7 @@ export declare class ThorchainProtocol implements IProtocol {
      * @param {Asset} asset Asset to check if it is supported
      * @returns {boolean} True if the asset is supported, otherwise false
      */
-    isAssetSupported(asset: Asset): Promise<boolean>;
+    isAssetSupported(asset: AnyAsset): Promise<boolean>;
     /**
      * Retrieve the supported chains by the protocol
      * @returns {Chain[]} the supported chains by the protocol

package/lib/types.d.ts

@@ -1,5 +1,5 @@
 import { TxHash } from '@xchainjs/xchain-client';
-import { Address, Asset, Chain, CryptoAmount } from '@xchainjs/xchain-util';
+import { Address, AnyAsset, Asset, Chain, CryptoAmount, SynthAsset, TokenAsset, TradeAsset } from '@xchainjs/xchain-util';
 import { Wallet } from '@xchainjs/xchain-wallet';
 /**
  * TxSubmitted
@@ -12,9 +12,9 @@ type TxSubmitted = {
  * Fees
  */
 type Fees = {
-    asset: Asset;
-    affiliateFee: CryptoAmount;
-    outboundFee: CryptoAmount;
+    asset: Asset | TokenAsset | SynthAsset | TradeAsset;
+    affiliateFee: CryptoAmount<Asset | TokenAsset | SynthAsset | TradeAsset>;
+    outboundFee: CryptoAmount<Asset | TokenAsset | SynthAsset | TradeAsset>;
 };
 /**
  * Protocols supported by the Aggregator
@@ -65,8 +65,8 @@ type QuoteSwap = {
     protocol: Protocol;
     toAddress: Address;
     memo: string;
-    expectedAmount: CryptoAmount;
-    dustThreshold: CryptoAmount;
+    expectedAmount: CryptoAmount<Asset | TokenAsset | SynthAsset | TradeAsset>;
+    dustThreshold: CryptoAmount<Asset | TokenAsset | SynthAsset | TradeAsset>;
     fees: Fees;
     totalSwapSeconds: number;
     slipBasisPoints: number;
@@ -78,9 +78,9 @@ type QuoteSwap = {
  * Represents parameters for quoting a swap operation.
  */
 type QuoteSwapParams = {
-    fromAsset: Asset;
-    destinationAsset: Asset;
-    amount: CryptoAmount;
+    fromAsset: Asset | TokenAsset | SynthAsset | TradeAsset;
+    destinationAsset: Asset | TokenAsset | SynthAsset | TradeAsset;
+    amount: CryptoAmount<Asset | TokenAsset | SynthAsset | TradeAsset>;
     fromAddress?: string;
     destinationAddress?: string;
     height?: number;
@@ -110,7 +110,7 @@ type SwapHistory = {
 };
 interface IProtocol {
     name: Protocol;
-    isAssetSupported(asset: Asset): Promise<boolean>;
+    isAssetSupported(asset: AnyAsset): Promise<boolean>;
     getSupportedChains(): Promise<Chain[]>;
     estimateSwap(params: QuoteSwapParams): Promise<QuoteSwap>;
     doSwap(params: QuoteSwapParams): Promise<TxSubmitted>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xchainjs/xchain-aggregator",
   "description": "Protocol aggregator to make actions in different protocols",
-  "version": "0.2.6",
+  "version": "1.0.0",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "lib/index.esm.js",
@@ -30,22 +30,22 @@
   },
   "dependencies": {
     "@chainflip/sdk": "1.3.0",
-    "@xchainjs/xchain-client": "0.16.8",
-    "@xchainjs/xchain-mayachain": "1.0.11",
-    "@xchainjs/xchain-mayachain-amm": "2.0.14",
-    "@xchainjs/xchain-mayachain-query": "0.1.21",
-    "@xchainjs/xchain-thorchain": "1.1.1",
-    "@xchainjs/xchain-thorchain-amm": "1.1.18",
-    "@xchainjs/xchain-thorchain-query": "0.7.17",
-    "@xchainjs/xchain-util": "0.13.7",
-    "@xchainjs/xchain-wallet": "0.1.19"
+    "@xchainjs/xchain-client": "1.0.0",
+    "@xchainjs/xchain-mayachain": "2.0.0",
+    "@xchainjs/xchain-mayachain-amm": "3.0.0",
+    "@xchainjs/xchain-mayachain-query": "1.0.0",
+    "@xchainjs/xchain-thorchain": "2.0.0",
+    "@xchainjs/xchain-thorchain-amm": "2.0.0",
+    "@xchainjs/xchain-thorchain-query": "1.0.0",
+    "@xchainjs/xchain-util": "1.0.0",
+    "@xchainjs/xchain-wallet": "1.0.0"
   },
   "devDependencies": {
-    "@xchainjs/xchain-avax": "0.5.6",
-    "@xchainjs/xchain-binance": "5.7.17",
-    "@xchainjs/xchain-bitcoin": "0.23.19",
-    "@xchainjs/xchain-ethereum": "0.32.6",
-    "@xchainjs/xchain-kujira": "0.1.21",
+    "@xchainjs/xchain-avax": "1.0.0",
+    "@xchainjs/xchain-binance": "6.0.0",
+    "@xchainjs/xchain-bitcoin": "1.0.0",
+    "@xchainjs/xchain-ethereum": "1.0.0",
+    "@xchainjs/xchain-kujira": "1.0.0",
     "axios": "1.3.6",
     "axios-mock-adapter": "1.20.0"
   }