@sentio/sdk 2.31.0-rc.1 → 2.31.0-rc.10

package/src/core/event-logger.ts

@@ -1,5 +1,13 @@
 import { BaseContext } from './base-context.js'
-import { CoinID, EventLogConfig, EventLogConfig_BasicFieldType, EventTrackingResult, LogLevel } from '@sentio/protos'
+import {
+  CoinID,
+  EventLogConfig,
+  EventLogConfig_BasicFieldType,
+  EventLogConfig_Field,
+  EventLogConfig_StructFieldType,
+  EventTrackingResult,
+  LogLevel
+} from '@sentio/protos'
 import { normalizeAttribute } from './normalization.js'
 import { MapStateStorage } from '@sentio/runtime'
 
@@ -32,33 +40,61 @@ export class EventLoggerBinding {
   }
 }
 
+export type BasicFieldType = EventLogConfig_BasicFieldType
+export const BasicFieldType = EventLogConfig_BasicFieldType
+
+export type FieldType = CoinID | BasicFieldType | Fields
+
+export type Fields = { [key: string]: FieldType }
+
 export interface EventLogOptions {
-  fields: Record<string, CoinID | EventLogConfig_BasicFieldType>
+  fields: Fields
+}
+
+export function fieldsToProtos(fields: Fields): EventLogConfig_Field[] {
+  const fieldsProto: EventLogConfig_Field[] = []
+  for (const [key, value] of Object.entries(fields)) {
+    let basicType: BasicFieldType | undefined
+    let coinType: CoinID | undefined
+    let structType: EventLogConfig_StructFieldType | undefined
+
+    if (typeof value === 'number') {
+      basicType = value
+    } else {
+      if (value.address || value.symbol) {
+        coinType = value
+      } else {
+        structType = EventLogConfig_StructFieldType.create({
+          fields: fieldsToProtos(value as Fields)
+        })
+      }
+    }
+    fieldsProto.push({
+      name: key,
+      basicType,
+      coinType,
+      structType
+    })
+  }
+  return fieldsProto
 }
 
 export class EventLogger {
   private readonly eventName: string
   config: EventLogConfig
 
-  private constructor(eventName: string, config?: EventLogConfig) {
+  private constructor(eventName: string, config: EventLogConfig) {
     this.eventName = eventName
-    this.config = EventLogConfig.fromPartial(config || {})
+    this.config = config
   }
 
   static register(eventName: string, options?: EventLogOptions): EventLogger {
-    const config = EventLogConfig.create()
-    for (const [key, value] of Object.entries(options?.fields || {})) {
-      let basicType: EventLogConfig_BasicFieldType | undefined
-      let coinType: CoinID | undefined
-      if (typeof value === 'number') {
-        basicType = value
-      } else {
-        coinType = value
-      }
-      config.fields.push({
-        name: key,
-        basicType,
-        coinType
+    let config = EventLogConfig.create()
+
+    if (options?.fields) {
+      config = EventLogConfig.create({
+        name: eventName,
+        fields: fieldsToProtos(options.fields)
       })
     }
 

package/src/eth/eth.ts

@@ -9,7 +9,7 @@ import {
   formatHash,
   formatReceiptLog,
   object,
-  formatData,
+  formatData
 } from 'ethers/providers'
 import { CallExceptionError, LogDescription, Result, DeferredTopicFilter, BlockParams } from 'ethers'
 import { ContractContext } from './context.js'
@@ -109,13 +109,14 @@ const _formatTransactionReceipt = object(
     //confirmations: allowNull(getNumber, null),
     cumulativeGasUsed: getBigInt,
     effectiveGasPrice: allowNull(getBigInt),
+    gasPrice: allowNull(getBigInt),
     status: allowNull(getNumber),
-    type: allowNull(getNumber, 0),
+    type: allowNull(getNumber, 0)
   },
   {
-    effectiveGasPrice: ['gasPrice'],
+    // effectiveGasPrice: ['gasPrice'],
     hash: ['transactionHash'],
-    index: ['transactionIndex'],
+    index: ['transactionIndex']
   }
 )
 
@@ -143,7 +144,7 @@ export function formatEthData(data: {
     block,
     trace,
     transaction,
-    transactionReceipt,
+    transactionReceipt
   }
 }
 

package/src/sui/builtin/0x1.ts

@@ -251,7 +251,7 @@ const MODULES = JSON.parse(
 
 export function loadAllTypes(coder: MoveCoder) {
   for (const m of Object.values(MODULES)) {
-    coder.load(m as any);
+    coder.load(m as any, "0x1");
   }
 }
 

package/src/sui/builtin/0x2.ts

@@ -2398,7 +2398,7 @@ const MODULES = JSON.parse(
 export function loadAllTypes(coder: MoveCoder) {
   _0x1.loadAllTypes(coder);
   for (const m of Object.values(MODULES)) {
-    coder.load(m as any);
+    coder.load(m as any, "0x2");
   }
 }
 

package/src/sui/builtin/0x3.ts

@@ -1882,7 +1882,7 @@ export function loadAllTypes(coder: MoveCoder) {
   _0x1.loadAllTypes(coder);
   _0x2.loadAllTypes(coder);
   for (const m of Object.values(MODULES)) {
-    coder.load(m as any);
+    coder.load(m as any, "0x3");
   }
 }
 

package/src/sui/sui-processor.ts

@@ -117,6 +117,10 @@ export class SuiBaseProcessor {
             processor.config.baseLabels
           )
 
+          // const parts = typeQname.split(SPLITTER)
+          // if (evt.packageId && parts[0] != evt.packageId) {
+          //   evt.type = evt.type.replace(parts[0], evt.packageId)
+          // }
           const decoded = await processor.coder.decodeEvent<any>(evt)
           await handler(decoded || evt, ctx)
           processResults.push(ctx.stopAndGetResult())

package/src/utils/index.ts

@@ -1,5 +1,5 @@
 export * from './conversion.js'
 export * as token from './token.js'
 export * from './dex-price.js'
-export { getPriceByType, getPriceClient, getPriceBySymbol } from './price.js'
+export { getPriceByType, getPriceClient, getPriceBySymbol, getCoinsThatHasPrice } from './price.js'
 export * from './call.js'

package/src/utils/price.ts

@@ -143,3 +143,21 @@ export async function getPriceBySymbol(
 function dateString(date: Date) {
   return [date.getUTCDate(), date.getUTCMonth() + 1, date.getUTCFullYear()].join('-')
 }
+
+/**
+ * get coins that has price, return results are list of coin id with both symbol and address field set
+ * @param chainId
+ */
+export async function getCoinsThatHasPrice(chainId: ChainId) {
+  if (!priceClient) {
+    priceClient = getPriceClient()
+  }
+  const response = await priceClient.listCoins({
+    chain: chainId
+  })
+
+  return Object.entries(response.coinAddressesInChain).map(([symbol, coin]) => {
+    coin.symbol = symbol
+    return coin
+  })
+}