@sentio/sdk 1.27.8 → 1.27.10

package/lib/cli/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/cli/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync } from 'child_process'\nimport { createHash } from 'crypto'\nimport FormData from 'form-data'\nimport fs from 'fs'\nimport readline from 'readline'\nimport { SentioProjectConfig } from './config'\nimport { ReadKey } from './key'\nimport path from 'path'\nimport chalk from 'chalk'\nimport { buildProcessor } from './build'\nimport fetch from 'node-fetch'\nimport { getCliVersion } from './utils'\n\nasync function createProject(options: SentioProjectConfig, apiKey: string) {\n  const url = new URL('/api/v1/projects', options.host)\n  return fetch(url, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({ slug: options.project, visibility: 'PRIVATE' }),\n  })\n}\n\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false)\n  }\n\n  console.log(chalk.blue('Prepare to upload'))\n\n  const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')\n\n  const url = new URL('/api/v1/processors', options.host)\n  const apiKey = apiKeyOverride || ReadKey(options.host)\n\n  const isProd = options.host === 'https://app.sentio.xyz'\n  if (!apiKey) {\n    const cmd = isProd ? 'sentio login' : 'sentio login --host=' + options.host\n    console.error(chalk.red('No Credential found for', options.host, '. Please run `' + cmd + '`.'))\n    process.exit(1)\n  }\n\n  if (!fs.existsSync(PROCESSOR_FILE)) {\n    console.error(chalk.red('File not existed ', PROCESSOR_FILE, \"don't use --nobuild\"))\n    process.exit(1)\n  }\n\n  const stat = fs.statSync(PROCESSOR_FILE)\n  console.log('Packed processor file size', Math.floor(stat.size / 1024) + 'K, last modified', stat.mtime)\n  const content = fs.readFileSync(PROCESSOR_FILE)\n  const hash = createHash('sha256')\n  hash.update(content)\n  const digest = hash.digest('hex')\n\n  let triedCount = 0\n  const upload = async () => {\n    const data = new FormData()\n    data.append('attachment', fs.createReadStream(PROCESSOR_FILE))\n    data.append('sha256', digest)\n\n    let commitSha = ''\n    try {\n      commitSha = execSync('git rev-parse HEAD').toString().trim()\n      data.append('commitSha', commitSha)\n    } catch (e) {\n      chalk.yellow(e)\n    }\n    try {\n      const gitUrl = execSync('git remote get-url origin').toString().trim()\n      data.append('gitUrl', gitUrl)\n    } catch (e) {\n      // skip errors\n    }\n    console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))\n    const res = await fetch(url, {\n      method: 'POST',\n      headers: {\n        'api-key': apiKey,\n        project: options.project,\n        version: getCliVersion(),\n      },\n      body: data,\n    })\n\n    if (res.ok) {\n      console.log(chalk.green('Upload success: '))\n      console.log('\\t', chalk.blue('sha256:'), digest)\n      if (commitSha) {\n        console.log('\\t', chalk.blue('Git commit SHA:'), commitSha)\n      }\n      const { ProjectSlug } = await res.json()\n      console.log('\\t', chalk.blue('Check status:'), `${options.host}/${ProjectSlug}/datasource`)\n    } else {\n      console.error(chalk.red('Upload Failed'))\n      console.error(chalk.red(await res.text()))\n\n      if (res.status === 404) {\n        const rl = readline.createInterface({\n          input: process.stdin,\n          output: process.stdout,\n        })\n\n        const prompt = async () => {\n          const answer: string = await new Promise((resolve) =>\n            rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve)\n          )\n          if (['y', 'yes'].includes(answer.toLowerCase())) {\n            rl.close()\n            const res = await createProject(options, apiKey)\n            if (!res.ok) {\n              console.error(chalk.red('Create Project Failed'))\n              console.error(chalk.red((await res.json()).message))\n              return\n            }\n            console.log(chalk.green('Project created'))\n            await upload()\n          } else if (['n', 'no'].includes(answer.toLowerCase())) {\n            rl.close()\n          } else {\n            await prompt()\n          }\n        }\n        await prompt()\n      }\n    }\n  }\n\n  const tryUploading = async () => {\n    if (triedCount++ >= 5) {\n      return\n    }\n    try {\n      await upload()\n    } catch (e) {\n      console.log(e)\n      if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {\n        await tryUploading()\n      }\n    }\n  }\n\n  await tryUploading()\n}\n"]}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/cli/upload.ts"],"names":[],"mappings":"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","sourcesContent":["import { execSync } from 'child_process'\nimport { createHash } from 'crypto'\nimport FormData from 'form-data'\nimport fs from 'fs'\nimport readline from 'readline'\nimport { SentioProjectConfig } from './config'\nimport { ReadKey } from './key'\nimport path from 'path'\nimport chalk from 'chalk'\nimport { buildProcessor } from './build'\nimport fetch from 'node-fetch'\nimport { getCliVersion } from './utils'\n\nasync function createProject(options: SentioProjectConfig, apiKey: string) {\n  const url = new URL('/api/v1/projects', options.host)\n  return fetch(url, {\n    method: 'POST',\n    headers: {\n      'api-key': apiKey,\n    },\n    body: JSON.stringify({ slug: options.project, visibility: 'PRIVATE' }),\n  })\n}\n\nexport async function uploadFile(options: SentioProjectConfig, apiKeyOverride: string) {\n  if (options.build) {\n    await buildProcessor(false)\n  }\n\n  console.log(chalk.blue('Prepare to upload'))\n\n  const PROCESSOR_FILE = path.join(process.cwd(), 'dist/lib.js')\n\n  const url = new URL('/api/v1/processors', options.host)\n  const apiKey = apiKeyOverride || ReadKey(options.host)\n\n  const isProd = options.host === 'https://app.sentio.xyz'\n  if (!apiKey) {\n    const cmd = isProd ? 'sentio login' : 'sentio login --host=' + options.host\n    console.error(chalk.red('No Credential found for', options.host, '. Please run `' + cmd + '`.'))\n    process.exit(1)\n  }\n\n  if (!fs.existsSync(PROCESSOR_FILE)) {\n    console.error(chalk.red('File not existed ', PROCESSOR_FILE, \"don't use --nobuild\"))\n    process.exit(1)\n  }\n\n  const stat = fs.statSync(PROCESSOR_FILE)\n  console.log('Packed processor file size', Math.floor(stat.size / 1024) + 'K, last modified', stat.mtime)\n  const content = fs.readFileSync(PROCESSOR_FILE)\n  const hash = createHash('sha256')\n  hash.update(content)\n  const digest = hash.digest('hex')\n\n  let triedCount = 0\n  const upload = async () => {\n    const data = new FormData()\n    data.append('attachment', fs.createReadStream(PROCESSOR_FILE))\n    data.append('sha256', digest)\n\n    let commitSha = ''\n    try {\n      commitSha = execSync('git rev-parse HEAD').toString().trim()\n      data.append('commitSha', commitSha)\n    } catch (e) {\n      chalk.yellow(e)\n    }\n    try {\n      const gitUrl = execSync('git remote get-url origin').toString().trim()\n      data.append('gitUrl', gitUrl)\n    } catch (e) {\n      // skip errors\n    }\n    console.log(chalk.blue(triedCount > 1 ? 'Retry uploading' : 'Uploading'))\n    const res = await fetch(url, {\n      method: 'POST',\n      headers: {\n        'api-key': apiKey,\n        project: options.project,\n        version: getCliVersion(),\n      },\n      body: data,\n    })\n\n    if (res.ok) {\n      console.log(chalk.green('Upload success: '))\n      console.log('\\t', chalk.blue('sha256:'), digest)\n      if (commitSha) {\n        console.log('\\t', chalk.blue('Git commit SHA:'), commitSha)\n      }\n      const { ProjectSlug } = await res.json()\n      console.log('\\t', chalk.blue('Check status:'), `${options.host}/${ProjectSlug}/datasource`)\n    } else {\n      console.error(chalk.red('Upload Failed'))\n      console.error(chalk.red(await res.text()))\n\n      if (res.status === 404) {\n        const rl = readline.createInterface({\n          input: process.stdin,\n          output: process.stdout,\n        })\n\n        const prompt = async () => {\n          const answer: string = await new Promise((resolve) =>\n            rl.question(`Do you want to create it and continue the uploading process? (yes/no) `, resolve)\n          )\n          if (['y', 'yes'].includes(answer.toLowerCase())) {\n            rl.close()\n            const res = await createProject(options, apiKey)\n            if (!res.ok) {\n              console.error(chalk.red('Create Project Failed'))\n              console.error(chalk.red((await res.json()).message))\n              return\n            }\n            console.log(chalk.green('Project created'))\n            await upload()\n          } else if (['n', 'no'].includes(answer.toLowerCase())) {\n            rl.close()\n          } else {\n            await prompt()\n          }\n        }\n        await prompt()\n      }\n    }\n  }\n\n  let error: Error\n  const tryUploading = async () => {\n    if (triedCount++ >= 5) {\n      console.error(error)\n      return\n    }\n    try {\n      await upload()\n    } catch (e) {\n      if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {\n        error = e\n        await new Promise((resolve) => setTimeout(resolve, 1000))\n        await tryUploading()\n      } else {\n        console.error(e)\n      }\n    }\n  }\n\n  await tryUploading()\n}\n"]}

