@sentio/sdk 2.7.4-rc.2 → 2.8.0-rc.2

package/lib/eth/provider.js

@@ -1,19 +1,26 @@
 import { Network, JsonRpcProvider } from 'ethers';
 import PQueue from 'p-queue';
 import { Endpoints } from '@sentio/runtime';
+import { BaseContext } from '../core/index.js';
 export const DummyProvider = new JsonRpcProvider('', Network.from(1));
 const providers = new Map();
-export function getProvider(networkish) {
+export function getNetworkFromCtxOrNetworkish(networkish) {
     if (!networkish) {
         networkish = 1;
     }
+    if (networkish instanceof BaseContext) {
+        networkish = networkish.getChainId();
+    }
     if (typeof networkish === 'string') {
         const id = parseInt(networkish);
         if (!isNaN(id)) {
             networkish = 1;
         }
     }
-    const network = Network.from(networkish);
+    return Network.from(networkish);
+}
+export function getProvider(networkish) {
+    const network = getNetworkFromCtxOrNetworkish(networkish);
     // TODO check if other key needed
     const address = Endpoints.INSTANCE.chainServer.get(network.chainId.toString());
     const key = network.chainId.toString() + '-' + address;

package/lib/eth/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Provider, Network, JsonRpcProvider } from 'ethers'\nimport { Networkish } from 'ethers/providers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\nexport function getProvider(networkish?: Networkish): Provider {\n  if (!networkish) {\n    networkish = 1\n  }\n  if (typeof networkish === 'string') {\n    const id = parseInt(networkish)\n    if (!isNaN(id)) {\n      networkish = 1\n    }\n  }\n  const network = Network.from(networkish)\n  // TODO check if other key needed\n\n  const address = Endpoints.INSTANCE.chainServer.get(network.chainId.toString())\n  const key = network.chainId.toString() + '-' + address\n  let provider = providers.get(key)\n\n  if (provider) {\n    return provider\n  }\n\n  if (address === undefined) {\n    throw Error(\n      'Provider not found for chain ' +\n        network.chainId +\n        ', configured chains: ' +\n        [...Endpoints.INSTANCE.chainServer.keys()].join(' ')\n    )\n  }\n  provider = new QueuedStaticJsonRpcProvider(address, Network.from(network), Endpoints.INSTANCE.concurrency)\n  providers.set(network.chainId.toString(), provider)\n  return provider\n}\n\nfunction getTag(prefix: string, value: any): string {\n  return (\n    prefix +\n    ':' +\n    JSON.stringify(value, (k, v) => {\n      if (v == null) {\n        return 'null'\n      }\n      if (typeof v === 'bigint') {\n        return `bigint:${v.toString()}`\n      }\n      if (typeof v === 'string') {\n        return v.toLowerCase()\n      }\n\n      // Sort object keys\n      if (typeof v === 'object' && !Array.isArray(v)) {\n        const keys = Object.keys(v)\n        keys.sort()\n        return keys.reduce((accum, key) => {\n          accum[key] = v[key]\n          return accum\n        }, <any>{})\n      }\n\n      return v\n    })\n  )\n}\n\nclass QueuedStaticJsonRpcProvider extends JsonRpcProvider {\n  executor: PQueue\n  #performCache = new Map<string, Promise<any>>()\n\n  constructor(url: string, network: Network, concurrency: number) {\n    // TODO re-enable match when possible\n    super(url, network, { staticNetwork: network, batchMaxCount: 1 })\n    this.executor = new PQueue({ concurrency: concurrency })\n  }\n\n  async send(method: string, params: Array<any>): Promise<any> {\n    const tag = getTag(method, params)\n    const block = params[params.length - 1]\n    let perform = this.#performCache.get(tag)\n    if (!perform) {\n      perform = this.executor.add(() => super.send(method, params))\n      this.#performCache.set(tag, perform)\n      // For non latest block call, we cache permanently, otherwise we cache for one minute\n      if (block === 'latest') {\n        setTimeout(() => {\n          if (this.#performCache.get(tag) === perform) {\n            this.#performCache.delete(tag)\n          }\n        }, 60 * 1000)\n      }\n    }\n\n    const result = await perform\n    if (!result) {\n      throw Error('Unexpected null response')\n    }\n    return result\n  }\n}\n"]}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/eth/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAA;AAG3D,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,eAAe,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAA;AAEpD,MAAM,UAAU,6BAA6B,CAAC,UAAqC;IACjF,IAAI,CAAC,UAAU,EAAE;QACf,UAAU,GAAG,CAAC,CAAA;KACf;IACD,IAAI,UAAU,YAAY,WAAW,EAAE;QACrC,UAAU,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;KACrC;IACD,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,MAAM,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAA;QAC/B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YACd,UAAU,GAAG,CAAC,CAAA;SACf;KACF;IACD,OAAO,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;AACjC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,UAAuB;IACjD,MAAM,OAAO,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAA;IACzD,iCAAiC;IAEjC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC9E,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,OAAO,CAAA;IACtD,IAAI,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEjC,IAAI,QAAQ,EAAE;QACZ,OAAO,QAAQ,CAAA;KAChB;IAED,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,KAAK,CACT,+BAA+B;YAC7B,OAAO,CAAC,OAAO;YACf,uBAAuB;YACvB,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACvD,CAAA;KACF;IACD,QAAQ,GAAG,IAAI,2BAA2B,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;IAC1G,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAA;IACnD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,SAAS,MAAM,CAAC,MAAc,EAAE,KAAU;IACxC,OAAO,CACL,MAAM;QACN,GAAG;QACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7B,IAAI,CAAC,IAAI,IAAI,EAAE;gBACb,OAAO,MAAM,CAAA;aACd;YACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACzB,OAAO,UAAU,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAA;aAChC;YACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;gBACzB,OAAO,CAAC,CAAC,WAAW,EAAE,CAAA;aACvB;YAED,mBAAmB;YACnB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBAC3B,IAAI,CAAC,IAAI,EAAE,CAAA;gBACX,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;oBAChC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAA;oBACnB,OAAO,KAAK,CAAA;gBACd,CAAC,EAAO,EAAE,CAAC,CAAA;aACZ;YAED,OAAO,CAAC,CAAA;QACV,CAAC,CAAC,CACH,CAAA;AACH,CAAC;AAED,MAAM,2BAA4B,SAAQ,eAAe;IACvD,QAAQ,CAAQ;IAChB,aAAa,GAAG,IAAI,GAAG,EAAwB,CAAA;IAE/C,YAAY,GAAW,EAAE,OAAgB,EAAE,WAAmB;QAC5D,qCAAqC;QACrC,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC,CAAA;QACjE,IAAI,CAAC,QAAQ,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,MAAkB;QAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QACvC,IAAI,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;YAC7D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YACpC,qFAAqF;YACrF,IAAI,KAAK,KAAK,QAAQ,EAAE;gBACtB,UAAU,CAAC,GAAG,EAAE;oBACd,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE;wBAC3C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;qBAC/B;gBACH,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAA;aACd;SACF;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAA;QAC5B,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;SACxC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;CACF","sourcesContent":["import { Provider, Network, JsonRpcProvider } from 'ethers'\nimport { Networkish } from 'ethers/providers'\n\nimport PQueue from 'p-queue'\nimport { Endpoints } from '@sentio/runtime'\nimport { BaseContext } from '../core/index.js'\n\nexport const DummyProvider = new JsonRpcProvider('', Network.from(1))\n\nconst providers = new Map<string, JsonRpcProvider>()\n\nexport function getNetworkFromCtxOrNetworkish(networkish?: BaseContext | Networkish) {\n  if (!networkish) {\n    networkish = 1\n  }\n  if (networkish instanceof BaseContext) {\n    networkish = networkish.getChainId()\n  }\n  if (typeof networkish === 'string') {\n    const id = parseInt(networkish)\n    if (!isNaN(id)) {\n      networkish = 1\n    }\n  }\n  return Network.from(networkish)\n}\n\nexport function getProvider(networkish?: Networkish): Provider {\n  const network = getNetworkFromCtxOrNetworkish(networkish)\n  // TODO check if other key needed\n\n  const address = Endpoints.INSTANCE.chainServer.get(network.chainId.toString())\n  const key = network.chainId.toString() + '-' + address\n  let provider = providers.get(key)\n\n  if (provider) {\n    return provider\n  }\n\n  if (address === undefined) {\n    throw Error(\n      'Provider not found for chain ' +\n        network.chainId +\n        ', configured chains: ' +\n        [...Endpoints.INSTANCE.chainServer.keys()].join(' ')\n    )\n  }\n  provider = new QueuedStaticJsonRpcProvider(address, Network.from(network), Endpoints.INSTANCE.concurrency)\n  providers.set(network.chainId.toString(), provider)\n  return provider\n}\n\nfunction getTag(prefix: string, value: any): string {\n  return (\n    prefix +\n    ':' +\n    JSON.stringify(value, (k, v) => {\n      if (v == null) {\n        return 'null'\n      }\n      if (typeof v === 'bigint') {\n        return `bigint:${v.toString()}`\n      }\n      if (typeof v === 'string') {\n        return v.toLowerCase()\n      }\n\n      // Sort object keys\n      if (typeof v === 'object' && !Array.isArray(v)) {\n        const keys = Object.keys(v)\n        keys.sort()\n        return keys.reduce((accum, key) => {\n          accum[key] = v[key]\n          return accum\n        }, <any>{})\n      }\n\n      return v\n    })\n  )\n}\n\nclass QueuedStaticJsonRpcProvider extends JsonRpcProvider {\n  executor: PQueue\n  #performCache = new Map<string, Promise<any>>()\n\n  constructor(url: string, network: Network, concurrency: number) {\n    // TODO re-enable match when possible\n    super(url, network, { staticNetwork: network, batchMaxCount: 1 })\n    this.executor = new PQueue({ concurrency: concurrency })\n  }\n\n  async send(method: string, params: Array<any>): Promise<any> {\n    const tag = getTag(method, params)\n    const block = params[params.length - 1]\n    let perform = this.#performCache.get(tag)\n    if (!perform) {\n      perform = this.executor.add(() => super.send(method, params))\n      this.#performCache.set(tag, perform)\n      // For non latest block call, we cache permanently, otherwise we cache for one minute\n      if (block === 'latest') {\n        setTimeout(() => {\n          if (this.#performCache.get(tag) === perform) {\n            this.#performCache.delete(tag)\n          }\n        }, 60 * 1000)\n      }\n    }\n\n    const result = await perform\n    if (!result) {\n      throw Error('Unexpected null response')\n    }\n    return result\n  }\n}\n"]}

package/lib/solana/solana-context.d.ts

@@ -5,5 +5,6 @@ export declare class SolanaContext extends BaseContext {
     programName: string;
     blockNumber: bigint;
     constructor(programName: string, network: string, address: string, slot: bigint);
+    getChainId(): string;
     getMetaData(name: string, labels: Labels): RecordMetaData;
 }

package/lib/solana/solana-context.js

@@ -11,6 +11,9 @@ export class SolanaContext extends BaseContext {
         this.address = address;
         this.blockNumber = slot;
     }
+    getChainId() {
+        return this.network;
+    }
     getMetaData(name, labels) {
         return {
             address: this.address,
@@ -19,7 +22,7 @@ export class SolanaContext extends BaseContext {
             transactionIndex: 0,
             transactionHash: '',
             logIndex: 0,
-            chainId: this.network,
+            chainId: this.getChainId(),
             name: name,
             labels: normalizeLabels(labels),
         };

package/lib/solana/solana-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"solana-context.js","sourceRoot":"","sources":["../../src/solana/solana-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,WAAW,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAA;AAE7F,MAAM,OAAO,aAAc,SAAQ,WAAW;IAC5C,OAAO,CAAQ;IACf,OAAO,CAAQ;IACf,WAAW,CAAQ;IACnB,WAAW,CAAQ;IAEnB,YAAY,WAAmB,EAAE,OAAe,EAAE,OAAe,EAAE,IAAY;QAC7E,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,SAAS,CAAC,cAAc,CAAA;QAClD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,MAAc;QACtC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,WAAW;YAC9B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF","sourcesContent":["import { normalizeLabels, Labels, BaseContext, RecordMetaData, CHAIN_IDS } from '@sentio/sdk'\n\nexport class SolanaContext extends BaseContext {\n  network: string\n  address: string\n  programName: string\n  blockNumber: bigint\n\n  constructor(programName: string, network: string, address: string, slot: bigint) {\n    super()\n    this.network = network || CHAIN_IDS.SOLANA_MAINNET\n    this.programName = programName\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.programName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO add\n      logIndex: 0,\n      chainId: this.network,\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}
+{"version":3,"file":"solana-context.js","sourceRoot":"","sources":["../../src/solana/solana-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,WAAW,EAAkB,SAAS,EAAE,MAAM,aAAa,CAAA;AAE7F,MAAM,OAAO,aAAc,SAAQ,WAAW;IAC5C,OAAO,CAAQ;IACf,OAAO,CAAQ;IACf,WAAW,CAAQ;IACnB,WAAW,CAAQ;IAEnB,YAAY,WAAmB,EAAE,OAAe,EAAE,OAAe,EAAE,IAAY;QAC7E,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,SAAS,CAAC,cAAc,CAAA;QAClD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,MAAc;QACtC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,WAAW;YAC9B,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,EAAE;YACnB,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;YAC1B,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF","sourcesContent":["import { normalizeLabels, Labels, BaseContext, RecordMetaData, CHAIN_IDS } from '@sentio/sdk'\n\nexport class SolanaContext extends BaseContext {\n  network: string\n  address: string\n  programName: string\n  blockNumber: bigint\n\n  constructor(programName: string, network: string, address: string, slot: bigint) {\n    super()\n    this.network = network || CHAIN_IDS.SOLANA_MAINNET\n    this.programName = programName\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getChainId(): string {\n    return this.network\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.programName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO add\n      logIndex: 0,\n      chainId: this.getChainId(),\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}

package/lib/sui/context.d.ts

@@ -10,5 +10,6 @@ export declare class SuiContext extends BaseContext {
     slot: bigint;
     transaction: SuiTransactionResponse;
     constructor(moduleName: string, network: SuiNetwork, address: string, timestamp: Date, slot: bigint, transaction?: SuiTransactionResponse);
+    getChainId(): string;
     getMetaData(name: string, labels: Labels): RecordMetaData;
 }

package/lib/sui/context.js

@@ -18,6 +18,9 @@ export class SuiContext extends BaseContext {
             this.transaction = transaction;
         }
     }
+    getChainId() {
+        return getChainId(this.network);
+    }
     getMetaData(name, labels) {
         return {
             address: this.address,
@@ -26,7 +29,7 @@ export class SuiContext extends BaseContext {
             transactionIndex: 0,
             transactionHash: this.transaction?.certificate.transactionDigest || '',
             logIndex: 0,
-            chainId: getChainId(this.network),
+            chainId: this.getChainId(),
             name: name,
             labels: normalizeLabels(labels),
         };

package/lib/sui/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/sui/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,EAAc,UAAU,EAAE,MAAM,cAAc,CAAA;AAGrD,MAAM,OAAO,UAAW,SAAQ,WAAW;IACzC,OAAO,CAAQ;IACf,OAAO,CAAY;IACnB,UAAU,CAAQ;IAClB,SAAS,CAAM;IACf,IAAI,CAAQ;IACZ,WAAW,CAAwB;IAEnC,YACE,UAAkB,EAClB,OAAmB,EACnB,OAAe,EACf,SAAe,EACf,IAAY,EACZ,WAAoC;QAEpC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;SAC/B;IACH,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,MAAc;QACtC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,UAAU;YAC7B,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,iBAAiB,IAAI,EAAE;YACtE,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC;YACjC,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF","sourcesContent":["import { RecordMetaData } from '@sentio/protos'\nimport { type Labels, BaseContext, normalizeLabels } from '../index.js'\nimport { SuiNetwork, getChainId } from './network.js'\nimport { SuiTransactionResponse } from '@mysten/sui.js'\n\nexport class SuiContext extends BaseContext {\n  address: string\n  network: SuiNetwork\n  moduleName: string\n  timestamp: Date\n  slot: bigint\n  transaction: SuiTransactionResponse\n\n  constructor(\n    moduleName: string,\n    network: SuiNetwork,\n    address: string,\n    timestamp: Date,\n    slot: bigint,\n    transaction?: SuiTransactionResponse\n  ) {\n    super()\n    this.address = address.toLowerCase()\n    this.network = network\n    this.moduleName = moduleName\n    this.timestamp = timestamp\n    this.slot = slot\n    if (transaction) {\n      this.transaction = transaction\n    }\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.slot,\n      transactionIndex: 0,\n      transactionHash: this.transaction?.certificate.transactionDigest || '', // TODO\n      logIndex: 0,\n      chainId: getChainId(this.network),\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/sui/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,EAAc,UAAU,EAAE,MAAM,cAAc,CAAA;AAGrD,MAAM,OAAO,UAAW,SAAQ,WAAW;IACzC,OAAO,CAAQ;IACf,OAAO,CAAY;IACnB,UAAU,CAAQ;IAClB,SAAS,CAAM;IACf,IAAI,CAAQ;IACZ,WAAW,CAAwB;IAEnC,YACE,UAAkB,EAClB,OAAmB,EACnB,OAAe,EACf,SAAe,EACf,IAAY,EACZ,WAAoC;QAEpC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;SAC/B;IACH,CAAC;IAED,UAAU;QACR,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACjC,CAAC;IAED,WAAW,CAAC,IAAY,EAAE,MAAc;QACtC,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,UAAU;YAC7B,WAAW,EAAE,IAAI,CAAC,IAAI;YACtB,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,iBAAiB,IAAI,EAAE;YACtE,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;YAC1B,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF","sourcesContent":["import { RecordMetaData } from '@sentio/protos'\nimport { type Labels, BaseContext, normalizeLabels } from '../index.js'\nimport { SuiNetwork, getChainId } from './network.js'\nimport { SuiTransactionResponse } from '@mysten/sui.js'\n\nexport class SuiContext extends BaseContext {\n  address: string\n  network: SuiNetwork\n  moduleName: string\n  timestamp: Date\n  slot: bigint\n  transaction: SuiTransactionResponse\n\n  constructor(\n    moduleName: string,\n    network: SuiNetwork,\n    address: string,\n    timestamp: Date,\n    slot: bigint,\n    transaction?: SuiTransactionResponse\n  ) {\n    super()\n    this.address = address.toLowerCase()\n    this.network = network\n    this.moduleName = moduleName\n    this.timestamp = timestamp\n    this.slot = slot\n    if (transaction) {\n      this.transaction = transaction\n    }\n  }\n\n  getChainId(): string {\n    return getChainId(this.network)\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.slot,\n      transactionIndex: 0,\n      transactionHash: this.transaction?.certificate.transactionDigest || '', // TODO\n      logIndex: 0,\n      chainId: this.getChainId(),\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}

package/lib/utils/erc20.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"erc20.test.js","sourceRoot":"","sources":["../../src/utils/erc20.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAA;AAEtE,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,KAAK,CAAC,KAAK,EAAE,CAAA;IACb,oBAAoB;IAEpB,MAAM,aAAa,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAA;IAEnD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAE/C,MAAM,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,4CAA4C,CAAC,CAAA;QAElF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QAC/B,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,4CAA4C,CAAC,CAAA;QAElF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { State } from '@sentio/runtime'\nimport { getERC20TokenInfo } from './token.js'\nimport { loadTestProvidersFromEnv } from '../testing/test-provider.js'\n\ndescribe('erc20 tests', () => {\n  State.reset()\n  // Endpoints.reset()\n\n  const haveProviders = loadTestProvidersFromEnv('1')\n\n  const testIf = haveProviders ? test : test.skip\n\n  testIf('test bytes32', async () => {\n    const info = await getERC20TokenInfo('0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2')\n\n    expect(info.decimal).toEqual(18)\n    expect(info.symbol).toEqual('MKR')\n    expect(info.name).toEqual('Maker')\n  })\n\n  testIf('test normal', async () => {\n    const info = await getERC20TokenInfo('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48')\n\n    expect(info.decimal).toEqual(6)\n    expect(info.symbol).toEqual('USDC')\n    expect(info.name).toEqual('USD Coin')\n  })\n})\n"]}
+{"version":3,"file":"erc20.test.js","sourceRoot":"","sources":["../../src/utils/erc20.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAA;AAEtE,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,KAAK,CAAC,KAAK,EAAE,CAAA;IACb,oBAAoB;IAEpB,MAAM,aAAa,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAA;IAEnD,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAE/C,MAAM,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,4CAA4C,EAAE,CAAC,CAAC,CAAA;QAErF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;QAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QAC/B,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,4CAA4C,EAAE,CAAC,CAAC,CAAA;QAErF,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACvC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { State } from '@sentio/runtime'\nimport { getERC20TokenInfo } from './token.js'\nimport { loadTestProvidersFromEnv } from '../testing/test-provider.js'\n\ndescribe('erc20 tests', () => {\n  State.reset()\n  // Endpoints.reset()\n\n  const haveProviders = loadTestProvidersFromEnv('1')\n\n  const testIf = haveProviders ? test : test.skip\n\n  testIf('test bytes32', async () => {\n    const info = await getERC20TokenInfo('0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2', 1)\n\n    expect(info.decimal).toEqual(18)\n    expect(info.symbol).toEqual('MKR')\n    expect(info.name).toEqual('Maker')\n  })\n\n  testIf('test normal', async () => {\n    const info = await getERC20TokenInfo('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', 1)\n\n    expect(info.decimal).toEqual(6)\n    expect(info.symbol).toEqual('USDC')\n    expect(info.name).toEqual('USD Coin')\n  })\n})\n"]}

package/lib/utils/token.d.ts

@@ -1,4 +1,6 @@
 import { BigDecimal } from '../core/big-decimal.js';
+import { Networkish } from 'ethers';
+import { BaseContext } from '../core/index.js';
 export interface TokenInfo {
     symbol: string;
     name: string;
@@ -9,5 +11,5 @@ export declare const NATIVE_ETH: {
     decimal: number;
     name: string;
 };
-export declare function getERC20TokenInfo(tokenAddress: string, chainId?: number): Promise<TokenInfo>;
-export declare function getER20NormalizedAmount(tokenAddress: string, amount: bigint, chainId: number): Promise<BigDecimal>;
+export declare function getERC20TokenInfo(tokenAddress: string, contextOrNetworkish: BaseContext | Networkish): Promise<TokenInfo>;
+export declare function getER20NormalizedAmount(tokenAddress: string, amount: bigint, contextOrNetworkish: BaseContext | Networkish): Promise<BigDecimal>;

package/lib/utils/token.js

@@ -2,6 +2,7 @@ import { getERC20Contract } from '../eth/builtin/erc20.js';
 import { getERC20BytesContract } from '../eth/builtin/erc20bytes.js';
 import { scaleDown } from '../core/big-decimal.js';
 import { decodeBytes32String } from 'ethers';
+import { getNetworkFromCtxOrNetworkish } from '../eth/index.js';
 export const NATIVE_ETH = {
     symbol: 'ETH',
     decimal: 18,
@@ -15,7 +16,8 @@ async function getTokenInfoPromise(symbol, name, decimal) {
         decimal: Number(await decimal),
     };
 }
-export async function getERC20TokenInfo(tokenAddress, chainId = 1) {
+export async function getERC20TokenInfo(tokenAddress, contextOrNetworkish) {
+    const chainId = getNetworkFromCtxOrNetworkish(contextOrNetworkish).chainId.toString();
     const key = chainId + tokenAddress;
     const res = TOKEN_INFOS.get(key);
     if (res) {
@@ -42,8 +44,8 @@ export async function getERC20TokenInfo(tokenAddress, chainId = 1) {
     TOKEN_INFOS.set(key, info);
     return info;
 }
-export async function getER20NormalizedAmount(tokenAddress, amount, chainId) {
-    const tokenInfo = await getERC20TokenInfo(tokenAddress, chainId);
+export async function getER20NormalizedAmount(tokenAddress, amount, contextOrNetworkish) {
+    const tokenInfo = await getERC20TokenInfo(tokenAddress, contextOrNetworkish);
     return scaleDown(amount, tokenInfo.decimal);
 }
 //# sourceMappingURL=token.js.map

package/lib/utils/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAA;AAQ5C,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,YAAY;CACnB,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAA;AAEzD,KAAK,UAAU,mBAAmB,CAChC,MAAuC,EACvC,IAAqC,EACrC,OAA+B;IAE/B,OAAO;QACL,MAAM,EAAE,MAAM,MAAM;QACpB,IAAI,EAAE,MAAM,IAAI;QAChB,OAAO,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAoB,EAAE,OAAO,GAAG,CAAC;IACvE,MAAM,GAAG,GAAG,OAAO,GAAG,YAAY,CAAA;IAClC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,GAAG,EAAE;QACP,OAAO,GAAG,CAAA;KACX;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,qBAAqB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAElE,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI;QACF,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;KACvD;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI;QACF,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;KAC3D;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,YAAoB,EACpB,MAAc,EACd,OAAe;IAEf,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAChE,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { getERC20Contract } from '../eth/builtin/erc20.js'\nimport { getERC20BytesContract } from '../eth/builtin/erc20bytes.js'\nimport { BigDecimal, scaleDown } from '../core/big-decimal.js'\nimport { PromiseOrValue } from '../eth/builtin/internal/common.js'\nimport { decodeBytes32String } from 'ethers'\n\nexport interface TokenInfo {\n  symbol: string\n  name: string\n  decimal: number\n}\n\nexport const NATIVE_ETH = {\n  symbol: 'ETH',\n  decimal: 18,\n  name: 'Native ETH',\n}\n\nconst TOKEN_INFOS = new Map<string, Promise<TokenInfo>>()\n\nasync function getTokenInfoPromise(\n  symbol: PromiseOrValue<string> | string,\n  name: PromiseOrValue<string> | string,\n  decimal: PromiseOrValue<bigint>\n): Promise<TokenInfo> {\n  return {\n    symbol: await symbol,\n    name: await name,\n    decimal: Number(await decimal),\n  }\n}\n\nexport async function getERC20TokenInfo(tokenAddress: string, chainId = 1): Promise<TokenInfo> {\n  const key = chainId + tokenAddress\n  const res = TOKEN_INFOS.get(key)\n  if (res) {\n    return res\n  }\n  const contract = getERC20Contract(tokenAddress, chainId)\n  const bytesContract = getERC20BytesContract(tokenAddress, chainId)\n\n  let name = ''\n  try {\n    name = await contract.name()\n  } catch (e) {\n    name = decodeBytes32String(await bytesContract.name())\n  }\n\n  let symbol = ''\n  try {\n    symbol = await contract.symbol()\n  } catch (e) {\n    symbol = decodeBytes32String(await bytesContract.symbol())\n  }\n\n  const decimal = await contract.decimals()\n  const info = getTokenInfoPromise(symbol, name, decimal)\n\n  TOKEN_INFOS.set(key, info)\n  return info\n}\n\nexport async function getER20NormalizedAmount(\n  tokenAddress: string,\n  amount: bigint,\n  chainId: number\n): Promise<BigDecimal> {\n  const tokenInfo = await getERC20TokenInfo(tokenAddress, chainId)\n  return scaleDown(amount, tokenInfo.decimal)\n}\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAc,MAAM,QAAQ,CAAA;AAExD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAA;AAQ/D,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,YAAY;CACnB,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAA;AAEzD,KAAK,UAAU,mBAAmB,CAChC,MAAuC,EACvC,IAAqC,EACrC,OAA+B;IAE/B,OAAO;QACL,MAAM,EAAE,MAAM,MAAM;QACpB,IAAI,EAAE,MAAM,IAAI;QAChB,OAAO,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,YAAoB,EACpB,mBAA6C;IAE7C,MAAM,OAAO,GAAG,6BAA6B,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;IACrF,MAAM,GAAG,GAAG,OAAO,GAAG,YAAY,CAAA;IAClC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,GAAG,EAAE;QACP,OAAO,GAAG,CAAA;KACX;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,qBAAqB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAElE,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI;QACF,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;KACvD;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI;QACF,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;KAC3D;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,YAAoB,EACpB,MAAc,EACd,mBAA6C;IAE7C,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;IAC5E,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { getERC20Contract } from '../eth/builtin/erc20.js'\nimport { getERC20BytesContract } from '../eth/builtin/erc20bytes.js'\nimport { BigDecimal, scaleDown } from '../core/big-decimal.js'\nimport { PromiseOrValue } from '../eth/builtin/internal/common.js'\nimport { decodeBytes32String, Networkish } from 'ethers'\nimport { BaseContext } from '../core/index.js'\nimport { getNetworkFromCtxOrNetworkish } from '../eth/index.js'\n\nexport interface TokenInfo {\n  symbol: string\n  name: string\n  decimal: number\n}\n\nexport const NATIVE_ETH = {\n  symbol: 'ETH',\n  decimal: 18,\n  name: 'Native ETH',\n}\n\nconst TOKEN_INFOS = new Map<string, Promise<TokenInfo>>()\n\nasync function getTokenInfoPromise(\n  symbol: PromiseOrValue<string> | string,\n  name: PromiseOrValue<string> | string,\n  decimal: PromiseOrValue<bigint>\n): Promise<TokenInfo> {\n  return {\n    symbol: await symbol,\n    name: await name,\n    decimal: Number(await decimal),\n  }\n}\n\nexport async function getERC20TokenInfo(\n  tokenAddress: string,\n  contextOrNetworkish: BaseContext | Networkish\n): Promise<TokenInfo> {\n  const chainId = getNetworkFromCtxOrNetworkish(contextOrNetworkish).chainId.toString()\n  const key = chainId + tokenAddress\n  const res = TOKEN_INFOS.get(key)\n  if (res) {\n    return res\n  }\n  const contract = getERC20Contract(tokenAddress, chainId)\n  const bytesContract = getERC20BytesContract(tokenAddress, chainId)\n\n  let name = ''\n  try {\n    name = await contract.name()\n  } catch (e) {\n    name = decodeBytes32String(await bytesContract.name())\n  }\n\n  let symbol = ''\n  try {\n    symbol = await contract.symbol()\n  } catch (e) {\n    symbol = decodeBytes32String(await bytesContract.symbol())\n  }\n\n  const decimal = await contract.decimals()\n  const info = getTokenInfoPromise(symbol, name, decimal)\n\n  TOKEN_INFOS.set(key, info)\n  return info\n}\n\nexport async function getER20NormalizedAmount(\n  tokenAddress: string,\n  amount: bigint,\n  contextOrNetworkish: BaseContext | Networkish\n): Promise<BigDecimal> {\n  const tokenInfo = await getERC20TokenInfo(tokenAddress, contextOrNetworkish)\n  return scaleDown(amount, tokenInfo.decimal)\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.7.4-rc.2",
+  "version": "2.8.0-rc.2",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -23,8 +23,8 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.25",
-    "@sentio/protos": "^2.7.4-rc.2",
-    "@sentio/runtime": "^2.7.4-rc.2",
+    "@sentio/protos": "^2.8.0-rc.2",
+    "@sentio/runtime": "^2.8.0-rc.2",
     "@solana/web3.js": "^1.73.2",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.7.1",
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "5f121c6585d0175729927c13d1e3aea8fce741ad"
+  "gitHead": "1ec4e97cc7cf3f0cca1bba30d11f89d77b87e85c"
 }

package/src/aptos/context.ts

@@ -27,6 +27,10 @@ export class AptosContext extends BaseContext {
     }
   }
 
+  getChainId(): string {
+    return getChainId(this.network)
+  }
+
   getMetaData(name: string, labels: Labels): RecordMetaData {
     return {
       address: this.address,
@@ -35,7 +39,7 @@ export class AptosContext extends BaseContext {
       transactionIndex: 0,
       transactionHash: this.transaction?.hash || '', // TODO
       logIndex: 0,
-      chainId: getChainId(this.network),
+      chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels),
     }
@@ -56,6 +60,10 @@ export class AptosResourceContext extends BaseContext {
     this.timestampInMicros = timestampInMicros
   }
 
+  getChainId(): string {
+    return getChainId(this.network)
+  }
+
   getMetaData(name: string, labels: Labels): RecordMetaData {
     return {
       address: this.address,
@@ -64,7 +72,7 @@ export class AptosResourceContext extends BaseContext {
       transactionIndex: 0,
       transactionHash: '',
       logIndex: 0,
-      chainId: getChainId(this.network),
+      chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels),
     }

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

@@ -84,12 +84,14 @@ export class AptosDex<T> {
     if (resultX.gt(0)) {
       this.volumeByCoin.record(ctx, resultX, {
         coin: coinXInfo.symbol,
+        bridge: coinXInfo.bridge,
         type: coinXInfo.token_type.type,
       })
     }
     if (resultY.gt(0)) {
       this.volumeByCoin.record(ctx, resultY, {
         coin: coinYInfo.symbol,
+        bridge: coinYInfo.bridge,
         type: coinYInfo.token_type.type,
       })
     }

package/src/core/base-context.ts

@@ -23,4 +23,6 @@ export abstract class BaseContext {
   }
 
   abstract getMetaData(name: string, labels: Labels): RecordMetaData
+
+  abstract getChainId(): string
 }

package/src/eth/builtin/internal/eacaggregatorproxy-processor.ts

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { EACAggregatorProxy, EACAggregatorProxy__factory } from "./index.js";
@@ -1086,8 +1088,9 @@ export class EACAggregatorProxyProcessorTemplate extends BaseProcessorTemplate<
 
 export function getEACAggregatorProxyContract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): EACAggregatorProxyContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "EACAggregatorProxy",
     address,

package/src/eth/builtin/internal/eacaggregatorproxy-test-utils.ts

@@ -24,7 +24,7 @@ export function mockAnswerUpdatedLog(
   contractAddress: string,
   event: AnswerUpdatedEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "AnswerUpdated(int256,uint256,uint256)",
     [event.current, event.roundId, event.updatedAt]
@@ -42,7 +42,7 @@ export function mockNewRoundLog(
   contractAddress: string,
   event: NewRoundEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "NewRound(uint256,address,uint256)",
     [event.roundId, event.startedBy, event.startedAt]
@@ -60,7 +60,7 @@ export function mockOwnershipTransferRequestedLog(
   contractAddress: string,
   event: OwnershipTransferRequestedEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferRequested(address,address)",
     [event.from, event.to]
@@ -78,7 +78,7 @@ export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferred(address,address)",
     [event.from, event.to]

package/src/eth/builtin/internal/erc1155-processor.ts

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC1155, ERC1155__factory } from "./index.js";
@@ -509,8 +511,9 @@ export class ERC1155ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC1155Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC1155ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC1155",
     address,

package/src/eth/builtin/internal/erc1155-test-utils.ts

@@ -24,7 +24,7 @@ export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "ApprovalForAll(address,address,bool)",
     [event.account, event.operator, event.approved]
@@ -42,7 +42,7 @@ export function mockTransferBatchLog(
   contractAddress: string,
   event: TransferBatchEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "TransferBatch(address,address,address,uint256[],uint256[])",
     [event.operator, event.from, event.to, event.ids, event.values]
@@ -60,7 +60,7 @@ export function mockTransferSingleLog(
   contractAddress: string,
   event: TransferSingleEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "TransferSingle(address,address,address,uint256,uint256)",
     [event.operator, event.from, event.to, event.id, event.value]
@@ -78,7 +78,7 @@ export function mockURILog(
   contractAddress: string,
   event: URIEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "URI(string,uint256)",
     [event.value, event.id]

package/src/eth/builtin/internal/erc20-processor.ts

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC20, ERC20__factory } from "./index.js";
@@ -622,8 +624,9 @@ export class ERC20ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC20Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC20ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC20",
     address,

package/src/eth/builtin/internal/erc20-test-utils.ts

@@ -23,7 +23,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC20Contract(contractAddress);
+  const contract = getERC20Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
@@ -41,7 +41,7 @@ export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
 ): LogParams {
-  const contract = getERC20Contract(contractAddress);
+  const contract = getERC20Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferred(address,address)",
     [event.previousOwner, event.newOwner]
@@ -59,7 +59,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC20Contract(contractAddress);
+  const contract = getERC20Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]

package/src/eth/builtin/internal/erc20bytes-processor.ts

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC20Bytes, ERC20Bytes__factory } from "./index.js";
@@ -418,8 +420,9 @@ export class ERC20BytesProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC20BytesContract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC20BytesContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC20Bytes",
     address,

package/src/eth/builtin/internal/erc20bytes-test-utils.ts

@@ -19,7 +19,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(contractAddress);
+  const contract = getERC20BytesContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
@@ -37,7 +37,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(contractAddress);
+  const contract = getERC20BytesContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]

package/src/eth/builtin/internal/erc721-processor.ts

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC721, ERC721__factory } from "./index.js";
@@ -639,8 +641,9 @@ export class ERC721ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC721Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC721ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC721",
     address,

package/src/eth/builtin/internal/erc721-test-utils.ts

@@ -23,7 +23,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress);
+  const contract = getERC721Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.approved, event.tokenId]
@@ -41,7 +41,7 @@ export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress);
+  const contract = getERC721Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "ApprovalForAll(address,address,bool)",
     [event.owner, event.operator, event.approved]
@@ -59,7 +59,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress);
+  const contract = getERC721Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.tokenId]

package/src/eth/builtin/internal/weth9-processor.ts

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { WETH9, WETH9__factory } from "./index.js";
@@ -492,8 +494,9 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getWETH9Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): WETH9ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "WETH9",
     address,

package/src/eth/builtin/internal/weth9-test-utils.ts

@@ -24,7 +24,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.src, event.guy, event.wad]
@@ -42,7 +42,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.src, event.dst, event.wad]
@@ -60,7 +60,7 @@ export function mockDepositLog(
   contractAddress: string,
   event: DepositEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Deposit(address,uint256)",
     [event.dst, event.wad]
@@ -78,7 +78,7 @@ export function mockWithdrawalLog(
   contractAddress: string,
   event: WithdrawalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Withdrawal(address,uint256)",
     [event.src, event.wad]