@sentio/sdk 2.0.0-rc.19 → 2.0.0-rc.20

package/lib/utils/dex-price.js

@@ -1,8 +1,8 @@
-import { getEACAggregatorProxyContract } from '../builtin/internal/eacaggregatorproxy_processor.js';
+import { getEACAggregatorProxyContract } from '../eth/builtin/internal/eacaggregatorproxy_processor.js';
 import fs from 'fs';
 import { parse } from 'csv-parse/sync';
-import { scaleDown } from './token.js';
 import url from 'url';
+import { scaleDown } from '../core/big-decimal.js';
 export var PriceUnit;
 (function (PriceUnit) {
     PriceUnit[PriceUnit["USD"] = 0] = "USD";

package/lib/utils/dex-price.js.map

@@ -1 +1 @@
-{"version":3,"file":"dex-price.js","sourceRoot":"","sources":["../../src/utils/dex-price.ts"],"names":[],"mappings":"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","sourcesContent":["import { getEACAggregatorProxyContract } from '../builtin/internal/eacaggregatorproxy_processor.js'\nimport fs from 'fs'\nimport { parse } from 'csv-parse/sync'\nimport { BlockTag } from 'ethers/providers'\nimport { scaleDown } from './token.js'\nimport url from 'url'\n\ntype OralceRecord = {\n  Pair: string\n  Asset: string\n  Type: string\n  Address: string\n}\n\nexport enum PriceUnit {\n  USD = 0,\n  ETH = 1,\n  BTC = 2,\n}\n\nexport interface DexPriceResult {\n  price?: number\n  error?: string\n}\n\n// Load price feed from https://docs.chain.link/docs/data-feeds/price-feeds/addresses/?network=ethereum\n// and then use EACAggregatorProxy contract to get price\nclass DexPrice {\n  USD_ORACLE_MAP = new Map<string, string>()\n  ETH_ORACLE_MAP = new Map<string, string>()\n  BTC_ORACLE_MAP = new Map<string, string>()\n  ASSETS_INFOS = new Map<string, number>()\n\n  readonly chainId: number\n\n  constructor(csvFileName: string, chainId: number) {\n    this.chainId = chainId\n    const csvFilePath = url.fileURLToPath(new URL('./' + csvFileName, import.meta.url))\n    const fileContent = fs.readFileSync(csvFilePath, { encoding: 'utf-8' })\n    const headers = ['Pair', 'Asset', 'Type', 'Address']\n\n    const records: OralceRecord[] = parse(fileContent, {\n      delimiter: ',',\n      columns: headers,\n      skip_empty_lines: true,\n    })\n\n    for (const record of records) {\n      const pair = record.Pair.split('/')\n      const asset = pair[0].trim().toLowerCase()\n      const target = pair[1].trim().toLowerCase()\n      const address = record.Address.toLowerCase()\n      if (target === 'usd') {\n        this.USD_ORACLE_MAP.set(asset, address)\n      } else if (target === 'eth') {\n        this.ETH_ORACLE_MAP.set(asset, address)\n      } else if (target == 'btc') {\n        this.BTC_ORACLE_MAP.set(asset, address)\n      } else {\n        console.error('wrong asset record:' + JSON.stringify(record))\n      }\n\n      // console.log(asset, target, address)\n    }\n  }\n\n  // asset: symbol of the asset\n  // unit: usd, eth or btc\n  // blockTag: blockNumber of block symbol like \"latest\"\n  // returns the asset price,\n  // throw exception if calling to price feed failed, e.g. due to a invalid block number\n  async getPrice(\n    asset: string,\n    blockTag: BlockTag = 'latest',\n    unit: PriceUnit = PriceUnit.USD\n  ): Promise<DexPriceResult> {\n    // if (chainId !== 1 && chainId !== 5) {\n    //   return {\n    //     error: \"current dex price only support chain 1 (mainnet) or 5 (goerli)\"\n    //   }\n    // }\n\n    let oracleMap = this.USD_ORACLE_MAP\n    switch (unit) {\n      case PriceUnit.ETH:\n        oracleMap = this.ETH_ORACLE_MAP\n        break\n      case PriceUnit.BTC:\n        oracleMap = this.BTC_ORACLE_MAP\n        break\n      default:\n    }\n\n    asset = asset.trim().toLowerCase()\n\n    const addr = oracleMap.get(asset)\n    if (!addr) {\n      return {\n        error: 'No price feed found for asset',\n      }\n    }\n\n    const contract = getEACAggregatorProxyContract(addr, this.chainId)\n    try {\n      const price = await contract.latestAnswer({\n        blockTag: blockTag,\n      })\n\n      let decimal = this.ASSETS_INFOS.get(asset)\n      if (!decimal) {\n        decimal = Number(await contract.decimals())\n        this.ASSETS_INFOS.set(asset, decimal)\n      }\n\n      return {\n        price: scaleDown(price, decimal).toNumber(),\n      }\n    } catch (e) {\n      return {\n        error:\n          'Price query error for ' +\n          asset +\n          ' failed at ' +\n          addr +\n          ' at chain ' +\n          this.chainId +\n          '. Details: ' +\n          e.toString(),\n      }\n    }\n  }\n}\n\nexport const EthereumDexPrice = new DexPrice('chainlink-oracles.csv', 1)\nexport const GoerliDexPrice = new DexPrice('chainlink-oracles-goerli.csv', 5)\n"]}
+{"version":3,"file":"dex-price.js","sourceRoot":"","sources":["../../src/utils/dex-price.ts"],"names":[],"mappings":"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","sourcesContent":["import { getEACAggregatorProxyContract } from '../eth/builtin/internal/eacaggregatorproxy_processor.js'\nimport fs from 'fs'\nimport { parse } from 'csv-parse/sync'\nimport { BlockTag } from 'ethers/providers'\nimport url from 'url'\nimport { scaleDown } from '../core/big-decimal.js'\n\ntype OralceRecord = {\n  Pair: string\n  Asset: string\n  Type: string\n  Address: string\n}\n\nexport enum PriceUnit {\n  USD = 0,\n  ETH = 1,\n  BTC = 2,\n}\n\nexport interface DexPriceResult {\n  price?: number\n  error?: string\n}\n\n// Load price feed from https://docs.chain.link/docs/data-feeds/price-feeds/addresses/?network=ethereum\n// and then use EACAggregatorProxy contract to get price\nclass DexPrice {\n  USD_ORACLE_MAP = new Map<string, string>()\n  ETH_ORACLE_MAP = new Map<string, string>()\n  BTC_ORACLE_MAP = new Map<string, string>()\n  ASSETS_INFOS = new Map<string, number>()\n\n  readonly chainId: number\n\n  constructor(csvFileName: string, chainId: number) {\n    this.chainId = chainId\n    const csvFilePath = url.fileURLToPath(new URL('./' + csvFileName, import.meta.url))\n    const fileContent = fs.readFileSync(csvFilePath, { encoding: 'utf-8' })\n    const headers = ['Pair', 'Asset', 'Type', 'Address']\n\n    const records: OralceRecord[] = parse(fileContent, {\n      delimiter: ',',\n      columns: headers,\n      skip_empty_lines: true,\n    })\n\n    for (const record of records) {\n      const pair = record.Pair.split('/')\n      const asset = pair[0].trim().toLowerCase()\n      const target = pair[1].trim().toLowerCase()\n      const address = record.Address.toLowerCase()\n      if (target === 'usd') {\n        this.USD_ORACLE_MAP.set(asset, address)\n      } else if (target === 'eth') {\n        this.ETH_ORACLE_MAP.set(asset, address)\n      } else if (target == 'btc') {\n        this.BTC_ORACLE_MAP.set(asset, address)\n      } else {\n        console.error('wrong asset record:' + JSON.stringify(record))\n      }\n\n      // console.log(asset, target, address)\n    }\n  }\n\n  // asset: symbol of the asset\n  // unit: usd, eth or btc\n  // blockTag: blockNumber of block symbol like \"latest\"\n  // returns the asset price,\n  // throw exception if calling to price feed failed, e.g. due to a invalid block number\n  async getPrice(\n    asset: string,\n    blockTag: BlockTag = 'latest',\n    unit: PriceUnit = PriceUnit.USD\n  ): Promise<DexPriceResult> {\n    // if (chainId !== 1 && chainId !== 5) {\n    //   return {\n    //     error: \"current dex price only support chain 1 (mainnet) or 5 (goerli)\"\n    //   }\n    // }\n\n    let oracleMap = this.USD_ORACLE_MAP\n    switch (unit) {\n      case PriceUnit.ETH:\n        oracleMap = this.ETH_ORACLE_MAP\n        break\n      case PriceUnit.BTC:\n        oracleMap = this.BTC_ORACLE_MAP\n        break\n      default:\n    }\n\n    asset = asset.trim().toLowerCase()\n\n    const addr = oracleMap.get(asset)\n    if (!addr) {\n      return {\n        error: 'No price feed found for asset',\n      }\n    }\n\n    const contract = getEACAggregatorProxyContract(addr, this.chainId)\n    try {\n      const price = await contract.latestAnswer({\n        blockTag: blockTag,\n      })\n\n      let decimal = this.ASSETS_INFOS.get(asset)\n      if (!decimal) {\n        decimal = Number(await contract.decimals())\n        this.ASSETS_INFOS.set(asset, decimal)\n      }\n\n      return {\n        price: scaleDown(price, decimal).toNumber(),\n      }\n    } catch (e) {\n      return {\n        error:\n          'Price query error for ' +\n          asset +\n          ' failed at ' +\n          addr +\n          ' at chain ' +\n          this.chainId +\n          '. Details: ' +\n          e.toString(),\n      }\n    }\n  }\n}\n\nexport const EthereumDexPrice = new DexPrice('chainlink-oracles.csv', 1)\nexport const GoerliDexPrice = new DexPrice('chainlink-oracles-goerli.csv', 5)\n"]}

package/lib/utils/token.d.ts

@@ -11,4 +11,3 @@ export declare const NATIVE_ETH: {
 };
 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 scaleDown(amount: bigint, decimal: number | bigint): BigDecimal;

package/lib/utils/token.js

@@ -1,7 +1,6 @@
-import { transformEtherError } from '../error.js';
-import { getERC20Contract } from '../builtin/erc20/index.js';
-import { getERC20BytesContract } from '../builtin/internal/erc20bytes_processor.js';
-import { BigDecimal } from '../core/big-decimal.js';
+import { getERC20Contract } from '../eth/builtin/erc20/index.js';
+import { getERC20BytesContract } from '../eth/builtin/internal/erc20bytes_processor.js';
+import { scaleDown } from '../core/big-decimal.js';
 import { decodeBytes32String } from 'ethers';
 export const NATIVE_ETH = {
     symbol: 'ETH',
@@ -24,37 +23,27 @@ export async function getERC20TokenInfo(tokenAddress, chainId = 1) {
     }
     const contract = getERC20Contract(tokenAddress, chainId);
     const bytesContract = getERC20BytesContract(tokenAddress, chainId);
+    let name = '';
     try {
-        // TODO maybe not do try catch, just do raw call the parse results
-        let name = '';
-        try {
-            name = await contract.name();
-        }
-        catch (e) {
-            name = decodeBytes32String(await bytesContract.name());
-        }
-        let symbol = '';
-        try {
-            symbol = await contract.symbol();
-        }
-        catch (e) {
-            symbol = decodeBytes32String(await bytesContract.symbol());
-        }
-        const decimal = await contract.decimals();
-        const info = getTokenInfoPromise(symbol, name, decimal);
-        TOKEN_INFOS.set(key, info);
-        return info;
+        name = await contract.name();
     }
     catch (e) {
-        throw transformEtherError(e, undefined);
+        name = decodeBytes32String(await bytesContract.name());
     }
+    let symbol = '';
+    try {
+        symbol = await contract.symbol();
+    }
+    catch (e) {
+        symbol = decodeBytes32String(await bytesContract.symbol());
+    }
+    const decimal = await contract.decimals();
+    const info = getTokenInfoPromise(symbol, name, decimal);
+    TOKEN_INFOS.set(key, info);
+    return info;
 }
 export async function getER20NormalizedAmount(tokenAddress, amount, chainId) {
     const tokenInfo = await getERC20TokenInfo(tokenAddress, chainId);
     return scaleDown(amount, tokenInfo.decimal);
 }
-export function scaleDown(amount, decimal) {
-    const divider = new BigDecimal(10).pow(Number(decimal));
-    return amount.asBigDecimal().dividedBy(divider);
-}
 //# 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,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAA;AACnF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAInD,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;QACF,kEAAkE;QAClE,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,IAAI;YACF,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;SACvD;QAED,IAAI,MAAM,GAAG,EAAE,CAAA;QACf,IAAI;YACF,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;SACjC;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;SAC3D;QAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;QACzC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QAEvD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAA;KACZ;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,mBAAmB,CAAC,CAAC,EAAE,SAAS,CAAC,CAAA;KACxC;AACH,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;AAED,MAAM,UAAU,SAAS,CAAC,MAAc,EAAE,OAAwB;IAChE,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;IACvD,OAAO,MAAM,CAAC,YAAY,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;AACjD,CAAC","sourcesContent":["import { transformEtherError } from '../error.js'\nimport { getERC20Contract } from '../builtin/erc20/index.js'\nimport { getERC20BytesContract } from '../builtin/internal/erc20bytes_processor.js'\nimport { BigDecimal } from '../core/big-decimal.js'\n// import { toBigDecimal } from './conversion'\n// import { utils } from 'ethers'\nimport { PromiseOrValue } from '../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  try {\n    // TODO maybe not do try catch, just do raw call the parse results\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  } catch (e) {\n    throw transformEtherError(e, undefined)\n  }\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\nexport function scaleDown(amount: bigint, decimal: number | bigint) {\n  const divider = new BigDecimal(10).pow(Number(decimal))\n  return amount.asBigDecimal().dividedBy(divider)\n}\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAA;AACvF,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAI9D,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/index.js'\nimport { getERC20BytesContract } from '../eth/builtin/internal/erc20bytes_processor.js'\nimport { BigDecimal, scaleDown } from '../core/big-decimal.js'\n// import { toBigDecimal } from './conversion'\n// import { utils } from 'ethers'\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"]}

package/package.json

@@ -1,35 +1,35 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.0.0-rc.19",
+  "version": "2.0.0-rc.20",
   "type": "module",
   "scripts": {
-    "compile_typechain_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
-    "build": "yarn gen && yarn aptos:gen && yarn solana:gen && yarn compile",
+    "build": "yarn gen:eth && yarn gen:aptos && yarn gen:solana && yarn compile",
     "build_all": "yarn lerna run --scope=@sentio/sdk build --include-dependencies",
     "test": "NODE_OPTIONS=--experimental-vm-modules yarn jest",
-    "gen": "yarn compile_typechain_target && yarn gen_bultin_evm",
-    "gen_bultin_evm": "typechain --target lib/target-ethers-sentio/index.cjs --out-dir src/builtin/internal 'src/abis/*.json'",
-    "aptos:gen": "ts-node-esm  ./src/aptos/run-codegen.ts src/aptos/abis src/aptos/builtin && yarn aptos:gen_test",
-    "aptos:gen_test": "ts-node-esm  ./src/aptos/run-codegen.ts src/aptos/tests/abis src/aptos/tests/types",
-    "solana:gen": "ts-node-esm ./src/solana/run-codegen.ts src/solana/tests/abis src/solana/tests/types"
+    "gen:eth": "ts-node-esm ./src/eth/run-codegen.ts src/eth/abis src/eth/builtin && yarn gen:eth_test",
+    "gen:eth_test": "ts-node-esm ./src/eth/run-codegen.ts src/tests/abis/eth ./src/tests/types/eth",
+    "gen:aptos": "ts-node-esm  ./src/aptos/run-codegen.ts src/aptos/abis src/aptos/builtin && yarn gen:aptos_test",
+    "gen:aptos_test": "ts-node-esm  ./src/aptos/run-codegen.ts src/aptos/tests/abis src/aptos/tests/types",
+    "gen:solana": "ts-node-esm ./src/solana/run-codegen.ts src/solana/tests/abis src/solana/tests/types"
   },
   "dependencies": {
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.24",
-    "@sentio/protos": "^2.0.0-rc.19",
-    "@sentio/runtime": "^2.0.0-rc.19",
-    "@sentio/sdk": "^2.0.0-rc.19",
+    "@sentio/protos": "^2.0.0-rc.20",
+    "@sentio/runtime": "^2.0.0-rc.20",
+    "@sentio/sdk": "^2.0.0-rc.20",
     "@solana/web3.js": "^1.47.3",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:@sentio/aptos@^1.6.0",
     "bs58": "^5.0.0",
     "chalk": "^5.2.0",
     "csv-parse": "^5.3.0",
-    "ethers": "npm:@sentio/ethers@^6.0.0-patch.2",
+    "ethers": "npm:@sentio/ethers@^6.0.0-patch.3",
     "google-protobuf": "^3.15.8",
+    "mkdirp": "^2.1.3",
     "nice-grpc": "^2.0.0",
     "p-queue": "^7.3.0",
     "prettier": "^2.8.1",
@@ -43,20 +43,21 @@
   },
   "exports": {
     ".": "./lib/index.js",
-    "./eth": "./lib/eth/index.js",
     "./testing": "./lib/testing/index.js",
-    "./builtin": "./lib/builtin/index.js",
-    "./builtin/erc20": "./lib/builtin/erc20/index.js",
-    "./builtin/erc721": "./lib/builtin/erc721/index.js",
-    "./builtin/erc1155": "./lib/builtin/erc1155/index.js",
-    "./builtin/eacaggregatorproxy": "./lib/builtin/eacaggregatorproxy/index.js",
-    "./builtin/weth9": "./lib/builtin/weth9/index.js",
     "./utils": "./lib/utils/index.js",
+    "./eth": "./lib/eth/index.js",
+    "./eth/codegen": "./lib/eth/codegen/index.js",
+    "./eth/builtin": "./lib/eth/builtin/index.js",
+    "./eth/builtin/erc20": "./lib/eth/builtin/erc20/index.js",
+    "./eth/builtin/erc721": "./lib/eth/builtin/erc721/index.js",
+    "./eth/builtin/erc1155": "./lib/eth/builtin/erc1155/index.js",
+    "./eth/builtin/eacaggregatorproxy": "./lib/eth/builtin/eacaggregatorproxy/index.js",
+    "./eth/builtin/weth9": "./lib/eth/builtin/weth9/index.js",
     "./aptos": "./lib/aptos/index.js",
+    "./aptos/codegen": "./lib/aptos/codegen/index.js",
     "./aptos/builtin": "./lib/aptos/builtin/index.js",
     "./aptos/builtin/0x1": "./lib/aptos/builtin/0x1.js",
     "./aptos/builtin/0x3": "./lib/aptos/builtin/0x3.js",
-    "./aptos/codegen": "./lib/aptos/codegen/index.js",
     "./solana": "./lib/solana/index.js",
     "./solana/builtin": "./lib/solana/builtin/index.js",
     "./solana/codegen": "./lib/solana/codegen/index.js"
@@ -72,5 +73,5 @@
   "typedoc": {
     "entryPoint": "./src/index.ts"
   },
-  "gitHead": "1fe5303cf8c75078018ab4d41de3318eb478ced0"
+  "gitHead": "6e809c147d767c9652954a5547c239ab3963615e"
 }

package/src/aptos/codegen/codegen.ts

@@ -8,6 +8,15 @@ import chalk from 'chalk'
 import { AptosNetwork, getAptosChainName } from '../network.js'
 import { parseMoveType } from '../types.js'
 import { AptosClient } from 'aptos-sdk'
+import { camelCase } from 'lodash-es'
+
+export async function codegen(abisDir: string, outDir = 'src/types/aptos') {
+  if (!fs.existsSync(abisDir)) {
+    return
+  }
+  console.log(chalk.green('Generated Types for Aptos'))
+  await generate(abisDir, outDir)
+}
 
 function getRpcEndpoint(network: AptosNetwork): string {
   switch (network) {
@@ -21,20 +30,12 @@ function getRpcClient(network: AptosNetwork): AptosClient {
   return new AptosClient(getRpcEndpoint(network))
 }
 
-export async function codeGenAptosProcessor(abisDir: string, outDir = 'src/types/aptos') {
-  if (!fs.existsSync(abisDir)) {
-    return
-  }
-  console.log(chalk.green('Generated Types for Aptos'))
-  await generate(abisDir, outDir)
-}
-
-export async function generate(srcDir: string, outputDir: string) {
+async function generate(srcDir: string, outputDir: string) {
   await generateForNetwork(srcDir, outputDir, AptosNetwork.MAIN_NET)
   await generateForNetwork(path.join(srcDir, 'testnet'), path.join(outputDir, 'testnet'), AptosNetwork.TEST_NET)
 }
 
-export async function generateForNetwork(srcDir: string, outputDir: string, network: AptosNetwork) {
+async function generateForNetwork(srcDir: string, outputDir: string, network: AptosNetwork) {
   if (!fs.existsSync(srcDir)) {
     return
   }
@@ -366,7 +367,7 @@ function generateCallArgsStructs(module: MoveModule, func: MoveFunction) {
     return `${generateType(param, module.address)}`
   })
 
-  const camelFuncName = capitalizeFirstChar(camelize(func.name))
+  const camelFuncName = capitalizeFirstChar(camelCase(func.name))
 
   const genericString = generateFunctionTypeParameters(func)
   return `
@@ -386,7 +387,7 @@ function generateOnEntryFunctions(module: MoveModule, func: MoveFunction) {
   // const genericString = generateFunctionTypeParameters(func)
   const moduleName = normalizeToJSName(module.name)
 
-  const camelFuncName = capitalizeFirstChar(camelize(func.name))
+  const camelFuncName = capitalizeFirstChar(camelCase(func.name))
   const source = `
   onEntry${camelFuncName}(func: (call: ${moduleName}.${camelFuncName}Payload, ctx: AptosContext) => void, filter?: CallFilter, fetchConfig?: AptosFetchConfig): ${moduleName} {
     this.onEntryFunctionCall(func, {
@@ -448,16 +449,6 @@ function generateOnEvents(module: MoveModule, struct: MoveStruct): string {
   return source
 }
 
-function camelize(input: string): string {
-  return input
-    .split('_')
-    .reduce(
-      (res, word, i) =>
-        i === 0 ? word.toLowerCase() : `${res}${word.charAt(0).toUpperCase()}${word.slice(1).toLowerCase()}`,
-      ''
-    )
-}
-
 function capitalizeFirstChar(input: string): string {
   if (!input) {
     return input

package/src/aptos/codegen/tsconfig.json

@@ -3,6 +3,6 @@
     "rootDir": "..",
     "outDir": "../../../lib/aptos"
   },
-  "extends": "../../../tsconfig.json",
+  "extends": "@sentio/sdk/tsconfig.json",
   "include": ["./"]
 }

package/src/aptos/network.ts

@@ -1,4 +1,4 @@
-import { CHAIN_IDS, getChainName } from '../chain.js'
+import { CHAIN_IDS, getChainName } from '../core/chain.js'
 
 export enum AptosNetwork {
   MAIN_NET = 1,

package/src/aptos/run-codegen.ts

@@ -1,12 +1,12 @@
 // #!/usr/bin/env node
 
-import { codeGenAptosProcessor } from './codegen/codegen.js'
+import { codegen } from './codegen/codegen.js'
 
 if (process.argv.length > 3) {
   const abisDir = process.argv[2]
   const targetDir = process.argv[3]
 
-  await codeGenAptosProcessor(abisDir, targetDir)
+  await codegen(abisDir, targetDir)
 } else {
   console.error('Not enough argument')
   process.exit(1)

package/src/core/big-decimal.ts

@@ -5,8 +5,19 @@ export { BigDecimal } from '@sentio/bigdecimal'
 declare global {
   interface BigInt {
     asBigDecimal(): BigDecimal
+    scaleDown(decimal: number | bigint): BigDecimal
   }
 }
 BigInt.prototype.asBigDecimal = function () {
   return new BigDecimal(this.toString())
 }
+
+BigInt.prototype.scaleDown = function (decimal: number | bigint) {
+  // @ts-ignore this is fine
+  return scaleDown(this, decimal)
+}
+
+export function scaleDown(amount: bigint, decimal: number | bigint): BigDecimal {
+  const divider = new BigDecimal(10).pow(Number(decimal))
+  return amount.asBigDecimal().dividedBy(divider)
+}

package/src/core/index.ts

@@ -1,13 +1,10 @@
-export { BigDecimal } from './big-decimal.js'
+export { BigDecimal, scaleDown } from './big-decimal.js'
 export { BaseContext } from './base-context.js'
 export { type Labels, normalizeLabels } from './metadata.js'
-export { ContractContext, ContractView, BoundContractView } from './context.js'
 export { CounterBinding, Meter, GaugeBinding, Counter, Gauge, MetricOptions } from './meter.js'
 export { EventTracker, AccountEventTracker } from './event-tracker.js'
 export { Exporter } from './exporter.js'
-export { type Numberish, toBigInteger, toMetricValue, toBlockTag } from './numberish.js'
-
-export { BindOptions } from './bind-options.js'
+export { type Numberish, toBigInteger, toMetricValue } from './numberish.js'
 
 export { SuiBaseProcessor, SuiBindOptions } from './sui-processor.js'
 

package/src/core/numberish.ts

@@ -1,19 +1,8 @@
 import { BigInteger, MetricValue } from '@sentio/protos'
 import { BigDecimal } from './big-decimal.js'
-import { BlockTag } from 'ethers/providers'
 
 export type Numberish = number | bigint | BigDecimal | string
 
-export function toBlockTag(a: number | bigint): BlockTag {
-  if (typeof a === 'number') {
-    return a
-  }
-  if (a > Number.MAX_SAFE_INTEGER) {
-    return '0x' + a.toString(16)
-  }
-  return Number(a)
-}
-
 export function toMetricValue(value: Numberish): MetricValue {
   if (typeof value === 'number') {
     if (Number.isNaN(value)) {

package/src/core/sui-plugin.ts

@@ -3,7 +3,7 @@ import { ContractConfig, DataBinding, HandlerType, ProcessConfigResponse, Proces
 
 import { ServerError, Status } from 'nice-grpc'
 
-import { CHAIN_IDS } from '../chain.js'
+import { CHAIN_IDS } from './chain.js'
 import { SuiProcessorState } from './sui-processor.js'
 
 export class SuiPlugin extends Plugin {

package/src/core/sui-processor.ts

@@ -1,4 +1,4 @@
-import { SuiContext } from './context.js'
+import { SuiContext } from '../eth/context.js'
 import { ProcessResult } from '@sentio/protos'
 import { ListStateStorage } from '@sentio/runtime'
 

package/src/eth/account-processor.ts

@@ -1,16 +1,16 @@
-import { ERC20__factory, ERC721__factory } from '../builtin/internal/index.js'
+import { ERC20__factory, ERC721__factory } from './builtin/internal/index.js'
 import { AddressType, EthFetchConfig, ProcessResult } from '@sentio/protos'
-import { AccountBindOptions } from '../core/bind-options.js'
+import { AccountBindOptions } from './bind-options.js'
 
 import { Network, LogParams } from 'ethers/providers'
 
-import { TransferEvent as ERC20TransferEvent } from '../builtin/internal/ERC20.js'
-import { TransferEvent as ERC721TransferEvent } from '../builtin/internal/ERC721.js'
+import { TransferEvent as ERC20TransferEvent } from './builtin/internal/ERC20.js'
+import { TransferEvent as ERC721TransferEvent } from './builtin/internal/ERC721.js'
 
-import { ERC20Processor } from '../builtin/internal/erc20_processor.js'
-import { ERC721Processor } from '../builtin/internal/erc721_processor.js'
+import { ERC20Processor } from './builtin/internal/erc20_processor.js'
+import { ERC721Processor } from './builtin/internal/erc721_processor.js'
 
-import { AccountContext } from '../core/context.js'
+import { AccountContext } from './context.js'
 import { PromiseOrVoid } from '../promise-or-void.js'
 import { AddressOrTypeEventFilter, EventsHandler } from './base-processor.js'
 import { Transaction, Block, TransactionReceipt, LogDescription } from 'ethers'

package/src/eth/base-processor-template.ts

@@ -1,14 +1,14 @@
-import { BoundContractView, ContractContext, ContractView } from '../core/context.js'
+import { BoundContractView, ContractContext, ContractView } from './context.js'
 import { BaseContract, ContractEvent, Block, LogDescription } from 'ethers'
 import { AddressOrTypeEventFilter, BaseProcessor } from './base-processor.js'
-import { BindOptions, getOptionsSignature } from '../core/bind-options.js'
+import { BindOptions, getOptionsSignature } from './bind-options.js'
 import { EthFetchConfig, HandleInterval, TemplateInstance } from '@sentio/protos'
 import { PromiseOrVoid } from '../promise-or-void.js'
 import { Trace } from './trace.js'
 import { ListStateStorage } from '@sentio/runtime'
 import { EventFilter, LogParams, Network } from 'ethers/providers'
 import { DeferredTopicFilter } from 'ethers/contract'
-import { Eth } from './eth.js'
+import { EthLog } from './eth.js'
 
 export class ProcessorTemplateProcessorState extends ListStateStorage<
   BaseProcessorTemplate<BaseContract, BoundContractView<BaseContract, any>>
@@ -37,7 +37,7 @@ export abstract class BaseProcessorTemplate<
     fetchConfig?: EthFetchConfig
   }[] = []
   eventHandlers: {
-    handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
+    handler: (event: EthLog, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
     filter: DeferredTopicFilter | DeferredTopicFilter[]
     fetchConfig?: EthFetchConfig
   }[] = []
@@ -88,7 +88,7 @@ export abstract class BaseProcessorTemplate<
   }
 
   public onEvent(
-    handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
+    handler: (event: EthLog, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     filter: DeferredTopicFilter | DeferredTopicFilter[],
     fetchConfig?: EthFetchConfig
   ) {

package/src/eth/base-processor.ts

@@ -1,7 +1,7 @@
 import { Block, TransactionReceipt, BaseContract, Transaction, DeferredTopicFilter } from 'ethers'
 import { LogParams, Network } from 'ethers/providers'
 
-import { BoundContractView, ContractContext, ContractView } from '../core/context.js'
+import { BoundContractView, ContractContext, ContractView } from './context.js'
 import {
   AddressType,
   Data_EthBlock,
@@ -11,11 +11,11 @@ import {
   HandleInterval,
   ProcessResult,
 } from '@sentio/protos'
-import { BindInternalOptions, BindOptions } from '../core/bind-options.js'
+import { BindInternalOptions, BindOptions } from './bind-options.js'
 import { PromiseOrVoid } from '../promise-or-void.js'
 import { Trace } from './trace.js'
 import { ServerError, Status } from 'nice-grpc'
-import { Eth } from './eth.js'
+import { EthLog } from './eth.js'
 
 export interface AddressOrTypeEventFilter extends DeferredTopicFilter {
   addressType?: AddressType
@@ -78,7 +78,7 @@ export abstract class BaseProcessor<
   }
 
   public onEvent(
-    handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
+    handler: (event: EthLog, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     filter: DeferredTopicFilter | DeferredTopicFilter[],
     fetchConfig?: EthFetchConfig
   ) {
@@ -120,7 +120,7 @@ export abstract class BaseProcessor<
         const parsed = contractView.rawContract.interface.parseLog(logParam)
 
         if (parsed) {
-          const event: Eth = { ...log, args: parsed.args }
+          const event: EthLog = { ...log, args: parsed.args }
           await handler(event, ctx)
           return ctx.getProcessResult()
         }
@@ -189,7 +189,7 @@ export abstract class BaseProcessor<
     return this
   }
 
-  public onAllEvents(handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
+  public onAllEvents(handler: (event: EthLog, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
     const _filters: DeferredTopicFilter[] = []
     const tmpContract = this.CreateBoundContractView()
 

package/src/eth/binds.ts

@@ -1,5 +1,5 @@
-import { BindOptions, getOptionsSignature } from '../core/bind-options.js'
-import { ContractView } from '../core/index.js'
+import { BindOptions, getOptionsSignature } from './bind-options.js'
+import { ContractView } from './context.js'
 import { BaseProcessor } from './base-processor.js'
 import { Networkish, Network } from 'ethers/providers'
 

package/src/{builtin → eth/builtin}/internal/eacaggregatorproxy_processor.ts

@@ -20,7 +20,7 @@ import {
   DummyProvider,
   TypedCallTrace,
   toBlockTag,
-} from "@sentio/sdk";
+} from "@sentio/sdk/eth";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { EACAggregatorProxy, EACAggregatorProxy__factory } from "./index.js";

package/src/{builtin → eth/builtin}/internal/erc1155_processor.ts

@@ -20,7 +20,7 @@ import {
   DummyProvider,
   TypedCallTrace,
   toBlockTag,
-} from "@sentio/sdk";
+} from "@sentio/sdk/eth";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC1155, ERC1155__factory } from "./index.js";