@sentio/sdk 2.1.6-rc.1 → 2.2.0-rc.1

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

@@ -4,6 +4,7 @@
 
 /* Generated modules for account 0x3 */
 
+import { CallFilter } from "@sentio/sdk/move";
 import {
   MoveCoder,
   AptosBindOptions,
@@ -12,9 +13,8 @@ import {
   AptosNetwork,
   TypedEntryFunctionPayload,
   AptosContext,
-  CallFilter,
 } from "@sentio/sdk/aptos";
-import { AptosFetchConfig } from "@sentio/protos";
+import { MoveFetchConfig } from "@sentio/protos";
 import { Address, MoveModule } from "@sentio/sdk/aptos";
 
 import * as _0x1 from "./0x1.js";
@@ -35,7 +35,7 @@ export class token extends AptosBaseProcessor {
   onEntryBurn(
     func: (call: token.BurnPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -51,7 +51,7 @@ export class token extends AptosBaseProcessor {
   onEntryBurnByCreator(
     func: (call: token.BurnByCreatorPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -70,7 +70,7 @@ export class token extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -86,7 +86,7 @@ export class token extends AptosBaseProcessor {
   onEntryCreateTokenScript(
     func: (call: token.CreateTokenScriptPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -102,7 +102,7 @@ export class token extends AptosBaseProcessor {
   onEntryDirectTransferScript(
     func: (call: token.DirectTransferScriptPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -118,7 +118,7 @@ export class token extends AptosBaseProcessor {
   onEntryInitializeTokenScript(
     func: (call: token.InitializeTokenScriptPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -134,7 +134,7 @@ export class token extends AptosBaseProcessor {
   onEntryMintScript(
     func: (call: token.MintScriptPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -150,7 +150,7 @@ export class token extends AptosBaseProcessor {
   onEntryMutateTokenProperties(
     func: (call: token.MutateTokenPropertiesPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -166,7 +166,7 @@ export class token extends AptosBaseProcessor {
   onEntryOptInDirectTransfer(
     func: (call: token.OptInDirectTransferPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEntryFunctionCall(
       func,
@@ -184,7 +184,7 @@ export class token extends AptosBaseProcessor {
       event: token.CreateCollectionEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEvent(
       func,
@@ -201,7 +201,7 @@ export class token extends AptosBaseProcessor {
       event: token.CreateTokenDataEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEvent(
       func,
@@ -215,7 +215,7 @@ export class token extends AptosBaseProcessor {
 
   onEventMintTokenEvent(
     func: (event: token.MintTokenEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEvent(
       func,
@@ -229,7 +229,7 @@ export class token extends AptosBaseProcessor {
 
   onEventDepositEvent(
     func: (event: token.DepositEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEvent(
       func,
@@ -243,7 +243,7 @@ export class token extends AptosBaseProcessor {
 
   onEventWithdrawEvent(
     func: (event: token.WithdrawEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEvent(
       func,
@@ -257,7 +257,7 @@ export class token extends AptosBaseProcessor {
 
   onEventBurnTokenEvent(
     func: (event: token.BurnTokenEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEvent(
       func,
@@ -274,7 +274,7 @@ export class token extends AptosBaseProcessor {
       event: token.MutateTokenPropertyMapEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token {
     this.onEvent(
       func,
@@ -649,7 +649,7 @@ export class token_coin_swap extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_coin_swap {
     this.onEntryFunctionCall(
       func,
@@ -667,7 +667,7 @@ export class token_coin_swap extends AptosBaseProcessor {
       event: token_coin_swap.TokenListingEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_coin_swap {
     this.onEvent(
       func,
@@ -684,7 +684,7 @@ export class token_coin_swap extends AptosBaseProcessor {
       event: token_coin_swap.TokenSwapEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_coin_swap {
     this.onEvent(
       func,
@@ -805,7 +805,7 @@ export class token_transfers extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_transfers {
     this.onEntryFunctionCall(
       func,
@@ -821,7 +821,7 @@ export class token_transfers extends AptosBaseProcessor {
   onEntryClaimScript(
     func: (call: token_transfers.ClaimScriptPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_transfers {
     this.onEntryFunctionCall(
       func,
@@ -837,7 +837,7 @@ export class token_transfers extends AptosBaseProcessor {
   onEntryOfferScript(
     func: (call: token_transfers.OfferScriptPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_transfers {
     this.onEntryFunctionCall(
       func,
@@ -855,7 +855,7 @@ export class token_transfers extends AptosBaseProcessor {
       event: token_transfers.TokenOfferEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_transfers {
     this.onEvent(
       func,
@@ -872,7 +872,7 @@ export class token_transfers extends AptosBaseProcessor {
       event: token_transfers.TokenCancelOfferEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_transfers {
     this.onEvent(
       func,
@@ -889,7 +889,7 @@ export class token_transfers extends AptosBaseProcessor {
       event: token_transfers.TokenClaimEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): token_transfers {
     this.onEvent(
       func,

package/src/aptos/codegen/codegen.ts

@@ -169,12 +169,12 @@ export class AccountCodegen {
     }
 
     const imports = `
+    import { CallFilter } from "@sentio/sdk/move"
     import { 
       MoveCoder, AptosBindOptions, AptosBaseProcessor, 
       TypedEventInstance, AptosNetwork, TypedEntryFunctionPayload,
-      AptosContext, CallFilter
-    } from "@sentio/sdk/aptos"
-    import { AptosFetchConfig } from "@sentio/protos"
+      AptosContext } from "@sentio/sdk/aptos"
+    import { MoveFetchConfig } from "@sentio/protos"
     import { Address, MoveModule } from "@sentio/sdk/aptos"
     `
 
@@ -393,7 +393,7 @@ function generateOnEntryFunctions(module: MoveModule, func: MoveFunction) {
 
   const camelFuncName = capitalizeFirstChar(camelCase(func.name))
   const source = `
-  onEntry${camelFuncName}(func: (call: ${moduleName}.${camelFuncName}Payload, ctx: AptosContext) => void, filter?: CallFilter, fetchConfig?: AptosFetchConfig): ${moduleName} {
+  onEntry${camelFuncName}(func: (call: ${moduleName}.${camelFuncName}Payload, ctx: AptosContext) => void, filter?: CallFilter, fetchConfig?: MoveFetchConfig): ${moduleName} {
     this.onEntryFunctionCall(func, {
       ...filter,
       function: '${module.name}::${func.name}'
@@ -442,7 +442,7 @@ function generateOnEvents(module: MoveModule, struct: MoveStruct): string {
   const source = `
   onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(
     struct.name
-  )}Instance, ctx: AptosContext) => void, fetchConfig?: AptosFetchConfig): ${moduleName} {
+  )}Instance, ctx: AptosContext) => void, fetchConfig?: MoveFetchConfig): ${moduleName} {
     this.onEvent(func, {
       type: '${module.name}::${struct.name}'
     },

package/src/aptos/index.ts

@@ -1,7 +1,6 @@
 export * from './move-types.js'
 export type { EventInstance, TypedEventInstance, TypedEntryFunctionPayload, TypedMoveResource } from './models.js'
 export { defaultMoveCoder, MoveCoder } from './move-coder.js'
-export type { FunctionNameAndCallFilter, EventFilter, CallFilter, ArgumentsFilter } from './aptos-processor.js'
 export { AptosBaseProcessor, AptosAccountProcessor } from './aptos-processor.js'
 export { AptosContext, AptosResourceContext } from './context.js'
 export { AptosBindOptions, AptosNetwork } from './network.js'

package/src/aptos/tests/types/reserved.ts

@@ -4,6 +4,7 @@
 
 /* Generated modules for account 0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807 */
 
+import { CallFilter } from "@sentio/sdk/move";
 import {
   MoveCoder,
   AptosBindOptions,
@@ -12,9 +13,8 @@ import {
   AptosNetwork,
   TypedEntryFunctionPayload,
   AptosContext,
-  CallFilter,
 } from "@sentio/sdk/aptos";
-import { AptosFetchConfig } from "@sentio/protos";
+import { MoveFetchConfig } from "@sentio/protos";
 import { Address, MoveModule } from "@sentio/sdk/aptos";
 
 import { _0x1 } from "@sentio/sdk/aptos/builtin";
@@ -37,7 +37,7 @@ export class package_ extends AptosBaseProcessor {
   onEntryAddAcl(
     func: (call: package_.AddAclPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): package_ {
     this.onEntryFunctionCall(
       func,
@@ -53,7 +53,7 @@ export class package_ extends AptosBaseProcessor {
   onEntryCreateCandyMachine(
     func: (call: package_.CreateCandyMachinePayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): package_ {
     this.onEntryFunctionCall(
       func,
@@ -69,7 +69,7 @@ export class package_ extends AptosBaseProcessor {
   onEntryCreateCollection(
     func: (call: package_.CreateCollectionPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): package_ {
     this.onEntryFunctionCall(
       func,
@@ -85,7 +85,7 @@ export class package_ extends AptosBaseProcessor {
   onEntryPullToken(
     func: (call: package_.PullTokenPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): package_ {
     this.onEntryFunctionCall(
       func,
@@ -104,7 +104,7 @@ export class package_ extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): package_ {
     this.onEntryFunctionCall(
       func,
@@ -291,7 +291,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
   onEntryAddAcl(
     func: (call: SouffleChefCampaign.AddAclPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -310,7 +310,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -329,7 +329,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -348,7 +348,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -364,7 +364,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
   onEntryClaim(
     func: (call: SouffleChefCampaign.ClaimPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -383,7 +383,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -402,7 +402,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -421,7 +421,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -440,7 +440,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -459,7 +459,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -478,7 +478,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       ctx: AptosContext
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEntryFunctionCall(
       func,
@@ -496,7 +496,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       event: SouffleChefCampaign.BurnEnjoyEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEvent(
       func,
@@ -513,7 +513,7 @@ export class SouffleChefCampaign extends AptosBaseProcessor {
       event: SouffleChefCampaign.PullTokenEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: AptosFetchConfig
+    fetchConfig?: MoveFetchConfig
   ): SouffleChefCampaign {
     this.onEvent(
       func,