@sentio/sdk 2.60.3 → 2.61.0-rc.10

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

@@ -544,6 +544,22 @@ export class token extends AptosBaseProcessor {
     );
     return this;
   }
+
+  onEventWithdrawCapability(
+    func: (event: token.WithdrawCapabilityInstance, ctx: AptosContext) => void,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      token.WithdrawCapabilityInstance
+    >,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): token {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "token::WithdrawCapability" },
+      handlerOptions,
+    );
+    return this;
+  }
 }
 
 export namespace token {
@@ -1219,6 +1235,12 @@ export namespace token {
     }
   }
 
+  export type WithdrawCapabilityInstance =
+    TypedEventInstance<WithdrawCapability> & {
+      data_decoded: WithdrawCapability;
+      type_arguments: [];
+    };
+
   export namespace entry {
     export async function burn(
       client: Aptos,
@@ -1740,6 +1762,25 @@ export class token_coin_swap extends AptosBaseProcessor {
     return this;
   }
 
+  onEventTokenCoinSwap(
+    func: (
+      event: token_coin_swap.TokenCoinSwapInstance,
+      ctx: AptosContext,
+    ) => void,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      token_coin_swap.TokenCoinSwapInstance
+    >,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): token_coin_swap {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "token_coin_swap::TokenCoinSwap" },
+      handlerOptions,
+    );
+    return this;
+  }
+
   onEventTokenListingEvent(
     func: (
       event: token_coin_swap.TokenListingEventInstance,
@@ -1799,6 +1840,11 @@ export namespace token_coin_swap {
     }
   }
 
+  export type TokenCoinSwapInstance = TypedEventInstance<TokenCoinSwap<any>> & {
+    data_decoded: TokenCoinSwap<any>;
+    type_arguments: [string];
+  };
+
   export interface TokenEscrow {
     token: token.Token;
     locked_until_secs: bigint;

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

@@ -44,6 +44,32 @@ export class token extends AptosBaseProcessor {
     return new token({ ...token.DEFAULT_OPTIONS, ...options });
   }
 
+  onEventBurnRef(
+    func: (event: token.BurnRefInstance, ctx: AptosContext) => void,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, token.BurnRefInstance>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): token {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "token::BurnRef" },
+      handlerOptions,
+    );
+    return this;
+  }
+
+  onEventMutatorRef(
+    func: (event: token.MutatorRefInstance, ctx: AptosContext) => void,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, token.MutatorRefInstance>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): token {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "token::MutatorRef" },
+      handlerOptions,
+    );
+    return this;
+  }
+
   onEventMutation(
     func: (event: token.MutationInstance, ctx: AptosContext) => void,
     handlerOptions?: HandlerOptions<MoveFetchConfig, token.MutationInstance>,
@@ -90,6 +116,11 @@ export namespace token {
     }
   }
 
+  export type BurnRefInstance = TypedEventInstance<BurnRef> & {
+    data_decoded: BurnRef;
+    type_arguments: [];
+  };
+
   export interface MutatorRef {
     self: MoveAddressType;
   }
@@ -104,6 +135,11 @@ export namespace token {
     }
   }
 
+  export type MutatorRefInstance = TypedEventInstance<MutatorRef> & {
+    data_decoded: MutatorRef;
+    type_arguments: [];
+  };
+
   export interface Mutation {
     token_address: MoveAddressType;
     mutated_field_name: string;
@@ -400,6 +436,36 @@ export namespace token {
   }
 }
 
