@thalalabs/surf 0.0.16 → 1.0.0

package/src/types/client/client.ts

@@ -2,7 +2,6 @@
  * The types for the `Client` class.
  */
 
-import { AptosAccount, TxnBuilderTypes } from 'aptos';
 import { ABIRoot } from '../abi.js';
 import {
   EntryFunctionName,
@@ -11,29 +10,19 @@ import {
   ViewFunctionName,
   ExtractArgsType,
 } from '../extractor/functionExtractor.js';
+import { EntryFunctionArgumentTypes, MoveFunctionId, MoveStructId, MoveValue, SimpleEntryFunctionArgumentTypes } from '@aptos-labs/ts-sdk';
 
 export type TransactionResponse = {
   hash: string;
 };
 
-export type EntryOptions = {
-  account: AptosAccount;
-};
-
-export type ViewOptions = {
-  ledger_version?: string;
-};
-
 /**
  * The return payload type of `createEntryPayload`
  */
 export type EntryPayload = {
-  rawPayload: {
-    function: string;
-    type_arguments: string[];
-    arguments: any[];
-  };
-  entryRequest: TxnBuilderTypes.EntryFunction;
+  function: MoveFunctionId;
+  typeArguments: Array<string>;
+  functionArguments: Array<EntryFunctionArgumentTypes | SimpleEntryFunctionArgumentTypes>;
 };
 
 /**
@@ -44,8 +33,8 @@ export type EntryRequestPayload<
   TFuncName extends EntryFunctionName<T>,
 > = {
   function: TFuncName;
-  arguments: ExtractArgsTypeOmitSigner<T, TFuncName>;
-  type_arguments: ExtractGenericArgsType<T, TFuncName>;
+  functionArguments: ExtractArgsTypeOmitSigner<T, TFuncName>;
+  typeArguments: ExtractGenericArgsType<T, TFuncName>;
 };
 
 /**
@@ -56,18 +45,15 @@ export type ViewRequestPayload<
   TFuncName extends ViewFunctionName<T>,
 > = {
   function: TFuncName;
-  arguments: ExtractArgsType<T, TFuncName>;
-  type_arguments: ExtractGenericArgsType<T, TFuncName>;
+  functionArguments: ExtractArgsType<T, TFuncName>;
+  typeArguments: ExtractGenericArgsType<T, TFuncName>;
 };
 
 /**
  * The return payload type of `createViewPayload`
  */
 export type ViewPayload<_TReturn> = {
-  viewRequest: {
-    function: string;
-    type_arguments: string[];
-    arguments: any[];
-  };
-  decoders: (((value: any) => any) | null)[];
+  function: MoveFunctionId;
+  typeArguments?: Array<MoveStructId>;
+  functionArguments?: Array<MoveValue>;
 };

package/src/types/convertor/argsConvertor.ts

@@ -57,5 +57,5 @@ type ConvertNonStructArgType<TMoveType extends MoveNonStructTypes> =
     : TMoveType extends `0x1::object::Object<${string}>`
     ? `0x${string}`
     : TMoveType extends `0x1::option::Option<${infer TInner}>`
-    ? [ConvertArgType<TInner>] | []
+    ? ConvertArgType<TInner> | null
     : UnknownStruct<TMoveType>;

package/src/types/convertor/genericConvertor.ts

@@ -1,7 +1,9 @@
 /**
  * Convert an array of generic arguments from Move type to TypeScript type.
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type ConvertGenerics<T extends readonly any[]> = T extends readonly [
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   any,
   ...infer TRest,
 ]

package/src/types/convertor/returnConvertor.ts

@@ -36,11 +36,11 @@ type ConvertPrimitiveReturnType<TMoveType extends MovePrimitive> =
     : TMoveType extends 'u32'
     ? number
     : TMoveType extends 'u64'
-    ? bigint
+    ? string
     : TMoveType extends 'u128'
-    ? bigint
+    ? string
     : TMoveType extends 'u256'
-    ? bigint
+    ? string
     : TMoveType extends 'address'
     ? `0x${string}`
     : TMoveType extends '0x1::string::String'

package/src/types/index.ts

@@ -7,8 +7,6 @@ export type {
 export type {
   ViewPayload,
   EntryPayload,
-  ViewOptions,
-  EntryOptions,
   ViewRequestPayload,
   EntryRequestPayload,
   TransactionResponse,