@0xobelisk/sui-client 0.5.19 → 0.5.21

package/dist/index.js

@@ -974,7 +974,7 @@ function createTx(meta, fn) {
     }
   );
 }
-var _query, _tx, _struct, _exec, _read;
+var _query, _tx, _object, _exec, _read, _bcs;
 var Obelisk = class {
   /**
    * Support the following ways to init the ObeliskClient:
@@ -998,7 +998,49 @@ var Obelisk = class {
   } = {}) {
     __privateAdd(this, _query, {});
     __privateAdd(this, _tx, {});
-    __privateAdd(this, _struct, {});
+    __privateAdd(this, _object, {
+      address: import_bcs2.bcs.bytes(32).transform({
+        // To change the input type, you need to provide a type definition for the input
+        input: (val) => (0, import_bcs2.fromHEX)(val),
+        output: (val) => (0, import_bcs2.toHEX)(val)
+      }),
+      u8: import_bcs2.bcs.u8(),
+      u16: import_bcs2.bcs.u16(),
+      u32: import_bcs2.bcs.u32(),
+      u64: import_bcs2.bcs.u64(),
+      u128: import_bcs2.bcs.u128(),
+      u256: import_bcs2.bcs.u256(),
+      bool: import_bcs2.bcs.bool(),
+      "0x1::ascii::String": import_bcs2.bcs.string(),
+      "0x1::option::Option<address>": import_bcs2.bcs.option(
+        import_bcs2.bcs.bytes(32).transform({
+          // To change the input type, you need to provide a type definition for the input
+          input: (val) => (0, import_bcs2.fromHEX)(val),
+          output: (val) => (0, import_bcs2.toHEX)(val)
+        })
+      ),
+      "0x1::option::Option<u8>": import_bcs2.bcs.option(import_bcs2.bcs.u8()),
+      "0x1::option::Option<u16>": import_bcs2.bcs.option(import_bcs2.bcs.u16()),
+      "0x1::option::Option<u32>": import_bcs2.bcs.option(import_bcs2.bcs.u32()),
+      "0x1::option::Option<u64>": import_bcs2.bcs.option(import_bcs2.bcs.u64()),
+      "0x1::option::Option<u128>": import_bcs2.bcs.option(import_bcs2.bcs.u128()),
+      "0x1::option::Option<u256>": import_bcs2.bcs.option(import_bcs2.bcs.u256()),
+      "0x1::option::Option<bool>": import_bcs2.bcs.option(import_bcs2.bcs.bool()),
+      "vector<address>": import_bcs2.bcs.vector(
+        import_bcs2.bcs.bytes(32).transform({
+          // To change the input type, you need to provide a type definition for the input
+          input: (val) => (0, import_bcs2.fromHEX)(val),
+          output: (val) => (0, import_bcs2.toHEX)(val)
+        })
+      ),
+      "vector<u8>": import_bcs2.bcs.vector(import_bcs2.bcs.u8()),
+      "vector<u16>": import_bcs2.bcs.vector(import_bcs2.bcs.u16()),
+      "vector<u32>": import_bcs2.bcs.vector(import_bcs2.bcs.u32()),
+      "vector<u64>": import_bcs2.bcs.vector(import_bcs2.bcs.u64()),
+      "vector<u128>": import_bcs2.bcs.vector(import_bcs2.bcs.u128()),
+      "vector<u256>": import_bcs2.bcs.vector(import_bcs2.bcs.u256()),
+      "vector<bool>": import_bcs2.bcs.vector(import_bcs2.bcs.bool())
+    });
     __privateAdd(this, _exec, async (meta, tx, params, typeArguments, isRaw) => {
       if (isRaw === true) {
         return tx.moveCall({
@@ -1029,43 +1071,224 @@ var Obelisk = class {
       });
       return await this.inspectTxn(tx);
     });
+    __privateAdd(this, _bcs, (bcsmeta) => {
+      let loopFlag = false;
+      const bcsJson = {};
+      Object.entries(bcsmeta.objectType.fields).forEach(([index, type]) => {
+        const objName = type.name;
+        const objType = type.type;
+        switch (typeof objType) {
+          case "object":
+            for (const [key, value] of Object.entries(objType)) {
+              switch (key) {
+                case "Struct":
+                  const structType = value;
+                  if (structType.address === "0x1" && structType.module === "ascii" && structType.name === "String") {
+                    bcsJson[objName] = import_bcs2.bcs.string();
+                    return;
+                  } else if (structType.address === "0x2" && structType.module === "object" && structType.name === "UID") {
+                    bcsJson[objName] = import_bcs2.bcs.fixedArray(32, import_bcs2.bcs.u8()).transform({
+                      input: (id) => (0, import_bcs2.fromHEX)(id),
+                      output: (id) => (0, import_bcs2.toHEX)(Uint8Array.from(id))
+                    });
+                    return;
+                  } else if (structType.address === "0x2" && structType.module === "object" && structType.name === "ID") {
+                    bcsJson[objName] = import_bcs2.bcs.fixedArray(32, import_bcs2.bcs.u8()).transform({
+                      input: (id) => (0, import_bcs2.fromHEX)(id),
+                      output: (id) => (0, import_bcs2.toHEX)(Uint8Array.from(id))
+                    });
+                    return;
+                  } else if (structType.address === "0x2" && structType.module === "bag" && structType.name === "Bag") {
+                    bcsJson[objName] = import_bcs2.bcs.fixedArray(32, import_bcs2.bcs.u8()).transform({
+                      input: (id) => (0, import_bcs2.fromHEX)(id),
+                      output: (id) => (0, import_bcs2.toHEX)(Uint8Array.from(id))
+                    });
+                    return;
+                  } else if (structType.address === "0x1" && structType.module === "option" && structType.name === "Option") {
+                    switch (structType.typeArguments[0]) {
+                      case "U8":
+                        bcsJson[objName] = import_bcs2.bcs.option(import_bcs2.bcs.u8());
+                        return;
+                      case "U16":
+                        bcsJson[objName] = import_bcs2.bcs.option(import_bcs2.bcs.u16());
+                        return;
+                      case "U32":
+                        bcsJson[objName] = import_bcs2.bcs.option(import_bcs2.bcs.u32());
+                        return;
+                      case "U64":
+                        bcsJson[objName] = import_bcs2.bcs.option(import_bcs2.bcs.u64());
+                        return;
+                      case "U128":
+                        bcsJson[objName] = import_bcs2.bcs.option(import_bcs2.bcs.u128());
+                        return;
+                      case "U256":
+                        bcsJson[objName] = import_bcs2.bcs.option(import_bcs2.bcs.u256());
+                        return;
+                      case "Bool":
+                        bcsJson[objName] = import_bcs2.bcs.option(import_bcs2.bcs.bool());
+                        return;
+                      case "Address":
+                        bcsJson[objName] = import_bcs2.bcs.option(
+                          import_bcs2.bcs.bytes(32).transform({
+                            // To change the input type, you need to provide a type definition for the input
+                            input: (val) => (0, import_bcs2.fromHEX)(val),
+                            output: (val) => (0, import_bcs2.toHEX)(val)
+                          })
+                        );
+                        return;
+                      default:
+                    }
+                  } else {
+                    if (this.object[`${structType.address}::${structType.module}::${structType.name}`] === void 0) {
+                      loopFlag = true;
+                    } else {
+                      bcsJson[objName] = this.object[`${structType.address}::${structType.module}::${structType.name}`];
+                      return;
+                    }
+                  }
+                  return;
+                case "Vector":
+                  switch (value) {
+                    case "U8":
+                      bcsJson[objName] = import_bcs2.bcs.vector(import_bcs2.bcs.u8());
+                      return;
+                    case "U16":
+                      bcsJson[objName] = import_bcs2.bcs.vector(import_bcs2.bcs.u16());
+                      return;
+                    case "U32":
+                      bcsJson[objName] = import_bcs2.bcs.vector(import_bcs2.bcs.u32());
+                      return;
+                    case "U64":
+                      bcsJson[objName] = import_bcs2.bcs.vector(import_bcs2.bcs.u64());
+                      return;
+                    case "U128":
+                      bcsJson[objName] = import_bcs2.bcs.vector(import_bcs2.bcs.u128());
+                      return;
+                    case "U256":
+                      bcsJson[objName] = import_bcs2.bcs.vector(import_bcs2.bcs.u256());
+                      return;
+                    case "Bool":
+                      bcsJson[objName] = import_bcs2.bcs.vector(import_bcs2.bcs.bool());
+                      return;
+                    case "Address":
+                      bcsJson[objName] = import_bcs2.bcs.vector(
+                        import_bcs2.bcs.bytes(32).transform({
+                          // To change the input type, you need to provide a type definition for the input
+                          input: (val) => (0, import_bcs2.fromHEX)(val),
+                          output: (val) => (0, import_bcs2.toHEX)(val)
+                        })
+                      );
+                      return;
+                    default:
+                  }
+                case "TypeParameter":
+                  bcsJson[objName] = import_bcs2.bcs.u128();
+                  return;
+                default:
+                  throw new Error("Unsupported type");
+              }
+            }
+            return;
+          case "string":
+            switch (objType) {
+              case "U8":
+                bcsJson[objName] = import_bcs2.bcs.u8();
+                return;
+              case "U16":
+                bcsJson[objName] = import_bcs2.bcs.u16();
+                return;
+              case "U32":
+                bcsJson[objName] = import_bcs2.bcs.u32();
+                return;
+              case "U64":
+                bcsJson[objName] = import_bcs2.bcs.u64();
+                return;
+              case "U128":
+                bcsJson[objName] = import_bcs2.bcs.u128();
+                return;
+              case "U256":
+                bcsJson[objName] = import_bcs2.bcs.u256();
+                return;
+              case "Bool":
+                bcsJson[objName] = import_bcs2.bcs.bool();
+                return;
+              case "Address":
+                bcsJson[objName] = import_bcs2.bcs.bytes(32).transform({
+                  // To change the input type, you need to provide a type definition for the input
+                  input: (val) => (0, import_bcs2.fromHEX)(val),
+                  output: (val) => (0, import_bcs2.toHEX)(val)
+                });
+                return;
+              default:
+                return;
+            }
+          default:
+            throw new Error("Unsupported type");
+        }
+      });
+      return {
+        bcs: import_bcs2.bcs.struct(bcsmeta.objectName, bcsJson),
+        loopFlag
+      };
+    });
     this.accountManager = new SuiAccountManager({ mnemonics, secretKey });
     fullnodeUrls = fullnodeUrls || [(0, import_client2.getFullnodeUrl)(networkType ?? "mainnet")];
     this.suiInteractor = new SuiInteractor(fullnodeUrls, networkType);
     this.packageId = packageId;
     if (metadata !== void 0) {
       this.metadata = metadata;
-      Object.values(metadata).forEach(
-        (moudlevalue) => {
-          const data = moudlevalue;
-          const moduleName = data.name;
-          Object.entries(data.exposedFunctions).forEach(
-            ([funcName, funcvalue]) => {
-              const meta = funcvalue;
-              meta.moduleName = moduleName;
-              meta.funcName = funcName;
-              if (isUndefined(__privateGet(this, _query)[moduleName])) {
-                __privateGet(this, _query)[moduleName] = {};
-              }
-              if (isUndefined(__privateGet(this, _query)[moduleName][funcName])) {
-                __privateGet(this, _query)[moduleName][funcName] = createQuery(
-                  meta,
-                  (tx, p, typeArguments, isRaw) => __privateGet(this, _read).call(this, meta, tx, p, typeArguments, isRaw)
-                );
-              }
-              if (isUndefined(__privateGet(this, _tx)[moduleName])) {
-                __privateGet(this, _tx)[moduleName] = {};
+      const maxLoopNum = 5;
+      let loopNum = 0;
+      let stillNeedFormat = true;
+      while (stillNeedFormat === true && loopNum <= maxLoopNum) {
+        let loopFlag = false;
+        Object.values(metadata).forEach(
+          (moudlevalue) => {
+            const data = moudlevalue;
+            const moduleName = data.name;
+            const objMoudleId = `${packageId}::${moduleName}`;
+            Object.entries(data.structs).forEach(([objectName, objectType]) => {
+              const objId = `${objMoudleId}::${objectName}`;
+              const bcsmeta = {
+                objectName,
+                objectType
+              };
+              let bcsObj = __privateGet(this, _bcs).call(this, bcsmeta);
+              if (bcsObj.loopFlag === true) {
+                loopFlag = bcsObj.loopFlag;
               }
-              if (isUndefined(__privateGet(this, _tx)[moduleName][funcName])) {
-                __privateGet(this, _tx)[moduleName][funcName] = createTx(
-                  meta,
-                  (tx, p, typeArguments, isRaw) => __privateGet(this, _exec).call(this, meta, tx, p, typeArguments, isRaw)
-                );
+              __privateGet(this, _object)[objId] = bcsObj.bcs;
+            });
+            Object.entries(data.exposedFunctions).forEach(
+              ([funcName, funcvalue]) => {
+                const meta = funcvalue;
+                meta.moduleName = moduleName;
+                meta.funcName = funcName;
+                if (isUndefined(__privateGet(this, _query)[moduleName])) {
+                  __privateGet(this, _query)[moduleName] = {};
+                }
+                if (isUndefined(__privateGet(this, _query)[moduleName][funcName])) {
+                  __privateGet(this, _query)[moduleName][funcName] = createQuery(
+                    meta,
+                    (tx, p, typeArguments, isRaw) => __privateGet(this, _read).call(this, meta, tx, p, typeArguments, isRaw)
+                  );
+                }
+                if (isUndefined(__privateGet(this, _tx)[moduleName])) {
+                  __privateGet(this, _tx)[moduleName] = {};
+                }
+                if (isUndefined(__privateGet(this, _tx)[moduleName][funcName])) {
+                  __privateGet(this, _tx)[moduleName][funcName] = createTx(
+                    meta,
+                    (tx, p, typeArguments, isRaw) => __privateGet(this, _exec).call(this, meta, tx, p, typeArguments, isRaw)
+                  );
+                }
               }
-            }
-          );
-        }
-      );
+            );
+          }
+        );
+        stillNeedFormat = loopFlag;
+        loopNum++;
+      }
     }
     this.contractFactory = new SuiContractFactory({
       packageId,
@@ -1078,8 +1301,23 @@ var Obelisk = class {
   get tx() {
     return __privateGet(this, _tx);
   }
-  get struct() {
-    return __privateGet(this, _struct);
+  get object() {
+    return __privateGet(this, _object);
+  }
+  view(dryResult) {
+    let returnValues = [];
+    if (dryResult.effects.status.status === "success") {
+      const resultList = dryResult.results[0].returnValues;
+      for (const res of resultList) {
+        let baseValue = res[0];
+        let baseType = res[1];
+        const value = Uint8Array.from(baseValue);
+        returnValues.push(this.object[baseType].parse(value));
+      }
+      return returnValues;
+    } else {
+      return void 0;
+    }
   }
   /**
    * if derivePathParams is not provided or mnemonics is empty, it will return the keypair.
@@ -1297,50 +1535,11 @@ var Obelisk = class {
     if (entityId !== void 0) {
       params.push(tx.pure.address(entityId));
     }
-    const getResult = await this.query[schemaModuleName].get(
+    const dryResult = await this.query[schemaModuleName].get(
       tx,
       params
     );
-    let returnValues = [];
-    if (getResult.effects.status.status === "success") {
-      const resultList = getResult.results[0].returnValues;
-      for (const res of resultList) {
-        let baseValue = res[0];
-        let baseType = res[1];
-        const value = Uint8Array.from(baseValue);
-        if (baseType === "address") {
-          const Address = import_bcs2.bcs.bytes(32).transform({
-            // To change the input type, you need to provide a type definition for the input
-            input: (val) => (0, import_bcs2.fromHEX)(val),
-            output: (val) => (0, import_bcs2.toHEX)(val)
-          });
-          returnValues.push(Address.parse(value));
-        } else if (baseType === "u8") {
-          returnValues.push(import_bcs2.bcs.u8().parse(value));
-        } else if (baseType === "u16") {
-          returnValues.push(import_bcs2.bcs.u16().parse(value));
-        } else if (baseType === "u32") {
-          returnValues.push(import_bcs2.bcs.u32().parse(value));
-        } else if (baseType === "u64") {
-          returnValues.push(import_bcs2.bcs.u64().parse(value));
-        } else if (baseType === "u128") {
-          returnValues.push(import_bcs2.bcs.u128().parse(value));
-        } else if (baseType === "u256") {
-          returnValues.push(import_bcs2.bcs.u256().parse(value));
-        } else if (baseType === "bool") {
-          returnValues.push(import_bcs2.bcs.bool().parse(value));
-        } else if (baseType === "0x1::ascii::String") {
-          returnValues.push(import_bcs2.bcs.string().parse(value));
-        } else if (baseType === "vector<u8>") {
-          returnValues.push(import_bcs2.bcs.vector(import_bcs2.bcs.u8()).parse(value));
-        } else if (baseType === "0x1::option::Option<u8>") {
-          returnValues.push(import_bcs2.bcs.option(import_bcs2.bcs.u8()).parse(value));
-        }
-      }
-      return returnValues;
-    } else {
-      return void 0;
-    }
+    return this.view(dryResult);
   }
   async containEntity(worldId, schemaName, entityId) {
     const schemaModuleName = `${schemaName}_schema`;
@@ -1349,18 +1548,11 @@ var Obelisk = class {
     if (entityId !== void 0) {
       params.push(tx.pure.address(entityId));
     }
-    const getResult = await this.query[schemaModuleName].contains(
+    const dryResult = await this.query[schemaModuleName].contains(
       tx,
       params
     );
-    if (getResult.effects.status.status === "success") {
-      const res = getResult.results[0].returnValues[0];
-      let baseValue = res[0];
-      const value = Uint8Array.from(baseValue);
-      return import_bcs2.bcs.bool().parse(value);
-    } else {
-      return void 0;
-    }
+    return this.view(dryResult);
   }
   // async getEntities(
   //   worldId: string,
@@ -1457,54 +1649,13 @@ var Obelisk = class {
   //   const u8Value = Uint8Array.from(value);
   //   return bcs.de(type, u8Value);
   // }
-  async autoFormatDryValue(value) {
-    let returnValues = [];
-    if (value.effects.status.status === "success") {
-      const resultList = value.results[0].returnValues;
-      for (const res of resultList) {
-        let baseValue = res[0];
-        let baseType = res[1];
-        const value2 = Uint8Array.from(baseValue);
-        if (baseType === "address") {
-          const Address = import_bcs2.bcs.bytes(32).transform({
-            // To change the input type, you need to provide a type definition for the input
-            input: (val) => (0, import_bcs2.fromHEX)(val),
-            output: (val) => (0, import_bcs2.toHEX)(val)
-          });
-          returnValues.push(Address.parse(value2));
-        } else if (baseType === "u8") {
-          returnValues.push(import_bcs2.bcs.u8().parse(value2));
-        } else if (baseType === "u16") {
-          returnValues.push(import_bcs2.bcs.u16().parse(value2));
-        } else if (baseType === "u32") {
-          returnValues.push(import_bcs2.bcs.u32().parse(value2));
-        } else if (baseType === "u64") {
-          returnValues.push(import_bcs2.bcs.u64().parse(value2));
-        } else if (baseType === "u128") {
-          returnValues.push(import_bcs2.bcs.u128().parse(value2));
-        } else if (baseType === "u256") {
-          returnValues.push(import_bcs2.bcs.u256().parse(value2));
-        } else if (baseType === "bool") {
-          returnValues.push(import_bcs2.bcs.bool().parse(value2));
-        } else if (baseType === "0x1::ascii::String") {
-          returnValues.push(import_bcs2.bcs.string().parse(value2));
-        } else if (baseType === "vector<u8>") {
-          returnValues.push(import_bcs2.bcs.vector(import_bcs2.bcs.u8()).parse(value2));
-        } else if (baseType === "0x1::option::Option<u8>") {
-          returnValues.push(import_bcs2.bcs.option(import_bcs2.bcs.u8()).parse(value2));
-        }
-      }
-      return returnValues;
-    } else {
-      return void 0;
-    }
-  }
 };
 _query = new WeakMap();
 _tx = new WeakMap();
-_struct = new WeakMap();
+_object = new WeakMap();
 _exec = new WeakMap();
 _read = new WeakMap();
+_bcs = new WeakMap();
 
 // src/libs/multiSig/client.ts
 var import_multisig = require("@mysten/sui/multisig");