@sentio/sdk 1.40.5 → 1.41.0-rc.1

package/lib/builtin/weth9/test-utils.d.ts

@@ -1,6 +1,6 @@
-import { Log } from "@ethersproject/providers";
+import { LogParams } from "ethers/providers";
 import { ApprovalEventObject, TransferEventObject, DepositEventObject, WithdrawalEventObject } from ".";
-export declare function mockApprovalLog(contractAddress: string, event: ApprovalEventObject): Log;
-export declare function mockTransferLog(contractAddress: string, event: TransferEventObject): Log;
-export declare function mockDepositLog(contractAddress: string, event: DepositEventObject): Log;
-export declare function mockWithdrawalLog(contractAddress: string, event: WithdrawalEventObject): Log;
+export declare function mockApprovalLog(contractAddress: string, event: ApprovalEventObject): LogParams;
+export declare function mockTransferLog(contractAddress: string, event: TransferEventObject): LogParams;
+export declare function mockDepositLog(contractAddress: string, event: DepositEventObject): LogParams;
+export declare function mockWithdrawalLog(contractAddress: string, event: WithdrawalEventObject): LogParams;

package/lib/builtin/weth9/test-utils.js

@@ -12,9 +12,10 @@ const mockField = {
 };
 function mockApprovalLog(contractAddress, event) {
     const contract = (0, _1.getWETH9Contract)(contractAddress);
-    const encodedLog = contract.rawContract.interface.encodeEventLog(contract.rawContract.interface.getEvent("Approval"), [event.src, event.guy, event.wad]);
+    const encodedLog = contract.rawContract.interface.encodeEventLog("Approval(address,address,uint256)", [event.src, event.guy, event.wad]);
     return {
         ...mockField,
+        index: 0,
         address: contractAddress,
         data: encodedLog.data,
         topics: encodedLog.topics,
@@ -23,9 +24,10 @@ function mockApprovalLog(contractAddress, event) {
 exports.mockApprovalLog = mockApprovalLog;
 function mockTransferLog(contractAddress, event) {
     const contract = (0, _1.getWETH9Contract)(contractAddress);
-    const encodedLog = contract.rawContract.interface.encodeEventLog(contract.rawContract.interface.getEvent("Transfer"), [event.src, event.dst, event.wad]);
+    const encodedLog = contract.rawContract.interface.encodeEventLog("Transfer(address,address,uint256)", [event.src, event.dst, event.wad]);
     return {
         ...mockField,
+        index: 0,
         address: contractAddress,
         data: encodedLog.data,
         topics: encodedLog.topics,
@@ -34,9 +36,10 @@ function mockTransferLog(contractAddress, event) {
 exports.mockTransferLog = mockTransferLog;
 function mockDepositLog(contractAddress, event) {
     const contract = (0, _1.getWETH9Contract)(contractAddress);
-    const encodedLog = contract.rawContract.interface.encodeEventLog(contract.rawContract.interface.getEvent("Deposit"), [event.dst, event.wad]);
+    const encodedLog = contract.rawContract.interface.encodeEventLog("Deposit(address,uint256)", [event.dst, event.wad]);
     return {
         ...mockField,
+        index: 0,
         address: contractAddress,
         data: encodedLog.data,
         topics: encodedLog.topics,
@@ -45,9 +48,10 @@ function mockDepositLog(contractAddress, event) {
 exports.mockDepositLog = mockDepositLog;
 function mockWithdrawalLog(contractAddress, event) {
     const contract = (0, _1.getWETH9Contract)(contractAddress);
-    const encodedLog = contract.rawContract.interface.encodeEventLog(contract.rawContract.interface.getEvent("Withdrawal"), [event.src, event.wad]);
+    const encodedLog = contract.rawContract.interface.encodeEventLog("Withdrawal(address,uint256)", [event.src, event.wad]);
     return {
         ...mockField,
+        index: 0,
         address: contractAddress,
         data: encodedLog.data,
         topics: encodedLog.topics,

package/lib/builtin/weth9/test-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../../src/builtin/weth9/test-utils.ts"],"names":[],"mappings":";;;AAIA,wBAMW;AACX,MAAM,SAAS,GAAG;IAChB,SAAS,EACP,oEAAoE;IACtE,WAAW,EAAE,CAAC;IACd,QAAQ,EAAE,CAAC;IACX,OAAO,EAAE,KAAK;IACd,eAAe,EACb,oEAAoE;IACtE,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEF,SAAgB,eAAe,CAC7B,eAAuB,EACvB,KAA0B;IAE1B,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EACnD,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAClC,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAfD,0CAeC;AAED,SAAgB,eAAe,CAC7B,eAAuB,EACvB,KAA0B;IAE1B,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EACnD,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAClC,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAfD,0CAeC;AAED,SAAgB,cAAc,CAC5B,eAAuB,EACvB,KAAyB;IAEzB,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAClD,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CACvB,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAfD,wCAeC;AAED,SAAgB,iBAAiB,CAC/B,eAAuB,EACvB,KAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EACrD,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CACvB,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAfD,8CAeC","sourcesContent":["/* Autogenerated file. Do not edit manually. */\n/* tslint:disable */\n/* eslint-disable */\nimport { Log } from \"@ethersproject/providers\";\nimport {\n  getWETH9Contract,\n  ApprovalEventObject,\n  TransferEventObject,\n  DepositEventObject,\n  WithdrawalEventObject,\n} from \".\";\nconst mockField = {\n  blockHash:\n    \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n  blockNumber: 0,\n  logIndex: 0,\n  removed: false,\n  transactionHash:\n    \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n  transactionIndex: 0,\n};\n\nexport function mockApprovalLog(\n  contractAddress: string,\n  event: ApprovalEventObject\n): Log {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    contract.rawContract.interface.getEvent(\"Approval\"),\n    [event.src, event.guy, event.wad]\n  );\n  return {\n    ...mockField,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n\nexport function mockTransferLog(\n  contractAddress: string,\n  event: TransferEventObject\n): Log {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    contract.rawContract.interface.getEvent(\"Transfer\"),\n    [event.src, event.dst, event.wad]\n  );\n  return {\n    ...mockField,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n\nexport function mockDepositLog(\n  contractAddress: string,\n  event: DepositEventObject\n): Log {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    contract.rawContract.interface.getEvent(\"Deposit\"),\n    [event.dst, event.wad]\n  );\n  return {\n    ...mockField,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n\nexport function mockWithdrawalLog(\n  contractAddress: string,\n  event: WithdrawalEventObject\n): Log {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    contract.rawContract.interface.getEvent(\"Withdrawal\"),\n    [event.src, event.wad]\n  );\n  return {\n    ...mockField,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n"]}
+{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../../src/builtin/weth9/test-utils.ts"],"names":[],"mappings":";;;AAIA,wBAMW;AACX,MAAM,SAAS,GAAG;IAChB,SAAS,EACP,oEAAoE;IACtE,WAAW,EAAE,CAAC;IACd,QAAQ,EAAE,CAAC;IACX,OAAO,EAAE,KAAK;IACd,eAAe,EACb,oEAAoE;IACtE,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEF,SAAgB,eAAe,CAC7B,eAAuB,EACvB,KAA0B;IAE1B,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,mCAAmC,EACnC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAClC,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAhBD,0CAgBC;AAED,SAAgB,eAAe,CAC7B,eAAuB,EACvB,KAA0B;IAE1B,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,mCAAmC,EACnC,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAClC,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAhBD,0CAgBC;AAED,SAAgB,cAAc,CAC5B,eAAuB,EACvB,KAAyB;IAEzB,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,0BAA0B,EAC1B,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CACvB,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAhBD,wCAgBC;AAED,SAAgB,iBAAiB,CAC/B,eAAuB,EACvB,KAA4B;IAE5B,MAAM,QAAQ,GAAG,IAAA,mBAAgB,EAAC,eAAe,CAAC,CAAC;IACnD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAC9D,6BAA6B,EAC7B,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CACvB,CAAC;IACF,OAAO;QACL,GAAG,SAAS;QACZ,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,UAAU,CAAC,IAAI;QACrB,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAC;AACJ,CAAC;AAhBD,8CAgBC","sourcesContent":["/* Autogenerated file. Do not edit manually. */\n/* tslint:disable */\n/* eslint-disable */\nimport { LogParams } from \"ethers/providers\";\nimport {\n  getWETH9Contract,\n  ApprovalEventObject,\n  TransferEventObject,\n  DepositEventObject,\n  WithdrawalEventObject,\n} from \".\";\nconst mockField = {\n  blockHash:\n    \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n  blockNumber: 0,\n  logIndex: 0,\n  removed: false,\n  transactionHash:\n    \"0x0000000000000000000000000000000000000000000000000000000000000000\",\n  transactionIndex: 0,\n};\n\nexport function mockApprovalLog(\n  contractAddress: string,\n  event: ApprovalEventObject\n): LogParams {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    \"Approval(address,address,uint256)\",\n    [event.src, event.guy, event.wad]\n  );\n  return {\n    ...mockField,\n    index: 0,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n\nexport function mockTransferLog(\n  contractAddress: string,\n  event: TransferEventObject\n): LogParams {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    \"Transfer(address,address,uint256)\",\n    [event.src, event.dst, event.wad]\n  );\n  return {\n    ...mockField,\n    index: 0,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n\nexport function mockDepositLog(\n  contractAddress: string,\n  event: DepositEventObject\n): LogParams {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    \"Deposit(address,uint256)\",\n    [event.dst, event.wad]\n  );\n  return {\n    ...mockField,\n    index: 0,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n\nexport function mockWithdrawalLog(\n  contractAddress: string,\n  event: WithdrawalEventObject\n): LogParams {\n  const contract = getWETH9Contract(contractAddress);\n  const encodedLog = contract.rawContract.interface.encodeEventLog(\n    \"Withdrawal(address,uint256)\",\n    [event.src, event.wad]\n  );\n  return {\n    ...mockField,\n    index: 0,\n    address: contractAddress,\n    data: encodedLog.data,\n    topics: encodedLog.topics,\n  };\n}\n"]}

package/lib/core/big-decimal.d.ts

@@ -1 +1,7 @@
+import { BigDecimal } from '@sentio/bigdecimal';
 export { BigDecimal } from '@sentio/bigdecimal';
+declare global {
+    interface BigInt {
+        asBigDecimal(): BigDecimal;
+    }
+}

package/lib/core/big-decimal.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BigDecimal = void 0;
-var bigdecimal_1 = require("@sentio/bigdecimal");
-Object.defineProperty(exports, "BigDecimal", { enumerable: true, get: function () { return bigdecimal_1.BigDecimal; } });
+const bigdecimal_1 = require("@sentio/bigdecimal");
+var bigdecimal_2 = require("@sentio/bigdecimal");
+Object.defineProperty(exports, "BigDecimal", { enumerable: true, get: function () { return bigdecimal_2.BigDecimal; } });
+BigInt.prototype.asBigDecimal = function () {
+    return new bigdecimal_1.BigDecimal(this.toString());
+};
 //# sourceMappingURL=big-decimal.js.map

package/lib/core/big-decimal.js.map

@@ -1 +1 @@
-{"version":3,"file":"big-decimal.js","sourceRoot":"","sources":["../../src/core/big-decimal.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAAtC,wGAAA,UAAU,OAAA","sourcesContent":["export { BigDecimal } from '@sentio/bigdecimal'\n"]}
+{"version":3,"file":"big-decimal.js","sourceRoot":"","sources":["../../src/core/big-decimal.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAE/C,iDAA+C;AAAtC,wGAAA,UAAU,OAAA;AAOnB,MAAM,CAAC,SAAS,CAAC,YAAY,GAAG;IAC9B,OAAO,IAAI,uBAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;AACxC,CAAC,CAAA","sourcesContent":["import { BigDecimal } from '@sentio/bigdecimal'\n\nexport { BigDecimal } from '@sentio/bigdecimal'\n\ndeclare global {\n  interface BigInt {\n    asBigDecimal(): BigDecimal\n  }\n}\nBigInt.prototype.asBigDecimal = function () {\n  return new BigDecimal(this.toString())\n}\n"]}

package/lib/core/bind-options.d.ts

@@ -1,4 +1,4 @@
-import { Networkish } from '@ethersproject/networks';
+import { Networkish } from 'ethers/providers';
 export declare class BindOptions {
     address: string;
     network?: Networkish;

package/lib/core/bind-options.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountBindOptions = exports.BindInternalOptions = exports.getOptionsSignature = exports.BindOptions = void 0;
-const providers_1 = require("@ethersproject/providers");
+const providers_1 = require("ethers/providers");
 class BindOptions {
     // Contract address
     address;
@@ -16,7 +16,7 @@ exports.BindOptions = BindOptions;
 function getOptionsSignature(opts) {
     const sig = [opts.address];
     if (opts.network) {
-        sig.push((0, providers_1.getNetwork)(opts.network).chainId.toString());
+        sig.push(providers_1.Network.from(opts.network).chainId.toString());
     }
     if (opts.name) {
         sig.push(opts.name);

package/lib/core/bind-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"bind-options.js","sourceRoot":"","sources":["../../src/core/bind-options.ts"],"names":[],"mappings":";;;AACA,wDAAqD;AAErD,MAAa,WAAW;IACtB,mBAAmB;IACnB,OAAO,CAAQ;IACf,6CAA6C;IAC7C,OAAO,GAAgB,CAAC,CAAA;IACxB,2CAA2C;IAC3C,IAAI,CAAS;IACb,UAAU,CAAkB;IAC5B,QAAQ,CAAkB;CAC3B;AATD,kCASC;AAED,SAAgB,mBAAmB,CAAC,IAAiB;IACnD,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1B,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,GAAG,CAAC,IAAI,CAAC,IAAA,sBAAU,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;KACtD;IACD,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACpB;IACD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;KACnC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACtB,CAAC;AAfD,kDAeC;AAED,MAAa,mBAAmB;IAC9B,OAAO,CAAQ;IACf,OAAO,CAAY;IACnB,IAAI,CAAQ;IACZ,UAAU,CAAQ;IAClB,QAAQ,CAAS;CAClB;AAND,kDAMC;AAED,MAAa,kBAAkB;IAC7B,OAAO,CAAQ;IACf,OAAO,CAAa;IACpB,UAAU,CAAkB;CAC7B;AAJD,gDAIC","sourcesContent":["import { Networkish } from '@ethersproject/networks'\nimport { getNetwork } from '@ethersproject/providers'\n\nexport class BindOptions {\n  // Contract address\n  address: string\n  // Optional, if not set, then use eth mainnet\n  network?: Networkish = 1\n  // Optional, override default contract name\n  name?: string\n  startBlock?: bigint | number\n  endBlock?: bigint | number\n}\n\nexport function getOptionsSignature(opts: BindOptions): string {\n  const sig = [opts.address]\n  if (opts.network) {\n    sig.push(getNetwork(opts.network).chainId.toString())\n  }\n  if (opts.name) {\n    sig.push(opts.name)\n  }\n  if (opts.startBlock) {\n    sig.push(opts.startBlock.toString())\n  }\n  if (opts.endBlock) {\n    sig.push(opts.endBlock.toString())\n  }\n  return sig.join('_')\n}\n\nexport class BindInternalOptions {\n  address: string\n  network: Networkish\n  name: string\n  startBlock: bigint\n  endBlock?: bigint\n}\n\nexport class AccountBindOptions {\n  address: string\n  network?: Networkish\n  startBlock?: bigint | number\n}\n"]}
+{"version":3,"file":"bind-options.js","sourceRoot":"","sources":["../../src/core/bind-options.ts"],"names":[],"mappings":";;;AAAA,gDAAsD;AAEtD,MAAa,WAAW;IACtB,mBAAmB;IACnB,OAAO,CAAQ;IACf,6CAA6C;IAC7C,OAAO,GAAgB,CAAC,CAAA;IACxB,2CAA2C;IAC3C,IAAI,CAAS;IACb,UAAU,CAAkB;IAC5B,QAAQ,CAAkB;CAC3B;AATD,kCASC;AAED,SAAgB,mBAAmB,CAAC,IAAiB;IACnD,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1B,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,GAAG,CAAC,IAAI,CAAC,mBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;KACxD;IACD,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACpB;IACD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAA;KACrC;IACD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;KACnC;IACD,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACtB,CAAC;AAfD,kDAeC;AAED,MAAa,mBAAmB;IAC9B,OAAO,CAAQ;IACf,OAAO,CAAY;IACnB,IAAI,CAAQ;IACZ,UAAU,CAAQ;IAClB,QAAQ,CAAS;CAClB;AAND,kDAMC;AAED,MAAa,kBAAkB;IAC7B,OAAO,CAAQ;IACf,OAAO,CAAa;IACpB,UAAU,CAAkB;CAC7B;AAJD,gDAIC","sourcesContent":["import { Networkish, Network } from 'ethers/providers'\n\nexport class BindOptions {\n  // Contract address\n  address: string\n  // Optional, if not set, then use eth mainnet\n  network?: Networkish = 1\n  // Optional, override default contract name\n  name?: string\n  startBlock?: bigint | number\n  endBlock?: bigint | number\n}\n\nexport function getOptionsSignature(opts: BindOptions): string {\n  const sig = [opts.address]\n  if (opts.network) {\n    sig.push(Network.from(opts.network).chainId.toString())\n  }\n  if (opts.name) {\n    sig.push(opts.name)\n  }\n  if (opts.startBlock) {\n    sig.push(opts.startBlock.toString())\n  }\n  if (opts.endBlock) {\n    sig.push(opts.endBlock.toString())\n  }\n  return sig.join('_')\n}\n\nexport class BindInternalOptions {\n  address: string\n  network: Networkish\n  name: string\n  startBlock: bigint\n  endBlock?: bigint\n}\n\nexport class AccountBindOptions {\n  address: string\n  network?: Networkish\n  startBlock?: bigint | number\n}\n"]}

package/lib/core/context.d.ts

@@ -1,10 +1,9 @@
+import { BaseContract, Transaction, TransactionReceipt, Block, ContractEvent } from 'ethers';
+import { LogParams } from 'ethers/providers';
 import { RecordMetaData } from '@sentio/protos';
-import { BaseContract, EventFilter, Transaction } from 'ethers';
-import { Block, Log } from '@ethersproject/abstract-provider';
-import { Trace } from './trace';
+import { Trace } from '../eth/trace';
 import { Labels } from './metadata';
 import { BaseContext } from './base-context';
-import { TransactionReceipt } from '@ethersproject/providers';
 export declare abstract class EthContext extends BaseContext {
     chainId: number;
     address: string;
@@ -16,7 +15,7 @@ export declare abstract class EthContext extends BaseContext {
     transaction?: Transaction;
     transactionReceipt?: TransactionReceipt;
     timestamp: Date;
-    constructor(chainId: number, address: string, timestamp?: Date, block?: Block, log?: Log, trace?: Trace, transaction?: Transaction, transactionReceipt?: TransactionReceipt);
+    constructor(chainId: number, address: string, timestamp?: Date, block?: Block, log?: LogParams, trace?: Trace, transaction?: Transaction, transactionReceipt?: TransactionReceipt);
     protected abstract getContractName(): string;
     getMetaData(name: string, labels: Labels): RecordMetaData;
 }
@@ -26,27 +25,22 @@ export declare class AccountContext extends EthContext {
 export declare class ContractContext<TContract extends BaseContract, TContractBoundView extends BoundContractView<TContract, ContractView<TContract>>> extends EthContext {
     contract: TContractBoundView;
     contractName: string;
-    constructor(contractName: string, view: TContractBoundView, chainId: number, timestamp?: Date, block?: Block, log?: Log, trace?: Trace, transaction?: Transaction, transactionReceipt?: TransactionReceipt);
+    constructor(contractName: string, view: TContractBoundView, chainId: number, timestamp?: Date, block?: Block, log?: LogParams, trace?: Trace, transaction?: Transaction, transactionReceipt?: TransactionReceipt);
     protected getContractName(): string;
 }
 export declare class ContractView<TContract extends BaseContract> {
-    filters: {
-        [name: string]: (...args: Array<any>) => EventFilter;
-    };
     protected contract: TContract;
     constructor(contract: TContract);
     get rawContract(): TContract;
-    get provider(): import("@ethersproject/abstract-provider").Provider;
+    get provider(): import("ethers").Provider | null | undefined;
 }
 export declare class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {
     protected view: TContractView;
     context: ContractContext<TContract, BoundContractView<TContract, TContractView>>;
     constructor(view: TContractView);
     get rawContract(): TContract;
-    get provider(): import("@ethersproject/abstract-provider").Provider;
-    get filters(): {
-        [name: string]: (...args: any[]) => EventFilter;
-    };
+    get provider(): import("ethers").Provider | null | undefined;
+    get filters(): Record<string, ContractEvent<any[]>>;
 }
 export declare class SuiContext extends BaseContext {
     address: string;

package/lib/core/context.js

@@ -45,7 +45,7 @@ class EthContext extends base_context_1.BaseContext {
                 blockNumber: BigInt(this.blockNumber),
                 transactionIndex: this.log.transactionIndex,
                 transactionHash: this.transactionHash || '',
-                logIndex: this.log.logIndex,
+                logIndex: this.log.index,
                 chainId: this.chainId.toString(),
                 name: name,
                 labels: (0, meter_1.normalizeLabels)(labels),
@@ -94,7 +94,10 @@ class ContractContext extends EthContext {
     contract;
     contractName;
     constructor(contractName, view, chainId, timestamp, block, log, trace, transaction, transactionReceipt) {
-        super(chainId, view.rawContract.address, timestamp, block, log, trace, transaction, transactionReceipt);
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        const address = view.rawContract.getAddress();
+        super(chainId, address, timestamp, block, log, trace, transaction, transactionReceipt);
         view.context = this;
         this.contractName = contractName;
         this.contract = view;
@@ -105,17 +108,15 @@ class ContractContext extends EthContext {
 }
 exports.ContractContext = ContractContext;
 class ContractView {
-    filters;
     contract;
     constructor(contract) {
         this.contract = contract;
-        this.filters = contract.filters;
     }
     get rawContract() {
         return this.contract;
     }
     get provider() {
-        return this.contract.provider;
+        return this.contract.runner?.provider;
     }
 }
 exports.ContractView = ContractView;
@@ -133,7 +134,7 @@ class BoundContractView {
         return this.view.provider;
     }
     get filters() {
-        return this.view.filters;
+        return this.view.rawContract.filters;
     }
 }
 exports.BoundContractView = BoundContractView;

package/lib/core/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { RecordMetaData } from '@sentio/protos'\nimport { BaseContract, EventFilter, Transaction } from 'ethers'\nimport { Block, Log } from '@ethersproject/abstract-provider'\nimport { normalizeLabels } from './meter'\nimport { Trace } from './trace'\nimport { Labels } from './metadata'\nimport { CHAIN_IDS } from '../utils/chain'\nimport { BaseContext } from './base-context'\nimport { TransactionReceipt } from '@ethersproject/providers'\n\nexport abstract class EthContext extends BaseContext {\n  chainId: number\n  address: string\n  private readonly log?: Log\n  block?: Block\n  private readonly trace?: Trace\n  blockNumber: bigint | number\n  transactionHash?: string\n  transaction?: Transaction\n  transactionReceipt?: TransactionReceipt\n  timestamp: Date\n\n  constructor(\n    chainId: number,\n    address: string,\n    timestamp?: Date,\n    block?: Block,\n    log?: Log,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    super()\n    this.chainId = chainId\n    this.log = log\n    this.block = block\n    this.trace = trace\n    this.address = address\n    this.transaction = transaction\n    this.transactionReceipt = transactionReceipt\n    this.timestamp = timestamp || new Date(0)\n    if (log) {\n      this.blockNumber = log.blockNumber\n      this.transactionHash = log.transactionHash\n    } else if (block) {\n      this.blockNumber = block.number\n    } else if (trace) {\n      this.blockNumber = trace.blockNumber\n      this.transactionHash = trace.transactionHash\n    }\n  }\n\n  protected abstract getContractName(): string\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    if (this.log) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.log.transactionIndex,\n        transactionHash: this.transactionHash || '',\n        logIndex: this.log.logIndex,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.block) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: -1,\n        transactionHash: '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.trace) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.trace.transactionPosition,\n        transactionHash: this.transactionHash || '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    throw new Error(\"Invaid ctx argument can't happen\")\n  }\n}\n\nexport class AccountContext extends EthContext {\n  // constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {\n  //   super(chainId, address, new Date(0), block, log, trace)\n  // }\n  protected getContractName(): string {\n    return 'account'\n  }\n}\n\nexport class ContractContext<\n  TContract extends BaseContract,\n  TContractBoundView extends BoundContractView<TContract, ContractView<TContract>>\n> extends EthContext {\n  contract: TContractBoundView\n  contractName: string\n\n  constructor(\n    contractName: string,\n    view: TContractBoundView,\n    chainId: number,\n    timestamp?: Date,\n    block?: Block,\n    log?: Log,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    super(chainId, view.rawContract.address, timestamp, block, log, trace, transaction, transactionReceipt)\n    view.context = this\n    this.contractName = contractName\n    this.contract = view\n  }\n\n  protected getContractName(): string {\n    return this.contractName\n  }\n}\n\nexport class ContractView<TContract extends BaseContract> {\n  filters: { [name: string]: (...args: Array<any>) => EventFilter }\n  protected contract: TContract\n\n  constructor(contract: TContract) {\n    this.contract = contract\n    this.filters = contract.filters\n  }\n\n  get rawContract() {\n    return this.contract\n  }\n\n  get provider() {\n    return this.contract.provider\n  }\n}\n\nexport class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {\n  protected view: TContractView\n  // context will be set right after context creation (in context's constructor)\n  context: ContractContext<TContract, BoundContractView<TContract, TContractView>>\n\n  constructor(view: TContractView) {\n    this.view = view\n  }\n\n  get rawContract() {\n    return this.view.rawContract\n  }\n\n  get provider() {\n    return this.view.provider\n  }\n\n  get filters() {\n    return this.view.filters\n  }\n}\n\nexport class SuiContext extends BaseContext {\n  address: string\n  moduleName: string\n  blockNumber: bigint\n\n  constructor(address: string, slot: bigint) {\n    super()\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.moduleName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO\n      logIndex: 0,\n      chainId: CHAIN_IDS.SUI_DEVNET, // TODO set in context\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContract, Transaction, TransactionReceipt, Block, ContractEvent } from 'ethers'\nimport { LogParams } from 'ethers/providers'\n\nimport { RecordMetaData } from '@sentio/protos'\nimport { normalizeLabels } from './meter'\nimport { Trace } from '../eth/trace'\nimport { Labels } from './metadata'\nimport { CHAIN_IDS } from '../utils/chain'\nimport { BaseContext } from './base-context'\n\nexport abstract class EthContext extends BaseContext {\n  chainId: number\n  address: string\n  private readonly log?: LogParams\n  block?: Block\n  private readonly trace?: Trace\n  blockNumber: bigint | number\n  transactionHash?: string\n  transaction?: Transaction\n  transactionReceipt?: TransactionReceipt\n  timestamp: Date\n\n  constructor(\n    chainId: number,\n    address: string,\n    timestamp?: Date,\n    block?: Block,\n    log?: LogParams,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    super()\n    this.chainId = chainId\n    this.log = log\n    this.block = block\n    this.trace = trace\n    this.address = address\n    this.transaction = transaction\n    this.transactionReceipt = transactionReceipt\n    this.timestamp = timestamp || new Date(0)\n    if (log) {\n      this.blockNumber = log.blockNumber\n      this.transactionHash = log.transactionHash\n    } else if (block) {\n      this.blockNumber = block.number\n    } else if (trace) {\n      this.blockNumber = trace.blockNumber\n      this.transactionHash = trace.transactionHash\n    }\n  }\n\n  protected abstract getContractName(): string\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    if (this.log) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.log.transactionIndex,\n        transactionHash: this.transactionHash || '',\n        logIndex: this.log.index,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.block) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: -1,\n        transactionHash: '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.trace) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.trace.transactionPosition,\n        transactionHash: this.transactionHash || '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    throw new Error(\"Invaid ctx argument can't happen\")\n  }\n}\n\nexport class AccountContext extends EthContext {\n  // constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {\n  //   super(chainId, address, new Date(0), block, log, trace)\n  // }\n  protected getContractName(): string {\n    return 'account'\n  }\n}\n\nexport class ContractContext<\n  TContract extends BaseContract,\n  TContractBoundView extends BoundContractView<TContract, ContractView<TContract>>\n> extends EthContext {\n  contract: TContractBoundView\n  contractName: string\n\n  constructor(\n    contractName: string,\n    view: TContractBoundView,\n    chainId: number,\n    timestamp?: Date,\n    block?: Block,\n    log?: LogParams,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n    // @ts-ignore\n    const address = view.rawContract.getAddress() as string\n    super(chainId, address, timestamp, block, log, trace, transaction, transactionReceipt)\n    view.context = this\n    this.contractName = contractName\n    this.contract = view\n  }\n\n  protected getContractName(): string {\n    return this.contractName\n  }\n}\n\nexport class ContractView<TContract extends BaseContract> {\n  protected contract: TContract\n\n  constructor(contract: TContract) {\n    this.contract = contract\n  }\n\n  get rawContract() {\n    return this.contract\n  }\n\n  get provider() {\n    return this.contract.runner?.provider\n  }\n}\n\nexport class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {\n  protected view: TContractView\n  // context will be set right after context creation (in context's constructor)\n  context: ContractContext<TContract, BoundContractView<TContract, TContractView>>\n\n  constructor(view: TContractView) {\n    this.view = view\n  }\n\n  get rawContract() {\n    return this.view.rawContract\n  }\n\n  get provider() {\n    return this.view.provider\n  }\n\n  get filters() {\n    return this.view.rawContract.filters\n  }\n}\n\nexport class SuiContext extends BaseContext {\n  address: string\n  moduleName: string\n  blockNumber: bigint\n\n  constructor(address: string, slot: bigint) {\n    super()\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.moduleName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO\n      logIndex: 0,\n      chainId: CHAIN_IDS.SUI_DEVNET, // TODO set in context\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}

package/lib/core/core-plugin.d.ts

@@ -2,5 +2,5 @@ import { Plugin } from '@sentio/runtime';
 import { ProcessConfigResponse } from '@sentio/protos';
 export declare class CorePlugin extends Plugin {
     name: string;
-    configure(config: ProcessConfigResponse): void;
+    configure(config: ProcessConfigResponse): Promise<void>;
 }

package/lib/core/core-plugin.js

@@ -7,7 +7,7 @@ const event_tracker_1 = require("./event-tracker");
 const exporter_1 = require("./exporter");
 class CorePlugin extends runtime_1.Plugin {
     name = 'CorePlugin';
-    configure(config) {
+    async configure(config) {
         // part 0, prepare metrics and event tracking configs
         for (const metric of meter_1.MetricState.INSTANCE.getValues()) {
             config.metricConfigs.push({

package/lib/core/core-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"core-plugin.js","sourceRoot":"","sources":["../../src/core/core-plugin.ts"],"names":[],"mappings":";;;AAAA,6CAAuD;AAGvD,mCAAqC;AACrC,mDAAmD;AACnD,yCAA0C;AAE1C,MAAa,UAAW,SAAQ,gBAAM;IACpC,IAAI,GAAW,YAAY,CAAA;IAE3B,SAAS,CAAC,MAA6B;QACrC,qDAAqD;QACrD,KAAK,MAAM,MAAM,IAAI,mBAAW,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACrD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,GAAG,MAAM,CAAC,MAAM;aACjB,CAAC,CAAA;SACH;QAED,KAAK,MAAM,YAAY,IAAI,iCAAiB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACjE,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC;gBAC/B,yBAAyB,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE;gBACpE,SAAS,EAAE,YAAY,CAAC,IAAI;gBAC5B,eAAe,EAAE,SAAS;gBAC1B,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,IAAI,KAAK;gBACpD,cAAc,EAAE,SAAS;gBACzB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK;aAC7C,CAAC,CAAA;SACH;QAED,KAAK,MAAM,QAAQ,IAAI,wBAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACzD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC,CAAA;SACH;IACH,CAAC;CACF;AA7BD,gCA6BC;AAED,uBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager } from '@sentio/runtime'\nimport { ProcessConfigResponse } from '@sentio/protos'\n\nimport { MetricState } from './meter'\nimport { EventTrackerState } from './event-tracker'\nimport { ExporterState } from './exporter'\n\nexport class CorePlugin extends Plugin {\n  name: string = 'CorePlugin'\n\n  configure(config: ProcessConfigResponse): void {\n    // part 0, prepare metrics and event tracking configs\n    for (const metric of MetricState.INSTANCE.getValues()) {\n      config.metricConfigs.push({\n        ...metric.config,\n      })\n    }\n\n    for (const eventTracker of EventTrackerState.INSTANCE.getValues()) {\n      config.eventTrackingConfigs.push({\n        distinctAggregationByDays: eventTracker.options.distinctByDays || [],\n        eventName: eventTracker.name,\n        retentionConfig: undefined,\n        totalByDay: eventTracker.options.totalByDay || false,\n        totalPerEntity: undefined,\n        unique: eventTracker.options.unique || false,\n      })\n    }\n\n    for (const exporter of ExporterState.INSTANCE.getValues()) {\n      config.exportConfigs.push({\n        name: exporter.name,\n        channel: exporter.channel,\n      })\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new CorePlugin())\n"]}
+{"version":3,"file":"core-plugin.js","sourceRoot":"","sources":["../../src/core/core-plugin.ts"],"names":[],"mappings":";;;AAAA,6CAAuD;AAGvD,mCAAqC;AACrC,mDAAmD;AACnD,yCAA0C;AAE1C,MAAa,UAAW,SAAQ,gBAAM;IACpC,IAAI,GAAW,YAAY,CAAA;IAE3B,KAAK,CAAC,SAAS,CAAC,MAA6B;QAC3C,qDAAqD;QACrD,KAAK,MAAM,MAAM,IAAI,mBAAW,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACrD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,GAAG,MAAM,CAAC,MAAM;aACjB,CAAC,CAAA;SACH;QAED,KAAK,MAAM,YAAY,IAAI,iCAAiB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACjE,MAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC;gBAC/B,yBAAyB,EAAE,YAAY,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE;gBACpE,SAAS,EAAE,YAAY,CAAC,IAAI;gBAC5B,eAAe,EAAE,SAAS;gBAC1B,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,UAAU,IAAI,KAAK;gBACpD,cAAc,EAAE,SAAS;gBACzB,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM,IAAI,KAAK;aAC7C,CAAC,CAAA;SACH;QAED,KAAK,MAAM,QAAQ,IAAI,wBAAa,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE;YACzD,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC;gBACxB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;aAC1B,CAAC,CAAA;SACH;IACH,CAAC;CACF;AA7BD,gCA6BC;AAED,uBAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAA","sourcesContent":["import { Plugin, PluginManager } from '@sentio/runtime'\nimport { ProcessConfigResponse } from '@sentio/protos'\n\nimport { MetricState } from './meter'\nimport { EventTrackerState } from './event-tracker'\nimport { ExporterState } from './exporter'\n\nexport class CorePlugin extends Plugin {\n  name: string = 'CorePlugin'\n\n  async configure(config: ProcessConfigResponse): Promise<void> {\n    // part 0, prepare metrics and event tracking configs\n    for (const metric of MetricState.INSTANCE.getValues()) {\n      config.metricConfigs.push({\n        ...metric.config,\n      })\n    }\n\n    for (const eventTracker of EventTrackerState.INSTANCE.getValues()) {\n      config.eventTrackingConfigs.push({\n        distinctAggregationByDays: eventTracker.options.distinctByDays || [],\n        eventName: eventTracker.name,\n        retentionConfig: undefined,\n        totalByDay: eventTracker.options.totalByDay || false,\n        totalPerEntity: undefined,\n        unique: eventTracker.options.unique || false,\n      })\n    }\n\n    for (const exporter of ExporterState.INSTANCE.getValues()) {\n      config.exportConfigs.push({\n        name: exporter.name,\n        channel: exporter.channel,\n      })\n    }\n  }\n}\n\nPluginManager.INSTANCE.register(new CorePlugin())\n"]}

package/lib/core/generic-processor.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"generic-processor.test.js","sourceRoot":"","sources":["../../src/core/generic-processor.test.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO move out of this package\n\nimport { expect } from 'chai'\n\nimport { HandlerType } from '@sentio/protos'\n\nimport { GenericProcessor } from './generic-processor'\nimport { TestProcessorServer, firstCounterValue } from '../testing'\n\ndescribe('Test Generic Processor', () => {\n  const service = new TestProcessorServer(() => {\n    GenericProcessor.bind(\n      [\n        'event Transfer(address indexed from, address indexed to, uint256 value)',\n        'event Approval(address indexed from, address indexed to, uint256 value)',\n      ],\n      { address: '0x1E4EDE388cbc9F4b5c79681B7f94d36a11ABEBC9' }\n    ).onAllEvents(function (log, ctx) {\n      ctx.meter.Counter('event_num').add(1)\n    })\n\n    GenericProcessor.bind('event WalletCreated(address wallet, address owner)', {\n      address: '0x57E037F4d2c8BEa011Ad8a9A5AF4AaEEd508650f',\n    }).onAllEvents(function (log, ctx) {\n      ctx.meter.Counter('wallet').add(1)\n    })\n  })\n\n  beforeAll(async () => {\n    await service.start()\n  })\n\n  test('check configuration', async () => {\n    const config = await service.getConfig({})\n    expect(config.contractConfigs).length(2)\n    expect(config.contractConfigs?.[0].contract?.name).equals('Generic')\n  })\n\n  test('Check log dispatch', async () => {\n    const res = await service.testLogs([logData, logData])\n    const counters = res.result?.counters\n    expect(counters).length(2)\n    expect(firstCounterValue(res.result, 'event_num')).equals(1n)\n    expect(counters?.[0].runtimeInfo?.from).equals(HandlerType.ETH_LOG)\n  })\n\n  test('Check log dispatch no buffer over rune', async () => {\n    const logStr =\n      '{\"address\":\"0x57e037f4d2c8bea011ad8a9a5af4aaeed508650f\",\"topics\":[\"0x5b03bfed1c14a02bdeceb5fa582eb1a5765fc0bc64ca0e6af4c20afc9487f081\"],\"data\":\"0x00000000000000000000000093269483a70c68d5c5bb63aac1e8f4ac59f498800000000000000000000000000c520e51c055cf63bab075715c1b860b2e9b8e24\",\"blockNumber\":\"0xc9d6d7\",\"transactionHash\":\"0x208af3250499672c2f07138b9aa236153c65c78ae4341b23c2763017afdd61a2\",\"transactionIndex\":\"0xf3\",\"blockHash\":\"0x6e3b100c34b510049e922fbe1c1dab1b0793be3d1229b632688e6a518cdd11b6\",\"logIndex\":\"0x14b\",\"removed\":false}'\n    const res = await service.testLog(JSON.parse(logStr))\n    console.log(JSON.stringify(res))\n  })\n\n  const logData = {\n    blockNumber: 14213252,\n    blockHash: '0x83d646fac9350b281def8c4c37626f9d8efc95df801287b848c719edf35cdbaf',\n    transactionIndex: 347,\n    removed: false,\n    address: '0x1E4EDE388cbc9F4b5c79681B7f94d36a11ABEBC9',\n    data: '0x00000000000000000000000000000000000000000000009a71db64810aaa0000',\n    topics: [\n      '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n      '0x0000000000000000000000000000000000000000000000000000000000000000',\n      '0x000000000000000000000000b329e39ebefd16f40d38f07643652ce17ca5bac1',\n    ],\n    transactionHash: '0x93355e0cb2c3490cb8a747029ff2dc8cdbde2407025b8391398436955afae303',\n    logIndex: 428,\n  }\n})\n"]}
+{"version":3,"file":"generic-processor.test.js","sourceRoot":"","sources":["../../src/core/generic-processor.test.ts"],"names":[],"mappings":"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","sourcesContent":["// TODO move out of this package\n\nimport { expect } from 'chai'\n\nimport { HandlerType } from '@sentio/protos'\n\nimport { GenericProcessor } from '../eth/generic-processor'\nimport { TestProcessorServer, firstCounterValue } from '../testing'\n\ndescribe('Test Generic Processor', () => {\n  const service = new TestProcessorServer(() => {\n    GenericProcessor.bind(\n      [\n        'event Transfer(address indexed from, address indexed to, uint256 value)',\n        'event Approval(address indexed from, address indexed to, uint256 value)',\n      ],\n      { address: '0x1E4EDE388cbc9F4b5c79681B7f94d36a11ABEBC9' }\n    ).onAllEvents(function (log, ctx) {\n      ctx.meter.Counter('event_num').add(1)\n    })\n\n    GenericProcessor.bind('event WalletCreated(address wallet, address owner)', {\n      address: '0x57E037F4d2c8BEa011Ad8a9A5AF4AaEEd508650f',\n    }).onAllEvents(function (log, ctx) {\n      ctx.meter.Counter('wallet').add(1)\n    })\n  })\n\n  beforeAll(async () => {\n    await service.start()\n  })\n\n  test('check configuration', async () => {\n    const config = await service.getConfig({})\n    expect(config.contractConfigs).length(2)\n    expect(config.contractConfigs?.[0].contract?.name).equals('Generic')\n  })\n\n  test('Check log dispatch', async () => {\n    const res = await service.testLogs([logData, logData])\n    const counters = res.result?.counters\n    expect(counters).length(2)\n    expect(firstCounterValue(res.result, 'event_num')).equals(1)\n    expect(counters?.[0].runtimeInfo?.from).equals(HandlerType.ETH_LOG)\n  })\n\n  test('Check log dispatch no buffer over rune', async () => {\n    const logStr =\n      '{\"address\":\"0x57e037f4d2c8bea011ad8a9a5af4aaeed508650f\",\"topics\":[\"0x5b03bfed1c14a02bdeceb5fa582eb1a5765fc0bc64ca0e6af4c20afc9487f081\"],\"data\":\"0x00000000000000000000000093269483a70c68d5c5bb63aac1e8f4ac59f498800000000000000000000000000c520e51c055cf63bab075715c1b860b2e9b8e24\",\"blockNumber\":\"0xc9d6d7\",\"transactionHash\":\"0x208af3250499672c2f07138b9aa236153c65c78ae4341b23c2763017afdd61a2\",\"transactionIndex\":\"0xf3\",\"blockHash\":\"0x6e3b100c34b510049e922fbe1c1dab1b0793be3d1229b632688e6a518cdd11b6\",\"logIndex\":\"0x14b\",\"removed\":false}'\n    const res = await service.testLog(JSON.parse(logStr))\n    console.log(JSON.stringify(res))\n  })\n\n  const logData = {\n    index: 0,\n    blockNumber: 14213252,\n    blockHash: '0x83d646fac9350b281def8c4c37626f9d8efc95df801287b848c719edf35cdbaf',\n    transactionIndex: 347,\n    removed: false,\n    address: '0x1E4EDE388cbc9F4b5c79681B7f94d36a11ABEBC9',\n    data: '0x00000000000000000000000000000000000000000000009a71db64810aaa0000',\n    topics: [\n      '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',\n      '0x0000000000000000000000000000000000000000000000000000000000000000',\n      '0x000000000000000000000000b329e39ebefd16f40d38f07643652ce17ca5bac1',\n    ],\n    transactionHash: '0x93355e0cb2c3490cb8a747029ff2dc8cdbde2407025b8391398436955afae303',\n    logIndex: 428,\n  }\n})\n"]}

package/lib/core/index.d.ts

@@ -4,11 +4,6 @@ export { CounterBinding, Meter, GaugeBinding, Counter, Gauge, MetricOptions } fr
 export { EventTracker, AccountEventTracker } from './event-tracker';
 export { type Numberish, toBigInteger, toMetricValue, toBlockTag } from './numberish';
 export { BindOptions } from './bind-options';
-export { BaseProcessor } from './base-processor';
-export { GenericProcessor } from './generic-processor';
-export { BaseProcessorTemplate } from './base-processor-template';
 export { SuiBaseProcessor, SuiBindOptions } from './sui-processor';
-export type { TypedCallTrace, Trace } from './trace';
-export { EthPlugin } from './eth-plugin';
 export { SuiPlugin } from './sui-plugin';
 export { CorePlugin } from './core-plugin';

package/lib/core/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CorePlugin = exports.SuiPlugin = exports.EthPlugin = exports.SuiBindOptions = exports.SuiBaseProcessor = exports.BaseProcessorTemplate = exports.GenericProcessor = exports.BaseProcessor = exports.BindOptions = exports.toBlockTag = exports.toMetricValue = exports.toBigInteger = exports.AccountEventTracker = exports.EventTracker = exports.MetricOptions = exports.Gauge = exports.Counter = exports.GaugeBinding = exports.Meter = exports.CounterBinding = exports.BoundContractView = exports.ContractView = exports.ContractContext = exports.BigDecimal = void 0;
+exports.CorePlugin = exports.SuiPlugin = exports.SuiBindOptions = exports.SuiBaseProcessor = exports.BindOptions = exports.toBlockTag = exports.toMetricValue = exports.toBigInteger = exports.AccountEventTracker = exports.EventTracker = exports.MetricOptions = exports.Gauge = exports.Counter = exports.GaugeBinding = exports.Meter = exports.CounterBinding = exports.BoundContractView = exports.ContractView = exports.ContractContext = exports.BigDecimal = void 0;
 var big_decimal_1 = require("./big-decimal");
 Object.defineProperty(exports, "BigDecimal", { enumerable: true, get: function () { return big_decimal_1.BigDecimal; } });
 var context_1 = require("./context");
@@ -23,17 +23,9 @@ Object.defineProperty(exports, "toMetricValue", { enumerable: true, get: functio
 Object.defineProperty(exports, "toBlockTag", { enumerable: true, get: function () { return numberish_1.toBlockTag; } });
 var bind_options_1 = require("./bind-options");
 Object.defineProperty(exports, "BindOptions", { enumerable: true, get: function () { return bind_options_1.BindOptions; } });
-var base_processor_1 = require("./base-processor");
-Object.defineProperty(exports, "BaseProcessor", { enumerable: true, get: function () { return base_processor_1.BaseProcessor; } });
-var generic_processor_1 = require("./generic-processor");
-Object.defineProperty(exports, "GenericProcessor", { enumerable: true, get: function () { return generic_processor_1.GenericProcessor; } });
-var base_processor_template_1 = require("./base-processor-template");
-Object.defineProperty(exports, "BaseProcessorTemplate", { enumerable: true, get: function () { return base_processor_template_1.BaseProcessorTemplate; } });
 var sui_processor_1 = require("./sui-processor");
 Object.defineProperty(exports, "SuiBaseProcessor", { enumerable: true, get: function () { return sui_processor_1.SuiBaseProcessor; } });
 Object.defineProperty(exports, "SuiBindOptions", { enumerable: true, get: function () { return sui_processor_1.SuiBindOptions; } });
-var eth_plugin_1 = require("./eth-plugin");
-Object.defineProperty(exports, "EthPlugin", { enumerable: true, get: function () { return eth_plugin_1.EthPlugin; } });
 var sui_plugin_1 = require("./sui-plugin");
 Object.defineProperty(exports, "SuiPlugin", { enumerable: true, get: function () { return sui_plugin_1.SuiPlugin; } });
 var core_plugin_1 = require("./core-plugin");

package/lib/core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAAjC,yGAAA,UAAU,OAAA;AACnB,qCAA4E;AAAnE,0GAAA,eAAe,OAAA;AAAE,uGAAA,YAAY,OAAA;AAAE,4GAAA,iBAAiB,OAAA;AACzD,iCAA4F;AAAnF,uGAAA,cAAc,OAAA;AAAE,8FAAA,KAAK,OAAA;AAAE,qGAAA,YAAY,OAAA;AAAE,gGAAA,OAAO,OAAA;AAAE,8FAAA,KAAK,OAAA;AAAE,sGAAA,aAAa,OAAA;AAC3E,iDAAmE;AAA1D,6GAAA,YAAY,OAAA;AAAE,oHAAA,mBAAmB,OAAA;AAC1C,yCAAqF;AAA5D,yGAAA,YAAY,OAAA;AAAE,0GAAA,aAAa,OAAA;AAAE,uGAAA,UAAU,OAAA;AAEhE,+CAA4C;AAAnC,2GAAA,WAAW,OAAA;AAEpB,mDAAgD;AAAvC,+GAAA,aAAa,OAAA;AACtB,yDAAsD;AAA7C,qHAAA,gBAAgB,OAAA;AACzB,qEAAiE;AAAxD,gIAAA,qBAAqB,OAAA;AAC9B,iDAAkE;AAAzD,iHAAA,gBAAgB,OAAA;AAAE,+GAAA,cAAc,OAAA;AAIzC,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAClB,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAClB,6CAA0C;AAAjC,yGAAA,UAAU,OAAA","sourcesContent":["export { BigDecimal } from './big-decimal'\nexport { ContractContext, ContractView, BoundContractView } from './context'\nexport { CounterBinding, Meter, GaugeBinding, Counter, Gauge, MetricOptions } from './meter'\nexport { EventTracker, AccountEventTracker } from './event-tracker'\nexport { type Numberish, toBigInteger, toMetricValue, toBlockTag } from './numberish'\n\nexport { BindOptions } from './bind-options'\n\nexport { BaseProcessor } from './base-processor'\nexport { GenericProcessor } from './generic-processor'\nexport { BaseProcessorTemplate } from './base-processor-template'\nexport { SuiBaseProcessor, SuiBindOptions } from './sui-processor'\n\nexport type { TypedCallTrace, Trace } from './trace'\n\nexport { EthPlugin } from './eth-plugin'\nexport { SuiPlugin } from './sui-plugin'\nexport { CorePlugin } from './core-plugin'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAAjC,yGAAA,UAAU,OAAA;AACnB,qCAA4E;AAAnE,0GAAA,eAAe,OAAA;AAAE,uGAAA,YAAY,OAAA;AAAE,4GAAA,iBAAiB,OAAA;AACzD,iCAA4F;AAAnF,uGAAA,cAAc,OAAA;AAAE,8FAAA,KAAK,OAAA;AAAE,qGAAA,YAAY,OAAA;AAAE,gGAAA,OAAO,OAAA;AAAE,8FAAA,KAAK,OAAA;AAAE,sGAAA,aAAa,OAAA;AAC3E,iDAAmE;AAA1D,6GAAA,YAAY,OAAA;AAAE,oHAAA,mBAAmB,OAAA;AAC1C,yCAAqF;AAA5D,yGAAA,YAAY,OAAA;AAAE,0GAAA,aAAa,OAAA;AAAE,uGAAA,UAAU,OAAA;AAEhE,+CAA4C;AAAnC,2GAAA,WAAW,OAAA;AAEpB,iDAAkE;AAAzD,iHAAA,gBAAgB,OAAA;AAAE,+GAAA,cAAc,OAAA;AAEzC,2CAAwC;AAA/B,uGAAA,SAAS,OAAA;AAClB,6CAA0C;AAAjC,yGAAA,UAAU,OAAA","sourcesContent":["export { BigDecimal } from './big-decimal'\nexport { ContractContext, ContractView, BoundContractView } from './context'\nexport { CounterBinding, Meter, GaugeBinding, Counter, Gauge, MetricOptions } from './meter'\nexport { EventTracker, AccountEventTracker } from './event-tracker'\nexport { type Numberish, toBigInteger, toMetricValue, toBlockTag } from './numberish'\n\nexport { BindOptions } from './bind-options'\n\nexport { SuiBaseProcessor, SuiBindOptions } from './sui-processor'\n\nexport { SuiPlugin } from './sui-plugin'\nexport { CorePlugin } from './core-plugin'\n"]}

package/lib/core/numberish.d.ts

@@ -1,8 +1,7 @@
-import { BigNumber } from 'ethers';
 import { BigInteger, MetricValue } from '@sentio/protos';
 import { BigDecimal } from '.';
-import { BlockTag } from '@ethersproject/providers';
-export type Numberish = number | BigNumber | bigint | BigDecimal | string;
+import { BlockTag } from 'ethers/providers';
+export type Numberish = number | bigint | BigDecimal | string;
 export declare function toBlockTag(a: number | bigint): BlockTag;
 export declare function toMetricValue(value: Numberish): MetricValue;
 export declare function toBigInteger(a: Numberish): BigInteger;

package/lib/core/numberish.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toBigInteger = exports.toMetricValue = exports.toBlockTag = void 0;
-const ethers_1 = require("ethers");
 const protos_1 = require("@sentio/protos");
 const _1 = require(".");
 function toBlockTag(a) {
@@ -15,52 +14,52 @@ function toBlockTag(a) {
 }
 exports.toBlockTag = toBlockTag;
 function toMetricValue(value) {
-    if (value instanceof ethers_1.BigNumber) {
-        return protos_1.MetricValue.fromPartial({
-            bigInteger: toBigInteger(value.toBigInt()),
-        });
-    }
-    if (value instanceof _1.BigDecimal) {
-        // Carefully consider the use case here
-        if (value.isInteger()) {
-            return protos_1.MetricValue.fromPartial({
-                bigInteger: bigDecimalToBigInteger(value),
-            });
+    if (typeof value === 'number') {
+        if (Number.isNaN(value)) {
+            throw new Error('Cannot record NaN value');
         }
-        else {
-            if (value.isNaN()) {
-                throw new Error('Cannot record NaN value');
-            }
-            if (!value.isFinite()) {
-                // NaN also not finite
-                throw new Error('Cannot record infinite value');
-            }
+        if (!Number.isFinite(value)) {
+            throw new Error('Cannot record infinite value');
+        }
+        if (Number.isInteger(value) && !Number.isSafeInteger(value)) {
             return protos_1.MetricValue.fromPartial({
-                bigDecimal: value.toString(), // e.g. -7.350918e-428
+                bigInteger: toBigInteger(value),
             });
         }
+        return protos_1.MetricValue.fromPartial({
+            doubleValue: Number(value),
+        });
+    }
+    if (typeof value === 'bigint') {
+        return protos_1.MetricValue.fromPartial({
+            bigInteger: toBigInteger(value),
+        });
     }
     if (typeof value === 'string') {
         return protos_1.MetricValue.fromPartial({
             bigDecimal: value,
         });
     }
-    if (typeof value === 'bigint' || Number.isInteger(value)) {
+    // if (value instanceof BigDecimal) {
+    // Carefully consider the use case here
+    if (value.isInteger()) {
         return protos_1.MetricValue.fromPartial({
-            bigInteger: toBigInteger(value),
+            bigInteger: bigDecimalToBigInteger(value),
         });
     }
-    if (typeof value === 'number') {
-        if (Number.isNaN(value)) {
+    else {
+        if (value.isNaN()) {
             throw new Error('Cannot record NaN value');
         }
-        if (!Number.isFinite(value)) {
+        if (!value.isFinite()) {
+            // NaN also not finite
             throw new Error('Cannot record infinite value');
         }
+        return protos_1.MetricValue.fromPartial({
+            bigDecimal: value.toString(), // e.g. -7.350918e-428
+        });
     }
-    return protos_1.MetricValue.fromPartial({
-        doubleValue: Number(value),
-    });
+    // }
 }
 exports.toMetricValue = toMetricValue;
 function bigDecimalToBigInteger(a) {
@@ -78,15 +77,18 @@ function intToBigInteger(a) {
     return hexToBigInteger(a.toString(16), negative);
 }
 function toBigInteger(a) {
-    if (a instanceof _1.BigDecimal) {
-        return bigDecimalToBigInteger(a);
+    if (typeof a === 'number') {
+        return intToBigInteger(a);
     }
-    if (a instanceof ethers_1.BigNumber) {
-        return intToBigInteger(a.toBigInt());
+    if (typeof a === 'bigint') {
+        return intToBigInteger(a);
     }
     if (typeof a === 'string') {
         return intToBigInteger(BigInt(a));
     }
+    if (a instanceof _1.BigDecimal) {
+        return bigDecimalToBigInteger(a);
+    }
     return intToBigInteger(a);
     // Following code is actually very slow
     // while (a > 0) {

package/lib/core/numberish.js.map

@@ -1 +1 @@
-{"version":3,"file":"numberish.js","sourceRoot":"","sources":["../../src/core/numberish.ts"],"names":[],"mappings":"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","sourcesContent":["import { BigNumber } from 'ethers'\nimport { BigInteger, MetricValue } from '@sentio/protos'\nimport { BigDecimal } from '.'\nimport { BlockTag } from '@ethersproject/providers'\n\nexport type Numberish = number | BigNumber | bigint | BigDecimal | string\n\nexport function toBlockTag(a: number | bigint): BlockTag {\n  if (typeof a === 'number') {\n    return a\n  }\n  if (a > Number.MAX_SAFE_INTEGER) {\n    return '0x' + a.toString(16)\n  }\n  return Number(a)\n}\n\nexport function toMetricValue(value: Numberish): MetricValue {\n  if (value instanceof BigNumber) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value.toBigInt()),\n    })\n  }\n  if (value instanceof BigDecimal) {\n    // Carefully consider the use case here\n    if (value.isInteger()) {\n      return MetricValue.fromPartial({\n        bigInteger: bigDecimalToBigInteger(value),\n      })\n    } else {\n      if (value.isNaN()) {\n        throw new Error('Cannot record NaN value')\n      }\n      if (!value.isFinite()) {\n        // NaN also not finite\n        throw new Error('Cannot record infinite value')\n      }\n      return MetricValue.fromPartial({\n        bigDecimal: value.toString(), // e.g. -7.350918e-428\n      })\n    }\n  }\n  if (typeof value === 'string') {\n    return MetricValue.fromPartial({\n      bigDecimal: value,\n    })\n  }\n  if (typeof value === 'bigint' || Number.isInteger(value)) {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value),\n    })\n  }\n\n  if (typeof value === 'number') {\n    if (Number.isNaN(value)) {\n      throw new Error('Cannot record NaN value')\n    }\n    if (!Number.isFinite(value)) {\n      throw new Error('Cannot record infinite value')\n    }\n  }\n\n  return MetricValue.fromPartial({\n    doubleValue: Number(value),\n  })\n}\n\nfunction bigDecimalToBigInteger(a: BigDecimal): BigInteger {\n  const negative = a.isNegative()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction intToBigInteger(a: bigint | number): BigInteger {\n  const negative = a < 0\n  if (negative) {\n    a = -a\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nexport function toBigInteger(a: Numberish): BigInteger {\n  if (a instanceof BigDecimal) {\n    return bigDecimalToBigInteger(a)\n  }\n\n  if (a instanceof BigNumber) {\n    return intToBigInteger(a.toBigInt())\n  }\n  if (typeof a === 'string') {\n    return intToBigInteger(BigInt(a))\n  }\n\n  return intToBigInteger(a)\n\n  // Following code is actually very slow\n  // while (a > 0) {\n  //   const d = a & 0xffn\n  //   a >>= 8n\n  //   value.push(Number(d))\n  // }\n  //\n  // return {\n  //   negative, value: new Uint8Array(value.reverse()),\n  // }\n}\n\nfunction hexToBigInteger(hex: string, negative: boolean): BigInteger {\n  if (hex.length % 2 === 1) {\n    hex = '0' + hex\n  }\n  const buffer = Buffer.from(hex, 'hex')\n\n  return {\n    negative: negative,\n    data: new Uint8Array(buffer),\n  }\n}\n"]}
+{"version":3,"file":"numberish.js","sourceRoot":"","sources":["../../src/core/numberish.ts"],"names":[],"mappings":"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","sourcesContent":["import { BigInteger, MetricValue } from '@sentio/protos'\nimport { BigDecimal } from '.'\nimport { BlockTag } from 'ethers/providers'\n\nexport type Numberish = number | bigint | BigDecimal | string\n\nexport function toBlockTag(a: number | bigint): BlockTag {\n  if (typeof a === 'number') {\n    return a\n  }\n  if (a > Number.MAX_SAFE_INTEGER) {\n    return '0x' + a.toString(16)\n  }\n  return Number(a)\n}\n\nexport function toMetricValue(value: Numberish): MetricValue {\n  if (typeof value === 'number') {\n    if (Number.isNaN(value)) {\n      throw new Error('Cannot record NaN value')\n    }\n    if (!Number.isFinite(value)) {\n      throw new Error('Cannot record infinite value')\n    }\n    if (Number.isInteger(value) && !Number.isSafeInteger(value)) {\n      return MetricValue.fromPartial({\n        bigInteger: toBigInteger(value),\n      })\n    }\n\n    return MetricValue.fromPartial({\n      doubleValue: Number(value),\n    })\n  }\n  if (typeof value === 'bigint') {\n    return MetricValue.fromPartial({\n      bigInteger: toBigInteger(value),\n    })\n  }\n  if (typeof value === 'string') {\n    return MetricValue.fromPartial({\n      bigDecimal: value,\n    })\n  }\n  // if (value instanceof BigDecimal) {\n  // Carefully consider the use case here\n  if (value.isInteger()) {\n    return MetricValue.fromPartial({\n      bigInteger: bigDecimalToBigInteger(value),\n    })\n  } else {\n    if (value.isNaN()) {\n      throw new Error('Cannot record NaN value')\n    }\n    if (!value.isFinite()) {\n      // NaN also not finite\n      throw new Error('Cannot record infinite value')\n    }\n    return MetricValue.fromPartial({\n      bigDecimal: value.toString(), // e.g. -7.350918e-428\n    })\n  }\n  // }\n}\n\nfunction bigDecimalToBigInteger(a: BigDecimal): BigInteger {\n  const negative = a.isNegative()\n  if (negative) {\n    a = a.abs()\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nfunction intToBigInteger(a: bigint | number): BigInteger {\n  const negative = a < 0\n  if (negative) {\n    a = -a\n  }\n  return hexToBigInteger(a.toString(16), negative)\n}\n\nexport function toBigInteger(a: Numberish): BigInteger {\n  if (typeof a === 'number') {\n    return intToBigInteger(a)\n  }\n  if (typeof a === 'bigint') {\n    return intToBigInteger(a)\n  }\n  if (typeof a === 'string') {\n    return intToBigInteger(BigInt(a))\n  }\n  if (a instanceof BigDecimal) {\n    return bigDecimalToBigInteger(a)\n  }\n  return intToBigInteger(a)\n\n  // Following code is actually very slow\n  // while (a > 0) {\n  //   const d = a & 0xffn\n  //   a >>= 8n\n  //   value.push(Number(d))\n  // }\n  //\n  // return {\n  //   negative, value: new Uint8Array(value.reverse()),\n  // }\n}\n\nfunction hexToBigInteger(hex: string, negative: boolean): BigInteger {\n  if (hex.length % 2 === 1) {\n    hex = '0' + hex\n  }\n  const buffer = Buffer.from(hex, 'hex')\n\n  return {\n    negative: negative,\n    data: new Uint8Array(buffer),\n  }\n}\n"]}