@sentio/sdk 1.40.5 → 1.41.0-rc.1

package/lib/target-ethers-sentio/file.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.codeGenTestUtilsFile = exports.codeGenSentioFile = exports.codeGenIndex = void 0;
 const typechain_1 = require("typechain");
-const reserved_keywords_1 = require("@typechain/ethers-v5/dist/codegen/reserved-keywords");
+const reserved_keywords_1 = require("@sentio/ethers-v6/dist/codegen/reserved-keywords");
 const signatures_1 = require("typechain/dist/utils/signatures");
 const functions_handler_1 = require("./functions-handler");
 const event_handler_1 = require("./event-handler");
@@ -18,7 +18,7 @@ function codeGenSentioFile(contract) {
     const source = `
   ${Object.values(contract.functions).map(functions_handler_1.codegenCallTraceTypes).join('\n')}
 
-  const templateContract = ${contract.name}__factory.connect("", DummyProvider)
+  const templateContract = ${contract.name}__factory.connect("0x0", DummyProvider)
 
   export class ${contract.name}ContractView extends ContractView<${contract.name}> {
     constructor (contract: ${contract.name}) {
@@ -31,72 +31,74 @@ function codeGenSentioFile(contract) {
         .join('\n')}
   }
   
-  export class ${contract.name}BoundContractView extends BoundContractView<${contract.name}, ${contract.name}ContractView> {
-    // constructor (contract: ${contract.name}) {
-    //   super(contract);
-    // }
-
-    ${Object.values(contract.functions)
+  export class ${contract.name}BoundContractView extends BoundContractView<${contract.name}, 
+    ${contract.name}ContractView> {
+  ${Object.values(contract.functions)
         .filter((f) => !reserved_keywords_1.reservedKeywords.has(f[0].name))
         .map((fs) => (0, view_function_1.generateBoundViewFunctions)(fs))
         .join('\n')}
   }
 
-  export type ${contract.name}Context = ContractContext<${contract.name}, ${contract.name}BoundContractView>
-
-  export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${contract.name}, ${contract.name}BoundContractView> {
-    bindInternal(options: BindOptions) {
-      if (!options.name) {
-        options.name = "${contract.name}"
-      }
-      let processor = getProcessor(options) as ${contract.name}Processor
-      if (!processor) {
-        processor = new ${contract.name}Processor(options)
-        addProcessor(options, processor)
-      }
-      return processor
-    }
+    export type ${contract.name}Context = ContractContext<${contract.name}, ${contract.name}BoundContractView>
 
+  export class ${contract.name}Processor extends BaseProcessor<${contract.name}, ${contract.name}BoundContractView> {
     ${Object.values(contract.events)
         .map((events) => (0, event_handler_1.generateEventHandlers)(events, contract.name))
         .join('\n')}
-    
-    ${Object.values(contract.functions)
-        .map((functions) => {
-        (0, functions_handler_1.generateCallHandlers)(functions, contract.name);
-    })
-        .join('\n')}
-    }
-
-    export class ${contract.name}Processor extends BaseProcessor<${contract.name}, ${contract.name}BoundContractView> {
-      ${Object.values(contract.events)
-        .map((events) => (0, event_handler_1.generateEventHandlers)(events, contract.name))
-        .join('\n')}
 
-      ${Object.values(contract.functions)
+    ${Object.values(contract.functions)
         .map((f) => (0, functions_handler_1.generateCallHandlers)(f, contract.name))
         .join('\n')}
 
-    public static filters = templateContract.filters
-    
-    protected CreateBoundContractView(): ${contract.name}BoundContractView {
-      const view = get${contract.name}Contract(this.config.address, this.config.network)
-      return new ${contract.name}BoundContractView(view)
+  public static filters = {
+    ${Object.values(contract.events)
+        .map((events) => (0, event_handler_1.generateEventFilters)(events))
+        .join(',')}
+  }
+  
+  protected CreateBoundContractView(): ${contract.name}BoundContractView {
+    const view = get${contract.name}Contract(this.config.address, this.config.network)
+    return new ${contract.name}BoundContractView(view)
+  }
+
+  public static bind(options: BindOptions): ${contract.name}Processor {
+     if (!options.name) {
+      options.name = "${contract.name}"
+    }
+    let processor = getProcessor(options) as ${contract.name}Processor
+    if (!processor) {
+      processor = new ${contract.name}Processor(options)
+      addProcessor(options, processor)
     }
+    return processor
+  }
+}
 
-    public static bind(options: BindOptions): ${contract.name}Processor {
-       if (!options.name) {
-        options.name = "${contract.name}"
-      }
-      let processor = getProcessor(options) as ${contract.name}Processor
-      if (!processor) {
-        processor = new ${contract.name}Processor(options)
-        addProcessor(options, processor)
-      }
-      return processor
+export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${contract.name}, ${contract.name}BoundContractView> {
+  bindInternal(options: BindOptions) {
+    if (!options.name) {
+      options.name = "${contract.name}"
+    }
+    let processor = getProcessor(options) as ${contract.name}Processor
+    if (!processor) {
+      processor = new ${contract.name}Processor(options)
+      addProcessor(options, processor)
     }
+    return processor
   }
 
+  ${Object.values(contract.events)
+        .map((events) => (0, event_handler_1.generateEventHandlers)(events, contract.name))
+        .join('\n')}
+  
+  ${Object.values(contract.functions)
+        .map((functions) => {
+        (0, functions_handler_1.generateCallHandlers)(functions, contract.name);
+    })
+        .join('\n')}
+  }
+
+
   export function get${contract.name}Contract(address: string, network: Networkish = 1): ${contract.name}ContractView {
     let contract = getContractByABI("${contract.name}", address, network) as ${contract.name}ContractView
     if (!contract) {
@@ -134,8 +136,8 @@ function codeGenSentioFile(contract) {
     // dedup namespace
     const uniqueStructImports = [...new Set(structImports)];
     const imports = (0, typechain_1.createImportsForUsedIdentifiers)({
-        ethers: ['BigNumber', 'BigNumberish', 'CallOverrides', 'BytesLike'],
-        '@ethersproject/providers': ['Networkish'],
+        ethers: ['BigNumberish', 'Overrides', 'BytesLike'],
+        'ethers/providers': ['Networkish'],
         '@sentio/sdk': [
             'addContractByABI',
             'getContractByABI',
@@ -143,6 +145,7 @@ function codeGenSentioFile(contract) {
             'getProcessor',
             'getProvider',
             'transformEtherError',
+            'Trace',
             'BindOptions',
             'BaseProcessor',
             'BaseProcessorTemplate',
@@ -185,7 +188,7 @@ function codeGenTestUtilsFile(contract) {
         .join('\n')}
   `;
     const imports = (0, typechain_1.createImportsForUsedIdentifiers)({
-        '@ethersproject/providers': ['Log'],
+        'ethers/providers': ['LogParams'],
         '.': [
             `get${contract.name}Contract`,
             ...Object.values(contract.events).flatMap((events) => {
@@ -203,21 +206,20 @@ function codeGenTestUtilsFile(contract) {
 exports.codeGenTestUtilsFile = codeGenTestUtilsFile;
 function generateMockEventLogFunction(event, contractName, includeArgTypes) {
     let eventName = event.name;
-    let eventNameWithSignature = event.name;
     if (includeArgTypes) {
         eventName = (0, typechain_1.getFullSignatureAsSymbolForEvent)(event) + '_';
-        eventNameWithSignature = (0, signatures_1.getFullSignatureForEvent)(event);
     }
     const eventArgs = event.inputs.map((input, i) => `event.${input.name ?? `arg${i.toString()}`}`);
     return `
-    export function mock${eventName}Log(contractAddress: string, event: ${eventName}EventObject): Log {
+    export function mock${eventName}Log(contractAddress: string, event: ${eventName}EventObject): LogParams {
       const contract = get${contractName}Contract(contractAddress)
       const encodedLog = contract.rawContract.interface.encodeEventLog(
-        contract.rawContract.interface.getEvent('${eventNameWithSignature}'),
+        '${(0, signatures_1.getFullSignatureForEvent)(event)}',
         [${eventArgs.join(', ')}]
       )
       return {
         ...mockField,
+        index: 0,
         address: contractAddress,
         data: encodedLog.data,
         topics: encodedLog.topics,

package/lib/target-ethers-sentio/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/file.ts"],"names":[],"mappings":"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"}

package/lib/target-ethers-sentio/functions-handler.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.codegenCallTraceTypes = exports.generateCallHandlers = void 0;
-const types_1 = require("@typechain/ethers-v5/dist/codegen/types");
-const typechain_1 = require("typechain");
+const types_1 = require("@sentio/ethers-v6/dist/codegen/types");
 const ethers_1 = require("ethers");
+const typechain_1 = require("typechain");
+// import { utils } from 'ethers'
 const types_2 = require("./types");
 function generateCallHandlers(fns, contractName) {
     if (fns.length === 1) {
@@ -27,12 +28,14 @@ function codegenCallTraceType(fn, overloadedName) {
     return `
   export interface ${identifier}CallObject ${objectOutput}
     
-  export type ${identifier}CallTrace = TypedCallTrace<${arrayOutput}, ${identifier}CallObject>
+  export type ${identifier}CallTrace = TypedCallTrace<${arrayOutput}, ${identifier}CallObject> & Trace
   `;
 }
 function generateCallHandler(fn, contractName, overloadedName) {
     const signature = (0, typechain_1.getSignatureForFn)(fn);
-    const sighash = ethers_1.utils.keccak256(ethers_1.utils.toUtf8Bytes(signature)).substring(0, 10);
+    // utils.toUtf8Bytes(signature))
+    const test = new TextEncoder().encode(signature);
+    const sighash = (0, ethers_1.keccak256)(test).substring(0, 10);
     return `
   onCall${capitalizeFirstChar(overloadedName ?? fn.name)}(
     handler: (call: ${capitalizeFirstChar(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,

package/lib/target-ethers-sentio/functions-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions-handler.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/functions-handler.ts"],"names":[],"mappings":";;;AAAA,mEAGgD;AAChD,yCAAkE;AAClE,mCAA8B;AAC9B,mCAA6D;AAE7D,SAAgB,oBAAoB,CAAC,GAA0B,EAAE,YAAoB;IACnF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;KACjD;IAED,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAA,2CAAmC,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACnH,CAAC;AAND,oDAMC;AAED,SAAgB,qBAAqB,CAAC,GAA0B;IAC9D,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;KACpC;IAED,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,IAAA,2CAAmC,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtG,CAAC;AAND,sDAMC;AAED,SAAS,oBAAoB,CAAC,EAAuB,EAAE,cAAuB;IAC5E,MAAM,UAAU,GAAG,mBAAmB,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC,CAAA;IAEjE,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAChH,MAAM,WAAW,GAAG,IAAA,wCAAgC,EAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IACtF,MAAM,YAAY,GAAG,IAAA,0CAAkC,EAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,IAAI,IAAI,CAAA;IAEjG,OAAO;qBACY,UAAU,cAAc,YAAY;;gBAEzC,UAAU,8BAA8B,WAAW,KAAK,UAAU;GAC/E,CAAA;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,EAAuB,EAAE,YAAoB,EAAE,cAAuB;IACjG,MAAM,SAAS,GAAG,IAAA,6BAAiB,EAAC,EAAE,CAAC,CAAA;IACvC,MAAM,OAAO,GAAG,cAAK,CAAC,SAAS,CAAC,cAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAE9E,OAAO;UACC,mBAAmB,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC;sBAClC,mBAAmB,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC,mBAAmB,YAAY;;;4BAGvE,OAAO;;CAElC,CAAA;AACD,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAA;KACb;IACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAC9E,CAAC"}
+{"version":3,"file":"functions-handler.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/functions-handler.ts"],"names":[],"mappings":";;;AAAA,gEAG6C;AAC7C,mCAAkC;AAClC,yCAAkE;AAClE,iCAAiC;AACjC,mCAA6D;AAE7D,SAAgB,oBAAoB,CAAC,GAA0B,EAAE,YAAoB;IACnF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;KACjD;IAED,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAA,2CAAmC,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACnH,CAAC;AAND,oDAMC;AAED,SAAgB,qBAAqB,CAAC,GAA0B;IAC9D,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;KACpC;IAED,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,IAAA,2CAAmC,EAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtG,CAAC;AAND,sDAMC;AAED,SAAS,oBAAoB,CAAC,EAAuB,EAAE,cAAuB;IAC5E,MAAM,UAAU,GAAG,mBAAmB,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC,CAAA;IAEjE,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAChH,MAAM,WAAW,GAAG,IAAA,wCAAgC,EAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IACtF,MAAM,YAAY,GAAG,IAAA,0CAAkC,EAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,IAAI,IAAI,CAAA;IAEjG,OAAO;qBACY,UAAU,cAAc,YAAY;;gBAEzC,UAAU,8BAA8B,WAAW,KAAK,UAAU;GAC/E,CAAA;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,EAAuB,EAAE,YAAoB,EAAE,cAAuB;IACjG,MAAM,SAAS,GAAG,IAAA,6BAAiB,EAAC,EAAE,CAAC,CAAA;IACvC,gCAAgC;IAEhC,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,IAAA,kBAAS,EAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAEhD,OAAO;UACC,mBAAmB,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC;sBAClC,mBAAmB,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC,mBAAmB,YAAY;;;4BAGvE,OAAO;;CAElC,CAAA;AACD,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAA;KACb;IACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAC9E,CAAC"}

package/lib/target-ethers-sentio/index.d.ts

@@ -1,4 +1,4 @@
-import Ethers from '@typechain/ethers-v5';
+import Ethers from '@sentio/ethers-v6';
 import { Config, FileDescription } from 'typechain';
 export default class EthersSentio extends Ethers {
     constructor(config: Config);

package/lib/target-ethers-sentio/index.js

@@ -1,13 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_v5_1 = __importDefault(require("@typechain/ethers-v5"));
+const tslib_1 = require("tslib");
+const ethers_v6_1 = tslib_1.__importDefault(require("@sentio/ethers-v6"));
 const typechain_1 = require("typechain");
 const path_1 = require("path");
 const file_1 = require("./file");
-class EthersSentio extends ethers_v5_1.default {
+class EthersSentio extends ethers_v6_1.default {
     constructor(config) {
         if (!config.outDir) {
             throw new Error('Out put path not specificed');

package/lib/target-ethers-sentio/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/index.ts"],"names":[],"mappings":";;;;;AAAA,qEAAyC;AACzC,yCAAqH;AACrH,+BAA8C;AAC9C,iCAA8E;AAE9E,MAAqB,YAAa,SAAQ,mBAAM;IAC9C,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;SAC/C;QACD,KAAK,CAAC,MAAM,CAAC,CAAA;IACf,CAAC;IAED,kEAAkE;IACzD,0BAA0B,CAAC,IAAqB;QACvD,MAAM,GAAG,GAAG,IAAA,sBAAU,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACrC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAM;SACP;QAED,MAAM,aAAa,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEzD,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAA,mCAAuB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnG,MAAM,QAAQ,GAAG,IAAA,iBAAK,EAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAA;QACpD,MAAM,KAAK,GAAG,KAAK,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAA;QAEpD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,wCAAwC;YACxC,8BAA8B;YAC9B,iCAAiC;YACjC,IAAI;YAEJ,OAAO;gBACL,GAAG,KAAK;gBACR;oBACE,IAAI,EAAE,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC;oBACjF,QAAQ,EAAE,IAAA,wBAAiB,EAAC,QAAQ,CAAC;iBACtC;gBACD;oBACE,IAAI,EAAE,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC;oBACjF,QAAQ,EAAE,IAAA,mBAAY,EAAC,QAAQ,CAAC;iBACjC;gBACD;oBACE,IAAI,EAAE,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,eAAe,CAAC;oBACtF,QAAQ,EAAE,IAAA,2BAAoB,EAAC,QAAQ,CAAC;iBACzC;aACF,CAAA;SACF;IACH,CAAC;IAEQ,QAAQ;QACf,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;YACzC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBACtC,IAAI,CAAC,QAAQ,GAAG,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAA;aACnD;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAtDD,+BAsDC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/index.ts"],"names":[],"mappings":";;;AAAA,0EAAsC;AACtC,yCAAqH;AACrH,+BAA8C;AAC9C,iCAA8E;AAE9E,MAAqB,YAAa,SAAQ,mBAAM;IAC9C,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;SAC/C;QACD,KAAK,CAAC,MAAM,CAAC,CAAA;IACf,CAAC;IAED,kEAAkE;IACzD,0BAA0B,CAAC,IAAqB;QACvD,MAAM,GAAG,GAAG,IAAA,sBAAU,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACrC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAM;SACP;QAED,MAAM,aAAa,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEzD,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAA,mCAAuB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnG,MAAM,QAAQ,GAAG,IAAA,iBAAK,EAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAA;QACpD,MAAM,KAAK,GAAG,KAAK,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAA;QAEpD,IAAI,KAAK,KAAK,SAAS,EAAE;YACvB,wCAAwC;YACxC,8BAA8B;YAC9B,iCAAiC;YACjC,IAAI;YAEJ,OAAO;gBACL,GAAG,KAAK;gBACR;oBACE,IAAI,EAAE,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC;oBACjF,QAAQ,EAAE,IAAA,wBAAiB,EAAC,QAAQ,CAAC;iBACtC;gBACD;oBACE,IAAI,EAAE,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC;oBACjF,QAAQ,EAAE,IAAA,mBAAY,EAAC,QAAQ,CAAC;iBACjC;gBACD;oBACE,IAAI,EAAE,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,eAAe,CAAC;oBACtF,QAAQ,EAAE,IAAA,2BAAoB,EAAC,QAAQ,CAAC;iBACzC;aACF,CAAA;SACF;IACH,CAAC;IAEQ,QAAQ;QACf,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;QAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;YACzC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBACtC,IAAI,CAAC,QAAQ,GAAG,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAA;aACnD;SACF;QACD,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAtDD,+BAsDC"}

package/lib/target-ethers-sentio/view-function.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateBoundViewFunction = exports.generateBoundViewFunctions = exports.generateViewFunction = exports.generateViewFunctions = void 0;
-const types_1 = require("@typechain/ethers-v5/dist/codegen/types");
+const types_1 = require("@sentio/ethers-v6/dist/codegen/types");
 const types_2 = require("./types");
 function generateReturnTypes(fn) {
     // sounds like returnResultObject should be true but we need to set false to make it work
@@ -19,17 +19,20 @@ function generateViewFunction(fn, includeArgTypes) {
         return '';
     }
     const declName = includeArgTypes ? (0, types_2.getFullSignatureAsSymbolForFunction)(fn) : fn.name;
-    const call = includeArgTypes ? 'this.contract["' + (0, types_2.getFullSignatureForFunction)(fn) + '"]' : 'this.contract.' + fn.name;
+    const call = 'this.contract.getFunction("' + (0, types_2.getFullSignatureForFunction)(fn) + '")';
+    // if (overrides) {
+    //   return await ${call}(${
+    //   fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
+    // } overrides)
+    //     } else {
+    //       return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})
+    //     }
     return `
   async ${declName}(${(0, types_1.generateInputTypes)(fn.inputs, {
         useStructs: true,
-    })}overrides?: CallOverrides): ${generateReturnTypes(fn)} {
-    try {
-      if (overrides) {
-        return await ${call}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} overrides)
-      } else {
-        return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})
-      }
+    })}overrides?: Overrides): ${generateReturnTypes(fn)} {
+    try {    
+       return await ${call}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} overrides || {})
     } catch (e) {
       throw transformEtherError(e, undefined)
     }
@@ -52,18 +55,15 @@ function generateBoundViewFunction(fn, includeArgTypes) {
     return `
   async ${declName ?? fn.name}(${(0, types_1.generateInputTypes)(fn.inputs, {
         useStructs: true,
-    })}overrides?: CallOverrides): ${generateReturnTypes(fn)} {
+    })}overrides?: Overrides): ${generateReturnTypes(fn)} {
     try {
       if (!overrides && this.context) {
         overrides = {
           blockTag: toBlockTag(this.context.blockNumber),
         }
       }
-      if (overrides) {
-        return await this.view.${declName}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} overrides)
-      } else {
-        return await this.view.${declName}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})
-      }
+      return await this.view.${declName}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} overrides || {})
+
     } catch (e) {
       throw transformEtherError(e, this.context)
     }

package/lib/target-ethers-sentio/view-function.js.map

@@ -1 +1 @@
-{"version":3,"file":"view-function.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/view-function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view-function.js","sourceRoot":"","sources":["../../src/target-ethers-sentio/view-function.ts"],"names":[],"mappings":"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"}

package/lib/testing/metric-utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstGaugeValue = exports.firstCounterValue = exports.MetricValueToNumber = void 0;
 const core_1 = require("../core");
-const ethers_1 = require("ethers");
+const conversion_1 = require("../utils/conversion");
 function MetricValueToNumber(v) {
     if (v === undefined) {
         return undefined;
@@ -11,7 +11,7 @@ function MetricValueToNumber(v) {
         return v.doubleValue;
     }
     if (v.bigInteger !== undefined) {
-        let intValue = ethers_1.BigNumber.from(v.bigInteger.data).toBigInt();
+        let intValue = (0, conversion_1.bytesToBigInt)(v.bigInteger.data);
         if (v.bigInteger.negative) {
             intValue = -intValue;
         }

package/lib/testing/metric-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"metric-utils.js","sourceRoot":"","sources":["../../src/testing/metric-utils.ts"],"names":[],"mappings":";;;AACA,kCAA+C;AAC/C,mCAAkC;AAElC,SAAgB,mBAAmB,CAAC,CAAmC;IACrE,IAAI,CAAC,KAAK,SAAS,EAAE;QACnB,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS,EAAE;QAC/B,OAAO,CAAC,CAAC,WAAW,CAAA;KACrB;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,EAAE;QAC9B,IAAI,QAAQ,GAAG,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC3D,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE;YACzB,QAAQ,GAAG,CAAC,QAAQ,CAAA;SACrB;QACD,OAAO,QAAQ,CAAA;KAChB;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,EAAE;QAC9B,OAAO,IAAI,iBAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;KACpC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAnBD,kDAmBC;AAED,SAAgB,iBAAiB,CAAC,MAAiC,EAAE,IAAY;IAC/E,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAA;KACjB;IACD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE;QACrC,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;YACnC,OAAO,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;SAChD;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAVD,8CAUC;AAED,SAAgB,eAAe,CAAC,MAAiC,EAAE,IAAY;IAC7E,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAA;KACjB;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;QACjC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;YACjC,OAAO,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;SAC9C;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAVD,0CAUC","sourcesContent":["import { MetricValue, ProcessResult } from '@sentio/protos'\nimport { Numberish, BigDecimal } from '../core'\nimport { BigNumber } from 'ethers'\n\nexport function MetricValueToNumber(v: Partial<MetricValue> | undefined): Numberish | undefined {\n  if (v === undefined) {\n    return undefined\n  }\n\n  if (v.doubleValue !== undefined) {\n    return v.doubleValue\n  }\n  if (v.bigInteger !== undefined) {\n    let intValue = BigNumber.from(v.bigInteger.data).toBigInt()\n    if (v.bigInteger.negative) {\n      intValue = -intValue\n    }\n    return intValue\n  }\n  if (v.bigDecimal !== undefined) {\n    return new BigDecimal(v.bigDecimal)\n  }\n  return undefined\n}\n\nexport function firstCounterValue(result: ProcessResult | undefined, name: string): Numberish | undefined {\n  if (!result) {\n    return undefined\n  }\n  for (const counter of result.counters) {\n    if (counter.metadata?.name === name) {\n      return MetricValueToNumber(counter.metricValue)\n    }\n  }\n  return undefined\n}\n\nexport function firstGaugeValue(result: ProcessResult | undefined, name: string): Numberish | undefined {\n  if (!result) {\n    return undefined\n  }\n  for (const gauge of result.gauges) {\n    if (gauge.metadata?.name === name) {\n      return MetricValueToNumber(gauge.metricValue)\n    }\n  }\n  return undefined\n}\n"]}
+{"version":3,"file":"metric-utils.js","sourceRoot":"","sources":["../../src/testing/metric-utils.ts"],"names":[],"mappings":";;;AACA,kCAA+C;AAC/C,oDAAmD;AAEnD,SAAgB,mBAAmB,CAAC,CAAmC;IACrE,IAAI,CAAC,KAAK,SAAS,EAAE;QACnB,OAAO,SAAS,CAAA;KACjB;IAED,IAAI,CAAC,CAAC,WAAW,KAAK,SAAS,EAAE;QAC/B,OAAO,CAAC,CAAC,WAAW,CAAA;KACrB;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,EAAE;QAC9B,IAAI,QAAQ,GAAG,IAAA,0BAAa,EAAC,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;IACD,IAAI,CAAC,CAAC,UAAU,KAAK,SAAS,EAAE;QAC9B,OAAO,IAAI,iBAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;KACpC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAnBD,kDAmBC;AAED,SAAgB,iBAAiB,CAAC,MAAiC,EAAE,IAAY;IAC/E,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAA;KACjB;IACD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE;QACrC,IAAI,OAAO,CAAC,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;YACnC,OAAO,mBAAmB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;SAChD;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAVD,8CAUC;AAED,SAAgB,eAAe,CAAC,MAAiC,EAAE,IAAY;IAC7E,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,SAAS,CAAA;KACjB;IACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;QACjC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;YACjC,OAAO,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;SAC9C;KACF;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAVD,0CAUC","sourcesContent":["import { MetricValue, ProcessResult } from '@sentio/protos'\nimport { Numberish, BigDecimal } from '../core'\nimport { bytesToBigInt } from '../utils/conversion'\n\nexport function MetricValueToNumber(v: Partial<MetricValue> | undefined): Numberish | undefined {\n  if (v === undefined) {\n    return undefined\n  }\n\n  if (v.doubleValue !== undefined) {\n    return v.doubleValue\n  }\n  if (v.bigInteger !== undefined) {\n    let intValue = bytesToBigInt(v.bigInteger.data)\n    if (v.bigInteger.negative) {\n      intValue = -intValue\n    }\n    return intValue\n  }\n  if (v.bigDecimal !== undefined) {\n    return new BigDecimal(v.bigDecimal)\n  }\n  return undefined\n}\n\nexport function firstCounterValue(result: ProcessResult | undefined, name: string): Numberish | undefined {\n  if (!result) {\n    return undefined\n  }\n  for (const counter of result.counters) {\n    if (counter.metadata?.name === name) {\n      return MetricValueToNumber(counter.metricValue)\n    }\n  }\n  return undefined\n}\n\nexport function firstGaugeValue(result: ProcessResult | undefined, name: string): Numberish | undefined {\n  if (!result) {\n    return undefined\n  }\n  for (const gauge of result.gauges) {\n    if (gauge.metadata?.name === name) {\n      return MetricValueToNumber(gauge.metricValue)\n    }\n  }\n  return undefined\n}\n"]}

package/lib/testing/test-processor-server.d.ts

@@ -2,9 +2,9 @@ import { AccountConfig, ContractConfig, DataBinding, Data_SolInstruction, Proces
 import { CallContext } from 'nice-grpc-common';
 import { Empty } from '@sentio/protos/lib/google/protobuf/empty';
 import { ProcessorServiceImpl } from '@sentio/runtime';
-import { Block, Log } from '@ethersproject/abstract-provider';
-import { Networkish } from '@ethersproject/providers';
-import { Trace } from '../core/trace';
+import { Trace } from '../eth/trace';
+import { LogParams, Networkish, BlockParams } from 'ethers/providers';
+import { Block } from 'ethers';
 export declare const TEST_CONTEXT: CallContext;
 export declare function cleanTest(): void;
 export declare class TestProcessorServer implements ProcessorServiceImplementation {
@@ -18,16 +18,16 @@ export declare class TestProcessorServer implements ProcessorServiceImplementati
     testTrace(trace: Trace, network?: Networkish): Promise<ProcessBindingResponse>;
     testTraces(traces: Trace[], network?: Networkish): Promise<ProcessBindingResponse>;
     buildTraceBinding(trace: Trace, network?: Networkish): DataBinding | undefined;
-    testLog(log: Log, network?: Networkish): Promise<ProcessBindingResponse>;
-    testLogs(logs: Log[], network?: Networkish): Promise<ProcessBindingResponse>;
-    buildLogBinding(log: Log, network?: Networkish): DataBinding | undefined;
-    testAccountLog(address: string, log: Log, network?: Networkish): Promise<ProcessBindingResponse>;
-    testAccountLogs(address: string, logs: Log[], network?: Networkish): Promise<ProcessBindingResponse>;
-    buildAccountLogBinding(address: string, log: Log, network?: Networkish): DataBinding | undefined;
-    testBlock(block: Partial<Block> & {
+    testLog(log: LogParams, network?: Networkish): Promise<ProcessBindingResponse>;
+    testLogs(logs: LogParams[], network?: Networkish): Promise<ProcessBindingResponse>;
+    buildLogBinding(log: LogParams, network?: Networkish): DataBinding | undefined;
+    testAccountLog(address: string, log: LogParams, network?: Networkish): Promise<ProcessBindingResponse>;
+    testAccountLogs(address: string, logs: LogParams[], network?: Networkish): Promise<ProcessBindingResponse>;
+    buildAccountLogBinding(address: string, log: LogParams, network?: Networkish): DataBinding | undefined;
+    testBlock(block: Partial<BlockParams> & {
         number: number;
     }, network?: Networkish): Promise<ProcessBindingResponse>;
-    testBlocks(blocks: Partial<Block> & {
+    testBlocks(blocks: Partial<BlockParams> & {
         number: number;
     }[], network?: Networkish): Promise<ProcessBindingResponse>;
     buildBlockBinding(block: Partial<Block> & {

package/lib/testing/test-processor-server.js

@@ -4,11 +4,11 @@ exports.TestProcessorServer = exports.cleanTest = exports.TEST_CONTEXT = void 0;
 const protos_1 = require("@sentio/protos");
 const runtime_1 = require("@sentio/runtime");
 const chain_1 = require("../utils/chain");
-const providers_1 = require("@ethersproject/providers");
+const providers_1 = require("ethers/providers");
 exports.TEST_CONTEXT = {};
 function cleanTest() {
     runtime_1.State.reset();
-    runtime_1.Endpoints.reset();
+    // Endpoints.reset()
 }
 exports.cleanTest = cleanTest;
 class TestProcessorServer {
@@ -18,15 +18,10 @@ class TestProcessorServer {
     constructor(loader, httpEndpoints = {}) {
         cleanTest();
         this.service = new runtime_1.ProcessorServiceImpl(loader);
-        const dummyConfig = {};
         for (const k in chain_1.CHAIN_MAP) {
             const http = httpEndpoints[k] || '';
-            dummyConfig[k] = {
-                ChainID: k,
-                Https: [http],
-            };
+            runtime_1.Endpoints.INSTANCE.chainServer.set(k, http);
         }
-        (0, runtime_1.setProvider)(dummyConfig);
     }
     async start(request = { templateInstances: [] }, context = exports.TEST_CONTEXT) {
         const res = await this.service.start(request, context);
@@ -70,7 +65,7 @@ class TestProcessorServer {
         }
         const signature = trace.action.input.slice(0, 10);
         for (const contract of this.contractConfigs) {
-            if (contract.contract?.chainId !== (0, providers_1.getNetwork)(network).chainId.toString()) {
+            if (contract.contract?.chainId !== providers_1.Network.from(network).chainId.toString()) {
                 continue;
             }
             if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -111,7 +106,7 @@ class TestProcessorServer {
     }
     buildLogBinding(log, network = 1) {
         for (const contract of this.contractConfigs) {
-            if (contract.contract?.chainId !== (0, providers_1.getNetwork)(network).chainId.toString()) {
+            if (contract.contract?.chainId !== providers_1.Network.from(network).chainId.toString()) {
                 continue;
             }
             if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -169,7 +164,7 @@ class TestProcessorServer {
     }
     buildAccountLogBinding(address, log, network = 1) {
         for (const account of this.accountConfigs) {
-            if (account.chainId !== (0, providers_1.getNetwork)(network).chainId.toString()) {
+            if (account.chainId !== providers_1.Network.from(network).chainId.toString()) {
                 continue;
             }
             if (address.toLowerCase() !== account.address.toLowerCase()) {
@@ -234,7 +229,7 @@ class TestProcessorServer {
             handlerIds: [],
         };
         for (const contract of this.contractConfigs) {
-            if (contract.contract?.chainId !== (0, providers_1.getNetwork)(network).chainId.toString()) {
+            if (contract.contract?.chainId !== providers_1.Network.from(network).chainId.toString()) {
                 continue;
             }
             const longBlockNumber = block.number;

package/lib/testing/test-processor-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-processor-server.js","sourceRoot":"","sources":["../../src/testing/test-processor-server.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountConfig,\n  ContractConfig,\n  DataBinding,\n  HandlerType,\n  Data_SolInstruction,\n  ProcessBindingResponse,\n  ProcessBindingsRequest,\n  ProcessConfigRequest,\n  ProcessConfigResponse,\n  ProcessorServiceImplementation,\n  StartRequest,\n} from '@sentio/protos'\nimport { CallContext } from 'nice-grpc-common'\nimport { Empty } from '@sentio/protos/lib/google/protobuf/empty'\nimport { ChainConfig, ProcessorServiceImpl, setProvider, Endpoints, State } from '@sentio/runtime'\nimport { CHAIN_MAP } from '../utils/chain'\nimport { Block, Log } from '@ethersproject/abstract-provider'\nimport { getNetwork, Networkish } from '@ethersproject/providers'\nimport { Trace } from '../core/trace'\n\nexport const TEST_CONTEXT: CallContext = <CallContext>{}\n\nexport function cleanTest() {\n  State.reset()\n  Endpoints.reset()\n}\n\nexport class TestProcessorServer implements ProcessorServiceImplementation {\n  service: ProcessorServiceImpl\n  contractConfigs: ContractConfig[]\n  accountConfigs: AccountConfig[]\n\n  constructor(loader: () => void, httpEndpoints: Record<string, string> = {}) {\n    cleanTest()\n\n    this.service = new ProcessorServiceImpl(loader)\n    const dummyConfig: Record<string, ChainConfig> = {}\n\n    for (const k in CHAIN_MAP) {\n      const http = httpEndpoints[k] || ''\n      dummyConfig[k] = {\n        ChainID: k,\n        Https: [http],\n      }\n    }\n\n    setProvider(dummyConfig)\n  }\n\n  async start(request: StartRequest = { templateInstances: [] }, context = TEST_CONTEXT): Promise<Empty> {\n    const res = await this.service.start(request, context)\n    const config = await this.getConfig({})\n    this.contractConfigs = config.contractConfigs\n    this.accountConfigs = config.accountConfigs\n    return res\n  }\n\n  stop(request: Empty, context = TEST_CONTEXT): Promise<Empty> {\n    return this.service.stop(request, context)\n  }\n\n  getConfig(request: ProcessConfigRequest, context = TEST_CONTEXT): Promise<ProcessConfigResponse> {\n    return this.service.getConfig(request, context)\n  }\n\n  // processLogs(request: ProcessBindingsRequest, context = TEST_CONTEXT): Promise<ProcessBindingResponse> {\n  //   return this.service.processLogs(request, context)\n  // }\n  //\n  // processTraces(request: ProcessBindingsRequest, context: CallContext = TEST_CONTEXT): Promise<ProcessBindingResponse> {\n  //   return this.service.processTraces(request, context)\n  // }\n\n  testTrace(trace: Trace, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testTraces([trace], network)\n  }\n\n  testTraces(traces: Trace[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const trace of traces) {\n      const binding = this.buildTraceBinding(trace, network)\n      if (!binding) {\n        throw Error('Invalid test trace: ' + JSON.stringify(trace))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildTraceBinding(trace: Trace, network: Networkish = 1): DataBinding | undefined {\n    if (trace.type !== 'call' || !trace.action.input) {\n      throw Error('Invalid test trace: ' + JSON.stringify(trace))\n    }\n    const signature = trace.action.input.slice(0, 10)\n\n    for (const contract of this.contractConfigs) {\n      if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {\n        continue\n      }\n      if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.traceConfigs) {\n        if (config.signature == signature) {\n          return {\n            data: {\n              ethTrace: {\n                trace,\n                timestamp: new Date(),\n              },\n            },\n            handlerIds: [config.handlerId],\n            handlerType: HandlerType.ETH_TRACE,\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testLog(log: Log, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testLogs([log], network)\n  }\n\n  testLogs(logs: Log[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildLogBinding(log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildLogBinding(log: Log, network: Networkish = 1): DataBinding | undefined {\n    for (const contract of this.contractConfigs) {\n      if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {\n        continue\n      }\n      if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n  testAccountLog(address: string, log: Log, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testAccountLogs(address, [log], network)\n  }\n\n  testAccountLogs(address: string, logs: Log[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildAccountLogBinding(address, log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildAccountLogBinding(address: string, log: Log, network: Networkish = 1): DataBinding | undefined {\n    for (const account of this.accountConfigs) {\n      if (account.chainId !== getNetwork(network).chainId.toString()) {\n        continue\n      }\n      if (address.toLowerCase() !== account.address.toLowerCase()) {\n        continue\n      }\n      for (const config of account.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testBlock(block: Partial<Block> & { number: number }, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testBlocks([block], network)\n  }\n\n  testBlocks(blocks: Partial<Block> & { number: number }[], network: Networkish = 1) {\n    const bindings = []\n    for (const block of blocks) {\n      const binding = this.buildBlockBinding(block, network)\n      if (!binding) {\n        throw Error('Invalid test block: ' + JSON.stringify(block))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildBlockBinding(block: Partial<Block> & { number: number }, network: Networkish = 1): DataBinding {\n    const binding: DataBinding = {\n      data: {\n        ethBlock: { block },\n      },\n      handlerType: HandlerType.ETH_BLOCK,\n      handlerIds: [],\n    }\n    for (const contract of this.contractConfigs) {\n      if (contract.contract?.chainId !== getNetwork(network).chainId.toString()) {\n        continue\n      }\n      const longBlockNumber = block.number\n      if (longBlockNumber < contract.startBlock) {\n        continue\n      }\n      if (contract.endBlock !== 0n && longBlockNumber >= contract.endBlock) {\n        continue\n      }\n\n      for (const config of contract.intervalConfigs) {\n        binding.handlerIds.push(config.handlerId)\n      }\n    }\n    return binding\n  }\n\n  testInstructions(instructions: Data_SolInstruction[]): Promise<ProcessBindingResponse> {\n    return this.processBindings({\n      bindings: instructions.map((instruction) => {\n        return {\n          data: {\n            raw: new Uint8Array(),\n            solInstruction: instruction,\n          },\n          handlerIds: [],\n          handlerType: HandlerType.SOL_INSTRUCTION,\n        }\n      }),\n    })\n  }\n\n  processBindings(\n    request: ProcessBindingsRequest,\n    context: CallContext = TEST_CONTEXT\n  ): Promise<ProcessBindingResponse> {\n    return this.service.processBindings(request, context)\n  }\n\n  processBindingsStream(request: AsyncIterable<DataBinding>, context: CallContext) {\n    return this.service.processBindingsStream(request, context)\n  }\n}\n"]}
+{"version":3,"file":"test-processor-server.js","sourceRoot":"","sources":["../../src/testing/test-processor-server.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AccountConfig,\n  ContractConfig,\n  DataBinding,\n  HandlerType,\n  Data_SolInstruction,\n  ProcessBindingResponse,\n  ProcessBindingsRequest,\n  ProcessConfigRequest,\n  ProcessConfigResponse,\n  ProcessorServiceImplementation,\n  StartRequest,\n} from '@sentio/protos'\nimport { CallContext } from 'nice-grpc-common'\nimport { Empty } from '@sentio/protos/lib/google/protobuf/empty'\nimport { ChainConfig, ProcessorServiceImpl, Endpoints, State } from '@sentio/runtime'\nimport { CHAIN_MAP } from '../utils/chain'\n\nimport { Trace } from '../eth/trace'\nimport { LogParams, Networkish, BlockParams, Network } from 'ethers/providers'\n\nimport { Block, Log } from 'ethers'\n\nexport const TEST_CONTEXT: CallContext = <CallContext>{}\n\nexport function cleanTest() {\n  State.reset()\n  // Endpoints.reset()\n}\n\nexport class TestProcessorServer implements ProcessorServiceImplementation {\n  service: ProcessorServiceImpl\n  contractConfigs: ContractConfig[]\n  accountConfigs: AccountConfig[]\n\n  constructor(loader: () => void, httpEndpoints: Record<string, string> = {}) {\n    cleanTest()\n\n    this.service = new ProcessorServiceImpl(loader)\n\n    for (const k in CHAIN_MAP) {\n      const http = httpEndpoints[k] || ''\n      Endpoints.INSTANCE.chainServer.set(k, http)\n    }\n  }\n\n  async start(request: StartRequest = { templateInstances: [] }, context = TEST_CONTEXT): Promise<Empty> {\n    const res = await this.service.start(request, context)\n    const config = await this.getConfig({})\n    this.contractConfigs = config.contractConfigs\n    this.accountConfigs = config.accountConfigs\n    return res\n  }\n\n  stop(request: Empty, context = TEST_CONTEXT): Promise<Empty> {\n    return this.service.stop(request, context)\n  }\n\n  getConfig(request: ProcessConfigRequest, context = TEST_CONTEXT): Promise<ProcessConfigResponse> {\n    return this.service.getConfig(request, context)\n  }\n\n  // processLogs(request: ProcessBindingsRequest, context = TEST_CONTEXT): Promise<ProcessBindingResponse> {\n  //   return this.service.processLogs(request, context)\n  // }\n  //\n  // processTraces(request: ProcessBindingsRequest, context: CallContext = TEST_CONTEXT): Promise<ProcessBindingResponse> {\n  //   return this.service.processTraces(request, context)\n  // }\n\n  testTrace(trace: Trace, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testTraces([trace], network)\n  }\n\n  testTraces(traces: Trace[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const trace of traces) {\n      const binding = this.buildTraceBinding(trace, network)\n      if (!binding) {\n        throw Error('Invalid test trace: ' + JSON.stringify(trace))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildTraceBinding(trace: Trace, network: Networkish = 1): DataBinding | undefined {\n    if (trace.type !== 'call' || !trace.action.input) {\n      throw Error('Invalid test trace: ' + JSON.stringify(trace))\n    }\n    const signature = trace.action.input.slice(0, 10)\n\n    for (const contract of this.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.traceConfigs) {\n        if (config.signature == signature) {\n          return {\n            data: {\n              ethTrace: {\n                trace,\n                timestamp: new Date(),\n              },\n            },\n            handlerIds: [config.handlerId],\n            handlerType: HandlerType.ETH_TRACE,\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testLog(log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testLogs([log], network)\n  }\n\n  testLogs(logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildLogBinding(log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildLogBinding(log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const contract of this.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {\n        continue\n      }\n      for (const config of contract.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n  testAccountLog(address: string, log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {\n    return this.testAccountLogs(address, [log], network)\n  }\n\n  testAccountLogs(address: string, logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {\n    const bindings = []\n    for (const log of logs) {\n      const binding = this.buildAccountLogBinding(address, log, network)\n      if (!binding) {\n        throw Error('Invalid test log: ' + JSON.stringify(log))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildAccountLogBinding(address: string, log: LogParams, network: Networkish = 1): DataBinding | undefined {\n    for (const account of this.accountConfigs) {\n      if (account.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      if (address.toLowerCase() !== account.address.toLowerCase()) {\n        continue\n      }\n      for (const config of account.logConfigs) {\n        for (const filter of config.filters) {\n          // if (filter.topics.length != log.topics.length) {\n          //   continue\n          // }\n\n          let match = true\n          for (const topicIdx in filter.topics) {\n            const logTopic = log.topics[topicIdx]\n            const possibleTopic = filter.topics[topicIdx].hashes\n            if (possibleTopic.length === 0) {\n              // match all\n              continue\n            }\n            if (possibleTopic.find((e) => e.toLowerCase() === logTopic.toLowerCase())) {\n              // find one\n              continue\n            }\n            match = false\n            break\n          }\n          if (match) {\n            return {\n              data: {\n                ethLog: { log, timestamp: new Date() },\n              },\n              handlerIds: [config.handlerId],\n              handlerType: HandlerType.ETH_LOG,\n            }\n          }\n        }\n      }\n    }\n    return undefined\n  }\n\n  testBlock(\n    block: Partial<BlockParams> & { number: number },\n    network: Networkish = 1\n  ): Promise<ProcessBindingResponse> {\n    return this.testBlocks([block], network)\n  }\n\n  testBlocks(blocks: Partial<BlockParams> & { number: number }[], network: Networkish = 1) {\n    const bindings = []\n    for (const block of blocks) {\n      const binding = this.buildBlockBinding(block, network)\n      if (!binding) {\n        throw Error('Invalid test block: ' + JSON.stringify(block))\n      }\n      bindings.push(binding)\n    }\n    return this.processBindings({\n      bindings: bindings,\n    })\n  }\n\n  buildBlockBinding(block: Partial<Block> & { number: number }, network: Networkish = 1): DataBinding {\n    const binding: DataBinding = {\n      data: {\n        ethBlock: { block },\n      },\n      handlerType: HandlerType.ETH_BLOCK,\n      handlerIds: [],\n    }\n    for (const contract of this.contractConfigs) {\n      if (contract.contract?.chainId !== Network.from(network).chainId.toString()) {\n        continue\n      }\n      const longBlockNumber = block.number\n      if (longBlockNumber < contract.startBlock) {\n        continue\n      }\n      if (contract.endBlock !== 0n && longBlockNumber >= contract.endBlock) {\n        continue\n      }\n\n      for (const config of contract.intervalConfigs) {\n        binding.handlerIds.push(config.handlerId)\n      }\n    }\n    return binding\n  }\n\n  testInstructions(instructions: Data_SolInstruction[]): Promise<ProcessBindingResponse> {\n    return this.processBindings({\n      bindings: instructions.map((instruction) => {\n        return {\n          data: {\n            raw: new Uint8Array(),\n            solInstruction: instruction,\n          },\n          handlerIds: [],\n          handlerType: HandlerType.SOL_INSTRUCTION,\n        }\n      }),\n    })\n  }\n\n  processBindings(\n    request: ProcessBindingsRequest,\n    context: CallContext = TEST_CONTEXT\n  ): Promise<ProcessBindingResponse> {\n    return this.service.processBindings(request, context)\n  }\n\n  processBindingsStream(request: AsyncIterable<DataBinding>, context: CallContext) {\n    return this.service.processBindingsStream(request, context)\n  }\n}\n"]}