@sentio/sdk 2.29.0-rc.1 → 2.29.0-rc.2

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

@@ -9,8 +9,6 @@ import { MoveCoder, TypedEventInstance } from "@typemove/aptos";
 
 import { defaultMoveCoder } from "@sentio/sdk/aptos";
 
-import { Address } from "@typemove/aptos";
-
 import { CallFilter, MoveFetchConfig } from "@sentio/sdk/move";
 import {
   AptosBindOptions,
@@ -19,6 +17,15 @@ import {
   TypedFunctionPayload,
   AptosContext,
 } from "@sentio/sdk/aptos";
+import {
+  Aptos,
+  Account as AptosAccount,
+  MoveAddressType,
+  PendingTransactionResponse,
+  InputGenerateTransactionOptions,
+  MoveStructId,
+  InputViewRequestData,
+} from "@aptos-labs/ts-sdk";
 
 import * as _0x1 from "./0x1.js";
 
@@ -422,7 +429,7 @@ export namespace token {
   }
 
   export interface CreateCollectionEvent {
-    creator: Address;
+    creator: MoveAddressType;
     collection_name: string;
     uri: string;
     description: string;
@@ -452,7 +459,7 @@ export namespace token {
     description: string;
     maximum: bigint;
     uri: string;
-    royalty_payee_address: Address;
+    royalty_payee_address: MoveAddressType;
     royalty_points_denominator: bigint;
     royalty_points_numerator: bigint;
     name: string;
@@ -551,7 +558,7 @@ export namespace token {
   export interface Royalty {
     royalty_points_numerator: bigint;
     royalty_points_denominator: bigint;
-    payee_address: Address;
+    payee_address: MoveAddressType;
   }
 
   export namespace Royalty {
@@ -608,7 +615,7 @@ export namespace token {
   }
 
   export interface TokenDataId {
-    creator: Address;
+    creator: MoveAddressType;
     collection: string;
     name: string;
   }
@@ -694,7 +701,7 @@ export namespace token {
   }
 
   export interface WithdrawCapability {
-    token_owner: Address;
+    token_owner: MoveAddressType;
     token_id: token.TokenId;
     amount: bigint;
     expiration_sec: bigint;
@@ -740,14 +747,18 @@ export namespace token {
   }
 
   export interface BurnPayload
-    extends TypedFunctionPayload<[Address, string, string, bigint, bigint]> {
-    arguments_decoded: [Address, string, string, bigint, bigint];
+    extends TypedFunctionPayload<
+      [MoveAddressType, string, string, bigint, bigint]
+    > {
+    arguments_decoded: [MoveAddressType, string, string, bigint, bigint];
     type_arguments: [];
   }
 
   export interface BurnByCreatorPayload
-    extends TypedFunctionPayload<[Address, string, string, bigint, bigint]> {
-    arguments_decoded: [Address, string, string, bigint, bigint];
+    extends TypedFunctionPayload<
+      [MoveAddressType, string, string, bigint, bigint]
+    > {
+    arguments_decoded: [MoveAddressType, string, string, bigint, bigint];
     type_arguments: [];
   }
 
@@ -766,7 +777,7 @@ export namespace token {
         bigint,
         bigint,
         string,
-        Address,
+        MoveAddressType,
         bigint,
         bigint,
         Boolean[],
@@ -782,7 +793,7 @@ export namespace token {
       bigint,
       bigint,
       string,
-      Address,
+      MoveAddressType,
       bigint,
       bigint,
       Boolean[],
@@ -795,9 +806,16 @@ export namespace token {
 
   export interface DirectTransferScriptPayload
     extends TypedFunctionPayload<
-      [Address, Address, string, string, bigint, bigint]
+      [MoveAddressType, MoveAddressType, string, string, bigint, bigint]
     > {
-    arguments_decoded: [Address, Address, string, string, bigint, bigint];
+    arguments_decoded: [
+      MoveAddressType,
+      MoveAddressType,
+      string,
+      string,
+      bigint,
+      bigint,
+    ];
     type_arguments: [];
   }
 
@@ -808,16 +826,16 @@ export namespace token {
   }
 
   export interface MintScriptPayload
-    extends TypedFunctionPayload<[Address, string, string, bigint]> {
-    arguments_decoded: [Address, string, string, bigint];
+    extends TypedFunctionPayload<[MoveAddressType, string, string, bigint]> {
+    arguments_decoded: [MoveAddressType, string, string, bigint];
     type_arguments: [];
   }
 
   export interface MutateTokenPropertiesPayload
     extends TypedFunctionPayload<
       [
-        Address,
-        Address,
+        MoveAddressType,
+        MoveAddressType,
         string,
         string,
         bigint,
@@ -828,8 +846,8 @@ export namespace token {
       ]
     > {
     arguments_decoded: [
-      Address,
-      Address,
+      MoveAddressType,
+      MoveAddressType,
       string,
       string,
       bigint,
@@ -849,9 +867,16 @@ export namespace token {
 
   export interface TransferWithOptInPayload
     extends TypedFunctionPayload<
-      [Address, string, string, bigint, Address, bigint]
+      [MoveAddressType, string, string, bigint, MoveAddressType, bigint]
     > {
-    arguments_decoded: [Address, string, string, bigint, Address, bigint];
+    arguments_decoded: [
+      MoveAddressType,
+      string,
+      string,
+      bigint,
+      MoveAddressType,
+      bigint,
+    ];
     type_arguments: [];
   }
 }
@@ -1124,7 +1149,7 @@ export namespace token_coin_swap {
 
   export interface TokenSwapEvent {
     token_id: token.TokenId;
-    token_buyer: Address;
+    token_buyer: MoveAddressType;
     token_amount: bigint;
     coin_amount: bigint;
     coin_type_info: _0x1.type_info.TypeInfo;
@@ -1148,10 +1173,10 @@ export namespace token_coin_swap {
 
   export interface ListTokenForSwapPayload<T0 = any>
     extends TypedFunctionPayload<
-      [Address, string, string, bigint, bigint, bigint, bigint]
+      [MoveAddressType, string, string, bigint, bigint, bigint, bigint]
     > {
     arguments_decoded: [
-      Address,
+      MoveAddressType,
       string,
       string,
       bigint,
@@ -1310,7 +1335,7 @@ export namespace token_transfers {
   }
 
   export interface TokenCancelOfferEvent {
-    to_address: Address;
+    to_address: MoveAddressType;
     token_id: token.TokenId;
     amount: bigint;
   }
@@ -1334,7 +1359,7 @@ export namespace token_transfers {
   }
 
   export interface TokenClaimEvent {
-    to_address: Address;
+    to_address: MoveAddressType;
     token_id: token.TokenId;
     amount: bigint;
   }
@@ -1358,7 +1383,7 @@ export namespace token_transfers {
   }
 
   export interface TokenOfferEvent {
-    to_address: Address;
+    to_address: MoveAddressType;
     token_id: token.TokenId;
     amount: bigint;
   }
@@ -1382,7 +1407,7 @@ export namespace token_transfers {
   }
 
   export interface TokenOfferId {
-    to_addr: Address;
+    to_addr: MoveAddressType;
     token_id: token.TokenId;
   }
 
@@ -1404,28 +1429,64 @@ export namespace token_transfers {
 
   export interface CancelOfferScriptPayload
     extends TypedFunctionPayload<
-      [Address, Address, Address, string, string, bigint]
+      [
+        MoveAddressType,
+        MoveAddressType,
+        MoveAddressType,
+        string,
+        string,
+        bigint,
+      ]
     > {
-    arguments_decoded: [Address, Address, Address, string, string, bigint];
+    arguments_decoded: [
+      MoveAddressType,
+      MoveAddressType,
+      MoveAddressType,
+      string,
+      string,
+      bigint,
+    ];
     type_arguments: [];
   }
 
   export interface ClaimScriptPayload
     extends TypedFunctionPayload<
-      [Address, Address, Address, string, string, bigint]
+      [
+        MoveAddressType,
+        MoveAddressType,
+        MoveAddressType,
+        string,
+        string,
+        bigint,
+      ]
     > {
-    arguments_decoded: [Address, Address, Address, string, string, bigint];
+    arguments_decoded: [
+      MoveAddressType,
+      MoveAddressType,
+      MoveAddressType,
+      string,
+      string,
+      bigint,
+    ];
     type_arguments: [];
   }
 
   export interface OfferScriptPayload
     extends TypedFunctionPayload<
-      [Address, Address, Address, string, string, bigint, bigint]
+      [
+        MoveAddressType,
+        MoveAddressType,
+        MoveAddressType,
+        string,
+        string,
+        bigint,
+        bigint,
+      ]
     > {
     arguments_decoded: [
-      Address,
-      Address,
-      Address,
+      MoveAddressType,
+      MoveAddressType,
+      MoveAddressType,
       string,
       string,
       bigint,
@@ -1589,7 +1650,7 @@ export class token_event_store extends AptosBaseProcessor {
 
 export namespace token_event_store {
   export interface CollectionDescriptionMutateEvent {
-    creator_addr: Address;
+    creator_addr: MoveAddressType;
     collection_name: string;
     old_description: string;
     new_description: string;
@@ -1615,7 +1676,7 @@ export namespace token_event_store {
   }
 
   export interface CollectionMaxiumMutateEvent {
-    creator_addr: Address;
+    creator_addr: MoveAddressType;
     collection_name: string;
     old_maximum: bigint;
     new_maximum: bigint;
@@ -1641,7 +1702,7 @@ export namespace token_event_store {
   }
 
   export interface CollectionUriMutateEvent {
-    creator_addr: Address;
+    creator_addr: MoveAddressType;
     collection_name: string;
     old_uri: string;
     new_uri: string;
@@ -1667,7 +1728,7 @@ export namespace token_event_store {
   }
 
   export interface DefaultPropertyMutateEvent {
-    creator: Address;
+    creator: MoveAddressType;
     collection: string;
     token: string;
     keys: string[];
@@ -1695,7 +1756,7 @@ export namespace token_event_store {
   }
 
   export interface DescriptionMutateEvent {
-    creator: Address;
+    creator: MoveAddressType;
     collection: string;
     token: string;
     old_description: string;
@@ -1721,7 +1782,7 @@ export namespace token_event_store {
   }
 
   export interface MaxiumMutateEvent {
-    creator: Address;
+    creator: MoveAddressType;
     collection: string;
     token: string;
     old_maximum: bigint;
@@ -1769,15 +1830,15 @@ export namespace token_event_store {
   }
 
   export interface RoyaltyMutateEvent {
-    creator: Address;
+    creator: MoveAddressType;
     collection: string;
     token: string;
     old_royalty_numerator: bigint;
     old_royalty_denominator: bigint;
-    old_royalty_payee_addr: Address;
+    old_royalty_payee_addr: MoveAddressType;
     new_royalty_numerator: bigint;
     new_royalty_denominator: bigint;
-    new_royalty_payee_addr: Address;
+    new_royalty_payee_addr: MoveAddressType;
   }
 
   export namespace RoyaltyMutateEvent {
@@ -1824,7 +1885,7 @@ export namespace token_event_store {
   }
 
   export interface UriMutationEvent {
-    creator: Address;
+    creator: MoveAddressType;
     collection: string;
     token: string;
     old_uri: string;

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

@@ -9,8 +9,6 @@ import { MoveCoder, TypedEventInstance } from "@typemove/aptos";
 
 import { defaultMoveCoder } from "@sentio/sdk/aptos";
 
-import { Address } from "@typemove/aptos";
-
 import { CallFilter, MoveFetchConfig } from "@sentio/sdk/move";
 import {
   AptosBindOptions,
@@ -19,6 +17,15 @@ import {
   TypedFunctionPayload,
   AptosContext,
 } from "@sentio/sdk/aptos";
+import {
+  Aptos,
+  Account as AptosAccount,
+  MoveAddressType,
+  PendingTransactionResponse,
+  InputGenerateTransactionOptions,
+  MoveStructId,
+  InputViewRequestData,
+} from "@aptos-labs/ts-sdk";
 
 import * as _0x1 from "./0x1.js";
 
@@ -63,7 +70,7 @@ export class token extends AptosBaseProcessor {
 export namespace token {
   export interface BurnRef {
     inner: _0x1.option.Option<_0x1.object_.DeleteRef>;
-    self: _0x1.option.Option<Address>;
+    self: _0x1.option.Option<MoveAddressType>;
   }
 
   export namespace BurnRef {
@@ -104,7 +111,7 @@ export namespace token {
   }
 
   export interface MutatorRef {
-    self: Address;
+    self: MoveAddressType;
   }
 
   export namespace MutatorRef {
@@ -187,7 +194,7 @@ export namespace royalty {
   export interface Royalty {
     numerator: bigint;
     denominator: bigint;
-    payee_address: Address;
+    payee_address: MoveAddressType;
   }
 
   export namespace Royalty {
@@ -250,7 +257,7 @@ export class collection extends AptosBaseProcessor {
 export namespace collection {
   export interface BurnEvent {
     index: bigint;
-    token: Address;
+    token: MoveAddressType;
   }
 
   export namespace BurnEvent {
@@ -269,7 +276,7 @@ export namespace collection {
   }
 
   export interface Collection {
-    creator: Address;
+    creator: MoveAddressType;
     description: string;
     name: string;
     uri: string;
@@ -306,7 +313,7 @@ export namespace collection {
 
   export interface MintEvent {
     index: bigint;
-    token: Address;
+    token: MoveAddressType;
   }
 
   export namespace MintEvent {
@@ -345,7 +352,7 @@ export namespace collection {
   }
 
   export interface MutatorRef {
-    self: Address;
+    self: MoveAddressType;
   }
 
   export namespace MutatorRef {
@@ -817,7 +824,16 @@ export namespace aptos_token {
 
   export interface MintSoulBoundPayload
     extends TypedFunctionPayload<
-      [string, string, string, string, string[], string[], string[], Address]
+      [
+        string,
+        string,
+        string,
+        string,
+        string[],
+        string[],
+        string[],
+        MoveAddressType,
+      ]
     > {
     arguments_decoded: [
       string,
@@ -827,7 +843,7 @@ export namespace aptos_token {
       string[],
       string[],
       string[],
-      Address,
+      MoveAddressType,
     ];
     type_arguments: [];
   }
@@ -846,9 +862,14 @@ export namespace aptos_token {
 
   export interface SetCollectionRoyaltiesCallPayload<T0 = any>
     extends TypedFunctionPayload<
-      [_0x1.object_.Object<T0>, bigint, bigint, Address]
+      [_0x1.object_.Object<T0>, bigint, bigint, MoveAddressType]
     > {
-    arguments_decoded: [_0x1.object_.Object<T0>, bigint, bigint, Address];
+    arguments_decoded: [
+      _0x1.object_.Object<T0>,
+      bigint,
+      bigint,
+      MoveAddressType,
+    ];
     type_arguments: [string];
   }
 
@@ -936,7 +957,7 @@ export class property_map extends AptosBaseProcessor {
 
 export namespace property_map {
   export interface MutatorRef {
-    self: Address;
+    self: MoveAddressType;
   }
 
   export namespace MutatorRef {

package/src/aptos/codegen/codegen.ts

@@ -4,7 +4,7 @@ import path, { join } from 'path'
 import { AptosCodegen as BaseAptosCodegen } from '@typemove/aptos/codegen'
 import { InternalMoveModule, InternalMoveStruct } from '@typemove/move'
 import { AptosNetwork, getRpcEndpoint } from '../network.js'
-import { MoveModuleBytecode, MoveResource } from '@typemove/aptos'
+import { MoveModuleBytecode, MoveResource, Event } from '@aptos-labs/ts-sdk'
 import { SharedNetworkCodegen } from '../../move/shared-network-codegen.js'
 
 export async function codegen(
@@ -32,7 +32,7 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
       MoveModuleBytecode,
       Event | MoveResource
     > {
-      ADDRESS_TYPE = 'Address'
+      ADDRESS_TYPE = 'MoveAddressType'
       PREFIX = 'Aptos'
       SYSTEM_PACKAGE = '@typemove/aptos'
 
@@ -51,7 +51,10 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
     return this.moduleGenerator.generateModule(module, allEventStructs)
   }
   generateImports() {
-    return this.moduleGenerator.generateImports()
+    return (
+      this.moduleGenerator.generateImports() +
+      `import { Aptos, Account as AptosAccount, MoveAddressType, PendingTransactionResponse, InputGenerateTransactionOptions, MoveStructId, InputViewRequestData } from '@aptos-labs/ts-sdk'`
+    )
   }
   generateLoadAll(isSystem: boolean): string {
     return this.moduleGenerator.generateLoadAll(isSystem)

package/src/aptos/context.ts

@@ -1,17 +1,24 @@
 import { RecordMetaData } from '@sentio/protos'
 import { type Labels, normalizeLabels } from '@sentio/sdk'
-import { Event, MoveModuleBytecode, MoveResource, Transaction_UserTransaction, MoveCoder } from '@sentio/sdk/aptos'
+import { MoveCoder } from '@sentio/sdk/aptos'
+import {
+  Aptos,
+  Event,
+  MoveResource,
+  UserTransactionResponse,
+  MoveModuleBytecode,
+  AptosConfig
+} from '@aptos-labs/ts-sdk'
 import { defaultMoveCoder } from './move-coder.js'
 import { AptosNetwork } from './network.js'
 import { Endpoints } from '@sentio/runtime'
 import { ServerError, Status } from 'nice-grpc'
-import { AptosClient } from 'aptos-sdk'
 import { MoveAccountContext, MoveContext } from '../move/index.js'
 
 export class AptosContext extends MoveContext<AptosNetwork, MoveModuleBytecode, Event | MoveResource> {
   moduleName: string
   version: bigint
-  transaction: Transaction_UserTransaction
+  transaction: UserTransactionResponse
   eventIndex: number
   coder: MoveCoder
 
@@ -20,7 +27,7 @@ export class AptosContext extends MoveContext<AptosNetwork, MoveModuleBytecode,
     network: AptosNetwork,
     address: string,
     version: bigint,
-    transaction: Transaction_UserTransaction,
+    transaction: UserTransactionResponse,
     eventIndex: number,
     baseLabels: Labels | undefined
   ) {
@@ -58,12 +65,13 @@ export class AptosContext extends MoveContext<AptosNetwork, MoveModuleBytecode,
     }
   }
 
-  getClient(): AptosClient {
-    const chainServer = Endpoints.INSTANCE.chainServer.get(this.network)
+  getClient(): Aptos {
+    let chainServer = Endpoints.INSTANCE.chainServer.get(this.network)
     if (!chainServer) {
       throw new ServerError(Status.INTERNAL, 'RPC endpoint not provided')
     }
-    return new AptosClient(chainServer)
+    chainServer = chainServer + '/v1'
+    return new Aptos(new AptosConfig({ fullnode: chainServer }))
   }
 }
 
@@ -103,11 +111,12 @@ export class AptosResourcesContext extends MoveAccountContext<AptosNetwork, Move
     }
   }
 
-  getClient(): AptosClient {
-    const chainServer = Endpoints.INSTANCE.chainServer.get(this.network)
+  getClient(): Aptos {
+    let chainServer = Endpoints.INSTANCE.chainServer.get(this.network)
     if (!chainServer) {
       throw new ServerError(Status.INTERNAL, 'RPC endpoint not provided')
     }
-    return new AptosClient(chainServer)
+    chainServer = chainServer + '/v1'
+    return new Aptos(new AptosConfig({ fullnode: chainServer }))
   }
 }

package/src/aptos/ext/aptos-dex.ts

@@ -1,14 +1,8 @@
 import { BigDecimal } from '@sentio/bigdecimal'
 import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
-import {
-  AptosResourcesContext,
-  MoveResource,
-  AptosContext,
-  AptosNetwork,
-  MoveModuleBytecode,
-  Event
-} from '@sentio/sdk/aptos'
+import { AptosResourcesContext, AptosContext, AptosNetwork } from '@sentio/sdk/aptos'
 import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor, SimpleCoinInfo } from '../../move/ext/index.js'
+import { MoveResource, Event, MoveModuleBytecode } from '@aptos-labs/ts-sdk'
 
 export type PoolAdaptor<T> = MovePoolAdaptor<MoveResource, T>
 

package/src/aptos/ext/coin-event.ts

@@ -1,13 +1,8 @@
-import { Event, Transaction_UserTransaction } from '@sentio/sdk/aptos'
-import { Types } from 'aptos-sdk' // TODO just use aptos without break test
+import { Event, UserTransactionResponse, WriteSetChangeWriteResource } from '@aptos-labs/ts-sdk'
 import { coin } from '../builtin/0x1.js'
 import { parseMoveType } from '../../move/index.js'
 
-export function findNewCoinBalances(
-  evt: Event,
-  tx: Transaction_UserTransaction,
-  coin: string
-): coin.Coin<any> | undefined {
+export function findNewCoinBalances(evt: Event, tx: UserTransactionResponse, coin: string): coin.Coin<any> | undefined {
   if (!tx.changes) {
     throw Error('No resource change found, did you forget set fetchOption to { resourceChanges: true  } ')
   }
@@ -15,7 +10,7 @@ export function findNewCoinBalances(
     if (change.type !== 'write_resource') {
       continue
     }
-    const writeResource = change as Types.WriteSetChange_WriteResource
+    const writeResource = change as WriteSetChangeWriteResource
     if (writeResource.address !== evt.guid.account_address) {
       continue
     }
@@ -40,7 +35,7 @@ interface EventHandlerState {
 }
 
 // TODO event handler name could be auto located from ABI
-function findResourceChangeType(evt: Event, tx: Transaction_UserTransaction, eventHandlerName: string) {
+function findResourceChangeType(evt: Event, tx: UserTransactionResponse, eventHandlerName: string) {
   if (!tx.changes) {
     throw Error('No resource change found, did you forget set fetchOption to { resourceChanges: true  } ')
   }
@@ -50,7 +45,7 @@ function findResourceChangeType(evt: Event, tx: Transaction_UserTransaction, eve
       continue
     }
 
-    const writeResource = change as Types.WriteSetChange_WriteResource
+    const writeResource = change as WriteSetChangeWriteResource
     if (writeResource.address !== evt.guid.account_address) {
       continue
     }
@@ -72,12 +67,12 @@ function findResourceChangeType(evt: Event, tx: Transaction_UserTransaction, eve
   throw Error(errStr)
 }
 
-export function getDepositCoinType(evt: Event, tx: Transaction_UserTransaction) {
+export function getDepositCoinType(evt: Event, tx: UserTransactionResponse) {
   const coinStore = findResourceChangeType(evt, tx, 'deposit_events')
   return parseMoveType(coinStore).typeArgs[0].getSignature()
 }
 
-export function getWithDrawCoinType(evt: Event, tx: Transaction_UserTransaction) {
+export function getWithDrawCoinType(evt: Event, tx: UserTransactionResponse) {
   const coinStore = findResourceChangeType(evt, tx, 'withdraw_events')
   return parseMoveType(coinStore).typeArgs[0].getSignature()
 }