update

AcalaNetwork · Jul 19, 2023 · 2a31072 · 2a31072
1 parent 12ad6be
commit 2a31072
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 20 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -5,8 +5,8 @@ module.exports = Object.assign({}, config, {
     '@acala-network/sdk-core(.*)$': '<rootDir>/packages/sdk-core/src/$1',
     '@acala-network/sdk-swap(.*)$': '<rootDir>/packages/sdk-swap/src/$1',
     '@acala-network/sdk/(.*)$': '<rootDir>/packages/sdk/src/$1',
-    '@acala-network/wormhole-portal(.*)$': '<rootDir>/packages/wormhole-portal/$1',
-    '@acala-network/sdk-payment(.*)$': '<rootDir>/packages/sdk-payment/$1'
+    '@acala-network/sdk-payment(.*)$': '<rootDir>/packages/sdk-payment/$1',
+    '@acala-network/wormhole-portal(.*)$': '<rootDir>/packages/wormhole-portal/$1'
   },
   modulePathIgnorePatterns: [
     '<rootDir>/build',

diff --git a/packages/sdk-payment/src/payment.spec.ts b/packages/sdk-payment/src/payment.spec.ts
@@ -0,0 +1,28 @@
+import { Wallet } from "@acala-network/sdk";
+import { AcalaDex, AggregateDex } from "@acala-network/sdk-swap";
+import { ApiPromise, WsProvider } from "@polkadot/api";
+import { Payment } from "./Payment";
+
+describe('payment', () => {
+  jest.setTimeout(50000);
+
+  const karuraEndpoint = 'wss://karura-rpc-0.aca-api.network';
+
+  let payment;
+
+  beforeAll(async () => {
+    const api = await ApiPromise.create({ provider: new WsProvider(karuraEndpoint) });
+
+    await api.isReady;
+
+    const wallet = new Wallet(api);
+    const dex = new AggregateDex({ api, wallet, providers: [new AcalaDex({ api, wallet })] });
+
+    await wallet.isReady;
+    await dex.isReady;
+
+    payment = new Payment({ api, wallet, dex });
+
+    await payment.isReady;
+  });
+})
diff --git a/packages/sdk-payment/src/utils/convert-currency-id.ts b/packages/sdk-payment/src/utils/convert-currency-id.ts
diff --git a/packages/sdk-payment/src/utils/get-tx-fee.ts b/packages/sdk-payment/src/utils/get-tx-fee.ts
diff --git a/packages/sdk-swap/src/dex-providers/acala/index.ts b/packages/sdk-swap/src/dex-providers/acala/index.ts
@@ -22,7 +22,7 @@ import {
   TradeMode,
   TradingPair,
   CompositeTradingPath,
-  TradingPathItem,
+  TradingPath,
   OverwriteCallParams
 } from '../../types';
 import { ExchangeFee, ExpandPath, ExpandPathWithPositions, MidResult } from './types';
@@ -333,7 +333,7 @@ export class AcalaDex implements BaseSwap {
     };
   }
 
-  public filterPath(path: TradingPathItem) {
+  public filterPath(path: TradingPath) {
     if (path[0] !== this.source) return false;
 
     return path[1].length <= this.configs.tradingPathLimit;

diff --git a/packages/sdk-swap/src/types.ts b/packages/sdk-swap/src/types.ts
@@ -74,7 +74,7 @@ export interface AggregateDexSwapParams extends SwapParams {
 export interface BaseSwap {
   get source(): DexSource;
   get tradingPairs$(): Observable<TradingPair[]>;
-  filterPath(path: TradingPathItem): boolean;
+  filterPath(path: TradingPath): boolean;
   swap(params: SwapParamsWithExactPath): Observable<SwapResult>;
   getAggregateTradingPath(result: SwapResult): any;
   getTradingTx(