@sentio/sdk 2.28.4-rc.3 → 2.29.0-rc.2

package/src/aptos/index.ts

@@ -9,16 +9,6 @@ export { AptosPlugin } from './aptos-plugin.js'
 
 export { defaultMoveCoder } from './move-coder.js'
 
-export type {
-  Event,
-  Transaction_UserTransaction,
-  Address,
-  MoveResource,
-  MoveFunction,
-  MoveStruct,
-  MoveModuleBytecode,
-  TransactionPayload_EntryFunctionPayload
-} from '@typemove/aptos'
 export { MoveCoder } from '@typemove/aptos'
 
 export { BUILTIN_TYPES } from '@typemove/move'

package/src/aptos/models.ts

@@ -1,11 +1,12 @@
-import { Event, MoveResource, TransactionPayload_EntryFunctionPayload } from '@typemove/aptos'
+import { Event, MoveResource, EntryFunctionPayloadResponse } from '@aptos-labs/ts-sdk'
+
 import { DecodedStruct } from '@typemove/move'
 
 export type TypedEventInstance<T> = DecodedStruct<Event, T>
 export type TypedMoveResource<T> = DecodedStruct<MoveResource, T>
 
 // Don't use intermediate type to make IDE happier
-export type TypedFunctionPayload<T extends Array<any>> = TransactionPayload_EntryFunctionPayload & {
+export type TypedFunctionPayload<T extends Array<any>> = EntryFunctionPayloadResponse & {
   /**
    * decoded argument data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch
    */

package/src/aptos/network.ts

@@ -1,5 +1,5 @@
 import { AptosChainId } from '@sentio/chain'
-import { AptosClient } from 'aptos-sdk'
+import { Aptos, AptosConfig } from '@aptos-labs/ts-sdk'
 import { Labels } from '../core/index.js'
 import { Endpoints } from '@sentio/runtime'
 
@@ -13,7 +13,7 @@ export const AptosNetwork = <const>{
 export class AptosBindOptions {
   address: string
   network?: AptosNetwork = AptosNetwork.MAIN_NET
-  client?: AptosClient
+  client?: Aptos
   startVersion?: bigint | number
   baseLabels?: Labels
 }
@@ -21,16 +21,18 @@ export class AptosBindOptions {
 export function getRpcEndpoint(network: AptosNetwork): string {
   switch (network) {
     case AptosNetwork.TEST_NET:
-      return 'https://testnet.aptoslabs.com/'
+      return 'https://testnet.aptoslabs.com/v1'
   }
-  return 'https://mainnet.aptoslabs.com/'
+  return 'https://mainnet.aptoslabs.com/v1'
 }
 
-export function getClient(network: AptosNetwork): AptosClient {
+export function getClient(network: AptosNetwork): Aptos {
   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'
   }
-  return new AptosClient(chainServer)
+  return new Aptos(new AptosConfig({ fullnode: chainServer }))
 }

package/src/eth/base-processor.ts

@@ -9,7 +9,7 @@ import {
   Data_EthTransaction,
   EthFetchConfig,
   HandleInterval,
-  ProcessResult,
+  ProcessResult
 } from '@sentio/protos'
 import { BindOptions } from './bind-options.js'
 import { PromiseOrVoid } from '../core/promises.js'
@@ -77,7 +77,7 @@ export class GlobalProcessor {
       address: '*',
       name: config.name || 'Global',
       network: config.network || EthChainId.ETHEREUM,
-      startBlock: 0n,
+      startBlock: 0n
     }
     if (config.startBlock) {
       this.config.startBlock = BigInt(config.startBlock)
@@ -98,7 +98,7 @@ export class GlobalProcessor {
       undefined,
       {
         recentInterval: blockInterval,
-        backfillInterval: backfillBlockInterval,
+        backfillInterval: backfillBlockInterval
       },
       fetchConfig
     )
@@ -143,13 +143,13 @@ export class GlobalProcessor {
           throw new ServerError(Status.INVALID_ARGUMENT, 'Block is empty')
         }
 
-        const ctx = new GlobalContext(chainId, new Date(block.timestamp * 1000), block, undefined, undefined)
+        const ctx = new GlobalContext(chainId, '*', new Date(block.timestamp * 1000), block, undefined, undefined)
         await handler(block, ctx)
         return ctx.stopAndGetResult()
       },
       timeIntervalInMinutes: timeInterval,
       blockInterval: blockInterval,
-      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
+      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {})
     })
     return this
   }
@@ -166,11 +166,20 @@ export class GlobalProcessor {
         if (!transaction) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'transaction is empty')
         }
-        const ctx = new GlobalContext(chainId, data.timestamp, block, undefined, trace, transaction, transactionReceipt)
+        const ctx = new GlobalContext(
+          chainId,
+          transaction.to || '*',
+          data.timestamp,
+          block,
+          undefined,
+          trace,
+          transaction,
+          transactionReceipt
+        )
         await handler(transaction, ctx)
         return ctx.stopAndGetResult()
       },
-      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
+      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {})
     })
     return this
   }
@@ -192,7 +201,7 @@ export abstract class BaseProcessor<
       name: config.name || '',
       network: config.network || EthChainId.ETHEREUM,
       startBlock: 0n,
