@sentio/sdk 1.22.0 → 1.22.2

package/lib/aptos/aptos-processor.d.ts

@@ -9,6 +9,7 @@ declare type IndexConfigure = {
 };
 export interface EventFilter {
     type: string;
+    account?: string;
 }
 export interface FunctionNameAndCallFilter extends CallFilter {
     function: string;

package/lib/aptos/aptos-processor.js

@@ -153,7 +153,7 @@ class AptosBaseProcessor {
             dataTyped = registry.decode(event.data, typeDescriptor);
         }
         catch (e) {
-            console.warn('Decoding error for ', event.type);
+            console.error('Decoding error for ', JSON.stringify(event));
             return event;
         }
         return { ...event, data_typed: dataTyped, type_arguments: typeArguments };
@@ -171,7 +171,7 @@ class AptosBaseProcessor {
             }
         }
         catch (e) {
-            console.warn('Decoding error for ', payload.function);
+            console.error('Decoding error for ', JSON.stringify(payload));
             return payload;
         }
         return { ...payload, arguments_typed: argumentsTyped };

package/lib/aptos/aptos-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"aptos-processor.js","sourceRoot":"","sources":["../../src/aptos/aptos-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ProcessResult } from '../gen'\nimport {\n  AptosBindOptions,\n  AptosContext,\n  AptosNetwork,\n  Transaction_UserTransaction,\n  TransactionPayload_EntryFunctionPayload,\n  TypedEntryFunctionPayload,\n  TypedEventInstance,\n  TypeRegistry,\n} from '.'\n\nimport Long from 'long'\nimport { APTOS_MAINNET_ID, APTOS_TESTNET_ID } from '../utils/chain'\nimport { EventInstance, GLOBAL_TYPE_REGISTRY } from './types'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\ntype IndexConfigure = {\n  address: string\n  network: AptosNetwork\n  startVersion: Long\n  // endSeqNumber?: Long\n}\n\n// TODO extends ArgumentsFilter\nexport interface EventFilter {\n  type: string\n}\n\nexport interface FunctionNameAndCallFilter extends CallFilter {\n  function: string\n}\n\n// TODO extends ArgumentsFilter\nexport interface CallFilter {\n  includeFailed?: boolean\n  typeArguments?: string[]\n}\n\nexport interface ArgumentsFilter {\n  arguments?: string[]\n}\n\nclass EventHandler {\n  filters: EventFilter[]\n  handler: (event: Transaction_UserTransaction) => Promise<ProcessResult>\n}\n\nclass CallHandler {\n  filters: FunctionNameAndCallFilter[]\n  handler: (call: Transaction_UserTransaction) => Promise<ProcessResult>\n}\n\nexport class AptosBaseProcessor {\n  readonly moduleName: string\n  config: IndexConfigure\n  eventHandlers: EventHandler[] = []\n  callHandlers: CallHandler[] = []\n\n  constructor(moduleName: string, options: AptosBindOptions) {\n    this.moduleName = moduleName\n    this.configure(options)\n    global.PROCESSOR_STATE.aptosProcessors.push(this)\n  }\n\n  // getABI(): MoveModule | undefined {\n  //   return undefined\n  // }\n\n  public onTransaction(\n    handler: (transaction: Transaction_UserTransaction, ctx: AptosContext) => void\n  ): AptosBaseProcessor {\n    const address = this.config.address\n    const moduleName = this.moduleName\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(moduleName, address, Long.fromString(tx.version), tx)\n        if (tx) {\n          handler(tx, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: [],\n    })\n    return this\n  }\n\n  public onEvent(\n    handler: (event: EventInstance, ctx: AptosContext) => void,\n    filter: EventFilter | EventFilter[]\n  ): AptosBaseProcessor {\n    let _filters: EventFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.eventHandlers.push({\n      handler: async function (txn) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(txn.version), txn)\n        if (txn && txn.events) {\n          const events = txn.events\n          txn.events = []\n          for (const evt of events) {\n            const decoded = processor.decodeEvent(evt as EventInstance)\n            handler(decoded, ctx)\n          }\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  public onEntryFunctionCall(\n    handler: (call: TransactionPayload_EntryFunctionPayload, ctx: AptosContext) => void,\n    filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[]\n  ): AptosBaseProcessor {\n    let _filters: FunctionNameAndCallFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(tx.version), tx)\n        if (tx) {\n          const payload = tx.payload as TransactionPayload_EntryFunctionPayload\n          const decoded = processor.decodeFunctionPayload(payload)\n          handler(decoded, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  private configure(options: AptosBindOptions) {\n    let startVersion = Long.ZERO\n    if (options.startVersion) {\n      startVersion = Long.fromValue(options.startVersion)\n    }\n\n    this.config = {\n      startVersion: startVersion,\n      address: options.address,\n      network: options.network || AptosNetwork.TEST_NET,\n    }\n  }\n\n  getChainId(): string {\n    switch (this.config.network) {\n      case AptosNetwork.TEST_NET:\n        return APTOS_TESTNET_ID\n      case AptosNetwork.MAIN_NET:\n        return APTOS_MAINNET_ID\n    }\n  }\n\n  loadTypes(registry: TypeRegistry) {\n    if (registry.contains(this.config.address, this.moduleName)) {\n      return\n    }\n    this.loadTypesInternal(registry)\n  }\n\n  protected loadTypesInternal(registry: TypeRegistry) {\n    // should be override by subclass\n  }\n\n  private decodeEvent(event: EventInstance): EventInstance {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    // TODO check if module is not loaded\n\n    const typeDescriptor = parseMoveType(event.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n    // TODO check move structure's type param match type args, also maybe\n    // use type arguments for decoding\n\n    let dataTyped = undefined\n    try {\n      dataTyped = registry.decode(event.data, typeDescriptor)\n    } catch (e) {\n      console.warn('Decoding error for ', event.type)\n      return event\n    }\n\n    return { ...event, data_typed: dataTyped, type_arguments: typeArguments } as TypedEventInstance<any>\n  }\n\n  private decodeFunctionPayload(\n    payload: TransactionPayload_EntryFunctionPayload\n  ): TransactionPayload_EntryFunctionPayload {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    const argumentsTyped: any[] = []\n\n    try {\n      const func = registry.getMoveFunction(payload.function)\n      for (const [idx, arg] of payload.arguments.entries()) {\n        // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n        const argType = parseMoveType(func.params[idx + 1])\n        argumentsTyped.push(registry.decode(arg, argType))\n      }\n    } catch (e) {\n      console.warn('Decoding error for ', payload.function)\n      return payload\n    }\n\n    return { ...payload, arguments_typed: argumentsTyped } as TypedEntryFunctionPayload<any>\n  }\n}\n"]}
+{"version":3,"file":"aptos-processor.js","sourceRoot":"","sources":["../../src/aptos/aptos-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ProcessResult } from '../gen'\nimport {\n  AptosBindOptions,\n  AptosContext,\n  AptosNetwork,\n  Transaction_UserTransaction,\n  TransactionPayload_EntryFunctionPayload,\n  TypedEntryFunctionPayload,\n  TypedEventInstance,\n  TypeRegistry,\n} from '.'\n\nimport Long from 'long'\nimport { APTOS_MAINNET_ID, APTOS_TESTNET_ID } from '../utils/chain'\nimport { EventInstance, GLOBAL_TYPE_REGISTRY } from './types'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\ntype IndexConfigure = {\n  address: string\n  network: AptosNetwork\n  startVersion: Long\n  // endSeqNumber?: Long\n}\n\n// TODO extends ArgumentsFilter\nexport interface EventFilter {\n  type: string\n  account?: string\n}\n\nexport interface FunctionNameAndCallFilter extends CallFilter {\n  function: string\n}\n\n// TODO extends ArgumentsFilter\nexport interface CallFilter {\n  includeFailed?: boolean\n  typeArguments?: string[]\n}\n\nexport interface ArgumentsFilter {\n  arguments?: string[]\n}\n\nclass EventHandler {\n  filters: EventFilter[]\n  handler: (event: Transaction_UserTransaction) => Promise<ProcessResult>\n}\n\nclass CallHandler {\n  filters: FunctionNameAndCallFilter[]\n  handler: (call: Transaction_UserTransaction) => Promise<ProcessResult>\n}\n\nexport class AptosBaseProcessor {\n  readonly moduleName: string\n  config: IndexConfigure\n  eventHandlers: EventHandler[] = []\n  callHandlers: CallHandler[] = []\n\n  constructor(moduleName: string, options: AptosBindOptions) {\n    this.moduleName = moduleName\n    this.configure(options)\n    global.PROCESSOR_STATE.aptosProcessors.push(this)\n  }\n\n  // getABI(): MoveModule | undefined {\n  //   return undefined\n  // }\n\n  public onTransaction(\n    handler: (transaction: Transaction_UserTransaction, ctx: AptosContext) => void\n  ): AptosBaseProcessor {\n    const address = this.config.address\n    const moduleName = this.moduleName\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(moduleName, address, Long.fromString(tx.version), tx)\n        if (tx) {\n          handler(tx, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: [],\n    })\n    return this\n  }\n\n  public onEvent(\n    handler: (event: EventInstance, ctx: AptosContext) => void,\n    filter: EventFilter | EventFilter[]\n  ): AptosBaseProcessor {\n    let _filters: EventFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.eventHandlers.push({\n      handler: async function (txn) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(txn.version), txn)\n        if (txn && txn.events) {\n          const events = txn.events\n          txn.events = []\n          for (const evt of events) {\n            const decoded = processor.decodeEvent(evt as EventInstance)\n            handler(decoded, ctx)\n          }\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  public onEntryFunctionCall(\n    handler: (call: TransactionPayload_EntryFunctionPayload, ctx: AptosContext) => void,\n    filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[]\n  ): AptosBaseProcessor {\n    let _filters: FunctionNameAndCallFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(tx.version), tx)\n        if (tx) {\n          const payload = tx.payload as TransactionPayload_EntryFunctionPayload\n          const decoded = processor.decodeFunctionPayload(payload)\n          handler(decoded, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  private configure(options: AptosBindOptions) {\n    let startVersion = Long.ZERO\n    if (options.startVersion) {\n      startVersion = Long.fromValue(options.startVersion)\n    }\n\n    this.config = {\n      startVersion: startVersion,\n      address: options.address,\n      network: options.network || AptosNetwork.TEST_NET,\n    }\n  }\n\n  getChainId(): string {\n    switch (this.config.network) {\n      case AptosNetwork.TEST_NET:\n        return APTOS_TESTNET_ID\n      case AptosNetwork.MAIN_NET:\n        return APTOS_MAINNET_ID\n    }\n  }\n\n  loadTypes(registry: TypeRegistry) {\n    if (registry.contains(this.config.address, this.moduleName)) {\n      return\n    }\n    this.loadTypesInternal(registry)\n  }\n\n  protected loadTypesInternal(registry: TypeRegistry) {\n    // should be override by subclass\n  }\n\n  private decodeEvent(event: EventInstance): EventInstance {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    // TODO check if module is not loaded\n\n    const typeDescriptor = parseMoveType(event.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n    // TODO check move structure's type param match type args, also maybe\n    // use type arguments for decoding\n\n    let dataTyped = undefined\n    try {\n      dataTyped = registry.decode(event.data, typeDescriptor)\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(event))\n      return event\n    }\n\n    return { ...event, data_typed: dataTyped, type_arguments: typeArguments } as TypedEventInstance<any>\n  }\n\n  private decodeFunctionPayload(\n    payload: TransactionPayload_EntryFunctionPayload\n  ): TransactionPayload_EntryFunctionPayload {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    const argumentsTyped: any[] = []\n\n    try {\n      const func = registry.getMoveFunction(payload.function)\n      for (const [idx, arg] of payload.arguments.entries()) {\n        // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n        const argType = parseMoveType(func.params[idx + 1])\n        argumentsTyped.push(registry.decode(arg, argType))\n      }\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(payload))\n      return payload\n    }\n\n    return { ...payload, arguments_typed: argumentsTyped } as TypedEntryFunctionPayload<any>\n  }\n}\n"]}

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

