@0xobelisk/sui-client 1.1.0 → 1.1.2

package/dist/libs/suiIndexerClient/index.d.ts

@@ -67,6 +67,10 @@ export declare class SuiIndexerClient {
         name?: string;
         key1?: string;
         key2?: string;
+        is_removed?: boolean;
+        last_update_checkpoint?: string;
+        last_update_digest?: string;
+        value?: any;
         orderBy?: string[];
     }): Promise<ConnectionResponse<IndexerSchema>>;
     getEvents(params?: {
@@ -76,18 +80,26 @@ export declare class SuiIndexerClient {
         checkpoint?: string;
         orderBy?: string[];
     }): Promise<ConnectionResponse<IndexerEvent>>;
-    getStorage({ name, key1, key2, first, after, orderBy, }: {
+    getStorage({ name, key1, key2, is_removed, last_update_checkpoint, last_update_digest, value, first, after, orderBy, }: {
         name?: string;
         key1?: string;
         key2?: string;
+        is_removed?: boolean;
+        last_update_checkpoint?: string;
+        last_update_digest?: string;
+        value?: any;
         first?: number;
         after?: string;
         orderBy?: string[];
     }): Promise<StorageResponse<IndexerSchema>>;
-    getStorageItem({ name, key1, key2, }: {
+    getStorageItem({ name, key1, key2, is_removed, last_update_checkpoint, last_update_digest, value, }: {
         name: string;
         key1?: string;
         key2?: string;
+        is_removed?: boolean;
+        last_update_checkpoint?: string;
+        last_update_digest?: string;
+        value?: any;
     }): Promise<StorageItemResponse<IndexerSchema> | undefined>;
     subscribe(names: string[], handleData: (data: any) => void): Promise<WebSocket>;
 }

package/dist/types/index.d.ts

@@ -73,11 +73,13 @@ export interface ContractQuery extends MessageMeta {
     }): Promise<DevInspectResults | TransactionResult>;
 }
 export interface ContractTx extends MessageMeta {
-    ({ tx, params, typeArguments, isRaw, }: {
+    ({ tx, params, typeArguments, isRaw, onSuccess, onError, }: {
         tx: Transaction;
         params?: (TransactionArgument | SerializedBcs<any>)[];
         typeArguments?: string[];
         isRaw?: boolean;
+        onSuccess?: (result: SuiTransactionBlockResponse) => void | Promise<void>;
+        onError?: (error: Error) => void | Promise<void>;
     }): Promise<SuiTransactionBlockResponse | TransactionResult>;
 }
 export type MapMessageTx = Record<string, ContractTx>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-client",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",

package/src/dubhe.ts

@@ -1,5 +1,4 @@
 import keccak256 from 'keccak256';
-import { getFullnodeUrl } from '@mysten/sui/client';
 import { Transaction, TransactionResult } from '@mysten/sui/transactions';
 import { BcsType, fromHex, SerializedBcs, toHex } from '@mysten/bcs';
 import type { TransactionArgument } from '@mysten/sui/transactions';
@@ -14,18 +13,9 @@ import type {
 import { SuiAccountManager } from './libs/suiAccountManager';
 import { SuiTx } from './libs/suiTxBuilder';
 import { SuiInteractor } from './libs/suiInteractor';
-import {
-  MapObjectStruct,
-  MoveStructType,
-  DubheObjectContent,
-  SuiDubheReturnType,
-  MoveEnumType,
-} from './types';
+import { MapObjectStruct, MoveStructType, MoveEnumType } from './types';
 import { SuiContractFactory } from './libs/suiContractFactory';
-import {
-  SuiMoveMoudleFuncType,
-  SuiMoveMoudleValueType,
-} from './libs/suiContractFactory/types';
+import { SuiMoveMoudleFuncType } from './libs/suiContractFactory/types';
 import { getDefaultURL, NetworkConfig } from './libs/suiInteractor';
 import {
   ContractQuery,
@@ -36,7 +26,6 @@ import {
   MapMoudleFuncTx,
   DubheParams,
   SuiTxArg,
-  // SuiTxArgument,
   SuiObjectArg,
   SuiVecTxArg,
 } from './types';
@@ -106,7 +95,9 @@ function createTx(
     tx: Transaction,
     params?: (TransactionArgument | SerializedBcs<any>)[],
     typeArguments?: string[],
-    isRaw?: boolean
+    isRaw?: boolean,
+    onSuccess?: (result: SuiTransactionBlockResponse) => void | Promise<void>,
+    onError?: (error: Error) => void | Promise<void>
   ) => Promise<SuiTransactionBlockResponse | TransactionResult>
 ): ContractTx {
   return withMeta(
@@ -116,13 +107,17 @@ function createTx(
       params,
       typeArguments,
       isRaw,
+      onSuccess,
+      onError,
     }: {
       tx: Transaction;
       params?: (TransactionArgument | SerializedBcs<any>)[];
       typeArguments?: string[];
       isRaw?: boolean;
+      onSuccess?: (result: SuiTransactionBlockResponse) => void | Promise<void>;
+      onError?: (error: Error) => void | Promise<void>;
     }): Promise<SuiTransactionBlockResponse | TransactionResult> => {
-      return await fn(tx, params, typeArguments, isRaw);
+      return await fn(tx, params, typeArguments, isRaw, onSuccess, onError);
     }
   );
 }
@@ -357,8 +352,16 @@ export class Dubhe {
                 if (isUndefined(this.#tx[moduleName][funcName])) {
                   this.#tx[moduleName][funcName] = createTx(
                     meta,
-                    (tx, p, typeArguments, isRaw) =>
-                      this.#exec(meta, tx, p, typeArguments, isRaw)
+                    (tx, p, typeArguments, isRaw, onSuccess, onError) =>
+                      this.#exec(
+                        meta,
+                        tx,
+                        p,
+                        typeArguments,
+                        isRaw,
+                        onSuccess,
+                        onError
+                      )
                   );
                 }
               }
@@ -393,7 +396,9 @@ export class Dubhe {
     tx: Transaction,
     params?: (TransactionArgument | SerializedBcs<any>)[],
     typeArguments?: string[],
-    isRaw?: boolean
+    isRaw?: boolean,
+    onSuccess?: (result: SuiTransactionBlockResponse) => void | Promise<void>,
+    onError?: (error: Error) => void | Promise<void>
   ) => {
     if (isRaw === true) {
       return tx.moveCall({
@@ -408,7 +413,7 @@ export class Dubhe {
       arguments: params,
       typeArguments,
     });
-    return await this.signAndSendTxn(tx);
+    return await this.signAndSendTxn({ tx, onSuccess, onError });
   };
 
   #read = async (
@@ -1144,6 +1149,10 @@ export class Dubhe {
     name,
     key1,
     key2,
+    is_removed,
+    last_update_checkpoint,
+    last_update_digest,
+    value,
     first,
     after,
     orderBy,
@@ -1151,6 +1160,10 @@ export class Dubhe {
     name?: string;
     key1?: string;
     key2?: string;
+    is_removed?: boolean;
+    last_update_checkpoint?: string;
+    last_update_digest?: string;
+    value?: any;
     first?: number;
     after?: string;
     orderBy?: string[];
@@ -1159,6 +1172,10 @@ export class Dubhe {
       name,
       key1,
       key2,
+      is_removed,
+      last_update_checkpoint,
+      last_update_digest,
+      value,
       first,
       after,
       orderBy,
@@ -1169,6 +1186,10 @@ export class Dubhe {
     name,
     key1,
     key2,
+    is_removed,
+    last_update_checkpoint,
+    last_update_digest,
+    value,
     first,
     after,
     orderBy,
@@ -1176,6 +1197,10 @@ export class Dubhe {
     name?: string;
     key1?: string;
     key2?: string;
+    is_removed?: boolean;
+    last_update_checkpoint?: string;
+    last_update_digest?: string;
+    value?: any;
     first?: number;
     after?: string;
     orderBy?: string[];
@@ -1184,6 +1209,10 @@ export class Dubhe {
       name,
       key1,
       key2,
+      is_removed,
+      last_update_checkpoint,
+      last_update_digest,
+      value,
       first,
       after,
       orderBy,
@@ -1194,15 +1223,27 @@ export class Dubhe {
     name,
     key1,
     key2,
+    is_removed,
+    last_update_checkpoint,
+    last_update_digest,
+    value,
   }: {
     name: string;
     key1?: string;
     key2?: string;
+    is_removed?: boolean;
+    last_update_checkpoint?: string;
+    last_update_digest?: string;
+    value?: any;
   }): Promise<StorageItemResponse<IndexerSchema> | undefined> {
     const response = await this.suiIndexerClient.getStorageItem({
       name,
       key1,
       key2,
+      is_removed,
+      last_update_checkpoint,
+      last_update_digest,
+      value,
     });
     return response;
   }
@@ -1385,12 +1426,39 @@ export class Dubhe {
     return await keyPair.signTransaction(txBytes);
   }
 
-  async signAndSendTxn(
-    tx: Uint8Array | Transaction | SuiTx,
-    derivePathParams?: DerivePathParams
-  ): Promise<SuiTransactionBlockResponse> {
-    const { bytes, signature } = await this.signTxn(tx, derivePathParams);
-    return this.sendTx(bytes, signature);
+  async signAndSendTxn({
+    tx,
+    derivePathParams,
+    onSuccess,
+    onError,
+  }: {
+    tx: Uint8Array | Transaction | SuiTx;
+    derivePathParams?: DerivePathParams;
+    onSuccess?: (result: SuiTransactionBlockResponse) => void | Promise<void>;
+    onError?: (error: Error) => void | Promise<void>;
+  }): Promise<SuiTransactionBlockResponse> {
+    try {
+      const { bytes, signature } = await this.signTxn(tx, derivePathParams);
+      const result = await this.sendTx(bytes, signature);
+
+      if (result.effects?.status.status === 'success') {
+        if (onSuccess) {
+          await onSuccess(result);
+        }
+      } else {
+        if (onError) {
+          await onError(
+            new Error(`Transaction failed: ${result.effects?.status.error}`)
+          );
+        }
+      }
+      return result;
+    } catch (error) {
+      if (onError) {
+        await onError(error as Error);
+      }
+      throw error;
+    }
   }
 
   async sendTx(
@@ -1417,7 +1485,7 @@ export class Dubhe {
   ) {
     const tx = new SuiTx();
     tx.transferSui(recipient, amount);
-    return this.signAndSendTxn(tx, derivePathParams);
+    return this.signAndSendTxn({ tx, derivePathParams });
   }
 
   /**
@@ -1433,7 +1501,7 @@ export class Dubhe {
   ) {
     const tx = new SuiTx();
     tx.transferSuiToMany(recipients, amounts);
-    return this.signAndSendTxn(tx, derivePathParams);
+    return this.signAndSendTxn({ tx, derivePathParams });
   }
 
   /**
@@ -1463,7 +1531,7 @@ export class Dubhe {
       recipients,
       amounts
     );
-    return this.signAndSendTxn(tx, derivePathParams);
+    return this.signAndSendTxn({ tx, derivePathParams });
   }
 
   async transferCoin(
@@ -1487,7 +1555,7 @@ export class Dubhe {
   ) {
     const tx = new SuiTx();
     tx.transferObjects(objects, recipient);
-    return this.signAndSendTxn(tx, derivePathParams);
+    return this.signAndSendTxn({ tx, derivePathParams });
   }
 
   async moveCall(callParams: {
@@ -1504,7 +1572,7 @@ export class Dubhe {
     } = callParams;
     const tx = new SuiTx();
     tx.moveCall(target, args, typeArguments);
-    return this.signAndSendTxn(tx, derivePathParams);
+    return this.signAndSendTxn({ tx, derivePathParams });
   }
 
   /**
@@ -1542,7 +1610,7 @@ export class Dubhe {
   ) {
     const tx = new SuiTx();
     tx.stakeSui(amount, validatorAddr);
-    return this.signAndSendTxn(tx, derivePathParams);
+    return this.signAndSendTxn({ tx, derivePathParams });
   }
 
   /**

package/src/libs/suiIndexerClient/index.ts

@@ -116,11 +116,37 @@ export class SuiIndexerClient {
     name?: string;
     key1?: string;
     key2?: string;
+    is_removed?: boolean;
+    last_update_checkpoint?: string;
+    last_update_digest?: string;
+    value?: any;
     orderBy?: string[];
   }): Promise<ConnectionResponse<IndexerSchema>> {
     const query = `
-      query GetSchemas($first: Int, $after: String, $name: String, $key1: String, $key2: String, $orderBy: [SchemaOrderField!]) {
-        schemas(first: $first, after: $after, name: $name, key1: $key1, key2: $key2, orderBy: $orderBy) {
+      query GetSchemas(
+        $first: Int, 
+        $after: String, 
+        $name: String, 
+        $key1: String, 
+        $key2: String,
+        $is_removed: Boolean,
+        $last_update_checkpoint: String,
+        $last_update_digest: String,
+        $value: JSON,
+        $orderBy: [SchemaOrderField!]
+      ) {
+        schemas(
+          first: $first,
+          after: $after,
+          name: $name,
+          key1: $key1,
+          key2: $key2,
+          is_removed: $is_removed,
+          last_update_checkpoint: $last_update_checkpoint,
+          last_update_digest: $last_update_digest,
+          value: $value,
+          orderBy: $orderBy
+        ) {
           edges {
             cursor
             node {
@@ -191,6 +217,10 @@ export class SuiIndexerClient {
     name,
     key1,
     key2,
+    is_removed = false,
+    last_update_checkpoint,
+    last_update_digest,
+    value,
     first,
     after,
     orderBy,
@@ -198,6 +228,10 @@ export class SuiIndexerClient {
     name?: string;
     key1?: string;
     key2?: string;
+    is_removed?: boolean;
+    last_update_checkpoint?: string;
+    last_update_digest?: string;
+    value?: any;
     first?: number;
     after?: string;
     orderBy?: string[];
@@ -206,15 +240,19 @@ export class SuiIndexerClient {
       name,
       key1,
       key2,
+      is_removed,
+      last_update_checkpoint,
+      last_update_digest,
+      value,
       first,
       after,
       orderBy,
     });
     const data = schemas.edges.map((edge) => edge.node);
-    const value = data.map((item) => parseValue(item.value));
+    const result = data.map((item) => parseValue(item.value));
     return {
       data,
-      value,
+      value: result,
       pageInfo: schemas.pageInfo,
       totalCount: schemas.totalCount,
     };
@@ -224,25 +262,37 @@ export class SuiIndexerClient {
     name,
     key1,
     key2,
+    is_removed,
+    last_update_checkpoint,
+    last_update_digest,
+    value,
   }: {
     name: string;
     key1?: string;
     key2?: string;
+    is_removed?: boolean;
+    last_update_checkpoint?: string;
+    last_update_digest?: string;
+    value?: any;
   }): Promise<StorageItemResponse<IndexerSchema> | undefined> {
     const schemas = await this.getSchemas({
       name,
       key1,
       key2,
+      is_removed,
+      last_update_checkpoint,
+      last_update_digest,
+      value,
       first: 1,
     });
     const data = schemas.edges[0]?.node;
     if (!data) {
       return undefined;
     }
-    const value = parseValue(data.value);
+    const result = parseValue(data.value);
     return {
       data,
-      value,
+      value: result,
     };
   }
 

package/src/types/index.ts

@@ -111,11 +111,15 @@ export interface ContractTx extends MessageMeta {
     params,
     typeArguments,
     isRaw,
+    onSuccess,
+    onError,
   }: {
     tx: Transaction;
     params?: (TransactionArgument | SerializedBcs<any>)[];
     typeArguments?: string[];
     isRaw?: boolean;
+    onSuccess?: (result: SuiTransactionBlockResponse) => void | Promise<void>;
+    onError?: (error: Error) => void | Promise<void>;
   }): Promise<SuiTransactionBlockResponse | TransactionResult>;
 }