package/lib/core/base-processor-template.d.ts

@@ -9,7 +9,11 @@ import { Trace } from './trace';
 export declare abstract class BaseProcessorTemplate<TContract extends BaseContract, TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>> {
     id: number;
     binds: Set<string>;
-    blockHandlers: ((block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid)[];
+    blockHandlers: {
+        handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid;
+        blockInterval?: number;
+        timeIntervalInMinutes?: number;
+    }[];
     traceHandlers: {
         signature: string;
         handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid;
@@ -22,6 +26,9 @@ export declare abstract class BaseProcessorTemplate<TContract extends BaseContra
     bind(options: BindOptions): BaseProcessor<TContract, TBoundContractView> | undefined;
     onEvent(handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, filter: EventFilter | EventFilter[]): this;
     onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
+    onBlockInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, blockInterval?: number): this;
+    onTimeInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, timeIntervalInMinutes?: number): this;
+    onInterval(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid, timeInterval: number | undefined, blockInterval: number | undefined): this;
     onTrace(signature: string, handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
     protected abstract bindInternal(options: BindOptions): BaseProcessor<TContract, TBoundContractView>;
 }

package/lib/core/base-processor-template.js

@@ -28,7 +28,7 @@ class BaseProcessorTemplate {
             processor.onEvent(eh.handler, eh.filter);
         }
         for (const bh of this.blockHandlers) {
-            processor.onBlock(bh);
+            processor.onInterval(bh.handler, bh.timeIntervalInMinutes, bh.blockInterval);
         }
         const instance = {
             templateId: this.id,
@@ -68,7 +68,16 @@ class BaseProcessorTemplate {
         return this;
     }
     onBlock(handler) {
-        this.blockHandlers.push(handler);
+        return this.onBlockInterval(handler);
+    }
+    onBlockInterval(handler, blockInterval = 1000) {
+        return this.onInterval(handler, undefined, blockInterval);
+    }
+    onTimeInterval(handler, timeIntervalInMinutes = 240) {
+        return this.onInterval(handler, timeIntervalInMinutes, undefined);
+    }
+    onInterval(handler, timeInterval, blockInterval) {
+        this.blockHandlers.push({ handler, timeIntervalInMinutes: timeInterval, blockInterval: blockInterval });
         return this;
     }
     onTrace(signature, handler) {

package/lib/core/base-processor-template.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-processor-template.js","sourceRoot":"","sources":["../../src/core/base-processor-template.ts"],"names":[],"mappings":"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","sourcesContent":["import { BoundContractView, ContractContext, ContractView } from './context'\nimport { Block } from '@ethersproject/abstract-provider'\nimport { BaseContract, EventFilter } from 'ethers'\nimport { Event } from '@ethersproject/contracts'\nimport { BaseProcessor } from './base-processor'\nimport { BindOptions, getOptionsSignature } from './bind-options'\nimport { TemplateInstance } from '../gen'\nimport Long from 'long'\nimport { getNetwork } from '@ethersproject/providers'\nimport { PromiseOrVoid } from '../promise-or-void'\nimport { Trace } from './trace'\n\nexport abstract class BaseProcessorTemplate<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  id: number\n  binds = new Set<string>()\n  blockHandlers: ((block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid)[] = []\n  traceHandlers: {\n    signature: string\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  }[] = []\n  eventHandlers: {\n    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n    filter: EventFilter | EventFilter[]\n  }[] = []\n\n  constructor() {\n    this.id = global.PROCESSOR_STATE.templates.length\n    global.PROCESSOR_STATE.templates.push(this)\n  }\n\n  public bind(options: BindOptions) {\n    const sig = getOptionsSignature(options)\n    if (this.binds.has(sig)) {\n      return\n    }\n    this.binds.add(sig)\n\n    const processor = this.bindInternal(options)\n\n    for (const eh of this.eventHandlers) {\n      processor.onEvent(eh.handler, eh.filter)\n    }\n    for (const bh of this.blockHandlers) {\n      processor.onBlock(bh)\n    }\n\n    const instance: TemplateInstance = {\n      templateId: this.id,\n      contract: {\n        address: options.address,\n        name: options.name || '',\n        chainId: options.network ? getNetwork(options.network).chainId.toString() : '1',\n        abi: '',\n      },\n      startBlock: Long.ZERO,\n      endBlock: Long.ZERO,\n    }\n    if (options.startBlock) {\n      if (typeof options.startBlock === 'number') {\n        instance.startBlock = Long.fromNumber(options.startBlock)\n      } else {\n        instance.startBlock = options.startBlock\n      }\n    }\n    if (options.endBlock) {\n      if (typeof options.endBlock === 'number') {\n        instance.endBlock = Long.fromNumber(options.endBlock)\n      } else {\n        instance.endBlock = options.endBlock\n      }\n    }\n    global.PROCESSOR_STATE.templatesInstances.push(instance)\n\n    return processor\n  }\n\n  public onEvent(\n    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: EventFilter | EventFilter[]\n  ) {\n    this.eventHandlers.push({\n      handler: handler,\n      filter: filter,\n    })\n    return this\n  }\n\n  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    this.blockHandlers.push(handler)\n    return this\n  }\n\n  public onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ) {\n    this.traceHandlers.push({ signature, handler })\n    return this\n  }\n\n  protected abstract bindInternal(options: BindOptions): BaseProcessor<TContract, TBoundContractView>\n}\n"]}
+{"version":3,"file":"base-processor-template.js","sourceRoot":"","sources":["../../src/core/base-processor-template.ts"],"names":[],"mappings":"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","sourcesContent":["import { BoundContractView, ContractContext, ContractView } from './context'\nimport { Block } from '@ethersproject/abstract-provider'\nimport { BaseContract, EventFilter } from 'ethers'\nimport { Event } from '@ethersproject/contracts'\nimport { BaseProcessor } from './base-processor'\nimport { BindOptions, getOptionsSignature } from './bind-options'\nimport { TemplateInstance } from '../gen'\nimport Long from 'long'\nimport { getNetwork } from '@ethersproject/providers'\nimport { PromiseOrVoid } from '../promise-or-void'\nimport { Trace } from './trace'\n\nexport abstract class BaseProcessorTemplate<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  id: number\n  binds = new Set<string>()\n  blockHandlers: {\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n    blockInterval?: number\n    timeIntervalInMinutes?: number\n  }[] = []\n  traceHandlers: {\n    signature: string\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  }[] = []\n  eventHandlers: {\n    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n    filter: EventFilter | EventFilter[]\n  }[] = []\n\n  constructor() {\n    this.id = global.PROCESSOR_STATE.templates.length\n    global.PROCESSOR_STATE.templates.push(this)\n  }\n\n  public bind(options: BindOptions) {\n    const sig = getOptionsSignature(options)\n    if (this.binds.has(sig)) {\n      return\n    }\n    this.binds.add(sig)\n\n    const processor = this.bindInternal(options)\n\n    for (const eh of this.eventHandlers) {\n      processor.onEvent(eh.handler, eh.filter)\n    }\n    for (const bh of this.blockHandlers) {\n      processor.onInterval(bh.handler, bh.timeIntervalInMinutes, bh.blockInterval)\n    }\n\n    const instance: TemplateInstance = {\n      templateId: this.id,\n      contract: {\n        address: options.address,\n        name: options.name || '',\n        chainId: options.network ? getNetwork(options.network).chainId.toString() : '1',\n        abi: '',\n      },\n      startBlock: Long.ZERO,\n      endBlock: Long.ZERO,\n    }\n    if (options.startBlock) {\n      if (typeof options.startBlock === 'number') {\n        instance.startBlock = Long.fromNumber(options.startBlock)\n      } else {\n        instance.startBlock = options.startBlock\n      }\n    }\n    if (options.endBlock) {\n      if (typeof options.endBlock === 'number') {\n        instance.endBlock = Long.fromNumber(options.endBlock)\n      } else {\n        instance.endBlock = options.endBlock\n      }\n    }\n    global.PROCESSOR_STATE.templatesInstances.push(instance)\n\n    return processor\n  }\n\n  public onEvent(\n    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: EventFilter | EventFilter[]\n  ) {\n    this.eventHandlers.push({\n      handler: handler,\n      filter: filter,\n    })\n    return this\n  }\n\n  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    return this.onBlockInterval(handler)\n  }\n\n  public onBlockInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    blockInterval = 1000\n  ) {\n    return this.onInterval(handler, undefined, blockInterval)\n  }\n\n  public onTimeInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeIntervalInMinutes = 240\n  ) {\n    return this.onInterval(handler, timeIntervalInMinutes, undefined)\n  }\n\n  public onInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeInterval: number | undefined,\n    blockInterval: number | undefined\n  ) {\n    this.blockHandlers.push({ handler, timeIntervalInMinutes: timeInterval, blockInterval: blockInterval })\n    return this\n  }\n\n  public onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ) {\n    this.traceHandlers.push({ signature, handler })\n    return this\n  }\n\n  protected abstract bindInternal(options: BindOptions): BaseProcessor<TContract, TBoundContractView>\n}\n"]}

package/lib/core/base-processor.d.ts

@@ -14,7 +14,7 @@ export declare class TraceHandler {
     signature: string;
     handler: (trace: Trace) => Promise<ProcessResult>;
 }
-declare class BlockHandlder {
+export declare class BlockHandlder {
     blockInterval?: number;
     timeIntervalInMinutes?: number;
     handler: (block: Block) => Promise<ProcessResult>;
@@ -35,4 +35,3 @@ export declare abstract class BaseProcessor<TContract extends BaseContract, TBou
     onAllEvents(handler: (event: Log, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
     protected onTrace(signature: string, handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid): this;
 }
-export {};

package/lib/core/base-processor.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseProcessor = exports.TraceHandler = exports.EventsHandler = void 0;
+exports.BaseProcessor = exports.BlockHandlder = exports.TraceHandler = exports.EventsHandler = void 0;
 const providers_1 = require("@ethersproject/providers");
 const long_1 = __importDefault(require("long"));
 const context_1 = require("./context");
@@ -23,6 +23,7 @@ class BlockHandlder {
     timeIntervalInMinutes;
     handler;
 }
+exports.BlockHandlder = BlockHandlder;
 class BaseProcessor {
     blockHandlers = [];
     eventHandlers = [];
@@ -90,12 +91,12 @@ class BaseProcessor {
         return this;
     }
     onBlock(handler) {
-        return this.onBlockInterval(handler, 1);
+        return this.onBlockInterval(handler);
     }
-    onBlockInterval(handler, blockInterval = 240) {
+    onBlockInterval(handler, blockInterval = 1000) {
         return this.onInterval(handler, undefined, blockInterval);
     }
-    onTimeInterval(handler, timeIntervalInMinutes = 60) {
+    onTimeInterval(handler, timeIntervalInMinutes = 60 * 4) {
         return this.onInterval(handler, timeIntervalInMinutes, undefined);
     }
     onInterval(handler, timeInterval, blockInterval) {

package/lib/core/base-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/core/base-processor.ts"],"names":[],"mappings":";;;;;;AAEA,wDAAiE;AAEjE,gDAAuB;AAEvB,uCAA4E;AAC5E,gCAAsC;AAQtC,MAAa,aAAa;IACxB,OAAO,CAAe;IACtB,OAAO,CAAwC;CAChD;AAHD,sCAGC;AAED,MAAa,YAAY;IACvB,SAAS,CAAQ;IACjB,OAAO,CAA0C;CAClD;AAHD,oCAGC;AAED,MAAM,aAAa;IACjB,aAAa,CAAS;IACtB,qBAAqB,CAAS;IAC9B,OAAO,CAA0C;CAClD;AAED,MAAsB,aAAa;IAIjC,aAAa,GAAoB,EAAE,CAAA;IACnC,aAAa,GAAoB,EAAE,CAAA;IACnC,aAAa,GAAmB,EAAE,CAAA;IAElC,MAAM,CAAqB;IAE3B,YAAY,MAAmB;QAC7B,IAAI,CAAC,MAAM,GAAG;YACZ,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC5C,UAAU,EAAE,IAAI,cAAI,CAAC,CAAC,CAAC;SACxB,CAAA;QACD,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,IAAI,OAAO,MAAM,CAAC,UAAU,KAAK,QAAQ,EAAE;gBACzC,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;aAC5D;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;aAC3C;SACF;QACD,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACvC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,cAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;aACxD;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;aACvC;SACF;IACH,CAAC;IAIM,UAAU;QACf,OAAO,IAAA,sBAAU,EAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAA;IAChD,CAAC;IAEM,OAAO,CACZ,OAA6F,EAC7F,MAAmC;QAEnC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QAEjC,IAAI,QAAQ,GAAkB,EAAE,CAAA;QAEhC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,QAAQ,GAAG,MAAM,CAAA;SAClB;aAAM;YACL,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;SACtB;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAA;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QACrC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,KAAK,WAAW,GAAG;gBAC1B,MAAM,GAAG,GAAG,IAAI,yBAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,SAAS,EACT,GAAG,CACJ,CAAA;gBACD,2CAA2C;gBAC3C,MAAM,KAAK,GAAiB,GAAG,CAAA;gBAC/B,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;gBAC/D,IAAI,MAAM,EAAE;oBACV,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;oBACxB,KAAK,CAAC,MAAM,GAAG,CAAC,IAAe,EAAE,MAAmB,EAAE,EAAE;wBACtD,OAAO,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;oBAC9F,CAAC,CAAA;oBACD,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAA;oBACzB,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,SAAS,CAAA;oBAEvC,oBAAoB;oBACpB,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;oBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;iBAC9B;gBACD,OAAO,mBAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;YACtC,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,OAAO,CAAC,OAA6F;QAC1G,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IACzC,CAAC;IAEM,eAAe,CACpB,OAA6F,EAC7F,aAAa,GAAG,GAAG;QAEnB,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;IAC3D,CAAC;IAEM,cAAc,CACnB,OAA6F,EAC7F,qBAAqB,GAAG,EAAE;QAE1B,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,qBAAqB,EAAE,SAAS,CAAC,CAAA;IACnE,CAAC;IAEM,UAAU,CACf,OAA6F,EAC7F,YAAgC,EAChC,aAAiC;QAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAA;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAErC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,OAAO,EAAE,KAAK,WAAW,KAAY;gBACnC,MAAM,GAAG,GAAG,IAAI,yBAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,KAAK,EACL,SAAS,CACV,CAAA;gBACD,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;YACD,qBAAqB,EAAE,YAAY;YACnC,aAAa,EAAE,aAAa;SAC7B,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAEM,WAAW,CAAC,OAA2F;QAC5G,MAAM,QAAQ,GAAkB,EAAE,CAAA;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAA;QAElD,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE;YACrC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;SAC1C;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,EAAE,GAAG;YACpC,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAC1B,CAAC,EAAE,QAAQ,CAAC,CAAA;IACd,CAAC;IAES,OAAO,CACf,SAAiB,EACjB,OAA6F;QAE7F,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QACjC,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAA;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAErC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACtB,SAAS;YACT,OAAO,EAAE,KAAK,WAAW,KAAY;gBACnC,MAAM,iBAAiB,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAA;gBAC5D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;gBACzD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE;oBACvB,OAAO,mBAAa,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;iBACrC;gBACD,MAAM,SAAS,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBACrD,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;gBAE3E,MAAM,GAAG,GAAG,IAAI,yBAAe,CAC7B,YAAY,EACZ,YAAY,EACZ,OAAO,EACP,SAAS,EACT,SAAS,EACT,KAAK,CACN,CAAA;gBACD,MAAM,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;gBACzB,OAAO,GAAG,CAAC,gBAAgB,EAAE,CAAA;YAC/B,CAAC;SACF,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAhLD,sCAgLC","sourcesContent":["import { Event } from '@ethersproject/contracts'\nimport { BytesLike } from '@ethersproject/bytes'\nimport { Block, Log, getNetwork } from '@ethersproject/providers'\nimport { BaseContract, EventFilter } from '@ethersproject/contracts'\nimport Long from 'long'\n\nimport { BoundContractView, ContractContext, ContractView } from './context'\nimport { ProcessResult } from '../gen'\nimport { BindInternalOptions, BindOptions } from './bind-options'\nimport { PromiseOrVoid } from '../promise-or-void'\nimport { Trace } from './trace'\nimport { MoveResource } from 'aptos-sdk/src/generated'\nimport { AptosResourceContext } from '../aptos'\nimport { MoveResourcesWithVersionPayload } from '../aptos/aptos-processor'\n\nexport class EventsHandler {\n  filters: EventFilter[]\n  handler: (event: Log) => Promise<ProcessResult>\n}\n\nexport class TraceHandler {\n  signature: string\n  handler: (trace: Trace) => Promise<ProcessResult>\n}\n\nclass BlockHandlder {\n  blockInterval?: number\n  timeIntervalInMinutes?: number\n  handler: (block: Block) => Promise<ProcessResult>\n}\n\nexport abstract class BaseProcessor<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  blockHandlers: BlockHandlder[] = []\n  eventHandlers: EventsHandler[] = []\n  traceHandlers: TraceHandler[] = []\n\n  config: BindInternalOptions\n\n  constructor(config: BindOptions) {\n    this.config = {\n      address: config.address,\n      name: config.name || '',\n      network: config.network ? config.network : 1,\n      startBlock: new Long(0),\n    }\n    if (config.startBlock) {\n      if (typeof config.startBlock === 'number') {\n        this.config.startBlock = Long.fromNumber(config.startBlock)\n      } else {\n        this.config.startBlock = config.startBlock\n      }\n    }\n    if (config.endBlock) {\n      if (typeof config.endBlock === 'number') {\n        this.config.endBlock = Long.fromNumber(config.endBlock)\n      } else {\n        this.config.endBlock = config.endBlock\n      }\n    }\n  }\n\n  protected abstract CreateBoundContractView(): TBoundContractView\n\n  public getChainId(): number {\n    return getNetwork(this.config.network).chainId\n  }\n\n  public onEvent(\n    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: EventFilter | EventFilter[]\n  ) {\n    const chainId = this.getChainId()\n\n    let _filters: EventFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    const contractView = this.CreateBoundContractView()\n    const contractName = this.config.name\n    this.eventHandlers.push({\n      filters: _filters,\n      handler: async function (log) {\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          undefined,\n          log\n        )\n        // let event: Event = <Event>deepCopy(log);\n        const event: Event = <Event>log\n        const parsed = contractView.rawContract.interface.parseLog(log)\n        if (parsed) {\n          event.args = parsed.args\n          event.decode = (data: BytesLike, topics?: Array<any>) => {\n            return contractView.rawContract.interface.decodeEventLog(parsed.eventFragment, data, topics)\n          }\n          event.event = parsed.name\n          event.eventSignature = parsed.signature\n\n          // TODO fix this bug\n          await handler(event, ctx)\n          return ctx.getProcessResult()\n        }\n        return ProcessResult.fromPartial({})\n      },\n    })\n    return this\n  }\n\n  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    return this.onBlockInterval(handler, 1)\n  }\n\n  public onBlockInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    blockInterval = 240\n  ) {\n    return this.onInterval(handler, undefined, blockInterval)\n  }\n\n  public onTimeInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeIntervalInMinutes = 60\n  ) {\n    return this.onInterval(handler, timeIntervalInMinutes, undefined)\n  }\n\n  public onInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeInterval: number | undefined,\n    blockInterval: number | undefined\n  ) {\n    const chainId = this.getChainId()\n    const contractView = this.CreateBoundContractView()\n    const contractName = this.config.name\n\n    this.blockHandlers.push({\n      handler: async function (block: Block) {\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          block,\n          undefined\n        )\n        await handler(block, ctx)\n        return ctx.getProcessResult()\n      },\n      timeIntervalInMinutes: timeInterval,\n      blockInterval: blockInterval,\n    })\n    return this\n  }\n\n  public onAllEvents(handler: (event: Log, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    const _filters: EventFilter[] = []\n    const tmpContract = this.CreateBoundContractView()\n\n    for (const key in tmpContract.filters) {\n      _filters.push(tmpContract.filters[key]())\n    }\n    return this.onEvent(function (log, ctx) {\n      return handler(log, ctx)\n    }, _filters)\n  }\n\n  protected onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ) {\n    const chainId = this.getChainId()\n    const contractView = this.CreateBoundContractView()\n    const contractName = this.config.name\n\n    this.traceHandlers.push({\n      signature,\n      handler: async function (trace: Trace) {\n        const contractInterface = contractView.rawContract.interface\n        const fragment = contractInterface.getFunction(signature)\n        if (!trace.action.input) {\n          return ProcessResult.fromPartial({})\n        }\n        const traceData = '0x' + trace.action.input.slice(10)\n        trace.args = contractInterface._abiCoder.decode(fragment.inputs, traceData)\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          undefined,\n          undefined,\n          trace\n        )\n        await handler(trace, ctx)\n        return ctx.getProcessResult()\n      },\n    })\n    return this\n  }\n}\n"]}
+{"version":3,"file":"base-processor.js","sourceRoot":"","sources":["../../src/core/base-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Event } from '@ethersproject/contracts'\nimport { BytesLike } from '@ethersproject/bytes'\nimport { Block, Log, getNetwork } from '@ethersproject/providers'\nimport { BaseContract, EventFilter } from '@ethersproject/contracts'\nimport Long from 'long'\n\nimport { BoundContractView, ContractContext, ContractView } from './context'\nimport { ProcessResult } from '../gen'\nimport { BindInternalOptions, BindOptions } from './bind-options'\nimport { PromiseOrVoid } from '../promise-or-void'\nimport { Trace } from './trace'\n\nexport class EventsHandler {\n  filters: EventFilter[]\n  handler: (event: Log) => Promise<ProcessResult>\n}\n\nexport class TraceHandler {\n  signature: string\n  handler: (trace: Trace) => Promise<ProcessResult>\n}\n\nexport class BlockHandlder {\n  blockInterval?: number\n  timeIntervalInMinutes?: number\n  handler: (block: Block) => Promise<ProcessResult>\n}\n\nexport abstract class BaseProcessor<\n  TContract extends BaseContract,\n  TBoundContractView extends BoundContractView<TContract, ContractView<TContract>>\n> {\n  blockHandlers: BlockHandlder[] = []\n  eventHandlers: EventsHandler[] = []\n  traceHandlers: TraceHandler[] = []\n\n  config: BindInternalOptions\n\n  constructor(config: BindOptions) {\n    this.config = {\n      address: config.address,\n      name: config.name || '',\n      network: config.network ? config.network : 1,\n      startBlock: new Long(0),\n    }\n    if (config.startBlock) {\n      if (typeof config.startBlock === 'number') {\n        this.config.startBlock = Long.fromNumber(config.startBlock)\n      } else {\n        this.config.startBlock = config.startBlock\n      }\n    }\n    if (config.endBlock) {\n      if (typeof config.endBlock === 'number') {\n        this.config.endBlock = Long.fromNumber(config.endBlock)\n      } else {\n        this.config.endBlock = config.endBlock\n      }\n    }\n  }\n\n  protected abstract CreateBoundContractView(): TBoundContractView\n\n  public getChainId(): number {\n    return getNetwork(this.config.network).chainId\n  }\n\n  public onEvent(\n    handler: (event: Event, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    filter: EventFilter | EventFilter[]\n  ) {\n    const chainId = this.getChainId()\n\n    let _filters: EventFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    const contractView = this.CreateBoundContractView()\n    const contractName = this.config.name\n    this.eventHandlers.push({\n      filters: _filters,\n      handler: async function (log) {\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          undefined,\n          log\n        )\n        // let event: Event = <Event>deepCopy(log);\n        const event: Event = <Event>log\n        const parsed = contractView.rawContract.interface.parseLog(log)\n        if (parsed) {\n          event.args = parsed.args\n          event.decode = (data: BytesLike, topics?: Array<any>) => {\n            return contractView.rawContract.interface.decodeEventLog(parsed.eventFragment, data, topics)\n          }\n          event.event = parsed.name\n          event.eventSignature = parsed.signature\n\n          // TODO fix this bug\n          await handler(event, ctx)\n          return ctx.getProcessResult()\n        }\n        return ProcessResult.fromPartial({})\n      },\n    })\n    return this\n  }\n\n  public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    return this.onBlockInterval(handler)\n  }\n\n  public onBlockInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    blockInterval = 1000\n  ) {\n    return this.onInterval(handler, undefined, blockInterval)\n  }\n\n  public onTimeInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeIntervalInMinutes = 60 * 4\n  ) {\n    return this.onInterval(handler, timeIntervalInMinutes, undefined)\n  }\n\n  public onInterval(\n    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,\n    timeInterval: number | undefined,\n    blockInterval: number | undefined\n  ) {\n    const chainId = this.getChainId()\n    const contractView = this.CreateBoundContractView()\n    const contractName = this.config.name\n\n    this.blockHandlers.push({\n      handler: async function (block: Block) {\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          block,\n          undefined\n        )\n        await handler(block, ctx)\n        return ctx.getProcessResult()\n      },\n      timeIntervalInMinutes: timeInterval,\n      blockInterval: blockInterval,\n    })\n    return this\n  }\n\n  public onAllEvents(handler: (event: Log, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {\n    const _filters: EventFilter[] = []\n    const tmpContract = this.CreateBoundContractView()\n\n    for (const key in tmpContract.filters) {\n      _filters.push(tmpContract.filters[key]())\n    }\n    return this.onEvent(function (log, ctx) {\n      return handler(log, ctx)\n    }, _filters)\n  }\n\n  protected onTrace(\n    signature: string,\n    handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid\n  ) {\n    const chainId = this.getChainId()\n    const contractView = this.CreateBoundContractView()\n    const contractName = this.config.name\n\n    this.traceHandlers.push({\n      signature,\n      handler: async function (trace: Trace) {\n        const contractInterface = contractView.rawContract.interface\n        const fragment = contractInterface.getFunction(signature)\n        if (!trace.action.input) {\n          return ProcessResult.fromPartial({})\n        }\n        const traceData = '0x' + trace.action.input.slice(10)\n        trace.args = contractInterface._abiCoder.decode(fragment.inputs, traceData)\n\n        const ctx = new ContractContext<TContract, TBoundContractView>(\n          contractName,\n          contractView,\n          chainId,\n          undefined,\n          undefined,\n          trace\n        )\n        await handler(trace, ctx)\n        return ctx.getProcessResult()\n      },\n    })\n    return this\n  }\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.27.8",
+  "version": "1.27.10",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/cli/webpack.config.js lib/cli && cp src/utils/*.csv lib/utils",

package/src/aptos-codegen/codegen.ts

@@ -143,7 +143,7 @@ export class AccountCodegen {
     const info = this.loader.accountImports.get(address)
 
     if (info) {
-      for (const [account, moduleImported] of info.imports.entries()) {
+      for (const [account] of info.imports.entries()) {
         // Remap to user's filename if possible, TODO codepath not well tested
         let tsAccountModule = './' + (this.loader.accountImports.get(account)?.moduleName || account)
         if (isFrameworkAccount(account) && !isFrameworkAccount(address)) {
@@ -154,12 +154,9 @@ export class AccountCodegen {
           }
           tsAccountModule = `@sentio/sdk/${srcRoot}/builtin/aptos/${account}`
         }
-        const items = Array.from(moduleImported)
-        moduleImports.push(`import { ${items.join(',')} } from "${tsAccountModule}"`)
+        moduleImports.push(`import * as _${account} from "${tsAccountModule}"`)
 
-        // Ideally we should use per module's load types, but it doesn't matter since we are loading the entire
-        // account modules anyway
-        items.forEach((m) => dependedAccounts.push(m))
+        dependedAccounts.push(account)
       }
     }
 
@@ -176,8 +173,8 @@ export class AccountCodegen {
     
     ${this.modules.map((m) => generateModule(m, this.config.network)).join('\n')}
     
-    function loadAllTypes(_r: aptos.TypeRegistry) {
-      ${dependedAccounts.map((m) => `${m}.loadTypes(_r)`).join('\n')}
+    export function loadAllTypes(_r: aptos.TypeRegistry) {
+      ${dependedAccounts.map((a) => `_${a}.loadAllTypes(_r)`).join('\n')}
 
       ${this.modules
         .map((m) => {
@@ -268,7 +265,7 @@ function generateStructs(module: MoveModule, struct: MoveStruct, events: Set<str
   const genericStringAny = generateStructTypeParameters(struct, true)
 
   const fields = struct.fields.map((field) => {
-    return `${field.name}: ${generateType(field.type)}`
+    return `${field.name}: ${generateType(field.type, module.address)}`
   })
 
   let eventPayload = ''
@@ -325,7 +322,7 @@ function generateCallArgsStructs(module: MoveModule, func: MoveFunction) {
   }
 
   const fields = getMeaningfulFunctionParams(func).map((param) => {
-    return `${generateType(param)}`
+    return `${generateType(param, module.address)}`
   })
 
   const camelFuncName = capitalizeFirstChar(camelize(func.name))

package/src/aptos-codegen/typegen.ts

@@ -2,7 +2,7 @@ import { MoveModule } from 'aptos-sdk/src/generated'
 import { TypeDescriptor } from '../aptos/types'
 import { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../aptos/utils'
 
-function generateTypeForDescriptor(type: TypeDescriptor): string {
+function generateTypeForDescriptor(type: TypeDescriptor, currentAddress: string): string {
   // TODO &signer is defintely an address, but what if &OTHER_TYPE?
   if (type.qname.startsWith('&')) {
     return 'Address'
@@ -34,10 +34,10 @@ function generateTypeForDescriptor(type: TypeDescriptor): string {
     if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {
       return `${elementTypeQname}[] | string`
     }
-    return generateTypeForDescriptor(type.typeArgs[0]) + '[]'
+    return generateTypeForDescriptor(type.typeArgs[0], currentAddress) + '[]'
   }
 
-  const simpleName = generateSimpleType(type.qname)
+  const simpleName = generateSimpleType(type.qname, currentAddress)
   if (simpleName.length === 0) {
     console.error('unexpected error')
   }
@@ -46,18 +46,20 @@ function generateTypeForDescriptor(type: TypeDescriptor): string {
   }
   if (type.typeArgs.length > 0) {
     // return simpleName
-    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t)).join(',') + '>'
+    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t, currentAddress)).join(',') + '>'
   }
   return simpleName
 }
 
-function generateSimpleType(type: string): string {
+function generateSimpleType(type: string, currentAddress: string): string {
   const parts = type.split(SPLITTER)
   if (parts.length < 2) {
     return parts[0]
   }
-
-  return parts.slice(1).join('.')
+  if (parts[0] === currentAddress) {
+    return parts.slice(1).join('.')
+  }
+  return '_' + parts.join('.')
 }
 
 export function parseMoveType(type: string): TypeDescriptor {
@@ -127,8 +129,8 @@ export function parseMoveType(type: string): TypeDescriptor {
 }
 
 // TODO ctx need to have type parameters
-export function generateType(type: string, ctx?: any): string {
-  return generateTypeForDescriptor(parseMoveType(type))
+export function generateType(type: string, currentAddress: string): string {
+  return generateTypeForDescriptor(parseMoveType(type), currentAddress)
 }
 
 export class AccountModulesImportInfo {

package/src/builtin/aptos/0x1.ts

@@ -4140,7 +4140,7 @@ export namespace transaction_validation {
   );
 }
 
-function loadAllTypes(_r: aptos.TypeRegistry) {
+export function loadAllTypes(_r: aptos.TypeRegistry) {
   _r.load(acl.ABI);
   _r.load(any.ABI);
   _r.load(bcs.ABI);

package/src/builtin/aptos/0x3.ts

@@ -7,7 +7,7 @@
 import { aptos } from "@sentio/sdk";
 import { Address, MoveModule } from "aptos-sdk/src/generated";
 
-import { table, event, simple_map, type_info } from "./0x1";
+import * as _0x1 from "./0x1";
 
 export class token extends aptos.AptosBaseProcessor {
   constructor(options: aptos.AptosBindOptions) {
@@ -248,11 +248,11 @@ export namespace token {
 
   export class Collections {
     static TYPE_QNAME = "0x3::token::Collections";
-    collection_data: table.Table<string, token.CollectionData>;
-    token_data: table.Table<token.TokenDataId, token.TokenData>;
-    create_collection_events: event.EventHandle<token.CreateCollectionEvent>;
-    create_token_data_events: event.EventHandle<token.CreateTokenDataEvent>;
-    mint_token_events: event.EventHandle<token.MintTokenEvent>;
+    collection_data: _0x1.table.Table<string, token.CollectionData>;
+    token_data: _0x1.table.Table<token.TokenDataId, token.TokenData>;
+    create_collection_events: _0x1.event.EventHandle<token.CreateCollectionEvent>;
+    create_token_data_events: _0x1.event.EventHandle<token.CreateTokenDataEvent>;
+    mint_token_events: _0x1.event.EventHandle<token.MintTokenEvent>;
   }
 
   export class CreateCollectionEvent {
@@ -382,12 +382,12 @@ export namespace token {
 
   export class TokenStore {
     static TYPE_QNAME = "0x3::token::TokenStore";
-    tokens: table.Table<token.TokenId, token.Token>;
+    tokens: _0x1.table.Table<token.TokenId, token.Token>;
     direct_transfer: Boolean;
-    deposit_events: event.EventHandle<token.DepositEvent>;
-    withdraw_events: event.EventHandle<token.WithdrawEvent>;
-    burn_events: event.EventHandle<token.BurnTokenEvent>;
-    mutate_token_property_events: event.EventHandle<token.MutateTokenPropertyMapEvent>;
+    deposit_events: _0x1.event.EventHandle<token.DepositEvent>;
+    withdraw_events: _0x1.event.EventHandle<token.WithdrawEvent>;
+    burn_events: _0x1.event.EventHandle<token.BurnTokenEvent>;
+    mutate_token_property_events: _0x1.event.EventHandle<token.MutateTokenPropertyMapEvent>;
   }
 
   export class WithdrawCapability {
@@ -535,7 +535,7 @@ export namespace token {
 export namespace property_map {
   export class PropertyMap {
     static TYPE_QNAME = "0x3::property_map::PropertyMap";
-    map: simple_map.SimpleMap<string, property_map.PropertyValue>;
+    map: _0x1.simple_map.SimpleMap<string, property_map.PropertyValue>;
   }
 
   export class PropertyValue {
@@ -630,7 +630,7 @@ export namespace token_coin_swap {
     amount: bigint;
     min_price: bigint;
     locked_until_secs: bigint;
-    coin_type_info: type_info.TypeInfo;
+    coin_type_info: _0x1.type_info.TypeInfo;
   }
 
   export interface TokenListingEventInstance
@@ -641,14 +641,17 @@ export namespace token_coin_swap {
 
   export class TokenListings<T0> {
     static TYPE_QNAME = "0x3::token_coin_swap::TokenListings";
-    listings: table.Table<token.TokenId, token_coin_swap.TokenCoinSwap<T0>>;
-    listing_events: event.EventHandle<token_coin_swap.TokenListingEvent>;
-    swap_events: event.EventHandle<token_coin_swap.TokenSwapEvent>;
+    listings: _0x1.table.Table<
+      token.TokenId,
+      token_coin_swap.TokenCoinSwap<T0>
+    >;
+    listing_events: _0x1.event.EventHandle<token_coin_swap.TokenListingEvent>;
+    swap_events: _0x1.event.EventHandle<token_coin_swap.TokenSwapEvent>;
   }
 
   export class TokenStoreEscrow {
     static TYPE_QNAME = "0x3::token_coin_swap::TokenStoreEscrow";
-    token_escrows: table.Table<token.TokenId, token_coin_swap.TokenEscrow>;
+    token_escrows: _0x1.table.Table<token.TokenId, token_coin_swap.TokenEscrow>;
   }
 
   export class TokenSwapEvent {
@@ -657,7 +660,7 @@ export namespace token_coin_swap {
     token_buyer: Address;
     token_amount: bigint;
     coin_amount: bigint;
-    coin_type_info: type_info.TypeInfo;
+    coin_type_info: _0x1.type_info.TypeInfo;
   }
 
   export interface TokenSwapEventInstance
@@ -784,10 +787,10 @@ export class token_transfers extends aptos.AptosBaseProcessor {
 export namespace token_transfers {
   export class PendingClaims {
     static TYPE_QNAME = "0x3::token_transfers::PendingClaims";
-    pending_claims: table.Table<token_transfers.TokenOfferId, token.Token>;
-    offer_events: event.EventHandle<token_transfers.TokenOfferEvent>;
-    cancel_offer_events: event.EventHandle<token_transfers.TokenCancelOfferEvent>;
-    claim_events: event.EventHandle<token_transfers.TokenClaimEvent>;
+    pending_claims: _0x1.table.Table<token_transfers.TokenOfferId, token.Token>;
+    offer_events: _0x1.event.EventHandle<token_transfers.TokenOfferEvent>;
+    cancel_offer_events: _0x1.event.EventHandle<token_transfers.TokenCancelOfferEvent>;
+    claim_events: _0x1.event.EventHandle<token_transfers.TokenClaimEvent>;
   }
 
   export class TokenCancelOfferEvent {
@@ -875,11 +878,8 @@ export namespace token_transfers {
   );
 }
 
-function loadAllTypes(_r: aptos.TypeRegistry) {
-  table.loadTypes(_r);
-  event.loadTypes(_r);
-  simple_map.loadTypes(_r);
-  type_info.loadTypes(_r);
+export function loadAllTypes(_r: aptos.TypeRegistry) {
+  _0x1.loadAllTypes(_r);
 
   _r.load(token.ABI);
   _r.load(property_map.ABI);

package/src/cli/upload.ts

@@ -126,16 +126,21 @@ export async function uploadFile(options: SentioProjectConfig, apiKeyOverride: s
     }
   }
 
+  let error: Error
   const tryUploading = async () => {
     if (triedCount++ >= 5) {
+      console.error(error)
       return
     }
     try {
       await upload()
     } catch (e) {
-      console.log(e)
       if (e.constructor.name === 'FetchError' && e.type === 'system' && e.code === 'EPIPE') {
+        error = e
+        await new Promise((resolve) => setTimeout(resolve, 1000))
         await tryUploading()
+      } else {
+        console.error(e)
       }
     }
   }

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

@@ -16,7 +16,11 @@ export abstract class BaseProcessorTemplate<
 > {
   id: number
   binds = new Set<string>()
-  blockHandlers: ((block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid)[] = []
+  blockHandlers: {
+    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
+    blockInterval?: number
+    timeIntervalInMinutes?: number
+  }[] = []
   traceHandlers: {
     signature: string
     handler: (trace: Trace, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
@@ -44,7 +48,7 @@ export abstract class BaseProcessorTemplate<
       processor.onEvent(eh.handler, eh.filter)
     }
     for (const bh of this.blockHandlers) {
-      processor.onBlock(bh)
+      processor.onInterval(bh.handler, bh.timeIntervalInMinutes, bh.blockInterval)
     }
 
     const instance: TemplateInstance = {
@@ -89,7 +93,29 @@ export abstract class BaseProcessorTemplate<
   }
 
   public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
-    this.blockHandlers.push(handler)
+    return this.onBlockInterval(handler)
+  }
+
+  public onBlockInterval(
+    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
+    blockInterval = 1000
+  ) {
+    return this.onInterval(handler, undefined, blockInterval)
+  }
+
+  public onTimeInterval(
+    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
+    timeIntervalInMinutes = 240
+  ) {
+    return this.onInterval(handler, timeIntervalInMinutes, undefined)
+  }
+
+  public onInterval(
+    handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
+    timeInterval: number | undefined,
+    blockInterval: number | undefined
+  ) {
+    this.blockHandlers.push({ handler, timeIntervalInMinutes: timeInterval, blockInterval: blockInterval })
     return this
   }
 

package/src/core/base-processor.ts

@@ -9,9 +9,6 @@ import { ProcessResult } from '../gen'
 import { BindInternalOptions, BindOptions } from './bind-options'
 import { PromiseOrVoid } from '../promise-or-void'
 import { Trace } from './trace'
-import { MoveResource } from 'aptos-sdk/src/generated'
-import { AptosResourceContext } from '../aptos'
-import { MoveResourcesWithVersionPayload } from '../aptos/aptos-processor'
 
 export class EventsHandler {
   filters: EventFilter[]
@@ -23,7 +20,7 @@ export class TraceHandler {
   handler: (trace: Trace) => Promise<ProcessResult>
 }
 
-class BlockHandlder {
+export class BlockHandlder {
   blockInterval?: number
   timeIntervalInMinutes?: number
   handler: (block: Block) => Promise<ProcessResult>
@@ -116,19 +113,19 @@ export abstract class BaseProcessor<
   }
 
   public onBlock(handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
-    return this.onBlockInterval(handler, 1)
+    return this.onBlockInterval(handler)
   }
 
   public onBlockInterval(
     handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
-    blockInterval = 240
+    blockInterval = 1000
   ) {
     return this.onInterval(handler, undefined, blockInterval)
   }
 
   public onTimeInterval(
     handler: (block: Block, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
-    timeIntervalInMinutes = 60
+    timeIntervalInMinutes = 60 * 4
   ) {
     return this.onInterval(handler, timeIntervalInMinutes, undefined)
   }

package/templates/evm/src/processor.ts

@@ -9,7 +9,7 @@ const rewardPerBlock = new Gauge('reward_per_block', {
 })
 const tokenCounter = new Counter('token')
 
-X2y2Processor.bind({ address: '0xB329e39Ebefd16f40d38f07643652cE17Ca5Bac1' }).onBlock(async (_, ctx) => {
+X2y2Processor.bind({ address: '0xB329e39Ebefd16f40d38f07643652cE17Ca5Bac1' }).onBlockInterval(async (_, ctx) => {
   const phase = (await ctx.contract.currentPhase()).toString()
   const reward = token.scaleDown(await ctx.contract.rewardPerBlockForStaking(), 18)
   rewardPerBlock.record(ctx, reward, { phase })