@sentio/sdk 3.9.0-rc.9 → 4.0.0-rc.2

package/src/fuel/context.ts

@@ -1,6 +1,7 @@
 import { BaseContext, Labels, normalizeLabels } from '../core/index.js'
 import { FuelChainId } from '@sentio/chain'
-import { RecordMetaData } from '@sentio/protos'
+import { RecordMetaData, RecordMetaDataSchema } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import type { CallResult, Contract } from 'fuels'
 import { InvocationScopeLike } from 'fuels'
 import { FuelBlock, FuelLog, FuelTransaction } from './types.js'
@@ -39,7 +40,7 @@ export class FuelContext extends BaseContext {
   }
 
   protected getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
-    return {
+    return create(RecordMetaDataSchema, {
       address: this.contractAddress,
       contractName: this.contractName,
       blockNumber: BigInt(this.block?.height?.toString() ?? (this.transaction?.blockNumber || 0)),
@@ -49,7 +50,7 @@ export class FuelContext extends BaseContext {
       name: name,
       logIndex: this.logIndex,
       labels: normalizeLabels(labels)
-    }
+    })
   }
 }
 

package/src/fuel/fuel-plugin.ts

@@ -2,17 +2,22 @@ import { errorString, GLOBAL_CONFIG, mergeProcessResults, Plugin, PluginManager,
 import { PartitionHandlerManager } from '../core/index.js'
 import { HandlerRegister } from '../core/handler-register.js'
 import {
-  ContractConfig,
+  ContractConfigSchema,
   DataBinding,
+  FuelAssetHandlerConfigSchema,
+  FuelReceiptHandlerConfigSchema,
+  FuelTransactionHandlerConfigSchema,
   HandlerType,
   InitResponse,
+  OnIntervalConfigSchema,
   ProcessConfigResponse,
   ProcessResult,
   ProcessStreamResponse_Partitions,
+  ProcessStreamResponse_PartitionsSchema,
   StartRequest
 } from '@sentio/protos'
-
-import { ServerError, Status } from 'nice-grpc'
+import { create } from '@bufbuild/protobuf'
+import { ConnectError, Code } from '@connectrpc/connect'
 import { FuelAssetProcessor } from './asset-processor.js'
 import { FuelProcessorState } from './types.js'
 import { FuelProcessor } from './fuel-processor.js'
@@ -39,7 +44,7 @@ export class FuelPlugin extends Plugin {
         continue
       }
       const processorConfig = processor.config
-      const contractConfig = ContractConfig.fromPartial({
+      const contractConfig = create(ContractConfigSchema, {
         processorType: USER_PROCESSOR,
         contract: {
           name: processorConfig.name,
@@ -60,24 +65,25 @@ export class FuelPlugin extends Plugin {
         const handlerName = txHandler.handlerName
         if (processor instanceof FuelProcessor) {
           // on transaction
-          const fetchConfig = {
+          const fetchConfig = create(FuelTransactionHandlerConfigSchema, {
             handlerId,
             handlerName
-          }
+          })
           contractConfig.fuelTransactionConfigs.push(fetchConfig)
         } else if (processor instanceof FuelAssetProcessor) {
           const assetConfig = txHandler.assetConfig
-          contractConfig.assetConfigs.push({
-            filters: assetConfig?.filters || [],
+          contractConfig.assetConfigs.push(
+            create(FuelAssetHandlerConfigSchema, {
+              filters: assetConfig?.filters || [],
+              handlerId,
+              handlerName
+            })
+          )
+        } else if (processor instanceof FuelGlobalProcessor) {
+          const fetchConfig = create(FuelTransactionHandlerConfigSchema, {
             handlerId,
             handlerName
           })
-        } else if (processor instanceof FuelGlobalProcessor) {
-          const fetchConfig = {
-            handlerId,
-            handlerName,
-            filters: []
-          }
           contractConfig.fuelTransactionConfigs.push(fetchConfig)
           contractConfig.contract!.address = '*'
         }
@@ -92,39 +98,38 @@ export class FuelPlugin extends Plugin {
         )
         const handlerName = receiptHandler.handlerName
         if (processor instanceof FuelProcessor) {
-          contractConfig.fuelReceiptConfigs.push({
-            ...receiptHandler.receiptConfig,
-            handlerId,
-            handlerName
-          })
+          contractConfig.fuelReceiptConfigs.push(
+            create(FuelReceiptHandlerConfigSchema, {
+              ...receiptHandler.receiptConfig,
+              handlerId,
+              handlerName
+            })
+          )
         }
       }
 
       for (const blockHandler of processor.blockHandlers) {
         const handlerId = this.handlerRegister.register(blockHandler.handler, chainId)
         this.partitionManager.registerPartitionHandler(HandlerType.FUEL_BLOCK, handlerId, blockHandler.partitionHandler)
-        contractConfig.intervalConfigs.push({
-          slot: 0,
-          slotInterval: blockHandler.blockInterval,
-          minutes: 0,
-          minutesInterval: blockHandler.timeIntervalInMinutes,
-          handlerId: handlerId,
-          handlerName: blockHandler.handlerName,
-          fetchConfig: undefined
-          // fetchConfig: blockHandler.fetchConfig
-        })
+        contractConfig.intervalConfigs.push(
+          create(OnIntervalConfigSchema, {
+            slot: 0,
+            slotInterval: blockHandler.blockInterval,
+            minutes: 0,
+            minutesInterval: blockHandler.timeIntervalInMinutes,
+            handlerId: handlerId,
+            handlerName: blockHandler.handlerName,
+            fetchConfig: undefined
+            // fetchConfig: blockHandler.fetchConfig
+          })
+        )
       }
 
       config.contractConfigs.push(contractConfig)
     }
   }
 
-  supportedHandlers = [
-    HandlerType.FUEL_TRANSACTION,
-    HandlerType.FUEL_RECEIPT,
-    HandlerType.FUEL_CALL,
-    HandlerType.FUEL_BLOCK
-  ]
+  supportedHandlers = [HandlerType.FUEL_TRANSACTION, HandlerType.FUEL_RECEIPT, HandlerType.FUEL_BLOCK]
 
   processBinding(request: DataBinding): Promise<ProcessResult> {
     switch (request.handlerType) {
@@ -135,7 +140,7 @@ export class FuelPlugin extends Plugin {
       case HandlerType.FUEL_BLOCK:
         return this.processBlock(request)
       default:
-        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
+        throw new ConnectError('No handle type registered ' + request.handlerType, Code.InvalidArgument)
     }
   }
 
@@ -143,41 +148,34 @@ export class FuelPlugin extends Plugin {
     let data: any
     switch (request.handlerType) {
       case HandlerType.FUEL_TRANSACTION:
-        if (!request.data?.fuelTransaction) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelTransaction can't be empty")
+        if (request.data?.value.case !== 'fuelTransaction') {
+          throw new ConnectError("fuelTransaction can't be empty", Code.InvalidArgument)
         }
-        data = request.data.fuelTransaction
+        data = request.data.value.value
         break
       case HandlerType.FUEL_RECEIPT:
-        if (!request.data?.fuelLog) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelReceipt can't be empty")
+        if (request.data?.value.case !== 'fuelLog') {
+          throw new ConnectError("fuelReceipt can't be empty", Code.InvalidArgument)
         }
-        data = request.data.fuelLog
+        data = request.data.value.value
         break
       case HandlerType.FUEL_BLOCK:
-        if (!request.data?.fuelBlock) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelBlock can't be empty")
-        }
-        data = request.data.fuelBlock
-        break
-      case HandlerType.FUEL_CALL:
-        // FUEL_CALL uses the same data as FUEL_TRANSACTION
-        if (!request.data?.fuelTransaction) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelTransaction can't be empty for FUEL_CALL")
+        if (request.data?.value.case !== 'fuelBlock') {
+          throw new ConnectError("fuelBlock can't be empty", Code.InvalidArgument)
         }
-        data = request.data.fuelTransaction
+        data = request.data.value.value
         break
       default:
-        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
+        throw new ConnectError('No handle type registered ' + request.handlerType, Code.InvalidArgument)
     }
     const partitions = await this.partitionManager.processPartitionForHandlerType(
       request.handlerType,
       request.handlerIds,
       data
     )
-    return {
+    return create(ProcessStreamResponse_PartitionsSchema, {
       partitions
-    }
+    })
   }
 
   async start(request: StartRequest) {
@@ -186,15 +184,15 @@ export class FuelPlugin extends Plugin {
         await processor.configure()
       }
     } catch (e) {
-      throw new ServerError(Status.INTERNAL, 'error starting FuelPlugin: ' + errorString(e))
+      throw new ConnectError('error starting FuelPlugin: ' + errorString(e), Code.Internal)
     }
   }
 
   async processReceipt(binding: DataBinding): Promise<ProcessResult> {
-    const receipt = binding?.data?.fuelLog
+    const receipt = binding?.data?.value.case === 'fuelLog' ? binding.data.value.value : undefined
 
     if (!receipt?.transaction) {
-      throw new ServerError(Status.INVALID_ARGUMENT, "transaction can't be null")
+      throw new ConnectError("transaction can't be null", Code.InvalidArgument)
     }
 
     const promises: Promise<ProcessResult>[] = []
@@ -206,9 +204,9 @@ export class FuelPlugin extends Plugin {
           handlerId
         )(receipt)
         .catch((e: any) => {
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing transaction: ' + JSON.stringify(receipt) + '\n' + errorString(e)
+          throw new ConnectError(
+            'error processing transaction: ' + JSON.stringify(receipt) + '\n' + errorString(e),
+            Code.Internal
           )
         })
       if (GLOBAL_CONFIG.execution.sequential) {
@@ -220,10 +218,10 @@ export class FuelPlugin extends Plugin {
   }
 
   async processTransaction(binding: DataBinding): Promise<ProcessResult> {
-    if (!binding.data?.fuelTransaction?.transaction) {
-      throw new ServerError(Status.INVALID_ARGUMENT, "transaction can't be null")
+    if (binding.data?.value.case !== 'fuelTransaction' || !binding.data.value.value.transaction) {
+      throw new ConnectError("transaction can't be null", Code.InvalidArgument)
     }
-    const fuelTransaction = binding.data.fuelTransaction
+    const fuelTransaction = binding.data.value.value
 
     const promises: Promise<ProcessResult>[] = []
 
@@ -234,9 +232,9 @@ export class FuelPlugin extends Plugin {
           handlerId
         )(fuelTransaction)
         .catch((e: any) => {
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing transaction: ' + JSON.stringify(fuelTransaction.transaction) + '\n' + errorString(e)
+          throw new ConnectError(
+            'error processing transaction: ' + JSON.stringify(fuelTransaction.transaction) + '\n' + errorString(e),
+            Code.Internal
           )
         })
       if (GLOBAL_CONFIG.execution.sequential) {
@@ -248,10 +246,10 @@ export class FuelPlugin extends Plugin {
   }
 
   async processBlock(binding: DataBinding): Promise<ProcessResult> {
-    if (!binding.data?.fuelBlock?.block) {
-      throw new ServerError(Status.INVALID_ARGUMENT, "Block can't be empty")
+    if (binding.data?.value.case !== 'fuelBlock' || !binding.data.value.value.block) {
+      throw new ConnectError("Block can't be empty", Code.InvalidArgument)
     }
-    const ethBlock = binding.data.fuelBlock
+    const ethBlock = binding.data.value.value
 
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
@@ -262,9 +260,9 @@ export class FuelPlugin extends Plugin {
         )(ethBlock)
         .catch((e: any) => {
           console.error('error processing block: ', e)
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing block: ' + ethBlock.block?.height + '\n' + errorString(e)
+          throw new ConnectError(
+            'error processing block: ' + (ethBlock.block as any)?.height + '\n' + errorString(e),
+            Code.Internal
           )
         })
       if (GLOBAL_CONFIG.execution.sequential) {

package/src/fuel/fuel-processor-template.ts

@@ -1,5 +1,6 @@
 import { FuelContext, FuelContractContext } from './context.js'
-import { HandleInterval, TemplateInstance } from '@sentio/protos'
+import { HandleInterval, HandleIntervalSchema, TemplateInstance, TemplateInstanceSchema } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { PromiseOrVoid } from '../core/promises.js'
 import { ListStateStorage, processMetrics } from '@sentio/runtime'
 import { Contract } from 'fuels'
@@ -41,7 +42,9 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
 
   constructor() {
     this.id = FuelProcessorTemplateProcessorState.INSTANCE.getValues().length
-    FuelProcessorTemplateProcessorState.INSTANCE.addValue(this)
+    // Stored type-erased as the base instantiation; the concrete type parameter only appears in
+    // handler parameter positions, which `strictFunctionTypes` checks contravariantly.
+    FuelProcessorTemplateProcessorState.INSTANCE.addValue(this as unknown as FuelBaseProcessorTemplate<Contract>)
     return proxyProcessor(this)
   }
 
@@ -51,7 +54,7 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
    * @param ctx
    */
   public bind(options: Omit<Omit<FuelProcessorConfig, 'chainId'>, 'abi'>, ctx: FuelContext): void {
-    const instance: TemplateInstance = {
+    const instance: TemplateInstance = create(TemplateInstanceSchema, {
       templateId: this.id,
       contract: {
         address: options.address,
@@ -63,7 +66,7 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
       endBlock: BigInt(options.endBlock || 0),
       baseLabels: {}
       // baseLabels: options.baseLabels
-    }
+    })
 
     ctx.sendTemplateInstance(instance)
 
@@ -128,10 +131,10 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
     return this.onInterval(
       handler,
       undefined,
-      {
+      create(HandleIntervalSchema, {
         recentInterval: blockInterval,
         backfillInterval: backfillBlockInterval
-      }
+      })
       // fetchConfig
     )
   }
@@ -144,7 +147,7 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
   ) {
     return this.onInterval(
       handler,
-      { recentInterval: timeIntervalInMinutes, backfillInterval: backfillBlockInterval },
+      create(HandleIntervalSchema, { recentInterval: timeIntervalInMinutes, backfillInterval: backfillBlockInterval }),
       undefined
       // fetchConfig
     )

package/src/fuel/fuel-processor.ts

@@ -2,10 +2,12 @@ import {
   Data_FuelBlock,
   Data_FuelTransaction,
   Data_FuelReceipt,
-  FuelCallFilter,
   HandleInterval,
-  ProcessResult
+  HandleIntervalSchema,
+  ProcessResultSchema,
+  timestampDate
 } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { FuelCall, FuelContext, FuelContractContext } from './context.js'
 import { bn, Contract, InputType, Interface, JsonAbi, Provider, ReceiptTransfer, ReceiptTransferOut } from 'fuels'
 import { FuelNetwork, getProvider } from './network.js'
@@ -22,13 +24,14 @@ import {
   ContractTransferFilter,
   FuelBaseProcessor,
   FuelBlock,
+  FuelCallFilter,
   FuelLog,
   FuelProcessorState,
   FuelTransaction,
   ReceiptHandler
 } from './types.js'
 import { PromiseOrVoid, HandlerOptions } from '../core/index.js'
-import { ServerError, Status } from 'nice-grpc'
+import { ConnectError, Code } from '@connectrpc/connect'
 import { getHandlerName, proxyProcessor } from '../utils/metrics.js'
 
 export class FuelProcessor<TContract extends Contract> implements FuelBaseProcessor<FuelProcessorConfig> {
@@ -106,7 +109,7 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
           this.getContract(tx),
           this.config.address,
           this.config.name ?? this.config.address,
-          call.timestamp || new Date(0),
+          call.timestamp ? timestampDate(call.timestamp) : new Date(0),
           tx,
           null
         )
@@ -176,7 +179,7 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
             this.config.chainId,
             this.config.address,
             this.config.name ?? this.config.address,
-            call.timestamp || new Date(0),
+            call.timestamp ? timestampDate(call.timestamp) : new Date(0),
             tx,
             null
           )
@@ -198,7 +201,7 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
           return ctx.stopAndGetResult()
         } catch (e) {
           console.error(e)
-          return ProcessResult.fromPartial({})
+          return create(ProcessResultSchema)
         }
       },
       fetchConfig: {
@@ -231,7 +234,7 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
               this.getContract(tx),
               this.config.address,
               this.config.name ?? this.config.address,
-              timestamp || new Date(0),
+              timestamp ? timestampDate(timestamp) : new Date(0),
               tx,
               null
             )
@@ -245,11 +248,14 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
           console.error(e)
         }
 
-        return ProcessResult.fromPartial({})
+        return create(ProcessResultSchema)
       },
       receiptConfig: {
-        log: {
-          logIds: Array.from(logIds)
+        receiptFilter: {
+          case: 'log',
+          value: {
+            logIds: Array.from(logIds)
+          }
         }
       },
       partitionHandler: async (data: Data_FuelReceipt): Promise<string | undefined> => {
@@ -297,7 +303,7 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
             this.getContract(tx),
             this.config.address,
             this.config.name ?? this.config.address,
-            timestamp || new Date(0),
+            timestamp ? timestampDate(timestamp) : new Date(0),
             tx,
             null
           )
@@ -307,13 +313,16 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
           console.error(e)
         }
 
-        return ProcessResult.fromPartial({})
+        return create(ProcessResultSchema)
       },
       receiptConfig: {
-        transfer: {
-          from,
-          to,
-          assetId
+        receiptFilter: {
+          case: 'transfer',
+          value: {
+            from,
+            to,
+            assetId
+          }
         }
       },
       partitionHandler: async (data: Data_FuelReceipt): Promise<string | undefined> => {
@@ -357,9 +366,9 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
       timeIntervalInMinutes: timeInterval,
       handlerName,
       handler: async function (data: Data_FuelBlock) {
-        const header = data.block
+        const header = data.block as any
         if (!header) {
-          throw new ServerError(Status.INVALID_ARGUMENT, 'Block is empty')
+          throw new ConnectError('Block is empty', Code.InvalidArgument)
         }
 
         const block: FuelBlock = {
@@ -383,7 +392,7 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
           contract,
           processor.config.address,
           processor.config.name ?? processor.config.address,
-          data.timestamp || new Date(0),
+          data.timestamp ? timestampDate(data.timestamp) : new Date(0),
           null,
           block
         )
@@ -394,7 +403,7 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
         const p = handlerOptions?.partitionKey
         if (!p) return undefined
         if (typeof p === 'function') {
-          const header = data.block
+          const header = data.block as any
           if (!header) return undefined
           const block: FuelBlock = {
             id: header.id,
@@ -428,10 +437,10 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
     return this.onInterval(
       handler,
       undefined,
-      {
+      create(HandleIntervalSchema, {
         recentInterval: blockInterval,
         backfillInterval: backfillBlockInterval
-      },
+      }),
       handlerOptions
     )
   }
@@ -444,7 +453,10 @@ export class FuelProcessor<TContract extends Contract> implements FuelBaseProces
   ): this {
     return this.onInterval(
       handler,
-      { recentInterval: timeIntervalInMinutes, backfillInterval: backfillTimeIntervalInMinutes },
+      create(HandleIntervalSchema, {
+        recentInterval: timeIntervalInMinutes,
+        backfillInterval: backfillTimeIntervalInMinutes
+      }),
       undefined,
       handlerOptions
     )

package/src/fuel/global-processor.ts

@@ -1,5 +1,5 @@
 import { CallHandler, FuelBaseProcessor, FuelBlock, FuelProcessorState, FuelTransaction } from './types.js'
-import { Data_FuelTransaction } from '@sentio/protos'
+import { Data_FuelTransaction, timestampDate } from '@sentio/protos'
 import { Provider, bn } from 'fuels'
 import { getProvider } from './network.js'
 import { decodeFuelTransaction, DEFAULT_FUEL_FETCH_CONFIG, FuelFetchConfig } from './transaction.js'
@@ -51,12 +51,12 @@ export class FuelGlobalProcessor implements FuelBaseProcessor<GlobalFuelProcesso
           console.error('error decoding transaction', e)
           return mergeProcessResults([])
         }
-        const header = call.transaction?.status.block.header
+        const header = (call.transaction as any)?.status.block.header
         const ctx = new FuelContext(
           this.config.chainId,
           ALL_ADDRESS,
           this.config.name ?? '*',
-          call.timestamp || new Date(0),
+          call.timestamp ? timestampDate(call.timestamp) : new Date(0),
           tx,
           header
             ? ({

package/src/fuel/types.ts

@@ -4,7 +4,6 @@ import {
   Data_FuelReceipt,
   Data_FuelTransaction,
   FuelAssetHandlerConfig,
-  FuelCallHandlerConfig,
   FuelReceiptHandlerConfig,
   HandleInterval,
   OnIntervalConfig,
@@ -12,6 +11,13 @@ import {
 } from '@sentio/protos'
 import { Block, TransactionSummary } from 'fuels'
 
+// Client-side only filter for `onCall`. Fuel calls are delivered as FUEL_TRANSACTION
+// data and filtered in-handler, so this never reaches the backend.
+export interface FuelCallFilter {
+  function: string
+  includeFailed: boolean
+}
+
 export interface FuelBaseProcessor<T> {
   configure(): Promise<void>
   config: T
@@ -27,15 +33,15 @@ export class FuelProcessorState extends MapStateStorage<FuelBaseProcessor<any>>
 export type CallHandler<T> = {
   handlerName: string
   handler: (call: T) => Promise<ProcessResult>
-  fetchConfig?: Partial<FuelCallHandlerConfig>
-  assetConfig?: Partial<FuelAssetHandlerConfig>
+  fetchConfig?: { filters: FuelCallFilter[] }
+  assetConfig?: Omit<Partial<FuelAssetHandlerConfig>, '$typeName' | '$unknown'>
   partitionHandler?: (call: T) => Promise<string | undefined>
 }
 
 export type ReceiptHandler = {
   handlerName: string
   handler: (receipt: Data_FuelReceipt) => Promise<ProcessResult>
-  receiptConfig?: Partial<FuelReceiptHandlerConfig>
+  receiptConfig?: Omit<Partial<FuelReceiptHandlerConfig>, '$typeName' | '$unknown'>
   partitionHandler?: (receipt: Data_FuelReceipt) => Promise<string | undefined>
 }
 

package/src/iota/context.ts

@@ -1,4 +1,5 @@
-import { RecordMetaData } from '@sentio/protos'
+import { type RecordMetaData, RecordMetaDataSchema } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { type Labels, normalizeLabels } from '../index.js'
 import { getClient, IotaNetwork } from './network.js'
 import {
@@ -52,7 +53,7 @@ export class IotaContext extends MoveContext<IotaNetwork, IotaMoveNormalizedModu
   }
 
   getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
-    return {
+    return create(RecordMetaDataSchema, {
       address: this.address,
       contractName: this.moduleName,
       blockNumber: this.checkpoint,
@@ -62,7 +63,7 @@ export class IotaContext extends MoveContext<IotaNetwork, IotaMoveNormalizedModu
       chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels)
-    }
+    })
   }
 
   get client(): IotaClient {
@@ -106,7 +107,7 @@ export class IotaObjectChangeContext extends MoveContext<
   }
 
   getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
-    return {
+    return create(RecordMetaDataSchema, {
       address: this.address,
       contractName: '*',
       blockNumber: this.checkpoint,
@@ -116,7 +117,7 @@ export class IotaObjectChangeContext extends MoveContext<
       chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels)
-    }
+    })
   }
 
   get client(): IotaClient {
@@ -158,7 +159,7 @@ export class IotaAddressContext extends MoveAccountContext<
   }
 
   getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
-    return {
+    return create(RecordMetaDataSchema, {
       address: this.address,
       contractName: this.contractName,
       blockNumber: this.checkpoint,
@@ -168,7 +169,7 @@ export class IotaAddressContext extends MoveAccountContext<
       chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels)
-    }
+    })
   }
 
   get client(): IotaClient {