-      baseLabels: config.baseLabels,
+      baseLabels: config.baseLabels
     }
     if (config.startBlock) {
       this.config.startBlock = BigInt(config.startBlock)
@@ -261,6 +270,9 @@ export abstract class BaseProcessor<
           throw e
           // console.log(e)
         }
+        if (processor.config.address === '*') {
+          contractView.address = log.address
+        }
 
         const ctx = new ContractContext<TContract, TBoundContractView>(
           contractName,
@@ -283,7 +295,7 @@ export abstract class BaseProcessor<
           return ctx.stopAndGetResult()
         }
         return ProcessResult.fromPartial({})
-      },
+      }
     })
     return this
   }
@@ -299,7 +311,7 @@ export abstract class BaseProcessor<
       undefined,
       {
         recentInterval: blockInterval,
-        backfillInterval: backfillBlockInterval,
+        backfillInterval: backfillBlockInterval
       },
       fetchConfig
     )
@@ -353,7 +365,7 @@ export abstract class BaseProcessor<
       },
       timeIntervalInMinutes: timeInterval,
       blockInterval: blockInterval,
-      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {}),
+      fetchConfig: EthFetchConfig.fromPartial(fetchConfig || {})
     })
     return this
   }
@@ -415,7 +427,7 @@ export abstract class BaseProcessor<
         )
         await handler(typedTrace, ctx)
         return ctx.stopAndGetResult()
-      },
+      }
     })
     return this
   }

package/src/eth/context.ts

@@ -125,6 +125,7 @@ export class AccountContext extends EthContext {
 export class GlobalContext extends EthContext {
   constructor(
     chainId: EthChainId,
+    address: string,
     timestamp?: Date,
     block?: BlockParams,
     log?: LogParams,
@@ -193,7 +194,7 @@ export class ContractView<TContract extends BaseContract> {
 
 export class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {
   protected view: TContractView
-  readonly address: string
+  address: string
   // context will be set right after context creation (in context's constructor)
   // context: ContractContext<TContract, BoundContractView<TContract, TContractView>>
   context: EthContext

package/src/testing/aptos-facet.ts

@@ -1,4 +1,4 @@
-import { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from '../aptos/index.js'
+import { UserTransactionResponse, EntryFunctionPayloadResponse } from '@aptos-labs/ts-sdk'
 import { DataBinding, HandlerType } from '@sentio/protos'
 import { TestProcessorServer } from './test-processor-server.js'
 import { AptosNetwork } from '@sentio/sdk/aptos'
@@ -10,11 +10,11 @@ export class AptosFacet {
     this.server = server
   }
 
-  testEntryFunctionCall(transaction: Transaction_UserTransaction, network: AptosNetwork = AptosNetwork.MAIN_NET) {
+  testEntryFunctionCall(transaction: UserTransactionResponse, network: AptosNetwork = AptosNetwork.MAIN_NET) {
     return this.testEntryFunctionCalls([transaction], network)
   }
 
-  testEntryFunctionCalls(transactions: Transaction_UserTransaction[], network: AptosNetwork = AptosNetwork.MAIN_NET) {
+  testEntryFunctionCalls(transactions: UserTransactionResponse[], network: AptosNetwork = AptosNetwork.MAIN_NET) {
     const bindings = []
     for (const trans of transactions) {
       const binding = this.buildEntryFunctionCallBinding(trans, network)
@@ -29,10 +29,10 @@ export class AptosFacet {
   }
 
   private buildEntryFunctionCallBinding(
-    transaction: Transaction_UserTransaction,
+    transaction: UserTransactionResponse,
     network: AptosNetwork = AptosNetwork.MAIN_NET
   ): DataBinding | undefined {
-    const payload = transaction.payload as TransactionPayload_EntryFunctionPayload
+    const payload = transaction.payload as EntryFunctionPayloadResponse
     for (const config of this.server.contractConfigs) {
       if (config.contract?.chainId !== network) {
         continue
@@ -56,7 +56,7 @@ export class AptosFacet {
     return undefined
   }
 
-  testEvent(transaction: Transaction_UserTransaction, network: AptosNetwork = AptosNetwork.MAIN_NET) {
+  testEvent(transaction: UserTransactionResponse, network: AptosNetwork = AptosNetwork.MAIN_NET) {
     const binding = this.buildEventBinding(transaction, network)
     if (!binding) {
       throw Error('Invalid test event: ' + JSON.stringify(transaction))
@@ -65,7 +65,7 @@ export class AptosFacet {
   }
 
   private buildEventBinding(
-    transaction: Transaction_UserTransaction,
+    transaction: UserTransactionResponse,
     network: AptosNetwork = AptosNetwork.MAIN_NET
   ): DataBinding | undefined {
     // const allEvents = new Set(transaction.events.map(e => e.type))

package/src/tsup.config.ts

@@ -20,8 +20,7 @@ export default defineConfig({
   splitting: false,
   external: [
     'protobufjs',
-    'aptos',
-    'aptos-sdk',
+    '@aptos-labs/ts-sdk',
     'ethers',
     'bs58',
     'bn.js',