@wishknish/knishio-client-ts 0.7.0 → 0.7.1

package/dist/index.js

@@ -912,9 +912,19 @@ var init_DecryptionKeyException = __esm({
 });
 
 // src/exception/StackableUnitAmountException.ts
+var StackableUnitAmountException, StackableUnitAmountException_default;
 var init_StackableUnitAmountException = __esm({
   "src/exception/StackableUnitAmountException.ts"() {
     init_BaseException();
+    StackableUnitAmountException = class extends 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;
   }
 });
 
@@ -1486,7 +1496,7 @@ var init_EnhancedResponse = __esm({
       // Enhanced response validation
       validate() {
         try {
-          const validationResult = ValidationResultSchema.parse(this.toValidationResult());
+          ValidationResultSchema.parse(this.toValidationResult());
           return {
             success: true,
             data: this._payload,
@@ -1507,14 +1517,14 @@ var init_EnhancedResponse = __esm({
       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()
         });
       }
@@ -1573,7 +1583,7 @@ var init_Response = __esm({
         if (Dot.has(this.$__response, this.errorKey)) {
           const error = Dot.get(this.$__response, this.errorKey);
           if (String(error).includes("Unauthenticated")) {
-            throw new UnauthenticatedException();
+            throw new UnauthenticatedException("Unauthenticated request");
           }
           throw new InvalidResponseException();
         }
@@ -1841,7 +1851,7 @@ function isNumeric(str) {
 }
 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 "";
@@ -2088,13 +2098,14 @@ function normalizeMolecularHash(mappedHashArray) {
   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 value = normalized[index];
+      const condition = totalCondition ? value < 8 : value > -8;
       if (condition) {
         if (totalCondition) {
-          normalized[index]++;
+          normalized[index] = value + 1;
           total++;
         } else {
-          normalized[index]--;
+          normalized[index] = value - 1;
           total--;
         }
         if (total === 0) break;
@@ -2806,6 +2817,12 @@ var Wallet = class _Wallet {
   tokenUnits;
   tradeRates;
   molecules;
+  // Token metadata (populated from query responses)
+  tokenName;
+  tokenAmount;
+  tokenSupply;
+  tokenFungibility;
+  createdAt;
   constructor({
     secret = null,
     bundle = null,
@@ -2952,6 +2969,45 @@ var Wallet = class _Wallet {
       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
@@ -2974,7 +3030,7 @@ var Wallet = class _Wallet {
    * 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 i = 0; i < 64; i++) {
       seed[i] = parseInt(seedHex.substr(i * 2, 2), 16);
@@ -3491,9 +3547,9 @@ var CheckMolecule = class {
       }
       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)) {
@@ -4613,8 +4669,7 @@ var GraphQLClient = class {
   }
   createUrqlClient({
     serverUri,
-    socket,
-    encrypt
+    socket
   }) {
     const exchanges = [cacheExchange, fetchExchange];
     if (socket?.socketUri) {
@@ -4666,13 +4721,36 @@ var GraphQLClient = class {
     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;
@@ -4701,7 +4779,7 @@ var GraphQLClient = class {
     }
   }
   unsubscribeAll() {
-    this.$__subscriptionManager.forEach((subscription, operationName) => {
+    this.$__subscriptionManager.forEach((_subscription, operationName) => {
       this.unsubscribe(operationName);
     });
   }
@@ -5554,7 +5632,6 @@ var ValidationChainBuilder = class {
 };
 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
@@ -5903,15 +5980,13 @@ var ResponseBalance = class _ResponseBalance extends Response {
     return wallet;
   }
 };
-
-// src/query/QueryBalance.ts
 var QueryBalance = class extends Query {
   /**
    * Create QueryBalance instance
    */
   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,
@@ -6123,8 +6198,6 @@ var ResponseWalletList = class _ResponseWalletList extends Response {
     return this.getWallets();
   }
 };
-
-// src/query/QueryWalletList.ts
 var QueryWalletList = class extends Query {
   /**
    * Create new QueryWalletList instance
@@ -6132,7 +6205,7 @@ var QueryWalletList = class extends Query {
    */
   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,
@@ -6206,15 +6279,13 @@ var ResponseWalletBundle = class extends Response {
     return aggregate;
   }
 };
-
-// src/query/QueryWalletBundle.ts
 var QueryWalletBundle = class extends Query {
   /**
    * Create QueryWalletBundle instance
    */
   constructor(graphQLClient, knishIOClient) {
     super(graphQLClient, knishIOClient);
-    this.$__query = `
+    this.$__query = gql`
       query($bundleHashes: [String!]) {
         WalletBundle(bundleHashes: $bundleHashes) {
           bundleHash,
@@ -6282,8 +6353,6 @@ var ResponseContinuId = class extends Response {
     return wallet;
   }
 };
-
-// src/query/QueryContinuId.ts
 var QueryContinuId = class extends Query {
   /**
    * Create new QueryContinuId instance
@@ -6291,7 +6360,7 @@ var QueryContinuId = class extends Query {
    */
   constructor(graphQLClient, knishIOClient) {
     super(graphQLClient, knishIOClient);
-    this.$__query = `query ($bundle: String!) {
+    this.$__query = gql`query ($bundle: String!) {
       ContinuId(bundle: $bundle) {
         address,
         bundleHash,
@@ -6361,8 +6430,6 @@ var ResponseMetaType = class extends Response {
     return response;
   }
 };
-
-// src/query/QueryMetaType.ts
 var QueryMetaType = class extends Query {
   /**
    * Create new QueryMetaType instance
@@ -6370,7 +6437,7 @@ var QueryMetaType = class extends Query {
    */
   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 {
@@ -6467,7 +6534,7 @@ var QueryBatch = class _QueryBatch extends Query {
    */
   constructor(graphQLClient, knishIOClient) {
     super(graphQLClient, knishIOClient);
-    this.$__query = `query( $batchId: String ) {
+    this.$__query = gql`query( $batchId: String ) {
       Batch( batchId: $batchId ) {
         ${_QueryBatch.getFields()},
         children {
@@ -6640,8 +6707,6 @@ var ResponseAtom = class extends Response {
     return metas;
   }
 };
-
-// src/query/QueryAtom.ts
 var QueryAtom = class extends Query {
   /**
    * Create new QueryAtom instance
@@ -6649,7 +6714,7 @@ var QueryAtom = class extends Query {
    */
   constructor(graphQLClient, knishIOClient) {
     super(graphQLClient, knishIOClient);
-    this.$__query = `query(
+    this.$__query = gql`query(
       $molecularHashes: [String!],
       $bundleHashes: [String!],
       $positions:[String!],
@@ -7155,8 +7220,6 @@ var ResponseMetaTypeViaAtom = class extends Response {
     return response;
   }
 };
-
-// src/query/QueryMetaTypeViaAtom.ts
 var QueryMetaTypeViaAtom = class extends Query {
   /**
    * Create new QueryMetaTypeViaAtom instance
@@ -7164,7 +7227,7 @@ var QueryMetaTypeViaAtom = class extends Query {
    */
   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
@@ -7276,7 +7339,6 @@ init_Response();
 init_Dot();
 var ResponseProposeMolecule = class extends Response {
   $__clientMolecule;
-  $__payload = null;
   /**
    * Class constructor
    */
@@ -7355,8 +7417,6 @@ var ResponseProposeMolecule = class extends Response {
     return this.$__payload;
   }
 };
-
-// src/mutation/MutationProposeMolecule.ts
 var MutationProposeMolecule = class extends Mutation {
   $__molecule;
   $__remainderWallet = null;
@@ -7367,7 +7427,7 @@ var MutationProposeMolecule = class extends Mutation {
     super(graphQLClient, knishIOClient);
     this.$__molecule = molecule;
     this.$__remainderWallet = null;
-    this.$__query = `
+    this.$__query = gql`
       mutation($molecule: MoleculeInput!) {
         ProposeMolecule(molecule: $molecule) {
           molecularHash,
@@ -8353,6 +8413,9 @@ var KnishIOClient = class {
    * 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];
   }
@@ -8513,8 +8576,8 @@ var KnishIOClient = class {
     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!`);
     }
@@ -8563,68 +8626,74 @@ var KnishIOClient = class {
   }
   /**
    * 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 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;
@@ -8726,7 +8795,8 @@ var KnishIOClient = class {
       type
     });
     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 TransferBalanceException();
     }
     if (!sourceWallet.position || !sourceWallet.address) {
@@ -8756,7 +8826,7 @@ var KnishIOClient = class {
    */
   async queryBundle({
     bundle = null,
-    fields = null,
+    fields: _fields = null,
     raw = false
   } = {}) {
     this.log("info", `KnishIOClient::queryBundle() - Querying wallet bundle metadata${bundle ? ` for ${bundle}` : ""}...`);
@@ -8790,7 +8860,7 @@ var KnishIOClient = class {
     key = null,
     value = null,
     latest = null,
-    fields = null,
+    fields: _fields = null,
     filter = null,
     queryArgs = null,
     count = null,
@@ -9096,21 +9166,22 @@ var KnishIOClient = class {
     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");
     }
@@ -9123,24 +9194,21 @@ var KnishIOClient = class {
     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");
     }
@@ -9152,7 +9220,7 @@ var KnishIOClient = class {
   async burnTokens({
     token,
     amount = null,
-    units = null,
+    units: _units = null,
     sourceWallet = null
   }) {
     this.log("info", `KnishIOClient::burnTokens() - Burning ${amount || "units"} of ${token}...`);
@@ -9162,17 +9230,17 @@ var KnishIOClient = class {
         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");
     }
@@ -9185,7 +9253,7 @@ var KnishIOClient = class {
     token,
     amount = null,
     units = null,
-    sourceWallet = null
+    sourceWallet: _sourceWallet = null
   }) {
     this.log("info", `KnishIOClient::replenishToken() - Replenishing ${amount || "units"} of ${token}...`);
     return this.requestTokens({
@@ -9198,11 +9266,11 @@ var KnishIOClient = class {
    * 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");
@@ -9217,14 +9285,14 @@ var KnishIOClient = class {
     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");
     }
@@ -9236,7 +9304,7 @@ var KnishIOClient = class {
   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 });
@@ -9250,15 +9318,12 @@ var KnishIOClient = class {
     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");
     }
@@ -9303,17 +9368,14 @@ var KnishIOClient = class {
     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");
     }
@@ -9329,17 +9391,14 @@ var KnishIOClient = class {
     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");
     }
@@ -9370,16 +9429,13 @@ var KnishIOClient = class {
     code
   }) {
     this.log("info", `KnishIOClient::createIdentifier() - Creating identifier of type ${type}...`);
-    const mutation = this.createQuery(MutationCreateIdentifier);
-    const sourceWallet = await this.getSourceWallet();
+    const mutation = await this.createMoleculeMutation({ mutationClass: MutationCreateIdentifier });
     await mutation.fillMolecule({
-      sourceWallet,
       type,
       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");
     }
@@ -9394,14 +9450,11 @@ var KnishIOClient = class {
   }) {
     this.log("info", `KnishIOClient::linkIdentifier() - Linking identifier of type ${type}...`);
     const mutation = this.createQuery(MutationLinkIdentifier);
-    const sourceWallet = await this.getSourceWallet();
-    await mutation.fillMolecule({
-      sourceWallet,
+    const response = await this.executeQuery(mutation, {
+      bundle: this.getBundle(),
       type,
-      contact
+      content: contact
     });
-    const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-    const response = await this.executeQuery(moleculeMutation);
     if (!response) {
       throw new CodeException("Identifier linking failed");
     }
@@ -9426,10 +9479,8 @@ var KnishIOClient = class {
   }) {
     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,
@@ -9439,8 +9490,6 @@ var KnishIOClient = class {
       timeZone,
       json
     });
-    const moleculeMutation = await this.createMoleculeMutation({ mutationClass: mutation });
-    const response = await this.executeQuery(moleculeMutation);
     if (!response) {
       throw new CodeException("Active session declaration failed");
     }
@@ -9462,15 +9511,12 @@ var KnishIOClient = class {
         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");
     }
@@ -9489,15 +9535,15 @@ var KnishIOClient = class {
     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");
     }
@@ -9515,11 +9561,9 @@ var KnishIOClient = class {
   } = {}) {
     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");
     }
@@ -9537,14 +9581,11 @@ var KnishIOClient = class {
   }) {
     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");
     }