Update incentive (#506)

* update incentive

* update version

Author: qwer951123

package.json

@@ -35,5 +35,5 @@
     "typescript": "^5.0.4"
   },
   "packageManager": "yarn@3.5.0",
-  "stableVersion": "4.1.9-7"
+  "stableVersion": "4.1.9-8"
 }

packages/sdk/src/incentive/index.ts

@@ -122,10 +122,10 @@ export class Incentive implements BaseSDK {
         ]);
 
         return data.map((item) => {
-          const rawId = item[0].args[0];
-          const id = getPoolId(rawId);
-          const type = rawId.isDex ? IncentiveType.DEX : IncentiveType.LOANS;
-          const collateral = tokens[forceToCurrencyName(getPoolToken(rawId))];
+          const raw = item[0].args[0];
+          const id = getPoolId(raw);
+          const type = raw.isDex ? IncentiveType.DEX : raw.isLoans ? IncentiveType.LOANS : IncentiveType.Earning;
+          const collateral = tokens[forceToCurrencyName(getPoolToken(raw))];
           const totalShares = FixedPointNumber.fromInner(item[1].totalShares.toString(), collateral.decimals);
 
           // format rewards infomations
@@ -142,7 +142,7 @@ export class Incentive implements BaseSDK {
             };
           });
 
-          return { collateral, type, id, rawId, totalShares, rewards };
+          return { collateral, type, id, raw, totalShares, rewards };
         });
       })
     );
@@ -180,8 +180,8 @@ export class Incentive implements BaseSDK {
 
         return combineLatest({
           info: of(info),
-          sharesAndWithdrawn: this.storages.userSharesAndWithdrawnRewards(info.rawId, address).observable,
-          pendingRewards: this.storages.pendingRewards(info.rawId, address).observable
+          sharesAndWithdrawn: this.storages.userSharesAndWithdrawnRewards(info.raw, address).observable,
+          pendingRewards: this.storages.pendingRewards(info.raw, address).observable
         });
       }),
       map(({ info, sharesAndWithdrawn, pendingRewards }) => {
@@ -312,7 +312,7 @@ export class Incentive implements BaseSDK {
     return this.subscribeAllIncentivePools().pipe(
       map((data) => {
         return data.find((item) => {
-          return item.type === type && forceToCurrencyName(getPoolToken(item.rawId)) === forceToCurrencyName(currency);
+          return item.type === type && forceToCurrencyName(getPoolToken(item.raw)) === forceToCurrencyName(currency);
         });
       })
     );

packages/sdk/src/incentive/types.ts

@@ -4,7 +4,8 @@ import { Wallet } from '../wallet';
 
 export enum IncentiveType {
   'LOANS',
-  'DEX'
+  'DEX',
+  'Earning'
 }
 
 export interface IncentiveConfigs {
@@ -50,7 +51,7 @@ export interface BaseIncentivePool {
   // pool id
   id: string;
   // raw pool id
-  rawId: ModuleSupportIncentivesPoolId;
+  raw: ModuleSupportIncentivesPoolId;
   // the colateral token required by the pool
   collateral: Token;
   // total shares belone to the pool

packages/sdk/src/incentive/utils/get-pool-id.ts

@@ -1,14 +1,5 @@
-import { forceToCurrencyName } from '@acala-network/sdk-core';
 import { ModuleSupportIncentivesPoolId } from '@polkadot/types/lookup';
 
 export function getPoolId(pool: ModuleSupportIncentivesPoolId): string {
-  if (pool.isDex) {
-    return `dex-${forceToCurrencyName(pool.asDex)}`;
-  }
-
-  if (pool.isLoans) {
-    return `loans-${forceToCurrencyName(pool.asLoans)}`;
-  }
-
-  return 'unknown';
+  return pool.toHex();
 }

packages/sdk/src/incentive/utils/get-pool-token.ts

@@ -5,6 +5,8 @@ export function getPoolToken(poolId: ModuleSupportIncentivesPoolId): AcalaPrimit
 
   if (poolId.isLoans) return poolId.asLoans;
 
+  if ((poolId as any).isEarning) return (poolId as any).asEarning;
+
   // always success, never run belown
   return undefined as unknown as AcalaPrimitivesCurrencyCurrencyId;
 }

tsconfig.base.json

@@ -30,8 +30,7 @@
       "@acala-network/sdk-payment": ["packages/sdk-payment/src"],
       "@acala-network/sdk-payment/*": ["packages/sdk-payment/src/*"],
       "@acala-network/wormhole-portal": ["packages/wormhole-portal/src"],
-      "@acala-network/wormhole-portal/*": ["packages/wormhole-portal/src/*"],
-      "@polkadot/types/lookup": ["node_modules/@acala-network/types/lookup/types-acala.d.ts"],
+      "@acala-network/wormhole-portal/*": ["packages/wormhole-portal/src/*"]
     },
   },
 }