@@ -1,7 +1,7 @@
 import Long from 'long';
 export declare enum AptosNetwork {
-    MAIN_NET = 0,
-    TEST_NET = 1
+    MAIN_NET = 1,
+    TEST_NET = 2
 }
 export declare class AptosBindOptions {
     address: string;

package/lib/aptos/bind-options.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AptosBindOptions = exports.AptosNetwork = void 0;
 var AptosNetwork;
 (function (AptosNetwork) {
-    AptosNetwork[AptosNetwork["MAIN_NET"] = 0] = "MAIN_NET";
-    AptosNetwork[AptosNetwork["TEST_NET"] = 1] = "TEST_NET";
+    AptosNetwork[AptosNetwork["MAIN_NET"] = 1] = "MAIN_NET";
+    AptosNetwork[AptosNetwork["TEST_NET"] = 2] = "TEST_NET";
     // DEV_NET,
 })(AptosNetwork = exports.AptosNetwork || (exports.AptosNetwork = {}));
 class AptosBindOptions {

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

@@ -1 +1 @@
-{"version":3,"file":"bind-options.js","sourceRoot":"","sources":["../../src/aptos/bind-options.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,uDAAY,CAAA;IACZ,uDAAY,CAAA;IACZ,WAAW;AACb,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAED,MAAa,gBAAgB;IAC3B,OAAO,CAAQ;IACf,OAAO,GAAkB,YAAY,CAAC,QAAQ,CAAA;IAC9C,YAAY,CAAgB;CAE7B;AALD,4CAKC","sourcesContent":["import Long from 'long'\n\nexport enum AptosNetwork {\n  MAIN_NET = 0,\n  TEST_NET = 1,\n  // DEV_NET,\n}\n\nexport class AptosBindOptions {\n  address: string\n  network?: AptosNetwork = AptosNetwork.TEST_NET\n  startVersion?: Long | number\n  // endBlock?: Long | number\n}\n"]}
+{"version":3,"file":"bind-options.js","sourceRoot":"","sources":["../../src/aptos/bind-options.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,uDAAY,CAAA;IACZ,uDAAY,CAAA;IACZ,WAAW;AACb,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAED,MAAa,gBAAgB;IAC3B,OAAO,CAAQ;IACf,OAAO,GAAkB,YAAY,CAAC,QAAQ,CAAA;IAC9C,YAAY,CAAgB;CAE7B;AALD,4CAKC","sourcesContent":["import Long from 'long'\n\nexport enum AptosNetwork {\n  MAIN_NET = 1,\n  TEST_NET = 2,\n  // DEV_NET,\n}\n\nexport class AptosBindOptions {\n  address: string\n  network?: AptosNetwork = AptosNetwork.TEST_NET\n  startVersion?: Long | number\n  // endBlock?: Long | number\n}\n"]}

package/lib/builtin/aptos/index.d.ts

@@ -0,0 +1,2 @@
+export * as _0x1 from './0x1';
+export * as _0x3 from './0x3';

package/lib/builtin/aptos/index.js

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

package/lib/builtin/aptos/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builtin/aptos/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA6B;AAC7B,8CAA6B","sourcesContent":["export * as _0x1 from './0x1'\nexport * as _0x3 from './0x3'"]}

package/lib/builtin/index.d.ts

@@ -3,3 +3,4 @@ export * as erc20 from './erc20';
 export * as erc20bytes from './erc20bytes';
 export * as weth9 from './weth9';
 export * as solana from './solana';
+export * as aptos from 'builtin/aptos';

package/lib/builtin/index.js

@@ -23,10 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solana = exports.weth9 = exports.erc20bytes = exports.erc20 = exports.eacaggregatorproxy = void 0;
+exports.aptos = exports.solana = exports.weth9 = exports.erc20bytes = exports.erc20 = exports.eacaggregatorproxy = void 0;
 exports.eacaggregatorproxy = __importStar(require("./eacaggregatorproxy"));
 exports.erc20 = __importStar(require("./erc20"));
 exports.erc20bytes = __importStar(require("./erc20bytes"));
 exports.weth9 = __importStar(require("./weth9"));
 exports.solana = __importStar(require("./solana"));
+exports.aptos = __importStar(require("builtin/aptos"));
 //# sourceMappingURL=index.js.map

package/lib/builtin/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAA0D;AAC1D,iDAAgC;AAChC,2DAA0C;AAC1C,iDAAgC;AAChC,mDAAkC","sourcesContent":["export * as eacaggregatorproxy from './eacaggregatorproxy'\nexport * as erc20 from './erc20'\nexport * as erc20bytes from './erc20bytes'\nexport * as weth9 from './weth9'\nexport * as solana from './solana'"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/builtin/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAA0D;AAC1D,iDAAgC;AAChC,2DAA0C;AAC1C,iDAAgC;AAChC,mDAAkC;AAElC,uDAAsC","sourcesContent":["export * as eacaggregatorproxy from './eacaggregatorproxy'\nexport * as erc20 from './erc20'\nexport * as erc20bytes from './erc20bytes'\nexport * as weth9 from './weth9'\nexport * as solana from './solana'\n\nexport * as aptos from 'builtin/aptos'"]}

package/lib/gen/processor/protos/processor.d.ts

@@ -91,6 +91,7 @@ export interface AptosEventHandlerConfig {
 }
 export interface AptosEventFilter {
     type: string;
+    account: string;
 }
 export interface AptosCallHandlerConfig {
     filters: AptosCallFilter[];

package/lib/gen/processor/protos/processor.js

@@ -1122,13 +1122,16 @@ exports.AptosEventHandlerConfig = {
     },
 };
 function createBaseAptosEventFilter() {
-    return { type: "" };
+    return { type: "", account: "" };
 }
 exports.AptosEventFilter = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (message.type !== "") {
             writer.uint32(10).string(message.type);
         }
+        if (message.account !== "") {
+            writer.uint32(18).string(message.account);
+        }
         return writer;
     },
     decode(input, length) {
@@ -1141,6 +1144,9 @@ exports.AptosEventFilter = {
                 case 1:
                     message.type = reader.string();
                     break;
+                case 2:
+                    message.account = reader.string();
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -1151,16 +1157,19 @@ exports.AptosEventFilter = {
     fromJSON(object) {
         return {
             type: isSet(object.type) ? String(object.type) : "",
+            account: isSet(object.account) ? String(object.account) : "",
         };
     },
     toJSON(message) {
         const obj = {};
         message.type !== undefined && (obj.type = message.type);
+        message.account !== undefined && (obj.account = message.account);
         return obj;
     },
     fromPartial(object) {
         const message = createBaseAptosEventFilter();
         message.type = object.type ?? "";
+        message.account = object.account ?? "";
         return message;
     },
 };