@sentio/sdk 1.40.5 → 1.41.0-rc.1

package/lib/testing/test-provider.js

@@ -4,7 +4,6 @@ exports.loadTestProvidersFromEnv = void 0;
 const runtime_1 = require("@sentio/runtime");
 const chain_1 = require("../utils/chain");
 function loadTestProvidersFromEnv(requiredChainIds) {
-    const dummyConfig = {};
     const found = [];
     if (!Array.isArray(requiredChainIds)) {
         requiredChainIds = [requiredChainIds];
@@ -16,12 +15,8 @@ function loadTestProvidersFromEnv(requiredChainIds) {
             continue;
         }
         found.push(k);
-        dummyConfig[k] = {
-            ChainID: k,
-            Https: [http],
-        };
+        runtime_1.Endpoints.INSTANCE.chainServer.set(k, http);
     }
-    (0, runtime_1.setProvider)(dummyConfig);
     for (const id of requiredChainIds) {
         if (!found.includes(id)) {
             return false;

package/lib/testing/test-provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-provider.js","sourceRoot":"","sources":["../../src/testing/test-provider.ts"],"names":[],"mappings":";;;AAAA,6CAA0D;AAC1D,0CAA0C;AAE1C,SAAgB,wBAAwB,CAAC,gBAAmC;IAC1E,MAAM,WAAW,GAAgC,EAAE,CAAA;IACnD,MAAM,KAAK,GAAa,EAAE,CAAA;IAE1B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QACpC,gBAAgB,GAAG,CAAC,gBAAgB,CAAC,CAAA;KACtC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAS,CAAC,EAAE;QACtC,MAAM,MAAM,GAAG,gBAAgB,GAAG,CAAC,CAAA;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,IAAI,EAAE;YACT,SAAQ;SACT;QACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACb,WAAW,CAAC,CAAC,CAAC,GAAG;YACf,OAAO,EAAE,CAAC;YACV,KAAK,EAAE,CAAC,IAAI,CAAC;SACd,CAAA;KACF;IAED,IAAA,qBAAW,EAAC,WAAW,CAAC,CAAA;IACxB,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE;QACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;YACvB,OAAO,KAAK,CAAA;SACb;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AA5BD,4DA4BC","sourcesContent":["import { ChainConfig, setProvider } from '@sentio/runtime'\nimport { CHAIN_MAP } from '../utils/chain'\n\nexport function loadTestProvidersFromEnv(requiredChainIds: string[] | string): boolean {\n  const dummyConfig: Record<string, ChainConfig> = {}\n  const found: string[] = []\n\n  if (!Array.isArray(requiredChainIds)) {\n    requiredChainIds = [requiredChainIds]\n  }\n\n  for (const k of Object.keys(CHAIN_MAP)) {\n    const envKey = 'TEST_ENDPOINT_' + k\n    const http = process.env[envKey]\n    if (!http) {\n      continue\n    }\n    found.push(k)\n    dummyConfig[k] = {\n      ChainID: k,\n      Https: [http],\n    }\n  }\n\n  setProvider(dummyConfig)\n  for (const id of requiredChainIds) {\n    if (!found.includes(id)) {\n      return false\n    }\n  }\n  return true\n}\n"]}
+{"version":3,"file":"test-provider.js","sourceRoot":"","sources":["../../src/testing/test-provider.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAC3C,0CAA0C;AAE1C,SAAgB,wBAAwB,CAAC,gBAAmC;IAC1E,MAAM,KAAK,GAAa,EAAE,CAAA;IAE1B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;QACpC,gBAAgB,GAAG,CAAC,gBAAgB,CAAC,CAAA;KACtC;IAED,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAS,CAAC,EAAE;QACtC,MAAM,MAAM,GAAG,gBAAgB,GAAG,CAAC,CAAA;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,IAAI,EAAE;YACT,SAAQ;SACT;QACD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACb,mBAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;KAC5C;IAED,KAAK,MAAM,EAAE,IAAI,gBAAgB,EAAE;QACjC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;YACvB,OAAO,KAAK,CAAA;SACb;KACF;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAvBD,4DAuBC","sourcesContent":["import { Endpoints } from '@sentio/runtime'\nimport { CHAIN_MAP } from '../utils/chain'\n\nexport function loadTestProvidersFromEnv(requiredChainIds: string[] | string): boolean {\n  const found: string[] = []\n\n  if (!Array.isArray(requiredChainIds)) {\n    requiredChainIds = [requiredChainIds]\n  }\n\n  for (const k of Object.keys(CHAIN_MAP)) {\n    const envKey = 'TEST_ENDPOINT_' + k\n    const http = process.env[envKey]\n    if (!http) {\n      continue\n    }\n    found.push(k)\n    Endpoints.INSTANCE.chainServer.set(k, http)\n  }\n\n  for (const id of requiredChainIds) {\n    if (!found.includes(id)) {\n      return false\n    }\n  }\n  return true\n}\n"]}

package/lib/utils/conversion.d.ts

@@ -1,6 +1,6 @@
-import { BigNumber } from 'ethers';
 import { BigDecimal } from '../core/big-decimal';
 import { Numberish } from '../core';
 import { MetricValue } from '@sentio/protos';
-export declare function toBigDecimal(n: BigNumber | bigint): BigDecimal;
+export declare function toBigDecimal(n: bigint): BigDecimal;
+export declare function bytesToBigInt(bytes: Uint8Array): bigint;
 export declare function metricValueToNumberish(v: MetricValue): Numberish;

package/lib/utils/conversion.js

@@ -1,22 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.metricValueToNumberish = exports.toBigDecimal = void 0;
-const ethers_1 = require("ethers");
+exports.metricValueToNumberish = exports.bytesToBigInt = exports.toBigDecimal = void 0;
 const big_decimal_1 = require("../core/big-decimal");
 function toBigDecimal(n) {
     return new big_decimal_1.BigDecimal(n.toString());
 }
 exports.toBigDecimal = toBigDecimal;
+function bytesToBigInt(bytes) {
+    let intValue = BigInt(0);
+    for (let i = 0; i < bytes.length; i++) {
+        intValue = intValue * BigInt(256) + BigInt(bytes[i]);
+    }
+    return intValue;
+}
+exports.bytesToBigInt = bytesToBigInt;
 function metricValueToNumberish(v) {
     if (v.doubleValue) {
         return v.doubleValue;
     }
     if (v.bigInteger) {
-        const bn = ethers_1.BigNumber.from(v.bigInteger.data);
+        let intValue = bytesToBigInt(v.bigInteger.data);
         if (v.bigInteger.negative) {
-            return ethers_1.BigNumber.from(0).sub(bn);
+            intValue = -intValue;
         }
-        return bn;
+        return intValue;
     }
     if (v.bigDecimal) {
         return new big_decimal_1.BigDecimal(v.bigDecimal);

package/lib/utils/conversion.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversion.js","sourceRoot":"","sources":["../../src/utils/conversion.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAClC,qDAAgD;AAIhD,SAAgB,YAAY,CAAC,CAAqB;IAChD,OAAO,IAAI,wBAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;AACrC,CAAC;AAFD,oCAEC;AAED,SAAgB,sBAAsB,CAAC,CAAc;IACnD,IAAI,CAAC,CAAC,WAAW,EAAE;QACjB,OAAO,CAAC,CAAC,WAAW,CAAA;KACrB;IACD,IAAI,CAAC,CAAC,UAAU,EAAE;QAChB,MAAM,EAAE,GAAG,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC5C,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE;YACzB,OAAO,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;SACjC;QACD,OAAO,EAAE,CAAA;KACV;IAED,IAAI,CAAC,CAAC,UAAU,EAAE;QAChB,OAAO,IAAI,wBAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;KACpC;IAED,MAAM,KAAK,CAAC,mDAAmD,CAAC,CAAA;AAClE,CAAC;AAjBD,wDAiBC","sourcesContent":["import { BigNumber } from 'ethers'\nimport { BigDecimal } from '../core/big-decimal'\nimport { Numberish } from '../core'\nimport { MetricValue } from '@sentio/protos'\n\nexport function toBigDecimal(n: BigNumber | bigint) {\n  return new BigDecimal(n.toString())\n}\n\nexport function metricValueToNumberish(v: MetricValue): Numberish {\n  if (v.doubleValue) {\n    return v.doubleValue\n  }\n  if (v.bigInteger) {\n    const bn = BigNumber.from(v.bigInteger.data)\n    if (v.bigInteger.negative) {\n      return BigNumber.from(0).sub(bn)\n    }\n    return bn\n  }\n\n  if (v.bigDecimal) {\n    return new BigDecimal(v.bigDecimal)\n  }\n\n  throw Error(\"MetricValue doesn't contain any of possible value\")\n}\n"]}
+{"version":3,"file":"conversion.js","sourceRoot":"","sources":["../../src/utils/conversion.ts"],"names":[],"mappings":";;;AAAA,qDAAgD;AAIhD,SAAgB,YAAY,CAAC,CAAS;IACpC,OAAO,IAAI,wBAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;AACrC,CAAC;AAFD,oCAEC;AAED,SAAgB,aAAa,CAAC,KAAiB;IAC7C,IAAI,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;KACrD;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAND,sCAMC;AAED,SAAgB,sBAAsB,CAAC,CAAc;IACnD,IAAI,CAAC,CAAC,WAAW,EAAE;QACjB,OAAO,CAAC,CAAC,WAAW,CAAA;KACrB;IACD,IAAI,CAAC,CAAC,UAAU,EAAE;QAChB,IAAI,QAAQ,GAAG,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC/C,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE;YACzB,QAAQ,GAAG,CAAC,QAAQ,CAAA;SACrB;QACD,OAAO,QAAQ,CAAA;KAChB;IAED,IAAI,CAAC,CAAC,UAAU,EAAE;QAChB,OAAO,IAAI,wBAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;KACpC;IAED,MAAM,KAAK,CAAC,mDAAmD,CAAC,CAAA;AAClE,CAAC;AAjBD,wDAiBC","sourcesContent":["import { BigDecimal } from '../core/big-decimal'\nimport { Numberish } from '../core'\nimport { MetricValue } from '@sentio/protos'\n\nexport function toBigDecimal(n: bigint) {\n  return new BigDecimal(n.toString())\n}\n\nexport function bytesToBigInt(bytes: Uint8Array) {\n  let intValue = BigInt(0)\n  for (let i = 0; i < bytes.length; i++) {\n    intValue = intValue * BigInt(256) + BigInt(bytes[i])\n  }\n  return intValue\n}\n\nexport function metricValueToNumberish(v: MetricValue): Numberish {\n  if (v.doubleValue) {\n    return v.doubleValue\n  }\n  if (v.bigInteger) {\n    let intValue = bytesToBigInt(v.bigInteger.data)\n    if (v.bigInteger.negative) {\n      intValue = -intValue\n    }\n    return intValue\n  }\n\n  if (v.bigDecimal) {\n    return new BigDecimal(v.bigDecimal)\n  }\n\n  throw Error(\"MetricValue doesn't contain any of possible value\")\n}\n"]}

package/lib/utils/dex-price.d.ts

@@ -1,4 +1,4 @@
-import { BlockTag } from '@ethersproject/providers';
+import { BlockTag } from 'ethers/providers';
 export declare enum PriceUnit {
     USD = 0,
     ETH = 1,

package/lib/utils/dex-price.js

@@ -1,12 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoerliDexPrice = exports.EthereumDexPrice = exports.PriceUnit = void 0;
+const tslib_1 = require("tslib");
 const eacaggregatorproxy_processor_1 = require("../builtin/internal/eacaggregatorproxy_processor");
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+// @ts-ignore type def not provided
 const sync_1 = require("csv-parse/sync");
 const token_1 = require("./token");
 var PriceUnit;
@@ -88,7 +87,7 @@ class DexPrice {
             });
             let decimal = this.ASSETS_INFOS.get(asset);
             if (!decimal) {
-                decimal = await contract.decimals();
+                decimal = Number(await contract.decimals());
                 this.ASSETS_INFOS.set(asset, decimal);
             }
             return {

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'\nimport path from 'path'\nimport fs from 'fs'\n\nimport { parse } from 'csv-parse/sync'\nimport { BlockTag } from '@ethersproject/providers'\nimport { scaleDown } from './token'\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 = path.resolve(__dirname, csvFileName)\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 = 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 '../builtin/internal/eacaggregatorproxy_processor'\nimport path from 'path'\nimport fs from 'fs'\n// @ts-ignore type def not provided\nimport { parse } from 'csv-parse/sync'\nimport { BlockTag } from 'ethers/providers'\nimport { scaleDown } from './token'\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 = path.resolve(__dirname, csvFileName)\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/dex-price.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"dex-price.test.js","sourceRoot":"","sources":["../../src/utils/dex-price.test.ts"],"names":[],"mappings":";;AAAA,2CAA8D;AAC9D,6CAAkD;AAClD,4DAAmE;AAEnE,+BAA6B;AAE7B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,eAAK,CAAC,KAAK,EAAE,CAAA;IACb,mBAAS,CAAC,KAAK,EAAE,CAAA;IAEjB,MAAM,aAAa,GAAG,IAAA,wCAAwB,EAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;IAE1D,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAE/C,MAAM,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,IAAI,GAAG,MAAM,4BAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC9D,IAAA,aAAM,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;QAEjC,MAAM,QAAQ,GAAG,MAAM,4BAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAClE,IAAA,aAAM,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,GAAG,GAAG,MAAM,0BAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACzD,IAAA,aAAM,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { EthereumDexPrice, GoerliDexPrice } from './dex-price'\nimport { State, Endpoints } from '@sentio/runtime'\nimport { loadTestProvidersFromEnv } from '../testing/test-provider'\n\nimport { expect } from 'chai'\n\ndescribe('dex price tests', () => {\n  State.reset()\n  Endpoints.reset()\n\n  const haveProviders = loadTestProvidersFromEnv(['1', '5'])\n\n  const testIf = haveProviders ? test : test.skip\n\n  testIf('get price at mainnet', async () => {\n    const usdc = await EthereumDexPrice.getPrice('usdc', 15677823)\n    expect(usdc.price).eq(0.99991649)\n\n    const compound = await EthereumDexPrice.getPrice('COMP', 15677823)\n    expect(compound.price).eq(60.27)\n  })\n\n  testIf('get price at goerli', async () => {\n    const dai = await GoerliDexPrice.getPrice('DAI', 7712734)\n    expect(dai.price).eq(0.99971281)\n  })\n})\n"]}
+{"version":3,"file":"dex-price.test.js","sourceRoot":"","sources":["../../src/utils/dex-price.test.ts"],"names":[],"mappings":";;AAAA,2CAA8D;AAC9D,6CAAkD;AAClD,4DAAmE;AAEnE,+BAA6B;AAE7B,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,eAAK,CAAC,KAAK,EAAE,CAAA;IACb,oBAAoB;IAEpB,MAAM,aAAa,GAAG,IAAA,wCAAwB,EAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;IAE1D,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAE/C,MAAM,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;QACxC,MAAM,IAAI,GAAG,MAAM,4BAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC9D,IAAA,aAAM,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;QAEjC,MAAM,QAAQ,GAAG,MAAM,4BAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAClE,IAAA,aAAM,EAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,MAAM,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QACvC,MAAM,GAAG,GAAG,MAAM,0BAAc,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACzD,IAAA,aAAM,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { EthereumDexPrice, GoerliDexPrice } from './dex-price'\nimport { State, Endpoints } from '@sentio/runtime'\nimport { loadTestProvidersFromEnv } from '../testing/test-provider'\n\nimport { expect } from 'chai'\n\ndescribe('dex price tests', () => {\n  State.reset()\n  // Endpoints.reset()\n\n  const haveProviders = loadTestProvidersFromEnv(['1', '5'])\n\n  const testIf = haveProviders ? test : test.skip\n\n  testIf('get price at mainnet', async () => {\n    const usdc = await EthereumDexPrice.getPrice('usdc', 15677823)\n    expect(usdc.price).eq(0.99991649)\n\n    const compound = await EthereumDexPrice.getPrice('COMP', 15677823)\n    expect(compound.price).eq(60.27)\n  })\n\n  testIf('get price at goerli', async () => {\n    const dai = await GoerliDexPrice.getPrice('DAI', 7712734)\n    expect(dai.price).eq(0.99971281)\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,6CAAkD;AAClD,mCAA2C;AAC3C,4DAAmE;AAEnE,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,eAAK,CAAC,KAAK,EAAE,CAAA;IACb,mBAAS,CAAC,KAAK,EAAE,CAAA;IAEjB,MAAM,aAAa,GAAG,IAAA,wCAAwB,EAAC,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,IAAA,yBAAiB,EAAC,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,IAAA,yBAAiB,EAAC,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, Endpoints } from '@sentio/runtime'\nimport { getERC20TokenInfo } from './token'\nimport { loadTestProvidersFromEnv } from '../testing/test-provider'\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,6CAAkD;AAClD,mCAA2C;AAC3C,4DAAmE;AAEnE,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,eAAK,CAAC,KAAK,EAAE,CAAA;IACb,oBAAoB;IAEpB,MAAM,aAAa,GAAG,IAAA,wCAAwB,EAAC,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,IAAA,yBAAiB,EAAC,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,IAAA,yBAAiB,EAAC,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, Endpoints } from '@sentio/runtime'\nimport { getERC20TokenInfo } from './token'\nimport { loadTestProvidersFromEnv } from '../testing/test-provider'\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"]}

package/lib/utils/index.js

@@ -1,31 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dexPrice = exports.token = exports.conversion = exports.chain = void 0;
-exports.chain = __importStar(require("./chain"));
-exports.conversion = __importStar(require("./conversion"));
-exports.token = __importStar(require("./token"));
-exports.dexPrice = __importStar(require("./dex-price"));
+const tslib_1 = require("tslib");
+exports.chain = tslib_1.__importStar(require("./chain"));
+exports.conversion = tslib_1.__importStar(require("./conversion"));
+exports.token = tslib_1.__importStar(require("./token"));
+exports.dexPrice = tslib_1.__importStar(require("./dex-price"));
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAgC;AAChC,2DAA0C;AAC1C,iDAAgC;AAChC,wDAAuC","sourcesContent":["export * as chain from './chain'\nexport * as conversion from './conversion'\nexport * as token from './token'\nexport * as dexPrice from './dex-price'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;AAAA,yDAAgC;AAChC,mEAA0C;AAC1C,yDAAgC;AAChC,gEAAuC","sourcesContent":["export * as chain from './chain'\nexport * as conversion from './conversion'\nexport * as token from './token'\nexport * as dexPrice from './dex-price'\n"]}

package/lib/utils/token.d.ts

@@ -1,4 +1,3 @@
-import { BigNumber } from '@ethersproject/bignumber';
 import { BigDecimal } from '../core/big-decimal';
 export interface TokenInfo {
     symbol: string;
@@ -11,5 +10,5 @@ export declare const NATIVE_ETH: {
     name: string;
 };
 export declare function getERC20TokenInfo(tokenAddress: string, chainId?: number): Promise<TokenInfo>;
-export declare function getER20NormalizedAmount(tokenAddress: string, amount: BigNumber, chainId: number): Promise<BigDecimal>;
-export declare function scaleDown(amount: BigNumber | bigint, decimal: number): BigDecimal;
+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

@@ -5,7 +5,6 @@ const error_1 = require("../error");
 const erc20_1 = require("../builtin/erc20");
 const erc20bytes_processor_1 = require("../builtin/internal/erc20bytes_processor");
 const big_decimal_1 = require("../core/big-decimal");
-const conversion_1 = require("./conversion");
 const ethers_1 = require("ethers");
 exports.NATIVE_ETH = {
     symbol: 'ETH',
@@ -17,7 +16,7 @@ async function getTokenInfoPromise(symbol, name, decimal) {
     return {
         symbol: await symbol,
         name: await name,
-        decimal: await decimal,
+        decimal: Number(await decimal),
     };
 }
 async function getERC20TokenInfo(tokenAddress, chainId = 1) {
@@ -35,14 +34,14 @@ async function getERC20TokenInfo(tokenAddress, chainId = 1) {
             name = await contract.name();
         }
         catch (e) {
-            name = ethers_1.utils.parseBytes32String(await bytesContract.name());
+            name = (0, ethers_1.decodeBytes32String)(await bytesContract.name());
         }
         let symbol = '';
         try {
             symbol = await contract.symbol();
         }
         catch (e) {
-            symbol = ethers_1.utils.parseBytes32String(await bytesContract.symbol());
+            symbol = (0, ethers_1.decodeBytes32String)(await bytesContract.symbol());
         }
         const decimal = await contract.decimals();
         const info = getTokenInfoPromise(symbol, name, decimal);
@@ -60,8 +59,8 @@ async function getER20NormalizedAmount(tokenAddress, amount, chainId) {
 }
 exports.getER20NormalizedAmount = getER20NormalizedAmount;
 function scaleDown(amount, decimal) {
-    const divider = new big_decimal_1.BigDecimal(10).pow(decimal);
-    return (0, conversion_1.toBigDecimal)(amount).dividedBy(divider);
+    const divider = new big_decimal_1.BigDecimal(10).pow(Number(decimal));
+    return amount.asBigDecimal().dividedBy(divider);
 }
 exports.scaleDown = scaleDown;
 //# 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":";;;AAEA,oCAA8C;AAC9C,4CAAmD;AACnD,mFAAgF;AAChF,qDAAgD;AAChD,6CAA2C;AAC3C,mCAA8B;AASjB,QAAA,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,OAAO;KACvB,CAAA;AACH,CAAC;AAEM,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,IAAA,wBAAgB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,IAAA,4CAAqB,EAAC,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,cAAK,CAAC,kBAAkB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;SAC5D;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,cAAK,CAAC,kBAAkB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;SAChE;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,IAAA,2BAAmB,EAAC,CAAC,EAAE,SAAS,CAAC,CAAA;KACxC;AACH,CAAC;AAjCD,8CAiCC;AAEM,KAAK,UAAU,uBAAuB,CAC3C,YAAoB,EACpB,MAAiB,EACjB,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;AAPD,0DAOC;AAED,SAAgB,SAAS,CAAC,MAA0B,EAAE,OAAe;IACnE,MAAM,OAAO,GAAG,IAAI,wBAAU,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IAC/C,OAAO,IAAA,yBAAY,EAAC,MAAM,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;AAChD,CAAC;AAHD,8BAGC","sourcesContent":["import { BigNumber } from '@ethersproject/bignumber'\n\nimport { transformEtherError } from '../error'\nimport { getERC20Contract } from '../builtin/erc20'\nimport { getERC20BytesContract } from '../builtin/internal/erc20bytes_processor'\nimport { BigDecimal } from '../core/big-decimal'\nimport { toBigDecimal } from './conversion'\nimport { utils } from 'ethers'\nimport { PromiseOrValue } from '../builtin/internal/common'\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<number>\n): Promise<TokenInfo> {\n  return {\n    symbol: await symbol,\n    name: await name,\n    decimal: 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 = utils.parseBytes32String(await bytesContract.name())\n    }\n\n    let symbol = ''\n    try {\n      symbol = await contract.symbol()\n    } catch (e) {\n      symbol = utils.parseBytes32String(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: BigNumber,\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: BigNumber | bigint, decimal: number) {\n  const divider = new BigDecimal(10).pow(decimal)\n  return toBigDecimal(amount).dividedBy(divider)\n}\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":";;;AAAA,oCAA8C;AAC9C,4CAAmD;AACnD,mFAAgF;AAChF,qDAAgD;AAIhD,mCAA4C;AAQ/B,QAAA,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;AAEM,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,IAAA,wBAAgB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,IAAA,4CAAqB,EAAC,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,IAAA,4BAAmB,EAAC,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,IAAA,4BAAmB,EAAC,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,IAAA,2BAAmB,EAAC,CAAC,EAAE,SAAS,CAAC,CAAA;KACxC;AACH,CAAC;AAjCD,8CAiCC;AAEM,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;AAPD,0DAOC;AAED,SAAgB,SAAS,CAAC,MAAc,EAAE,OAAwB;IAChE,MAAM,OAAO,GAAG,IAAI,wBAAU,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;AAHD,8BAGC","sourcesContent":["import { transformEtherError } from '../error'\nimport { getERC20Contract } from '../builtin/erc20'\nimport { getERC20BytesContract } from '../builtin/internal/erc20bytes_processor'\nimport { BigDecimal } from '../core/big-decimal'\nimport { toBigDecimal } from './conversion'\n// import { utils } from 'ethers'\nimport { PromiseOrValue } from '../builtin/internal/common'\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"]}

package/lib/webpack.config.js

@@ -41,7 +41,7 @@ module.exports = {
       if (/^nice-grpc.*$/.test(request)) {
         return callback(null, 'commonjs ' + request)
       }
-      if (/^@sentio\/(sdk|runtime|base|protos|bigdecimal).*$/.test(request)) {
+      if (/^@sentio\/(sdk|runtime|base|protos|bigdecimal|ethers).*$/.test(request)) {
         return callback(null, 'commonjs ' + request)
       }
       callback()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.40.5",
+  "version": "1.41.0-rc.1",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/utils/*.csv lib/utils && cp src/webpack.config.js lib",
@@ -17,24 +17,18 @@
     "gen_bultin_evm": "typechain --target lib/target-ethers-sentio --out-dir src/builtin/internal 'src/abis/*.json'"
   },
   "dependencies": {
-    "@ethersproject/providers": "~5.7.0",
-    "@sentio/bigdecimal": "^9.1.1-patch.2",
-    "@sentio/protos": "^1.40.5",
-    "@sentio/runtime": "^1.40.5",
-    "@typechain/ethers-v5": "^10.0.0",
-    "command-line-args": "^5.2.1",
-    "command-line-usage": "^6.1.3",
+    "@sentio/bigdecimal": "^9.1.1-patch.3",
+    "@sentio/ethers-v6": "^1.0.15",
+    "@sentio/protos": "^1.41.0-rc.1",
+    "@sentio/runtime": "^1.41.0-rc.1",
     "csv-parse": "^5.3.0",
-    "ethers": "~5.7.1",
+    "ethers": "npm:@sentio/ethers@6.0.0-beta-exports.14",
     "google-protobuf": "^3.15.8",
     "nice-grpc": "^2.0.0",
     "typechain": "^8.0.0",
     "winston": "^3.8.2"
   },
   "devDependencies": {
-    "@types/command-line-args": "^5.2.0",
-    "@types/command-line-usage": "^5.0.2",
-    "@types/fs-extra": "^9.0.13",
     "@types/google-protobuf": "^3.15.6"
   },
   "main": "./lib/index.js",
@@ -51,5 +45,5 @@
   "typedoc": {
     "entryPoint": "./src/index.ts"
   },
-  "gitHead": "2084825b0a19da3b60e2f25be1af802096f9a83d"
+  "gitHead": "b57184fbc61c5613ee131b32e02c9d01671b64e3"
 }

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

@@ -1,7 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import { Log } from "@ethersproject/providers";
+import { LogParams } from "ethers/providers";
 import {
   getEACAggregatorProxyContract,
   AnswerUpdatedEventObject,
@@ -23,14 +23,15 @@ const mockField = {
 export function mockAnswerUpdatedLog(
   contractAddress: string,
   event: AnswerUpdatedEventObject
-): Log {
+): LogParams {
   const contract = getEACAggregatorProxyContract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("AnswerUpdated"),
+    "AnswerUpdated(int256,uint256,uint256)",
     [event.current, event.roundId, event.updatedAt]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -40,14 +41,15 @@ export function mockAnswerUpdatedLog(
 export function mockNewRoundLog(
   contractAddress: string,
   event: NewRoundEventObject
-): Log {
+): LogParams {
   const contract = getEACAggregatorProxyContract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("NewRound"),
+    "NewRound(uint256,address,uint256)",
     [event.roundId, event.startedBy, event.startedAt]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -57,14 +59,15 @@ export function mockNewRoundLog(
 export function mockOwnershipTransferRequestedLog(
   contractAddress: string,
   event: OwnershipTransferRequestedEventObject
-): Log {
+): LogParams {
   const contract = getEACAggregatorProxyContract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("OwnershipTransferRequested"),
+    "OwnershipTransferRequested(address,address)",
     [event.from, event.to]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -74,14 +77,15 @@ export function mockOwnershipTransferRequestedLog(
 export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
-): Log {
+): LogParams {
   const contract = getEACAggregatorProxyContract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("OwnershipTransferred"),
+    "OwnershipTransferred(address,address)",
     [event.from, event.to]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,

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

@@ -1,7 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import { Log } from "@ethersproject/providers";
+import { LogParams } from "ethers/providers";
 import {
   getERC1155Contract,
   ApprovalForAllEventObject,
@@ -23,14 +23,15 @@ const mockField = {
 export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
-): Log {
+): LogParams {
   const contract = getERC1155Contract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("ApprovalForAll"),
+    "ApprovalForAll(address,address,bool)",
     [event.account, event.operator, event.approved]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -40,14 +41,15 @@ export function mockApprovalForAllLog(
 export function mockTransferBatchLog(
   contractAddress: string,
   event: TransferBatchEventObject
-): Log {
+): LogParams {
   const contract = getERC1155Contract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("TransferBatch"),
+    "TransferBatch(address,address,address,uint256[],uint256[])",
     [event.operator, event.from, event.to, event.ids, event.values]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -57,14 +59,15 @@ export function mockTransferBatchLog(
 export function mockTransferSingleLog(
   contractAddress: string,
   event: TransferSingleEventObject
-): Log {
+): LogParams {
   const contract = getERC1155Contract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("TransferSingle"),
+    "TransferSingle(address,address,address,uint256,uint256)",
     [event.operator, event.from, event.to, event.id, event.value]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -74,14 +77,15 @@ export function mockTransferSingleLog(
 export function mockURILog(
   contractAddress: string,
   event: URIEventObject
-): Log {
+): LogParams {
   const contract = getERC1155Contract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("URI"),
+    "URI(string,uint256)",
     [event.value, event.id]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,

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

@@ -1,7 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import { Log } from "@ethersproject/providers";
+import { LogParams } from "ethers/providers";
 import {
   getERC20Contract,
   ApprovalEventObject,
@@ -22,14 +22,15 @@ const mockField = {
 export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
-): Log {
+): LogParams {
   const contract = getERC20Contract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("Approval"),
+    "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -39,14 +40,15 @@ export function mockApprovalLog(
 export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
-): Log {
+): LogParams {
   const contract = getERC20Contract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("OwnershipTransferred"),
+    "OwnershipTransferred(address,address)",
     [event.previousOwner, event.newOwner]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -56,14 +58,15 @@ export function mockOwnershipTransferredLog(
 export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
-): Log {
+): LogParams {
   const contract = getERC20Contract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("Transfer"),
+    "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,

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

@@ -1,7 +1,7 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
-import { Log } from "@ethersproject/providers";
+import { LogParams } from "ethers/providers";
 import {
   getERC20BytesContract,
   ApprovalEventObject,
@@ -21,14 +21,15 @@ const mockField = {
 export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
-): Log {
+): LogParams {
   const contract = getERC20BytesContract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("Approval"),
+    "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,
@@ -38,14 +39,15 @@ export function mockApprovalLog(
 export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
-): Log {
+): LogParams {
   const contract = getERC20BytesContract(contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
-    contract.rawContract.interface.getEvent("Transfer"),
+    "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]
   );
   return {
     ...mockField,
+    index: 0,
     address: contractAddress,
     data: encodedLog.data,
     topics: encodedLog.topics,