+export class royalty extends AptosBaseProcessor {
+  constructor(options: AptosBindOptions) {
+    super("royalty", options);
+  }
+  static DEFAULT_OPTIONS: AptosBindOptions = {
+    address: "0x4",
+    network: AptosNetwork.MAIN_NET,
+  };
+
+  static bind(options: Partial<AptosBindOptions> = {}): royalty {
+    return new royalty({ ...royalty.DEFAULT_OPTIONS, ...options });
+  }
+
+  onEventMutatorRef(
+    func: (event: royalty.MutatorRefInstance, ctx: AptosContext) => void,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      royalty.MutatorRefInstance
+    >,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): royalty {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "royalty::MutatorRef" },
+      handlerOptions,
+    );
+    return this;
+  }
+}
+
 export namespace royalty {
   export interface MutatorRef {
     inner: _0x1.object$.ExtendRef;
@@ -415,6 +481,11 @@ export namespace royalty {
     }
   }
 
+  export type MutatorRefInstance = TypedEventInstance<MutatorRef> & {
+    data_decoded: MutatorRef;
+    type_arguments: [];
+  };
+
   export interface Royalty {
     numerator: bigint;
     denominator: bigint;
@@ -448,6 +519,22 @@ export class collection extends AptosBaseProcessor {
     return new collection({ ...collection.DEFAULT_OPTIONS, ...options });
   }
 
+  onEventMutatorRef(
+    func: (event: collection.MutatorRefInstance, ctx: AptosContext) => void,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.MutatorRefInstance
+    >,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): collection {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::MutatorRef" },
+      handlerOptions,
+    );
+    return this;
+  }
+
   onEventBurn(
     func: (event: collection.BurnInstance, ctx: AptosContext) => void,
     handlerOptions?: HandlerOptions<MoveFetchConfig, collection.BurnInstance>,
@@ -625,6 +712,11 @@ export namespace collection {
     }
   }
 
+  export type MutatorRefInstance = TypedEventInstance<MutatorRef> & {
+    data_decoded: MutatorRef;
+    type_arguments: [];
+  };
+
   export interface Burn {
     collection: MoveAddressType;
     index: bigint;
@@ -2148,6 +2240,55 @@ export namespace aptos_token {
   }
 }
 
+export class property_map extends AptosBaseProcessor {
+  constructor(options: AptosBindOptions) {
+    super("property_map", options);
+  }
+  static DEFAULT_OPTIONS: AptosBindOptions = {
+    address: "0x4",
+    network: AptosNetwork.MAIN_NET,
+  };
+
+  static bind(options: Partial<AptosBindOptions> = {}): property_map {
+    return new property_map({ ...property_map.DEFAULT_OPTIONS, ...options });
+  }
+
+  onEventMutatorRef(
+    func: (event: property_map.MutatorRefInstance, ctx: AptosContext) => void,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      property_map.MutatorRefInstance
+    >,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): property_map {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "property_map::MutatorRef" },
+      handlerOptions,
+    );
+    return this;
+  }
+
+  onEventPropertyValue(
+    func: (
+      event: property_map.PropertyValueInstance,
+      ctx: AptosContext,
+    ) => void,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      property_map.PropertyValueInstance
+    >,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
+  ): property_map {
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "property_map::PropertyValue" },
+      handlerOptions,
+    );
+    return this;
+  }
+}
+
 export namespace property_map {
   export interface MutatorRef {
     self: MoveAddressType;
@@ -2163,6 +2304,11 @@ export namespace property_map {
     }
   }
 
+  export type MutatorRefInstance = TypedEventInstance<MutatorRef> & {
+    data_decoded: MutatorRef;
+    type_arguments: [];
+  };
+
   export interface PropertyMap {
     inner: _0x1.simple_map.SimpleMap<string, property_map.PropertyValue>;
   }
@@ -2192,6 +2338,11 @@ export namespace property_map {
     }
   }
 
+  export type PropertyValueInstance = TypedEventInstance<PropertyValue> & {
+    data_decoded: PropertyValue;
+    type_arguments: [];
+  };
+
   export namespace entry {}
   export namespace view {}
 }

package/src/aptos/codegen/codegen.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk'
 import path, { join } from 'path'
 import { AptosCodegen as BaseAptosCodegen } from '@typemove/aptos/codegen'
 import { InternalMoveModule, InternalMoveStruct, normalizeToJSName, camel, upperFirst } from '@typemove/move'
-import { AptosNetwork, getRpcEndpoint } from '../network.js'
+import { AptosNetwork, getRpcConfig } from '../network.js'
 import { Event, MoveModuleBytecode, MoveResource } from '@aptos-labs/ts-sdk'
 import { SharedNetworkCodegen } from '../../move/shared-network-codegen.js'
 import { recursiveCodegen } from '../../core/codegen.js'
