@wishknish/knishio-client-ts 0.7.0 → 0.7.1

package/dist/index.iife.js

@@ -921,9 +921,19 @@ var KnishIO = (function (exports) {
   });
 
   // src/exception/StackableUnitAmountException.ts
+  var StackableUnitAmountException, StackableUnitAmountException_default;
   var init_StackableUnitAmountException = __esm({
     "src/exception/StackableUnitAmountException.ts"() {
       init_BaseException();
+      StackableUnitAmountException = class extends exports.BaseException {
+        /**
+         * Constructor using proper error type
+         */
+        constructor(message = "Stackable tokens with unit IDs cannot have an amount!") {
+          super("STACKABLE_UNIT_AMOUNT_ERROR", message);
+        }
+      };
+      StackableUnitAmountException_default = StackableUnitAmountException;
     }
   });
 
@@ -19896,7 +19906,7 @@ ${operationTypes.join("\n")}
         // Enhanced response validation
         validate() {
           try {
-            const validationResult = ValidationResultSchema.parse(this.toValidationResult());
+            ValidationResultSchema.parse(this.toValidationResult());
             return {
               success: true,
               data: this._payload,
@@ -19917,14 +19927,14 @@ ${operationTypes.join("\n")}
         static createSuccessResponse(payload, operation, rawData, duration) {
           return StandardResponse.success(payload, rawData, {
             operation,
-            duration,
+            ...duration !== void 0 ? { duration } : {},
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
         }
         static createErrorResponse(errorMessage, operation, rawData, duration) {
           return StandardResponse.failure(errorMessage, rawData, {
             operation,
-            duration,
+            ...duration !== void 0 ? { duration } : {},
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
         }
@@ -19983,7 +19993,7 @@ ${operationTypes.join("\n")}
           if (exports.Dot.has(this.$__response, this.errorKey)) {
             const error2 = exports.Dot.get(this.$__response, this.errorKey);
             if (String(error2).includes("Unauthenticated")) {
-              throw new UnauthenticatedException();
+              throw new UnauthenticatedException("Unauthenticated request");
             }
             throw new exports.InvalidResponseException();
           }
@@ -20839,7 +20849,7 @@ ${operationTypes.join("\n")}
   }
   function toCamelCase(str) {
     if (!str) return "";
-    return str.toLowerCase().replace(/[^a-zA-Z0-9]+(.)/g, (match, chr) => chr.toUpperCase());
+    return str.toLowerCase().replace(/[^a-zA-Z0-9]+(.)/g, (_match, chr) => chr.toUpperCase());
   }
   function toSnakeCase(str) {
     if (!str) return "";
@@ -21086,13 +21096,14 @@ ${operationTypes.join("\n")}
     const totalCondition = total < 0;
     while (total !== 0) {
       for (let index = 0; index < normalized.length; index++) {
-        const condition = totalCondition ? normalized[index] < 8 : normalized[index] > -8;
+        const value2 = normalized[index];
+        const condition = totalCondition ? value2 < 8 : value2 > -8;
         if (condition) {
           if (totalCondition) {
-            normalized[index]++;
+            normalized[index] = value2 + 1;
             total++;
           } else {
-            normalized[index]--;
+            normalized[index] = value2 - 1;
             total--;
           }
           if (total === 0) break;
@@ -22086,7 +22097,7 @@ ${operationTypes.join("\n")}
   );
   var genShake = (suffix, blockLen, outputLen, info = {}) => createHasher((opts2 = {}) => new Keccak(blockLen, suffix, opts2.dkLen === void 0 ? outputLen : opts2.dkLen, true), info);
   var shake128 = /* @__PURE__ */ genShake(31, 168, 16, /* @__PURE__ */ oidNist(11));
-  var shake2563 = /* @__PURE__ */ genShake(31, 136, 32, /* @__PURE__ */ oidNist(12));
+  var shake2562 = /* @__PURE__ */ genShake(31, 136, 32, /* @__PURE__ */ oidNist(12));
 
   // node_modules/@noble/curves/abstract/fft.js
   function checkU32(n3) {
@@ -22600,12 +22611,12 @@ ${operationTypes.join("\n")}
     };
   }
   function shakePRF(dkLen, key, nonce) {
-    return shake2563.create({ dkLen }).update(key).update(new Uint8Array([nonce])).digest();
+    return shake2562.create({ dkLen }).update(key).update(new Uint8Array([nonce])).digest();
   }
   var opts = {
     HASH256: sha3_256,
     HASH512: sha3_512,
-    KDF: shake2563,
+    KDF: shake2562,
     XOF: XOF128,
     PRF: shakePRF
   };
@@ -22629,6 +22640,12 @@ ${operationTypes.join("\n")}
     tokenUnits;
     tradeRates;
     molecules;
+    // Token metadata (populated from query responses)
+    tokenName;
+    tokenAmount;
+    tokenSupply;
+    tokenFungibility;
+    createdAt;
     constructor({
       secret = null,
       bundle = null,
@@ -22775,6 +22792,45 @@ ${operationTypes.join("\n")}
         characters: this.characters
       });
     }
+    /**
+     * Sets up a batch ID - either using the sender's, or a new one
+     * Matches JavaScript SDK Wallet.initBatchId exactly
+     */
+    initBatchId({
+      sourceWallet,
+      isRemainder = false
+    }) {
+      if (sourceWallet.batchId) {
+        this.batchId = isRemainder ? sourceWallet.batchId : generateBatchId({});
+      }
+    }
+    /**
+     * Split token units between wallets
+     * Matches JavaScript SDK Wallet.splitUnits exactly
+     *
+     * @param units - Array of token unit IDs to transfer
+     * @param remainderWallet - Wallet to receive units not being transferred
+     * @param recipientWallet - Wallet to receive the transferred units (optional)
+     */
+    splitUnits(units, remainderWallet, recipientWallet = null) {
+      if (units.length === 0) {
+        return;
+      }
+      const recipientTokenUnits = [];
+      const remainderTokenUnits = [];
+      this.tokenUnits.forEach((tokenUnit) => {
+        if (units.includes(tokenUnit.id)) {
+          recipientTokenUnits.push(tokenUnit);
+        } else {
+          remainderTokenUnits.push(tokenUnit);
+        }
+      });
+      this.tokenUnits = recipientTokenUnits;
+      if (recipientWallet !== null) {
+        recipientWallet.tokenUnits = recipientTokenUnits;
+      }
+      remainderWallet.tokenUnits = remainderTokenUnits;
+    }
     /**
      * Get token units data
      * Stub for compatibility
@@ -22797,7 +22853,7 @@ ${operationTypes.join("\n")}
      * Initializes the ML-KEM key pair (matches JavaScript SDK exactly)
      */
     initializeMLKEM() {
-      const seedHex = generateSecret(this.key, 128);
+      const seedHex = generateSecret(this.key, 64);
       const seed = new Uint8Array(64);
       for (let i4 = 0; i4 < 64; i4++) {
         seed[i4] = parseInt(seedHex.substr(i4 * 2, 2), 16);
@@ -23314,9 +23370,9 @@ ${operationTypes.join("\n")}
         }
         const metas = Meta.aggregateMeta(atom.meta);
         for (const key of policyArray) {
-          let policy = metas[key];
-          if (policy) {
-            policy = JSON.parse(policy);
+          const policyRaw = metas[key];
+          if (policyRaw) {
+            const policy = JSON.parse(policyRaw);
             for (const [policyName, policyValue] of Object.entries(policy)) {
               if (!policyArray.includes(policyName)) {
                 if (!Object.keys(metas).includes(policyName)) {
@@ -26862,8 +26918,7 @@ ${operationTypes.join("\n")}
     }
     createUrqlClient({
       serverUri,
-      socket,
-      encrypt
+      socket
     }) {
       const exchanges = [cacheExchange, fetchExchange];
       if (socket?.socketUri) {
@@ -26915,13 +26970,36 @@ ${operationTypes.join("\n")}
       const result = await this.$__client.query(request.query, finalVariables).toPromise();
       return this.formatResponse(result);
     }
-    async mutate(request, variables) {
+    async mutation(request, variables) {
       const finalVariables = variables || request.variables || {};
-      const result = await this.$__client.mutation(request.mutation, finalVariables).toPromise();
+      const mutationString = request.mutation || request.query;
+      const result = await this.$__client.mutation(mutationString, finalVariables).toPromise();
       return this.formatResponse(result);
     }
-    async mutation(request, variables) {
-      return this.mutate(request, variables);
+    // Alias for mutation() to match JS SDK interface
+    async mutate(request, variables) {
+      return this.mutation(request, variables);
+    }
+    async *subscription(request, variables) {
+      const finalVariables = variables || request.variables || {};
+      const subscription = this.$__client.subscription(request.query, finalVariables);
+      const results = [];
+      const { unsubscribe } = pipe(
+        subscription,
+        subscribe((result) => {
+          results.push(this.formatResponse(result));
+        })
+      );
+      try {
+        while (true) {
+          if (results.length > 0) {
+            yield results.shift();
+          }
+          await new Promise((resolve) => setTimeout(resolve, 10));
+        }
+      } finally {
+        unsubscribe();
+      }
     }
     subscribe(request, callback) {
       const { query, variables, operationName = "subscription" } = request;
@@ -26950,7 +27028,7 @@ ${operationTypes.join("\n")}
       }
     }
     unsubscribeAll() {
-      this.$__subscriptionManager.forEach((subscription, operationName) => {
+      this.$__subscriptionManager.forEach((_subscription, operationName) => {
         this.unsubscribe(operationName);
       });
     }
@@ -27806,7 +27884,6 @@ ${operationTypes.join("\n")}
   };
   var validationService = ValidationService.getInstance();
   var validateClientConfig = (config) => validationService.validateClientConfig(config);
-  var validateTransferParams = (params) => validationService.validateTransferParams(params);
   var { typeGuards } = validationService;
 
   // src/validation/UNIVERSAL_CONFIGURATION_INTERFACES.ts
@@ -28163,7 +28240,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `
+      this.$__query = gql`
       query($address: String, $bundleHash: String, $type: String, $token: String, $position: String) {
         Balance(address: $address, bundleHash: $bundleHash, type: $type, token: $token, position: $position) {
           address,
@@ -28384,7 +28461,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `query( $bundleHash: String, $tokenSlug: String ) {
+      this.$__query = gql`query( $bundleHash: String, $tokenSlug: String ) {
       Wallet( bundleHash: $bundleHash, tokenSlug: $tokenSlug ) {
         address,
         bundleHash,
@@ -28466,7 +28543,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `
+      this.$__query = gql`
       query($bundleHashes: [String!]) {
         WalletBundle(bundleHashes: $bundleHashes) {
           bundleHash,
@@ -28543,7 +28620,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `query ($bundle: String!) {
+      this.$__query = gql`query ($bundle: String!) {
       ContinuId(bundle: $bundle) {
         address,
         bundleHash,
@@ -28622,7 +28699,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `query( $metaType: String, $metaTypes: [ String! ], $metaId: String, $metaIds: [ String! ], $key: String, $keys: [ String! ], $value: String, $values: [ String! ], $count: String, $latest: Boolean, $filter: [ MetaFilter! ], $queryArgs: QueryArgs, $countBy: String, $cellSlug: String ) {
+      this.$__query = gql`query( $metaType: String, $metaTypes: [ String! ], $metaId: String, $metaIds: [ String! ], $key: String, $keys: [ String! ], $value: String, $values: [ String! ], $count: String, $latest: Boolean, $filter: [ MetaFilter! ], $queryArgs: QueryArgs, $countBy: String, $cellSlug: String ) {
       MetaType( metaType: $metaType, metaTypes: $metaTypes, metaId: $metaId, metaIds: $metaIds, key: $key, keys: $keys, value: $value, values: $values, count: $count, filter: $filter, queryArgs: $queryArgs, countBy: $countBy, cellSlug: $cellSlug ) {
         metaType,
         instanceCount {
@@ -28719,7 +28796,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `query( $batchId: String ) {
+      this.$__query = gql`query( $batchId: String ) {
       Batch( batchId: $batchId ) {
         ${_QueryBatch.getFields()},
         children {
@@ -28901,7 +28978,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `query(
+      this.$__query = gql`query(
       $molecularHashes: [String!],
       $bundleHashes: [String!],
       $positions:[String!],
@@ -29422,7 +29499,7 @@ ${operationTypes.join("\n")}
      */
     constructor(graphQLClient, knishIOClient) {
       super(graphQLClient, knishIOClient);
-      this.$__query = `query ($metaTypes: [String!], $metaIds: [String!], $values: [String!], $keys: [String!], $latest: Boolean, $filter: [MetaFilter!], $queryArgs: QueryArgs, $countBy: String, $atomValues: [String!], $cellSlugs: [String!] ) {
+      this.$__query = gql`query ($metaTypes: [String!], $metaIds: [String!], $values: [String!], $keys: [String!], $latest: Boolean, $filter: [MetaFilter!], $queryArgs: QueryArgs, $countBy: String, $atomValues: [String!], $cellSlugs: [String!] ) {
       MetaTypeViaAtom(
         metaTypes: $metaTypes
         metaIds: $metaIds
@@ -29534,7 +29611,6 @@ ${operationTypes.join("\n")}
   init_Dot();
   var ResponseProposeMolecule = class extends exports.Response {
     $__clientMolecule;
-    $__payload = null;
     /**
      * Class constructor
      */
@@ -29625,7 +29701,7 @@ ${operationTypes.join("\n")}
       super(graphQLClient, knishIOClient);
       this.$__molecule = molecule;
       this.$__remainderWallet = null;
-      this.$__query = `
+      this.$__query = gql`
       mutation($molecule: MoleculeInput!) {
         ProposeMolecule(molecule: $molecule) {
           molecularHash,
@@ -30625,6 +30701,9 @@ ${operationTypes.join("\n")}
      * Get random uri from specified this.$__uris
      */
     getRandomUri() {
+      if (this.$__uris.length === 0) {
+        throw new Error("No URIs configured");
+      }
       const rand = Math.floor(Math.random() * this.$__uris.length);
       return this.$__uris[rand];
     }
@@ -30785,8 +30864,8 @@ ${operationTypes.join("\n")}
       molecule = null
     }) {
       this.log("info", `KnishIOClient::createMoleculeMutation() - Creating a new ${mutationClass.name} query...`);
-      molecule || await this.createMolecule({});
-      const mutation = new mutationClass(this.client(), this);
+      const _molecule = molecule || await this.createMolecule({});
+      const mutation = new mutationClass(this.client(), this, _molecule);
       if (!(mutation instanceof Mutation)) {
         throw new CodeException(`${this.constructor.name}::createMoleculeMutation() - This method only accepts Mutation subclasses!`);
       }
@@ -30835,68 +30914,74 @@ ${operationTypes.join("\n")}
     }
     /**
      * Transfer tokens between wallets
-     * Enhanced with 2025 TypeScript validation patterns
+     * Matches JavaScript SDK transferToken implementation exactly
      */
-    async transferToken(params) {
-      const transferParams = {
-        recipient: params.bundleHash,
-        amount: params.amount || 0,
-        token: params.token
-      };
-      const validationResult = validateTransferParams(transferParams);
-      if (!validationResult.success) {
-        return {
-          success: false,
-          error: {
-            code: "VALIDATION_ERROR",
-            message: "Invalid transfer parameters",
-            details: validationResult.error.details,
-            context: "transferToken"
-          }
-        };
-      }
-      validationResult.data;
-      let {
-        bundleHash,
-        token,
-        amount = null,
-        units = [],
-        batchId = null,
-        sourceWallet = null
-      } = params;
+    async transferToken({
+      bundleHash,
+      token,
+      amount = null,
+      units = [],
+      batchId = null,
+      sourceWallet = null
+    }) {
       if (units.length > 0) {
-        if (amount && amount > 0) {
-          throw new CodeException("Cannot specify both amount and units");
+        if (amount !== null && amount > 0) {
+          throw new StackableUnitAmountException_default();
         }
         amount = units.length;
       }
-      Wallet.create({
-        bundle: bundleHash,
-        token,
-        batchId
-      });
-      if (!sourceWallet) {
-        sourceWallet = await this.getSourceWallet();
+      if (amount === null) {
+        amount = 0;
       }
-      if (!sourceWallet.balance || sourceWallet.balance < (amount || 0)) {
+      if (sourceWallet === null) {
+        sourceWallet = await this.querySourceWallet({
+          token,
+          amount
+        });
+      }
+      if (sourceWallet === null || Decimal.cmp(sourceWallet.balance, amount) < 0) {
         throw new exports.TransferBalanceException();
       }
+      const recipientWallet = Wallet.create({
+        bundle: bundleHash,
+        token
+      });
+      if (batchId !== null) {
+        recipientWallet.batchId = batchId;
+      } else {
+        recipientWallet.initBatchId({
+          sourceWallet
+        });
+      }
       const remainderWallet = sourceWallet.createRemainder(this.getSecret());
-      await this.createMolecule({
+      sourceWallet.splitUnits(
+        units,
+        remainderWallet,
+        recipientWallet
+      );
+      const molecule = await this.createMolecule({
         sourceWallet,
         remainderWallet
       });
-      return null;
+      const query = await this.createMoleculeMutation({
+        mutationClass: MutationTransferTokens,
+        molecule
+      });
+      query.fillMolecule({
+        recipientWallet,
+        amount
+      });
+      return await this.executeQuery(query);
     }
     /**
      * Request authorization token
      */
     async requestAuthToken({
-      secret = null,
-      seed = null,
-      cellSlug = null,
-      encrypt = false
-    }) {
+      secret: _secret = null,
+      seed: _seed = null,
+      cellSlug: _cellSlug = null,
+      encrypt: _encrypt = false
+    } = {}) {
       if (this.$__serverSdkVersion < 3) {
         this.log("warn", "KnishIOClient::authorize() - Server SDK version does not require an authorization...");
         return null;
@@ -30998,7 +31083,8 @@ ${operationTypes.join("\n")}
         type: type2
       });
       const sourceWallet = response.payload();
-      if (sourceWallet === null || Decimal.cmp(sourceWallet.balance || 0, amount) < 0) {
+      const amountNum = typeof amount === "string" ? Number(amount) : amount;
+      if (sourceWallet === null || Decimal.cmp(sourceWallet.balance || 0, amountNum) < 0) {
         throw new exports.TransferBalanceException();
       }
       if (!sourceWallet.position || !sourceWallet.address) {
@@ -31028,7 +31114,7 @@ ${operationTypes.join("\n")}
      */
     async queryBundle({
       bundle = null,
-      fields = null,
+      fields: _fields = null,
       raw = false
     } = {}) {
       this.log("info", `KnishIOClient::queryBundle() - Querying wallet bundle metadata${bundle ? ` for ${bundle}` : ""}...`);
@@ -31062,7 +31148,7 @@ ${operationTypes.join("\n")}
       key = null,
       value: value2 = null,
       latest = null,
-      fields = null,
+      fields: _fields = null,
       filter: filter2 = null,
       queryArgs = null,
       count = null,
@@ -31368,21 +31454,22 @@ ${operationTypes.join("\n")}
       amount = null,
       meta = null,
       batchId = null,
-      units = null
+      units: _units = null
     }) {
       this.log("info", `KnishIOClient::createToken() - Creating token ${token}...`);
-      const mutation = this.createQuery(MutationCreateToken);
-      const sourceWallet = await this.getSourceWallet();
-      await mutation.fillMolecule({
-        sourceWallet,
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationCreateToken });
+      const recipientWallet = new Wallet({
+        secret: this.getSecret(),
+        bundle: this.getBundle(),
         token: token.toUpperCase(),
-        amount,
-        meta,
-        batchId,
-        units
+        batchId
+      });
+      await mutation.fillMolecule({
+        recipientWallet,
+        amount: amount ?? 0,
+        meta
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Token creation failed");
       }
@@ -31395,24 +31482,21 @@ ${operationTypes.join("\n")}
       token,
       to = null,
       amount = null,
-      units = null,
+      units: _units = null,
       meta = null,
       batchId = null
     }) {
       this.log("info", `KnishIOClient::requestTokens() - Requesting ${amount || "units"} of ${token}...`);
-      const mutation = this.createQuery(MutationRequestTokens);
-      const sourceWallet = await this.getSourceWallet();
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationRequestTokens });
       await mutation.fillMolecule({
-        sourceWallet,
         token: token.toUpperCase(),
-        to,
-        amount,
-        units,
+        amount: amount ?? 0,
+        metaType: to || "",
+        metaId: to || "",
         meta,
         batchId
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Token request failed");
       }
@@ -31424,7 +31508,7 @@ ${operationTypes.join("\n")}
     async burnTokens({
       token,
       amount = null,
-      units = null,
+      units: _units = null,
       sourceWallet = null
     }) {
       this.log("info", `KnishIOClient::burnTokens() - Burning ${amount || "units"} of ${token}...`);
@@ -31434,17 +31518,17 @@ ${operationTypes.join("\n")}
           amount: amount || 0
         });
       }
-      const mutation = this.createQuery(MutationTransferTokens);
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationTransferTokens });
+      const recipientWallet = new Wallet({
+        secret: this.getSecret(),
+        bundle: "0000000000000000000000000000000000000000000000000000000000000000",
+        token: token.toUpperCase()
+      });
       await mutation.fillMolecule({
-        sourceWallet,
-        recipient: "0000000000000000000000000000000000000000000000000000000000000000",
-        // Burn address
-        token: token.toUpperCase(),
-        amount,
-        units
+        recipientWallet,
+        amount: amount ?? 0
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Token burn failed");
       }
@@ -31457,7 +31541,7 @@ ${operationTypes.join("\n")}
       token,
       amount = null,
       units = null,
-      sourceWallet = null
+      sourceWallet: _sourceWallet = null
     }) {
       this.log("info", `KnishIOClient::replenishToken() - Replenishing ${amount || "units"} of ${token}...`);
       return this.requestTokens({
@@ -31470,11 +31554,11 @@ ${operationTypes.join("\n")}
      * Fuse token units
      */
     async fuseToken({
-      bundleHash,
+      bundleHash: _bundleHash,
       tokenSlug,
-      newTokenUnit,
-      fusedTokenUnitIds,
-      sourceWallet = null
+      newTokenUnit: _newTokenUnit,
+      fusedTokenUnitIds: _fusedTokenUnitIds,
+      sourceWallet: _sourceWallet = null
     }) {
       this.log("info", `KnishIOClient::fuseToken() - Fusing token units for ${tokenSlug}...`);
       throw new CodeException("Token fusion not yet implemented");
@@ -31489,14 +31573,14 @@ ${operationTypes.join("\n")}
       token
     }) {
       this.log("info", `KnishIOClient::createWallet() - Creating wallet for token ${token}...`);
-      const mutation = this.createQuery(MutationCreateWallet);
-      const sourceWallet = await this.getSourceWallet();
-      await mutation.fillMolecule({
-        sourceWallet,
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationCreateWallet });
+      const newWallet = new Wallet({
+        secret: this.getSecret(),
+        bundle: this.getBundle(),
         token: token.toUpperCase()
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      await mutation.fillMolecule(newWallet);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Wallet creation failed");
       }
@@ -31508,7 +31592,7 @@ ${operationTypes.join("\n")}
     async claimShadowWallet({
       token,
       batchId = null,
-      molecule = null
+      molecule: _molecule = null
     }) {
       this.log("info", `KnishIOClient::claimShadowWallet() - Claiming shadow wallet for token ${token}...`);
       const shadowWallets = await this.queryWallets({ token });
@@ -31522,15 +31606,12 @@ ${operationTypes.join("\n")}
       if (!shadowWallet.isShadow()) {
         throw new WalletShadowException_default("Wallet is not a shadow wallet");
       }
-      const mutation = this.createQuery(MutationClaimShadowWallet);
-      const sourceWallet = await this.getSourceWallet();
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationClaimShadowWallet });
       await mutation.fillMolecule({
-        sourceWallet,
         token: token.toUpperCase(),
         batchId: shadowWallet.batchId
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Shadow wallet claim failed");
       }
@@ -31575,17 +31656,14 @@ ${operationTypes.join("\n")}
       policy = null
     }) {
       this.log("info", `KnishIOClient::createMeta() - Creating metadata for ${metaType}:${metaId}...`);
-      const mutation = this.createQuery(MutationCreateMeta);
-      const sourceWallet = await this.getSourceWallet();
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationCreateMeta });
       await mutation.fillMolecule({
-        sourceWallet,
         metaType: metaType.toUpperCase(),
         metaId,
         meta,
         policy
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Metadata creation failed");
       }
@@ -31601,17 +31679,14 @@ ${operationTypes.join("\n")}
       policy = null
     }) {
       this.log("info", `KnishIOClient::createRule() - Creating rule for ${metaType}:${metaId}...`);
-      const mutation = this.createQuery(MutationCreateRule);
-      const sourceWallet = await this.getSourceWallet();
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationCreateRule });
       await mutation.fillMolecule({
-        sourceWallet,
         metaType: metaType.toUpperCase(),
         metaId,
         rule,
         policy
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Rule creation failed");
       }
@@ -31642,16 +31717,13 @@ ${operationTypes.join("\n")}
       code
     }) {
       this.log("info", `KnishIOClient::createIdentifier() - Creating identifier of type ${type2}...`);
-      const mutation = this.createQuery(MutationCreateIdentifier);
-      const sourceWallet = await this.getSourceWallet();
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationCreateIdentifier });
       await mutation.fillMolecule({
-        sourceWallet,
         type: type2,
         contact,
         code
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Identifier creation failed");
       }
@@ -31666,14 +31738,11 @@ ${operationTypes.join("\n")}
     }) {
       this.log("info", `KnishIOClient::linkIdentifier() - Linking identifier of type ${type2}...`);
       const mutation = this.createQuery(MutationLinkIdentifier);
-      const sourceWallet = await this.getSourceWallet();
-      await mutation.fillMolecule({
-        sourceWallet,
+      const response = await this.executeQuery(mutation, {
+        bundle: this.getBundle(),
         type: type2,
-        contact
+        content: contact
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
       if (!response) {
         throw new CodeException("Identifier linking failed");
       }
@@ -31698,10 +31767,8 @@ ${operationTypes.join("\n")}
     }) {
       this.log("info", `KnishIOClient::activeSession() - Declaring active session for ${metaType}:${metaId}...`);
       const mutation = this.createQuery(MutationActiveSession);
-      const sourceWallet = await this.getSourceWallet();
-      await mutation.fillMolecule({
-        sourceWallet,
-        bundle,
+      const response = await this.executeQuery(mutation, {
+        bundle: bundle || this.getBundle(),
         metaType: metaType.toUpperCase(),
         metaId,
         ipAddress,
@@ -31711,8 +31778,6 @@ ${operationTypes.join("\n")}
         timeZone,
         json
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
       if (!response) {
         throw new CodeException("Active session declaration failed");
       }
@@ -31734,15 +31799,12 @@ ${operationTypes.join("\n")}
           amount
         });
       }
-      const mutation = this.createQuery(MutationDepositBufferToken);
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationDepositBufferToken });
       await mutation.fillMolecule({
-        sourceWallet,
-        tokenSlug: tokenSlug.toUpperCase(),
-        amount,
+        amount: typeof amount === "string" ? Number(amount) : amount,
         tradeRates
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Buffer token deposit failed");
       }
@@ -31761,15 +31823,15 @@ ${operationTypes.join("\n")}
       if (!sourceWallet) {
         sourceWallet = await this.getSourceWallet();
       }
-      const mutation = this.createQuery(MutationWithdrawBufferToken);
-      await mutation.fillMolecule({
-        sourceWallet,
-        tokenSlug: tokenSlug.toUpperCase(),
-        amount,
-        signingWallet
-      });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationWithdrawBufferToken });
+      const recipients = {};
+      recipients[this.getBundle()] = amount;
+      const fillMoleculeParams = { recipients };
+      if (signingWallet) {
+        fillMoleculeParams.signingWallet = signingWallet;
+      }
+      await mutation.fillMolecule(fillMoleculeParams);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Buffer token withdrawal failed");
       }
@@ -31787,11 +31849,9 @@ ${operationTypes.join("\n")}
     } = {}) {
       this.log("info", "KnishIOClient::requestGuestAuthToken() - Requesting guest auth token...");
       const mutation = this.createQuery(MutationRequestAuthorizationGuest);
-      await mutation.fillMolecule({
+      const response = await this.executeQuery(mutation, {
         cellSlug: cellSlug || this.getCellSlug()
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
       if (!response) {
         throw new CodeException("Guest auth token request failed");
       }
@@ -31809,14 +31869,11 @@ ${operationTypes.join("\n")}
     }) {
       this.log("info", "KnishIOClient::requestProfileAuthToken() - Requesting profile auth token...");
       this.setSecret(secret);
-      const mutation = this.createQuery(MutationRequestAuthorization);
-      const sourceWallet = await this.getSourceWallet();
+      const mutation = await this.createMoleculeMutation({ mutationClass: MutationRequestAuthorization });
       await mutation.fillMolecule({
-        sourceWallet,
-        cellSlug: this.getCellSlug()
+        meta: { encrypt: encrypt ? "true" : "false" }
       });
-      const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-      const response = await this.executeQuery(moleculeMutation);
+      const response = await this.executeQuery(mutation);
       if (!response) {
         throw new CodeException("Profile auth token request failed");
       }