@0xobelisk/client 0.3.1 → 0.3.3

package/package.json

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

package/src/obelisk.ts

@@ -1,33 +1,32 @@
 import {
-  RawSigner,
-  TransactionBlock,
   DevInspectResults,
-  SuiTransactionBlockResponse,
-  SuiMoveNormalizedModules,
+  RawSigner,
   SuiAddress,
+  SuiMoveNormalizedModules,
+  SuiTransactionBlockResponse,
+  TransactionBlock,
 } from '@mysten/sui.js';
 import { SuiAccountManager } from './libs/suiAccountManager';
 import { SuiTxBlock } from './libs/suiTxBuilder';
-import { SuiInteractor, getDefaultConnection } from './libs/suiInteractor';
+import { getDefaultConnection, SuiInteractor } from './libs/suiInteractor';
 
 import { ObeliskObjectData } from 'src/types';
 import { SuiContractFactory } from './libs/suiContractFactory';
 import {
-  SuiMoveMoudleValueType,
   SuiMoveMoudleFuncType,
+  SuiMoveMoudleValueType,
 } from './libs/suiContractFactory/types';
 import {
-  ObeliskParams,
-  DerivePathParams,
-  SuiTxArg,
-  SuiVecTxArg,
-  SuiTxArgument,
   ContractQuery,
   ContractTx,
+  DerivePathParams,
+  FaucetNetworkType,
   MapMoudleFuncQuery,
   MapMoudleFuncTx,
-  FaucetNetworkType,
-  SuiReturnValues,
+  ObeliskParams,
+  SuiTxArg,
+  SuiTxArgument,
+  SuiVecTxArg,
 } from './types';
 import { normalizeHexAddress, numberToAddressHex } from './utils';
 import keccak256 from 'keccak256';
