@sentio/sdk 2.44.7-rc.5 → 2.45.0-rc.1

package/lib/sui/ext/move-dex.d.ts

@@ -1,17 +1,17 @@
 import { BigDecimal } from '@sentio/bigdecimal';
-import { MoveCoinList, MoveDex, MovePoolAdaptor, SimpleCoinInfo } from '../../move/ext/index.js';
+import { MoveCoinList, MoveDex, MovePoolAdaptor, BaseCoinInfo } from '../../move/ext/index.js';
 import { SuiEvent, SuiMoveNormalizedModule, SuiMoveObject } from '@mysten/sui/client';
 import { SuiNetwork } from '../network.js';
 import { SuiContext, SuiObjectContext } from '../context.js';
 export type PoolAdaptor<T> = MovePoolAdaptor<SuiMoveObject, T>;
-export declare class CoinList implements MoveCoinList<SuiNetwork> {
-    calculateValueInUsd(amount: bigint, coinInfo: SimpleCoinInfo, timestamp: number): Promise<BigDecimal>;
-    getCoinInfo(type: string): SimpleCoinInfo;
+export declare class CoinList implements MoveCoinList<BaseCoinInfo, SuiNetwork> {
+    calculateValueInUsd(amount: bigint, coinInfo: BaseCoinInfo, timestamp: number): Promise<BigDecimal>;
+    getCoinInfo(type: string): Promise<BaseCoinInfo>;
     whiteListed(type: string): boolean;
-    whitelistCoins(): Map<string, SimpleCoinInfo>;
+    whitelistCoins(): Map<string, BaseCoinInfo>;
 }
 export declare const SuiCoinList: CoinList;
-export declare class SuiDex<T> extends MoveDex<SuiNetwork, SuiMoveNormalizedModule, SuiMoveObject, SuiEvent, SuiContext, SuiObjectContext, T> {
+export declare class SuiDex<T> extends MoveDex<BaseCoinInfo, SuiNetwork, SuiMoveNormalizedModule, SuiMoveObject, SuiEvent, SuiContext, SuiObjectContext, T> {
     coinList: CoinList;
     poolAdaptor: PoolAdaptor<T>;
 }

package/lib/sui/ext/move-dex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"move-dex.d.ts","sourceRoot":"","sources":["../../../src/sui/ext/move-dex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAoB,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAClH,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAE5D,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;AAE9D,qBAAa,QAAS,YAAW,YAAY,CAAC,UAAU,CAAC;IACvD,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIrG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc;IAIzC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIlC,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;CAG9C;AAED,eAAO,MAAM,WAAW,UAAiB,CAAA;AAEzC,qBAAa,MAAM,CAAC,CAAC,CAAE,SAAQ,OAAO,CACpC,UAAU,EACV,uBAAuB,EACvB,aAAa,EACb,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,CAAC,CACF;IACC,QAAQ,WAAc;IACd,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CACpC;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,CAAC,CAErB"}
+{"version":3,"file":"move-dex.d.ts","sourceRoot":"","sources":["../../../src/sui/ext/move-dex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE/C,OAAO,EAAE,YAAY,EAAE,OAAO,EAAoB,eAAe,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAChH,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAE5D,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;AAE9D,qBAAa,QAAS,YAAW,YAAY,CAAC,YAAY,EAAE,UAAU,CAAC;IACrE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAI7F,WAAW,CAAC,IAAI,EAAE,MAAM;IAI9B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIlC,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;CAG5C;AAED,eAAO,MAAM,WAAW,UAAiB,CAAA;AAEzC,qBAAa,MAAM,CAAC,CAAC,CAAE,SAAQ,OAAO,CACpC,YAAY,EACZ,UAAU,EACV,uBAAuB,EACvB,aAAa,EACb,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,CAAC,CACF;IACC,QAAQ,WAAc;IACd,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAA;CACpC;AAED,wBAAsB,YAAY,CAChC,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,CAAC,CAErB"}

package/lib/sui/ext/move-dex.js

@@ -4,7 +4,7 @@ export class CoinList {
     calculateValueInUsd(amount, coinInfo, timestamp) {
         return calculateValueInUsd(amount, coinInfo, timestamp);
     }
-    getCoinInfo(type) {
+    async getCoinInfo(type) {
         return getCoinInfo(type);
     }
     whiteListed(type) {

package/lib/sui/ext/move-dex.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-dex.js","sourceRoot":"","sources":["../../../src/sui/ext/move-dex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACzF,OAAO,EAAgB,OAAO,EAAE,gBAAgB,EAAmC,MAAM,yBAAyB,CAAA;AAOlH,MAAM,OAAO,QAAQ;IACnB,mBAAmB,CAAC,MAAc,EAAE,QAAwB,EAAE,SAAiB;QAC7E,OAAO,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;IACzD,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,OAAO,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,OAAO,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,cAAc;QACZ,OAAO,cAAc,EAAE,CAAA;IACzB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,QAAQ,EAAE,CAAA;AAEzC,MAAM,OAAO,MAAU,SAAQ,OAQ9B;IACC,QAAQ,GAAG,WAAW,CAAA;CAEvB;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAe,EACf,KAAa,EACb,KAAa,EACb,WAAmB,EACnB,WAAmB;IAEnB,OAAO,gBAAgB,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;AACnF,CAAC"}
+{"version":3,"file":"move-dex.js","sourceRoot":"","sources":["../../../src/sui/ext/move-dex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACzF,OAAO,EAAgB,OAAO,EAAE,gBAAgB,EAAiC,MAAM,yBAAyB,CAAA;AAOhH,MAAM,OAAO,QAAQ;IACnB,mBAAmB,CAAC,MAAc,EAAE,QAAsB,EAAE,SAAiB;QAC3E,OAAO,mBAAmB,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY;QAC5B,OAAO,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,WAAW,CAAC,IAAY;QACtB,OAAO,WAAW,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC;IAED,cAAc;QACZ,OAAO,cAAc,EAAE,CAAA;IACzB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,QAAQ,EAAE,CAAA;AAEzC,MAAM,OAAO,MAAU,SAAQ,OAS9B;IACC,QAAQ,GAAG,WAAW,CAAA;CAEvB;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAe,EACf,KAAa,EACb,KAAa,EACb,WAAmB,EACnB,WAAmB;IAEnB,OAAO,gBAAgB,CAAC,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;AACnF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/sdk",
-  "version": "2.44.7-rc.5",
+  "version": "2.45.0-rc.1",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -84,8 +84,8 @@
     "typechain": "^8.3.2",
     "utility-types": "^3.11.0",
     "yaml": "^2.3.4",
-    "@sentio/protos": "2.44.7-rc.5",
-    "@sentio/runtime": "^2.44.7-rc.5"
+    "@sentio/runtime": "^2.45.0-rc.1",
+    "@sentio/protos": "2.45.0-rc.1"
   },
   "peerDependencies": {
     "tsup": "npm:@sentio/tsup@^6.7.6"

package/src/aptos/aptos-plugin.ts

@@ -19,7 +19,7 @@ import { ServerError, Status } from 'nice-grpc'
 
 import { AptosProcessorState, AptosResourceProcessorState } from './aptos-processor.js'
 
-import { initCoinList } from './ext/coin.js'
+import { initTokenList } from './ext/token.js'
 import { AptosChainId } from '@sentio/chain'
 import { AptosResourcesContext } from './context.js'
 import {
@@ -42,7 +42,7 @@ export class AptosPlugin extends Plugin {
   }
 
   async start(request: StartRequest) {
-    await initCoinList()
+    await initTokenList()
 
     const allowedChainIds = new Set<string>(Object.values(AptosChainId))
     for (const instance of request.templateInstances) {

package/src/aptos/ext/aptos-dex.ts

@@ -1,37 +1,38 @@
 import { BigDecimal } from '@sentio/bigdecimal'
-import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
 import { AptosResourcesContext, AptosContext, AptosNetwork } from '../index.js'
-import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor, SimpleCoinInfo } from '../../move/ext/index.js'
+import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor } from '../../move/ext/index.js'
 import { MoveResource, Event, MoveModuleBytecode } from '@aptos-labs/ts-sdk'
+import { getTokenInfoWithFallback, TokenInfo, tokenTokenValueInUsd, whitelistTokens } from './token.js'
 
 export type PoolAdaptor<T> = MovePoolAdaptor<MoveResource, T>
 
-export class CoinList implements MoveCoinList<AptosNetwork> {
+export class CoinList implements MoveCoinList<TokenInfo, AptosNetwork> {
   calculateValueInUsd(
     amount: bigint,
-    coinInfo: SimpleCoinInfo,
+    coinInfo: TokenInfo,
     timestamp: number,
     network: AptosNetwork = AptosNetwork.MAIN_NET
   ): Promise<BigDecimal> {
-    return calculateValueInUsd(amount, coinInfo, timestamp, network)
+    return tokenTokenValueInUsd(amount, coinInfo, timestamp, network)
   }
 
-  getCoinInfo(type: string): SimpleCoinInfo {
-    return getCoinInfo(type)
+  async getCoinInfo(type: string) {
+    return getTokenInfoWithFallback(type)
   }
 
   whiteListed(type: string): boolean {
-    return whiteListed(type)
+    return whitelistTokens().has(type)
   }
 
-  whitelistCoins(): Map<string, SimpleCoinInfo> {
-    return whitelistCoins()
+  whitelistCoins() {
+    return whitelistTokens()
   }
 }
 
 export const AptosCoinList = new CoinList()
 
 export class AptosDex<T> extends MoveDex<
+  TokenInfo,
   AptosNetwork,
   MoveModuleBytecode,
   MoveResource,

package/src/aptos/ext/index.ts

@@ -1,4 +1,3 @@
 export * from './aptos-dex.js'
-export * from './coin.js'
 export * from './token.js'
 export { findNewCoinBalances } from './coin-event.js'

package/src/aptos/ext/token.ts

@@ -6,8 +6,9 @@ import { coin } from '../builtin/0x1.js'
 import { MoveStructId } from '@aptos-labs/ts-sdk'
 import { AptosChainId } from '@sentio/chain'
 import DEFAULT_TOKEN_LIST from './token-list.json' assert { type: 'json' }
+import { BaseCoinInfo } from '../../move/ext/index.js'
 
-type TokenInfo = {
+type InternalTokenInfo = {
   chainId: number
   tokenAddress: `0x${string}` | null
   faAddress: `0x${string}` | null
@@ -26,7 +27,8 @@ type TokenInfo = {
   coinMarketCapId: number | null
 }
 
-export type SimpleTokenInfo = {
+export interface TokenInfo extends BaseCoinInfo {
+  type: `0x${string}` // either tokenAddress or faAddress
   tokenAddress?: `0x${string}`
   faAddress?: `0x${string}`
   name: string
@@ -40,15 +42,15 @@ export type SimpleTokenInfo = {
   coinMarketCapId?: number
 }
 
-const TOKEN_MAP = new Map<string, SimpleTokenInfo>()
+const TOKEN_MAP = new Map<string, TokenInfo>()
 
 export async function initTokenList() {
-  let list = DEFAULT_TOKEN_LIST as TokenInfo[]
+  let list = DEFAULT_TOKEN_LIST as InternalTokenInfo[]
   try {
     const resp = await fetch(
       'https://raw.githubusercontent.com/PanoraExchange/Aptos-Tokens/refs/heads/main/token-list.json'
     )
-    list = (await resp.json()) as TokenInfo[]
+    list = (await resp.json()) as InternalTokenInfo[]
   } catch (e) {
     console.warn("Can't not fetch newest token list, use default list")
   }
@@ -56,8 +58,13 @@ export async function initTokenList() {
   setTokenList(list)
 }
 
-function tokenInfoToSimple(info: TokenInfo): SimpleTokenInfo {
+function tokenInfoToSimple(info: InternalTokenInfo): TokenInfo {
+  const type = info.tokenAddress || info.faAddress
+  if (!type) {
+    throw Error('Token info must have tokenAddress or faAddress')
+  }
   return {
+    type,
     tokenAddress: info.tokenAddress || undefined,
     faAddress: info.faAddress || undefined,
     name: info.name,
@@ -72,7 +79,7 @@ function tokenInfoToSimple(info: TokenInfo): SimpleTokenInfo {
   }
 }
 
-function setTokenList(list: TokenInfo[]) {
+function setTokenList(list: InternalTokenInfo[]) {
   for (const info of list) {
     const simpleInfo = tokenInfoToSimple(info)
     if (
@@ -107,7 +114,7 @@ export function isWhiteListToken(token: string): boolean {
 const TOKEN_METADATA_CACHE = new Map<string, Promise<any | null>>()
 
 // token: address of the fungible asset, e.g. "0xa", or the coin type, e.g. "0x1::aptos::AptosCoin"
-export async function getTokenInfoWithFallback(token: string, network?: AptosNetwork): Promise<SimpleTokenInfo> {
+export async function getTokenInfoWithFallback(token: string, network?: AptosNetwork): Promise<TokenInfo> {
   const r = TOKEN_MAP.get(token)
   if (!r) {
     network = network || AptosNetwork.MAIN_NET
@@ -134,6 +141,7 @@ export async function getTokenInfoWithFallback(token: string, network?: AptosNet
 
     // const parts = type.split(SPLITTER)
     return {
+      type: token as `0x${string}`,
       category: 'Native',
       tokenAddress: token as `0x${string}`,
       name: meta.name,
@@ -166,7 +174,7 @@ export async function getPriceForToken(
 
 export async function tokenTokenValueInUsd(
   n: bigint,
-  coinInfo: SimpleTokenInfo,
+  coinInfo: TokenInfo,
   timestamp: number,
   network = AptosChainId.APTOS_MAINNET
 ) {
@@ -179,4 +187,4 @@ export async function tokenTokenValueInUsd(
   throw Error('Token not found' + JSON.stringify(coinInfo))
 }
 
-setTokenList(DEFAULT_TOKEN_LIST as TokenInfo[])
+setTokenList(DEFAULT_TOKEN_LIST as InternalTokenInfo[])

package/src/move/ext/coin.ts

@@ -0,0 +1,17 @@
+import { BigDecimal } from '@sentio/bigdecimal'
+
+export interface BaseCoinInfo {
+  // token_type: { type: string; account_address: string }
+  type: string
+  symbol: string
+  hippo_symbol?: string
+  decimals: number
+  bridge: string
+}
+
+export interface MoveCoinList<TokenType extends BaseCoinInfo, Network> {
+  whiteListed(type: string): boolean
+  whitelistCoins(): Map<string, TokenType>
+  getCoinInfo(type: string): Promise<TokenType>
+  calculateValueInUsd(amount: bigint, coinInfo: TokenType, timestamp: number, network: Network): Promise<BigDecimal>
+}

package/src/move/ext/index.ts

@@ -1,2 +1,2 @@
-export * from './coin-list.js'
+export * from './coin.js'
 export * from './move-dex.js'

package/src/move/ext/move-dex.ts

@@ -2,15 +2,7 @@ import { DecodedStruct, TypeDescriptor } from '@typemove/move'
 import { BigDecimal } from '@sentio/bigdecimal'
 import { Gauge } from '../../core/index.js'
 import { MoveAccountContext, MoveContext } from '../move-context.js'
-import { MoveCoinList } from './coin-list.js'
-
-export interface SimpleCoinInfo {
-  token_type: { type: string; account_address: string }
-  symbol: string
-  hippo_symbol?: string
-  decimals: number
-  bridge: string
-}
+import { MoveCoinList, BaseCoinInfo } from './coin.js'
 
 export interface MovePoolAdaptor<StructType, T> {
   getXReserve(pool: T): bigint
@@ -23,6 +15,7 @@ export interface MovePoolAdaptor<StructType, T> {
 }
 
 export class MoveDex<
+  TokenType extends BaseCoinInfo,
   Network,
   ModuleType,
   StructType,
@@ -31,7 +24,7 @@ export class MoveDex<
   AccountContextType extends MoveAccountContext<Network, ModuleType, StructType | EventType>,
   T
 > {
-  coinList: MoveCoinList<Network>
+  coinList: MoveCoinList<TokenType, Network>
   poolAdaptor: MovePoolAdaptor<StructType, T>
   volume: Gauge
   volumeByCoin: Gauge
@@ -100,14 +93,14 @@ export class MoveDex<
       this.volumeByCoin.record(ctx, resultX, {
         coin: coinXInfo.symbol,
         bridge: coinXInfo.bridge,
-        type: coinXInfo.token_type.type
+        type: coinXInfo.type
       })
     }
     if (resultY.gt(0)) {
       this.volumeByCoin.record(ctx, resultY, {
         coin: coinYInfo.symbol,
         bridge: coinYInfo.bridge,
-        type: coinYInfo.token_type.type
+        type: coinYInfo.type
       })
     }
     result = resultX.plus(resultY).div(2)
@@ -152,23 +145,23 @@ export class MoveDex<
 
       if (whitelistx) {
         resultX = await this.coinList.calculateValueInUsd(coinx_amount, coinXInfo, timestamp, ctx.network)
-        let coinXTotal = volumeByCoin.get(coinXInfo.token_type.type)
+        let coinXTotal = volumeByCoin.get(coinXInfo.type)
         if (!coinXTotal) {
           coinXTotal = resultX
         } else {
           coinXTotal = coinXTotal.plus(resultX)
         }
-        volumeByCoin.set(coinXInfo.token_type.type, coinXTotal)
+        volumeByCoin.set(coinXInfo.type, coinXTotal)
       }
       if (whitelisty) {
         resultY = await this.coinList.calculateValueInUsd(coiny_amount, coinYInfo, timestamp, ctx.network)
-        let coinYTotal = volumeByCoin.get(coinYInfo.token_type.type)
+        let coinYTotal = volumeByCoin.get(coinYInfo.type)
         if (!coinYTotal) {
           coinYTotal = resultY
         } else {
           coinYTotal = coinYTotal.plus(resultY)
         }
-        volumeByCoin.set(coinYInfo.token_type.type, coinYTotal)
+        volumeByCoin.set(coinYInfo.type, coinYTotal)
       }
 
       if (resultX.eq(0)) {
@@ -202,7 +195,7 @@ export class MoveDex<
         this.tvlByCoin.record(ctx, v, {
           coin: coinInfo.symbol,
           bridge: coinInfo.bridge,
-          type: coinInfo.token_type.type
+          type: coinInfo.type
         })
       }
     }
@@ -218,8 +211,12 @@ export class MoveDex<
   }
 }
 
-export async function moveGetPairValue<Network, ContextType extends MoveAccountContext<Network, any, any>>(
-  coinList: MoveCoinList<Network>,
+export async function moveGetPairValue<
+  TokenType extends BaseCoinInfo,
+  Network,
+  ContextType extends MoveAccountContext<Network, any, any>
+>(
+  coinList: MoveCoinList<TokenType, Network>,
   ctx: ContextType,
   coinx: string,
   coiny: string,

package/src/sui/codegen/codegen.ts

@@ -24,6 +24,7 @@ export async function codegen(
 
 class SuiNetworkCodegen extends BaseSuiCodegen {
   moduleGenerator: SharedNetworkCodegen<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject>
+  SYSTEM_PACKAGE = '@sentio/sdk/sui'
 
   constructor(network: SuiNetwork) {
     const endpoint = getRpcEndpoint(network)

package/src/sui/ext/coin.ts

@@ -1,4 +1,4 @@
-import { SimpleCoinInfo } from '../../move/ext/index.js'
+import { BaseCoinInfo } from '../../move/ext/index.js'
 import fetch from 'node-fetch'
 import { accountTypeString, SPLITTER } from '../../move/index.js'
 import { getPriceByType } from '../../utils/index.js'
@@ -7,7 +7,7 @@ import { SuiChainId } from '@sentio/chain'
 import { getClient, SuiNetwork } from '../network.js'
 import { CoinMetadata } from '@mysten/sui/client'
 
-const WHITELISTED_COINS = new Map<string, SimpleCoinInfo>()
+const WHITELISTED_COINS = new Map<string, BaseCoinInfo>()
 
 export async function initCoinList() {
   let list = DEFAULT_LIST.coinlist
@@ -48,10 +48,7 @@ function setCoinList(list: SuiCoinInfo[]) {
       bridge = 'Wormhole'
     }
     WHITELISTED_COINS.set(info.address, {
-      token_type: {
-        type: info.address,
-        account_address: info.address.split('::')[0]
-      },
+      type: info.address,
       symbol: info.symbol,
       decimals: info.decimals,
       bridge
@@ -69,13 +66,13 @@ export function whiteListed(coin: string): boolean {
   return WHITELISTED_COINS.has(normalized)
 }
 
-export function getCoinInfo(type: string): SimpleCoinInfo {
+export function getCoinInfo(type: string): BaseCoinInfo {
   const r = WHITELISTED_COINS.get(type)
   if (!r) {
     const parts = type.split('::')
     // TDDO retrive from network
     return {
-      token_type: { type: type, account_address: parts[0] },
+      type,
       symbol: parts[2],
       decimals: 8,
       bridge: 'native'
@@ -86,7 +83,7 @@ export function getCoinInfo(type: string): SimpleCoinInfo {
 
 const COIN_METADATA_CACHE = new Map<string, Promise<CoinMetadata | null>>()
 
-export async function getCoinInfoWithFallback(type: string, network?: SuiNetwork): Promise<SimpleCoinInfo> {
+export async function getCoinInfoWithFallback(type: string, network?: SuiNetwork): Promise<BaseCoinInfo> {
   const r = WHITELISTED_COINS.get(type)
   if (!r) {
     network = network || SuiChainId.SUI_MAINNET
@@ -104,7 +101,7 @@ export async function getCoinInfoWithFallback(type: string, network?: SuiNetwork
 
     const parts = type.split(SPLITTER)
     return {
-      token_type: { type: type, account_address: parts[0] },
+      type,
       symbol: meta.symbol,
       decimals: meta.decimals,
       bridge: 'native'
@@ -126,8 +123,8 @@ export async function getPrice(coinType: string, timestamp: number): Promise<num
   }
 }
 
-export async function calculateValueInUsd(n: bigint, coinInfo: SimpleCoinInfo, timestamp: number) {
-  const price = await getPrice(coinInfo.token_type.type, timestamp)
+export async function calculateValueInUsd(n: bigint, coinInfo: BaseCoinInfo, timestamp: number) {
+  const price = await getPrice(coinInfo.type, timestamp)
   const amount = n.scaleDown(coinInfo.decimals)
   return amount.multipliedBy(price)
 }

package/src/sui/ext/move-dex.ts

@@ -1,18 +1,18 @@
 import { BigDecimal } from '@sentio/bigdecimal'
 import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
-import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor, SimpleCoinInfo } from '../../move/ext/index.js'
+import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor, BaseCoinInfo } from '../../move/ext/index.js'
 import { SuiEvent, SuiMoveNormalizedModule, SuiMoveObject } from '@mysten/sui/client'
 import { SuiNetwork } from '../network.js'
 import { SuiContext, SuiObjectContext } from '../context.js'
 
 export type PoolAdaptor<T> = MovePoolAdaptor<SuiMoveObject, T>
 
-export class CoinList implements MoveCoinList<SuiNetwork> {
-  calculateValueInUsd(amount: bigint, coinInfo: SimpleCoinInfo, timestamp: number): Promise<BigDecimal> {
+export class CoinList implements MoveCoinList<BaseCoinInfo, SuiNetwork> {
+  calculateValueInUsd(amount: bigint, coinInfo: BaseCoinInfo, timestamp: number): Promise<BigDecimal> {
     return calculateValueInUsd(amount, coinInfo, timestamp)
   }
 
-  getCoinInfo(type: string): SimpleCoinInfo {
+  async getCoinInfo(type: string) {
     return getCoinInfo(type)
   }
 
@@ -20,7 +20,7 @@ export class CoinList implements MoveCoinList<SuiNetwork> {
     return whiteListed(type)
   }
 
-  whitelistCoins(): Map<string, SimpleCoinInfo> {
+  whitelistCoins(): Map<string, BaseCoinInfo> {
     return whitelistCoins()
   }
 }
@@ -28,6 +28,7 @@ export class CoinList implements MoveCoinList<SuiNetwork> {
 export const SuiCoinList = new CoinList()
 
 export class SuiDex<T> extends MoveDex<
+  BaseCoinInfo,
   SuiNetwork,
   SuiMoveNormalizedModule,
   SuiMoveObject,

package/lib/aptos/ext/coin.d.ts

@@ -1,12 +0,0 @@
-import { SimpleCoinInfo } from '../../move/ext/move-dex.js';
-import { AptosNetwork } from '../network.js';
-import { AptosChainId } from '@sentio/chain';
-export declare function initCoinList(): Promise<void>;
-export declare function whitelistCoins(): Map<string, SimpleCoinInfo>;
-export declare function whiteListed(coin: string): boolean;
-export declare function getCoinInfo(type: string): SimpleCoinInfo;
-export declare function getCoinInfoWithFallback(type: string, network?: AptosNetwork): Promise<SimpleCoinInfo>;
-export declare function getPrice(coinType: string, timestamp: number, network?: AptosChainId): Promise<number>;
-export declare function calculateValueInUsd(n: bigint, coinInfo: SimpleCoinInfo, timestamp: number, network?: AptosChainId): Promise<import("@sentio/bigdecimal").BigDecimal>;
-export declare function delay(ms: number): Promise<unknown>;
-//# sourceMappingURL=coin.d.ts.map

package/lib/aptos/ext/coin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"coin.d.ts","sourceRoot":"","sources":["../../../src/aptos/ext/coin.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,YAAY,EAAa,MAAM,eAAe,CAAA;AAGvD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAI5C,wBAAsB,YAAY,kBAYjC;AA6BD,wBAAgB,cAAc,gCAE7B;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAIjD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAaxD;AAID,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,cAAc,CAAC,CA4B3G;AAED,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,eAA6B,GACnC,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED,wBAAsB,mBAAmB,CACvC,CAAC,EAAE,MAAM,EACT,QAAQ,EAAE,cAAc,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,eAA6B,oDAKrC;AAED,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,oBAE/B"}