@@ -27,7 +27,7 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
   SYSTEM_PACKAGE = '@sentio/sdk/aptos'
 
   constructor(network: AptosNetwork, useViewJson = false) {
-    const endpoint = getRpcEndpoint(network)
+    const endpoint = getRpcConfig(network)
     super(endpoint, useViewJson)
     const generator = this
 
@@ -134,21 +134,15 @@ class InitiaAptosNetworkCodegen extends AptosNetworkCodegen {
   }
 }
 
-const MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MAIN_NET)
-const TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.TEST_NET)
-const MOVEMENT_MAINNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_MAIN_NET)
-const MOVEMENT_TESTNET_CODEGEN = new AptosNetworkCodegen(AptosNetwork.MOVEMENT_TEST_NET)
-const ECHELON_CODEGEN = new InitiaAptosNetworkCodegen(AptosNetwork.INITIA_ECHELON)
-
 class AptosCodegen {
   async generate(srcDir: string, outputDir: string, builtin = false): Promise<number> {
     let numFiles = 0
     const generators: [string, AptosNetworkCodegen][] = [
-      ['', MAINNET_CODEGEN],
-      ['testnet', TESTNET_CODEGEN],
-      ['movement-mainnet', MOVEMENT_MAINNET_CODEGEN],
-      ['movement-testnet', MOVEMENT_TESTNET_CODEGEN],
-      ['initia-echelon', ECHELON_CODEGEN]
+      ['', new AptosNetworkCodegen(AptosNetwork.MAIN_NET)],
+      ['testnet', new AptosNetworkCodegen(AptosNetwork.TEST_NET)],
+      ['movement-mainnet', new AptosNetworkCodegen(AptosNetwork.MOVEMENT_MAIN_NET)],
+      ['movement-testnet', new AptosNetworkCodegen(AptosNetwork.MOVEMENT_TEST_NET)],
+      ['initia-echelon', new InitiaAptosNetworkCodegen(AptosNetwork.INITIA_ECHELON)]
     ]
 
     for (const [network, gen] of generators) {

package/src/aptos/network.ts

@@ -1,5 +1,5 @@
 import { AptosChainId } from '@sentio/chain'
-import { Aptos, AptosConfig } from '@aptos-labs/ts-sdk'
+import { Aptos, AptosConfig, Network } from '@aptos-labs/ts-sdk'
 import { Labels } from '../core/index.js'
 import { Endpoints } from '@sentio/runtime'
 import { RichAptosClient } from './api.js'
@@ -29,28 +29,36 @@ export class AptosBindOptions {
   baseLabels?: Labels
 }
 
-export function getRpcEndpoint(network: AptosNetwork): string {
+export function getRpcConfig(network: AptosNetwork, fullnode?: string | undefined): AptosConfig {
   switch (network) {
     case AptosNetwork.MAIN_NET:
-      return 'https://mainnet.aptoslabs.com/v1'
+      return new AptosConfig({ network: Network.MAINNET, fullnode: fullnode ?? 'https://mainnet.aptoslabs.com/v1' })
     case AptosNetwork.TEST_NET:
-      return 'https://testnet.aptoslabs.com/v1'
+      return new AptosConfig({ network: Network.TESTNET, fullnode: fullnode ?? 'https://testnet.aptoslabs.com/v1' })
     case AptosNetwork.MOVEMENT_MAIN_NET:
-      return 'https://mainnet.movementnetwork.xyz/v1'
+      return new AptosConfig({
+        network: Network.CUSTOM,
+        fullnode: fullnode ?? 'https://mainnet.movementnetwork.xyz/v1'
+      })
     case AptosNetwork.MOVEMENT_TEST_NET:
-      return 'https://aptos.testnet.bardock.movementlabs.xyz/v1'
+      return new AptosConfig({
+        network: Network.CUSTOM,
+        fullnode: fullnode ?? 'https://aptos.testnet.bardock.movementlabs.xyz/v1'
+      })
     case AptosNetwork.INITIA_ECHELON:
-      return 'https://rpc.sentio.xyz/initia-aptos/v1'
+      return new AptosConfig({
+        network: Network.CUSTOM,
+        fullnode: fullnode ?? 'https://rpc.sentio.xyz/initia-aptos/v1'
+      })
   }
 }
 
 export function getClient(network: AptosNetwork): RichAptosClient {
-  let chainServer = Endpoints.INSTANCE.chainServer.get(network)
-  if (!chainServer) {
-    chainServer = getRpcEndpoint(network)
-    // throw new ServerError(Status.INTERNAL, 'RPC endpoint not provided')
-  } else {
-    chainServer = chainServer + '/v1'
+  let fullnode = Endpoints.INSTANCE.chainServer.get(network)
+  if (fullnode) {
+    if (!fullnode.endsWith('/v1')) {
+      fullnode = fullnode + '/v1'
+    }
   }
-  return new RichAptosClient(new AptosConfig({ fullnode: chainServer }))
+  return new RichAptosClient(getRpcConfig(network, fullnode))
 }

package/src/core/core-plugin.ts

@@ -5,7 +5,7 @@ import { MetricState, MetricStateNew } from './meter.js'
 import { ExporterState } from './exporter.js'
 import { TemplateInstanceState } from './template.js'
 import { EventLoggerState } from './event-logger.js'
-import { DatabaseSchemaState } from './database-schema.js'
+import { DatabaseSchemaState, mergeSchemas } from './database-schema.js'
 
 export class CorePlugin extends Plugin {
   name: string = 'CorePlugin'
@@ -46,17 +46,10 @@ export class CorePlugin extends Plugin {
     }
 
     if (DatabaseSchemaState.INSTANCE.getValues().length > 0) {
+      const schemas = DatabaseSchemaState.INSTANCE.getValues()
+      const mergedSources = mergeSchemas(schemas)
       config.dbSchema = {
-        gqlSchema: DatabaseSchemaState.INSTANCE.getValues()
-          .map((e) => e.source)
-          .join('\n\n')
-      }
-    }
-    if (DatabaseSchemaState.INSTANCE.getValues().length > 0) {
-      config.dbSchema = {
-        gqlSchema: DatabaseSchemaState.INSTANCE.getValues()
-          .map((e) => e.source)
-          .join('\n\n')
+        gqlSchema: mergedSources
       }
     }
   }

package/src/core/database-schema.ts

@@ -1,5 +1,7 @@
 import { ListStateStorage } from '@sentio/runtime'
 import { EntityClass } from '../store/index.js'
+import { isInterfaceType, isObjectType, isScalarType, parse, printType } from 'graphql/index.js'
+import { buildSchema } from '../store/schema.js'
 
 type Schema = {
   source: string
@@ -25,3 +27,30 @@ export class DatabaseSchema {
     return undefined
   }
 }
+
+export function mergeSchemas(schemas: Schema[]) {
+  let ret = ''
+  const types: Record<string, any> = {}
+  for (const schema of schemas) {
+    const gqlSchema = buildSchema(parse(schema.source))
+    for (const type of Object.values(gqlSchema.getTypeMap())) {
+      if (isScalarType(type) || type.name.startsWith('__')) {
+        continue
+      }
+      if (types[type.name]) {
+        console.warn(`Type ${type.name} is already registered, you have duplicate definitions in multiple schemas.`)
+      } else if (isObjectType(type) || isInterfaceType(type)) {
+        types[type.name] = type
+        type.description = null
+        for (const field of Object.values(type.getFields())) {
+          field.description = null
+        }
+        ret += printType(type) + '\n'
+      } else {
+        types[type.name] = type
+        ret += printType(type) + '\n'
+      }
+    }
+  }
+  return ret
+}

package/src/fuel/transaction.ts

@@ -36,8 +36,15 @@ function findSenderFromInputs(inputs: Input[] | undefined, baseAssetId: string):
 export async function decodeFuelTransaction(gqlTransaction: any, provider: Provider): Promise<FuelTransaction> {
   const rawPayload = arrayify(gqlTransaction.rawPayload)
   const receipts = gqlTransaction?.status.receipts?.map(deserializeReceipt) || []
-
-  const [decodedTransaction] = new TransactionCoder().decode(rawPayload, 0)
+  let decodedTransaction: any
+  try {
+    const [d] = new TransactionCoder().decode(rawPayload, 0)
+    decodedTransaction = d
+  } catch (e) {
+    // If the transaction cannot be decoded, we log the payload in hex and rethrow it
+    console.error('Failed to decode transaction payload:', e, 'payload', Buffer.from(rawPayload).toString('hex'))
+    throw e
+  }
   const { gasCosts, feeParameters, txParameters, baseAssetId } = (await provider.getChain()).consensusParameters
   const blockNumber = gqlTransaction.status?.block?.header?.height
   const { gasPriceFactor, gasPerByte } = feeParameters
@@ -67,14 +74,28 @@ export async function decodeFuelTransaction(gqlTransaction: any, provider: Provi
 }
 
 export function decodeLog(receipt: any | undefined, abi: JsonAbi) {
-  if (receipt && (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log)) {
-    const interfaceToUse = new Interface(abi)
-    const data = receipt.type === ReceiptType.Log ? new BigNumberCoder('u64').encode(receipt.val0) : receipt.data
-    const logId: string = receipt.rb.toString()
-    const [decodedLog] = interfaceToUse.decodeLog(data, logId)
-    return { logId, data: decodedLog }
+  try {
+    if (receipt && (receipt.type === ReceiptType.LogData || receipt.type === ReceiptType.Log)) {
+      const interfaceToUse = new Interface(abi)
+      const data = receipt.type === ReceiptType.Log ? new BigNumberCoder('u64').encode(receipt.val0) : receipt.data
+      const logId: string = receipt.rb.toString()
+      const [decodedLog] = interfaceToUse.decodeLog(data, logId)
+      return { logId, data: decodedLog }
+    }
+    return null
+  } catch (e) {
+    console.error(
+      'Failed to decode log',
+      e,
+      'Please make sure you provide the correct abi.',
+      e,
+      'receipt',
+      receipt,
+      'abi',
+      abi
+    )
+    throw e
   }
-  return null
 }
 
 export async function decodeFuelTransactionWithAbi(

package/src/iota/codegen/codegen.ts

@@ -92,16 +92,13 @@ class IotaNetworkCodegen extends BaseIotaCodegen {
     return this.moduleGenerator.generateLoadAll(isSystem)
   }
 }
-//
-const MAINNET_CODEGEN = new IotaNetworkCodegen(IotaNetwork.MAIN_NET)
-const TESTNET_CODEGEN = new IotaNetworkCodegen(IotaNetwork.TEST_NET)
 
 class IotaCodegen {
   async generate(srcDir: string, outputDir: string, builtin = false): Promise<number> {
     let numFiles = 0
     const generators: [string, IotaNetworkCodegen][] = [
-      ['', MAINNET_CODEGEN],
-      ['testnet', TESTNET_CODEGEN]
+      ['', new IotaNetworkCodegen(IotaNetwork.MAIN_NET)],
+      ['testnet', new IotaNetworkCodegen(IotaNetwork.TEST_NET)]
     ]
 
     for (const [network, gen] of generators) {

package/src/iota/iota-plugin.ts

@@ -1,2 +1,4 @@
 // real plugin is in src/sui/sui-plugin.ts
+import '@sentio/sdk/sui'
+
 export class IotaPlugin {}

package/src/sui/abis/0x1.json

@@ -4171,6 +4171,32 @@
           }
         ]
       },
+      "skip": {
+        "visibility": "Public",
+        "isEntry": false,
+        "typeParameters": [
+          {
+            "abilities": [
+              "Drop"
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "Vector": {
+              "TypeParameter": 0
+            }
+          },
+          "U64"
+        ],
+        "return": [
+          {
+            "Vector": {
+              "TypeParameter": 0
+            }
+          }
+        ]
+      },
       "swap": {
         "visibility": "Public",
         "isEntry": false,
@@ -4215,6 +4241,32 @@
             "TypeParameter": 0
           }
         ]
+      },
+      "take": {
+        "visibility": "Public",
+        "isEntry": false,
+        "typeParameters": [
+          {
+            "abilities": [
+              "Drop"
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "Vector": {
+              "TypeParameter": 0
+            }
+          },
+          "U64"
+        ],
+        "return": [
+          {
+            "Vector": {
+              "TypeParameter": 0
+            }
+          }
+        ]
       }
     }
   }