@@ -131,10 +130,10 @@ export class Obelisk {
     if (metadata !== undefined) {
       this.metadata = metadata as SuiMoveNormalizedModules;
       Object.values(metadata as SuiMoveNormalizedModules).forEach((value) => {
-        let data = value as SuiMoveMoudleValueType;
-        let moduleName = data.name;
+        const data = value as SuiMoveMoudleValueType;
+        const moduleName = data.name;
         Object.entries(data.exposedFunctions).forEach(([funcName, value]) => {
-          let meta = value as SuiMoveMoudleFuncType;
+          const meta = value as SuiMoveMoudleFuncType;
           meta.moudleName = moduleName;
           meta.funcName = funcName;
 
@@ -446,143 +445,105 @@ export class Obelisk {
     return this.suiInteractor.getObject(worldObjectId);
   }
 
-  async listComponentNames(worldId: string) {
-    let worldObject = await this.getObject(worldId);
-    let newObjectContent = worldObject.objectFields;
-    return newObjectContent['compnames'];
+  async listSchemaNames(worldId: string) {
+    const worldObject = await this.getObject(worldId);
+    const newObjectContent = worldObject.objectFields;
+    return newObjectContent['schemaNames'];
   }
 
-  async getEntity(worldId: string, componentName: string, entityId?: string) {
-    let componentMoudleName = `${componentName}_comp`;
+  async getEntity(
+    worldId: string,
+    schemaName: string,
+    entityId?: string
+  ): Promise<any[] | undefined> {
+    const schemaMoudleName = `${schemaName}_schema`;
     const tx = new TransactionBlock();
-    let params = [tx.pure(worldId)] as SuiTxArgument[];
+    const params = [tx.pure(worldId)] as SuiTxArgument[];
     if (entityId !== undefined) {
       params.push(tx.pure(entityId));
     }
 
-    const getResult = (await this.query[componentMoudleName].get(
+    const getResult = (await this.query[schemaMoudleName].get(
       tx,
       params
     )) as DevInspectResults;
-    let returnValue = [];
-    let resultList = getResult.results![0].returnValues!;
-    for (let res of resultList) {
-      const bcs = new BCS(getSuiMoveConfig());
-      let value = Uint8Array.from(res[0]);
-      let data = bcs.de(res[1], value);
-      returnValue.push(data);
+    const returnValue = [];
+
+    // "success" | "failure";
+    if (getResult.effects.status.status === 'success') {
+      const resultList = getResult.results![0].returnValues!;
+      for (const res of resultList) {
+        const bcs = new BCS(getSuiMoveConfig());
+        const value = Uint8Array.from(res[0]);
+        const data = bcs.de(res[1], value);
+        returnValue.push(data);
+      }
+      return returnValue;
+    } else {
+      return undefined;
     }
-    return returnValue;
   }
 
-  async getEntities(
+  async containEntity(
     worldId: string,
-    componentName: string,
-    cursor?: string,
-    limit?: number
-  ) {
-    let componentMoudleName = `${componentName}_comp`;
-
+    schemaName: string,
+    entityId?: string
+  ): Promise<boolean | undefined> {
+    const schemaMoudleName = `${schemaName}_schema`;
     const tx = new TransactionBlock();
-    let params = [tx.pure(worldId)] as SuiTxArgument[];
+    const params = [tx.pure(worldId)] as SuiTxArgument[];
+    if (entityId !== undefined) {
+      params.push(tx.pure(entityId));
+    }
 
-    const tableResult = (await this.query[componentMoudleName].entities(
+    const getResult = (await this.query[schemaMoudleName].contains(
       tx,
       params
     )) as DevInspectResults;
-    const entities = tableResult.results as SuiReturnValues;
-    const bcs = new BCS(getSuiMoveConfig());
 
-    let value = Uint8Array.from(entities[0].returnValues[0][0]);
-    let tableId = '0x' + bcs.de('address', value);
-    let dynamicFields = await this.suiInteractor.getDynamicFields(
-      tableId,
-      cursor,
-      limit
-    );
-    let objectIds = dynamicFields.data.map((field) => field.objectId);
-    let objectDatas = await this.suiInteractor.getEntitiesObjects(objectIds);
-    return {
-      data: objectDatas,
-      nextCursor: dynamicFields.nextCursor,
-      hasNextPage: dynamicFields.hasNextPage,
-    };
-  }
-
-  // async getEntity(worldId: string, componentName: string, entityId: string) {
-  //   let checkWorldId = normalizeHexAddress(worldId);
-  //   if (checkWorldId) {
-  //     worldId = checkWorldId;
-  //   } else {
-  //     return undefined;
-  //   }
-
-  //   let checkEntityId = normalizeHexAddress(entityId);
-  //   if (checkEntityId) {
-  //     entityId = checkEntityId;
-  //   } else {
-  //     return undefined;
-  //   }
-
-  //   const parentId = await this.getComponentTable(worldId, componentName);
-  //   const name = {
-  //     type: 'address',
-  //     value: entityId,
-  //   } as DynamicFieldName;
-
-  //   let dynamicFieldObject = await this.suiInteractor.getDynamicFieldObject(
-  //     parentId,
-  //     name
-  //   );
-  //   return dynamicFieldObject;
-  // }
+    // "success" | "failure";
+    if (getResult.effects.status.status === 'success') {
+      const res = getResult.results![0].returnValues![0];
+      const bcs = new BCS(getSuiMoveConfig());
+      const value = Uint8Array.from(res[0]);
+      return bcs.de(res[1], value);
+    } else {
+      return undefined;
+    }
+  }
 
-  // async getEntityData(
+  // async getEntities(
   //   worldId: string,
-  //   componentName: string,
-  //   entityId: string
+  //   schemaName: string,
+  //   cursor?: string,
+  //   limit?: number
   // ) {
-  //   const parentId = await this.getComponentTable(worldId, componentName);
-  //   const name = {
-  //     type: 'address',
-  //     value: entityId,
-  //   } as DynamicFieldName;
-
-  //   let dynamicFieldObject = await this.suiInteractor.getDynamicFieldObject(
-  //     parentId,
-  //     name
-  //   );
-  //   let componentMoudleName = `${componentName}_comp`;
+  //   let schemaMoudleName = `${schemaName}_schema`;
 
   //   const tx = new TransactionBlock();
-  //   let params = [] as SuiTxArgument[];
+  //   let params = [tx.pure(worldId)] as SuiTxArgument[];
 
-  //   const typeResult = (await this.query[componentMoudleName].types(
+  //   const tableResult = (await this.query[schemaonentMoudleName].entities(
   //     tx,
   //     params
   //   )) as DevInspectResults;
-  //   let typeReturn = typeResult.results as SuiReturnValues;
-  //   console.log(typeReturn[0].returnValues[0][0]);
-
-  //   const typeBCS = new BCS(getSuiMoveConfig());
-  //   let typeValue = Uint8Array.from(typeReturn[0].returnValues[0][0]);
-
-  //   let typeData = typeBCS.de('vector<vector<u8>>', typeValue);
-  //   console.log(typeData);
-  //   const entityType = String.fromCharCode(...typeData[0]);
-
-  //   let dynamicFieldContent = dynamicFieldObject.data!
-  //     .content as DynamicFieldContentType;
-
-  //   let entityValue = dynamicFieldContent.fields['value'];
+  //   const entities = tableResult.results as SuiReturnValues;
   //   const bcs = new BCS(getSuiMoveConfig());
-  //   let value = Uint8Array.from(entityValue);
-  //   console.log(entityType);
-  //   console.log(value);
 
-  //   let data = bcs.de(entityType, value);
-  //   console.log(data);
-  //   return data;
+  //   let value = Uint8Array.from(entities[0].returnValues[0][0]);
+  //   let tableId = '0x' + bcs.de('address', value);
+  //   let dynamicFields = await this.suiInteractor.getDynamicFields(
+  //     tableId,
+  //     cursor,
+  //     limit
+  //   );
+  //   let objectIds = dynamicFields.data.map((field) => field.objectId);
+  //   let objectDatas = await this.suiInteractor.getEntitiesObjects(objectIds);
+  //   return {
+  //     data: objectDatas,
+  //     nextCursor: dynamicFields.nextCursor,
+  //     hasNextPage: dynamicFields.hasNextPage,
+  //   };
   // }
 
   async getOwnedObjects(owner: SuiAddress, cursor?: string, limit?: number) {
@@ -591,10 +552,10 @@ export class Obelisk {
       cursor,
       limit
     );
-    let ownedObjectsRes: ObeliskObjectData[] = [];
+    const ownedObjectsRes: ObeliskObjectData[] = [];
 
     for (const object of ownedObjects.data) {
-      let objectDetail = await this.getObject(object.data!.objectId);
+      const objectDetail = await this.getObject(object.data!.objectId);
 
       if (
         objectDetail.objectType.split('::')[0] ===
@@ -608,7 +569,7 @@ export class Obelisk {
   }
 
   async entity_key_from_object(objectId: string) {
-    let checkObjectId = normalizeHexAddress(objectId);
+    const checkObjectId = normalizeHexAddress(objectId);
     if (checkObjectId !== null) {
       objectId = checkObjectId;
       return objectId;
@@ -618,11 +579,11 @@ export class Obelisk {
   }
 
   async entity_key_from_bytes(bytes: Uint8Array | Buffer | string) {
-    let hashBytes = keccak256(bytes);
+    const hashBytes = keccak256(bytes);
     const hashU8Array: number[] = Array.from(hashBytes);
     const bcs = new BCS(getSuiMoveConfig());
-    let value = Uint8Array.from(hashU8Array);
-    let data = bcs.de('address', value);
+    const value = Uint8Array.from(hashU8Array);
+    const data = bcs.de('address', value);
     return '0x' + data;
   }
 
@@ -632,7 +593,7 @@ export class Obelisk {
 
   async formatData(type: string, value: Buffer | number[] | Uint8Array) {
     const bcs = new BCS(getSuiMoveConfig());
-    let u8Value = Uint8Array.from(value);
+    const u8Value = Uint8Array.from(value);
     return bcs.de(type, u8Value);
   }
 }

package/src/types/index.ts

@@ -35,8 +35,8 @@ export type ObeliskParams = {
   metadata?: SuiMoveNormalizedModules;
 };
 
-export type ComponentFieldType = {
-  components: {
+export type SchemaFieldType = {
+  schemas: {
     type: string;
     fields: {
       id: {
@@ -47,14 +47,14 @@ export type ComponentFieldType = {
   };
 };
 
-export type ComponentValueType = {
+export type SchemaValueType = {
   id: {
     id: string;
   };
   name: string;
   value: {
     type: string;
-    fields: ComponentFieldType;
+    fields: SchemaFieldType;
   };
 };
 
@@ -77,9 +77,9 @@ export type SuiTxArgument =
       index: number;
       resultIndex: number;
     };
-export type ComponentContentType = {
+export type SchemaContentType = {
   type: string;
-  fields: ComponentValueType;
+  fields: SchemaValueType;
   hasPublicTransfer: boolean;
   dataType: 'moveObject';
 };

package/dist/index.d.ts

@@ -1,9 +0,0 @@
-export * from '@mysten/sui.js';
-export { Ed25519Keypair } from '@mysten/sui.js/keypairs/ed25519';
-export * from '@mysten/bcs';
-export { Obelisk } from './obelisk';
-export { SuiAccountManager } from './libs/suiAccountManager';
-export { SuiTxBlock } from './libs/suiTxBuilder';
-export { SuiContractFactory } from './libs/suiContractFactory';
-export { getMetadata } from './metadata';
-export type * from './types';