@tokenops/sdk 2.0.0-alpha.2 → 2.0.0-alpha.4

package/dist/{chunk-UHHMVBLU.cjs → chunk-6AYJRUGP.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkUG5RKLU2_cjs = require('./chunk-UG5RKLU2.cjs');
+var chunkSUYBAF27_cjs = require('./chunk-SUYBAF27.cjs');
 var chunkMVDQMV25_cjs = require('./chunk-MVDQMV25.cjs');
-var chunkFT5H2Q7Y_cjs = require('./chunk-FT5H2Q7Y.cjs');
+var chunkYAL6JSAZ_cjs = require('./chunk-YAL6JSAZ.cjs');
 var chunkJK4XMMKM_cjs = require('./chunk-JK4XMMKM.cjs');
 var chunk66IHPTOK_cjs = require('./chunk-66IHPTOK.cjs');
 var chunk67OV5CX2_cjs = require('./chunk-67OV5CX2.cjs');
@@ -446,7 +446,7 @@ var ConfidentialVestingFactoryClient = class {
     this.walletClient = config.walletClient;
     const chainId = config.chainId ?? config.publicClient.chain?.id;
     const addressOverride = config.address ? chunkJK4XMMKM_cjs.normaliseAddress(config.address) : void 0;
-    const resolved = addressOverride ?? (chainId === void 0 ? void 0 : chunkFT5H2Q7Y_cjs.getFheVestingFactoryAddress(chainId));
+    const resolved = addressOverride ?? (chainId === void 0 ? void 0 : chunkYAL6JSAZ_cjs.getFheVestingFactoryAddress(chainId));
     if (!resolved) {
       throw new chunk67OV5CX2_cjs.DeploymentAddressUnavailableError({
         reason: chainId === void 0 ? "chain-id-missing" : "registry-not-deployed",
@@ -464,36 +464,9 @@ var ConfidentialVestingFactoryClient = class {
       hasWallet: !!this.walletClient,
       aclResolved: true,
       // factory has no ACL dependency; constant for funnel-shape parity with manager.
-      sdkVersion: chunkUG5RKLU2_cjs.SDK_VERSION
+      sdkVersion: chunkSUYBAF27_cjs.SDK_VERSION
     });
   }
-  // ----------------------- writes -----------------------
-  /**
-   * Deploy a new `ConfidentialVestingManager` clone via the factory and return
-   * its address, parsed from the `ManagerCreated` event in the tx receipt.
-   *
-   * **This is the headline factory entry point.** It returns one rich-return
-   * shape: the address is only knowable after the tx mines (the factory packs
-   * `block.number` into the clone's immutable args), so a hash-only variant
-   * would force consumers to re-derive what the SDK already had to compute.
-   *
-   * Calls `createManagerWithOptions` when `splitEnabled` or `pausableEnabled`
-   * is provided; otherwise calls the simpler `createManager` entry point.
-   *
-   * Internally: `writeContract` → {@link PublicClient.waitForTransactionReceipt} →
-   * `parseEventLogs({ eventName: "ManagerCreated" })`.
-   *
-   * Pre-mine prediction is exposed only on
-   * `ConfidentialVestingFactoryAdvancedClient` from
-   * `@tokenops/sdk/fhe-vesting/advanced` — predict at block N, mine at N+1,
-   * the addresses differ.
-   *
-   * @example
-   * const { hash, manager } = await factory.createManager({
-   *   token: "0xYourToken",
-   *   userSalt: "0x0000000000000000000000000000000000000000000000000000000000000001",
-   * });
-   */
   async createManager(args) {
     return chunkVJKZWYYJ_cjs.withTelemetry(this.#telemetry, "fhe-vesting.factory.createManager", async () => {
       const hasOptions = args.splitEnabled !== void 0 || args.pausableEnabled !== void 0;
@@ -502,28 +475,12 @@ var ConfidentialVestingFactoryClient = class {
         [args.token, args.userSalt, args.splitEnabled ?? true, args.pausableEnabled ?? true],
         args.account
       ) : await this.#write("createManager", [args.token, args.userSalt], args.account);
+      if (args.waitForReceipt === false) {
+        return { hash: chunk66IHPTOK_cjs.asTxHash(hash), manager: void 0, pending: true };
+      }
       return this.#resolveManagerFromReceipt(hash, "createManager");
     });
   }
-  /**
-   * Deploy a new manager clone and return its address, parsed from the
-   * `ManagerCreated` event in the tx receipt.
-   *
-   * This is the recommended entry point for the common "deploy a clone and use
-   * its address" flow. {@link ConfidentialVestingFactoryClient.predictManagerAddress}
-   * is unreliable on a live chain because the factory packs the deployment
-   * block number into the clone's immutable args — predict at block N, mine at
-   * N+1, and the addresses differ.
-   *
-   * Internally: {@link ConfidentialVestingFactoryClient.createManager} →
-   * {@link PublicClient.waitForTransactionReceipt} →
-   * `parseEventLogs({ eventName: "ManagerCreated" })`.
-   *
-   * @example
-   * const { hash, manager } = await factory.createManagerAndGetAddress({
-   *   token, userSalt,
-   * });
-   */
   async createManagerAndGetAddress(args) {
     return this.createManager(args);
   }

package/dist/{chunk-FEDX7B6T.cjs → chunk-6FUHF73F.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkUG5RKLU2_cjs = require('./chunk-UG5RKLU2.cjs');
+var chunkSUYBAF27_cjs = require('./chunk-SUYBAF27.cjs');
 var chunkMVDQMV25_cjs = require('./chunk-MVDQMV25.cjs');
-var chunkFT5H2Q7Y_cjs = require('./chunk-FT5H2Q7Y.cjs');
+var chunkYAL6JSAZ_cjs = require('./chunk-YAL6JSAZ.cjs');
 var chunkJK4XMMKM_cjs = require('./chunk-JK4XMMKM.cjs');
 var chunk66IHPTOK_cjs = require('./chunk-66IHPTOK.cjs');
 var chunk67OV5CX2_cjs = require('./chunk-67OV5CX2.cjs');
@@ -1826,7 +1826,7 @@ var TestnetFaucetClient = class {
     this.#chainId = chainId;
     assertTestnetFaucetChain(chainId);
     const addressOverride = config.address ? chunkJK4XMMKM_cjs.normaliseAddress(config.address) : void 0;
-    const resolved = addressOverride ?? (chainId === void 0 ? void 0 : chunkFT5H2Q7Y_cjs.getConfidentialTestTokenAddress(chainId));
+    const resolved = addressOverride ?? (chainId === void 0 ? void 0 : chunkYAL6JSAZ_cjs.getConfidentialTestTokenAddress(chainId));
     if (!resolved) {
       throw new chunk67OV5CX2_cjs.DeploymentAddressUnavailableError({
         reason: chainId === void 0 ? "chain-id-missing" : "registry-not-deployed",
@@ -1841,7 +1841,7 @@ var TestnetFaucetClient = class {
     this.#telemetry?.event("testnet-faucet.client.init", {
       chainId: chainId ?? null,
       hasWallet: !!this.walletClient,
-      sdkVersion: chunkUG5RKLU2_cjs.SDK_VERSION
+      sdkVersion: chunkSUYBAF27_cjs.SDK_VERSION
     });
   }
   // ============================================================
@@ -1864,7 +1864,7 @@ var TestnetFaucetClient = class {
    */
   async underlyingToken() {
     if (this.#cachedUnderlying) return this.#cachedUnderlying;
-    const fromRegistry = this.#cttAddressIsOverride || this.#chainId === void 0 ? void 0 : chunkFT5H2Q7Y_cjs.getTestTokenAddress(this.#chainId);
+    const fromRegistry = this.#cttAddressIsOverride || this.#chainId === void 0 ? void 0 : chunkYAL6JSAZ_cjs.getTestTokenAddress(this.#chainId);
     const resolved = fromRegistry ?? await this.#readCtt("underlying");
     this.#cachedUnderlying = chunkJK4XMMKM_cjs.normaliseAddress(resolved);
     return this.#cachedUnderlying;

package/dist/{chunk-NWFMBLSQ.js → chunk-7KY4K4PH.js}

@@ -1,4 +1,4 @@
 // src/core/version.ts
-var SDK_VERSION = "1.0.0";
+var SDK_VERSION = "2.0.0-alpha.4";
 
 export { SDK_VERSION };

package/dist/{chunk-FHWSBGWE.cjs → chunk-ARZ5C3FS.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunkWJLECC22_cjs = require('./chunk-WJLECC22.cjs');
+var chunkUUSSWOPR_cjs = require('./chunk-UUSSWOPR.cjs');
 var chunk3QHNYEQD_cjs = require('./chunk-3QHNYEQD.cjs');
-var chunkUHHMVBLU_cjs = require('./chunk-UHHMVBLU.cjs');
-var chunkFT5H2Q7Y_cjs = require('./chunk-FT5H2Q7Y.cjs');
+var chunk6AYJRUGP_cjs = require('./chunk-6AYJRUGP.cjs');
+var chunkYAL6JSAZ_cjs = require('./chunk-YAL6JSAZ.cjs');
 var chunk67OV5CX2_cjs = require('./chunk-67OV5CX2.cjs');
 var react = require('react');
 var wagmi = require('wagmi');
@@ -26,7 +26,7 @@ function useHookFiredEvent(hookName, telemetry, hasWallet, chainId) {
 function tryResolveFactoryAddress(override, chainId) {
   if (override) return override;
   if (chainId === void 0) return void 0;
-  return chunkFT5H2Q7Y_cjs.getFheVestingFactoryAddress(chainId);
+  return chunkYAL6JSAZ_cjs.getFheVestingFactoryAddress(chainId);
 }
 function useMemoFactoryClient(opts = {}) {
   const publicClient = wagmi.usePublicClient({ chainId: opts.chainId });
@@ -39,7 +39,7 @@ function useMemoFactoryClient(opts = {}) {
   const client = react.useMemo(() => {
     if (!publicClient) return void 0;
     if (!resolvedAddress) return void 0;
-    return chunkUHHMVBLU_cjs.createConfidentialVestingFactoryClient({
+    return chunk6AYJRUGP_cjs.createConfidentialVestingFactoryClient({
       publicClient,
       ...walletClient ? { walletClient } : {},
       address: resolvedAddress,
@@ -66,7 +66,7 @@ function computeFactoryResolutionError(override, chainId) {
       clientLabel: "ConfidentialVestingFactoryClient"
     });
   }
-  const resolved = chunkFT5H2Q7Y_cjs.getFheVestingFactoryAddress(chainId);
+  const resolved = chunkYAL6JSAZ_cjs.getFheVestingFactoryAddress(chainId);
   if (!resolved) {
     return new chunk67OV5CX2_cjs.DeploymentAddressUnavailableError({
       reason: "registry-not-deployed",
@@ -89,7 +89,7 @@ function useMemoManagerClient(opts) {
   const client = react.useMemo(() => {
     if (!publicClient) return void 0;
     if (!opts.address) return void 0;
-    return chunkWJLECC22_cjs.createConfidentialVestingManagerClient({
+    return chunkUUSSWOPR_cjs.createConfidentialVestingManagerClient({
       publicClient,
       ...walletClient ? { walletClient } : {},
       address: opts.address,

package/dist/{chunk-SPLNGUFF.js → chunk-AX6MQAWU.js}

@@ -1,6 +1,6 @@
-import { SDK_VERSION } from './chunk-NWFMBLSQ.js';
+import { SDK_VERSION } from './chunk-7KY4K4PH.js';
 import { isContractRevert, mapContractRevert } from './chunk-4RAAATVY.js';
-import { getConfidentialTestTokenAddress, getTestTokenAddress } from './chunk-A4DCEE33.js';
+import { getConfidentialTestTokenAddress, getTestTokenAddress } from './chunk-GHGF65LN.js';
 import { normaliseAddress } from './chunk-ZA673I3O.js';
 import { asEncryptedHandle, asTxHash } from './chunk-KWFFIJYX.js';
 import { TokenOpsSdkError, UnsupportedChainError, DeploymentAddressUnavailableError, TokenOpsContractError, ReceiptEventNotFoundError, ReceiptEventAmbiguousError, MissingWalletClientError, MissingAccountError, InvalidArgumentError } from './chunk-QBJ7O2B4.js';

package/dist/{chunk-IGO5XSPS.js → chunk-BSXEX2SH.js}

@@ -1,7 +1,7 @@
-import { createConfidentialVestingManagerClient } from './chunk-TWT3STIX.js';
+import { createConfidentialVestingManagerClient } from './chunk-K3R27WX4.js';
 import { resolveEncryptor } from './chunk-6GNR22OV.js';
-import { createConfidentialVestingFactoryClient } from './chunk-WJMEBBU7.js';
-import { getFheVestingFactoryAddress } from './chunk-A4DCEE33.js';
+import { createConfidentialVestingFactoryClient } from './chunk-TWU7L5H7.js';
+import { getFheVestingFactoryAddress } from './chunk-GHGF65LN.js';
 import { DeploymentAddressUnavailableError } from './chunk-QBJ7O2B4.js';
 import { useMemo, useRef, useEffect } from 'react';
 import { usePublicClient, useWalletClient } from 'wagmi';

package/dist/{chunk-44YJPMQC.js → chunk-CHGY6B7L.js}

@@ -1,8 +1,8 @@
 import { mapZamaError } from './chunk-WMACINXO.js';
 import { getFhevmAclAddress, requireFhevmAclAddress, ACL_ALLOWED_EVENT } from './chunk-ZWXJTBZO.js';
-import { SDK_VERSION } from './chunk-NWFMBLSQ.js';
+import { SDK_VERSION } from './chunk-7KY4K4PH.js';
 import { isContractRevert, mapContractRevert } from './chunk-4RAAATVY.js';
-import { getFheDisperseSingletonAddress } from './chunk-A4DCEE33.js';
+import { getFheDisperseSingletonAddress } from './chunk-GHGF65LN.js';
 import { normaliseAddress } from './chunk-ZA673I3O.js';
 import { asExternalInputProof, asEncryptedHandle } from './chunk-KWFFIJYX.js';
 import { InvalidArgumentError, TokenOpsSdkError, DeploymentAddressUnavailableError, PausedError, InsufficientFeeError, MissingEncryptorError, ReceiptEventAmbiguousError, MissingWalletClientError, MissingAccountError, BatchTooLargeError } from './chunk-QBJ7O2B4.js';
@@ -2272,7 +2272,8 @@ var ConfidentialDisperseClient = class {
    *
    * Internally composes:
    * - `isRegistered` + `getWallets` / `predictWallets`
-   * - `hasApprovedSubwallets` (wallet modes) or `isOperator(sender, singleton)` (direct mode)
+   * - `isOperator(sender, singleton)` (every mode: each one pulls from the sender) and,
+   *   for the wallet modes, `hasApprovedSubwallets` as well
    * - `calculateFee` / `getBatchLimits`
    * - Structural recipient + amount validation
    *
@@ -2287,12 +2288,25 @@ var ConfidentialDisperseClient = class {
     const { user, token, recipients, amounts, mode } = args;
     assertChecksumAddress(user, "user", "preflightDisperse");
     assertChecksumAddress(token, "token", "preflightDisperse");
-    const [isUserRegistered, predictedWallets, batchLimits, callerBalance, isPaused] = await Promise.all([
+    const [
+      isUserRegistered,
+      predictedWallets,
+      batchLimits,
+      callerBalance,
+      isPaused,
+      hasApprovedSingleton
+    ] = await Promise.all([
       this.isRegistered(user),
       this.predictWallets(user),
       this.getBatchLimits(),
       this.publicClient.getBalance({ address: user }),
-      this.paused()
+      this.paused(),
+      this.publicClient.readContract({
+        address: token,
+        abi: ERC7984_IS_OPERATOR_ABI,
+        functionName: "isOperator",
+        args: [user, this.address]
+      })
     ]);
     const wallets = isUserRegistered ? await this.getWallets(user) : null;
     let hasApprovedSubwallets = {
@@ -2300,15 +2314,7 @@ var ConfidentialDisperseClient = class {
       wallet1: false,
       both: false
     };
-    let hasApprovedSingleton = null;
-    if (mode === "direct") {
-      hasApprovedSingleton = await this.publicClient.readContract({
-        address: token,
-        abi: ERC7984_IS_OPERATOR_ABI,
-        functionName: "isOperator",
-        args: [user, this.address]
-      });
-    } else {
+    if (mode !== "direct") {
       if (isUserRegistered) {
         hasApprovedSubwallets = await this.hasApprovedSubwallets({ user, token });
       } else if (predictedWallets) {
@@ -2390,7 +2396,7 @@ var ConfidentialDisperseClient = class {
         );
       }
     }
-    if (mode === "direct" && hasApprovedSingleton === false) {
+    if (!hasApprovedSingleton) {
       blockers.push("Sender has not approved the singleton as operator on the token");
       blockerErrors.push(
         new SingletonNotApprovedError({
@@ -2439,18 +2445,6 @@ var ConfidentialDisperseClient = class {
       blockerErrors
     };
   }
-  // ============================================================
-  //                       WRITE METHODS
-  // ============================================================
-  /**
-   * Register the caller's dedicated wallet pair for wallet-mode disperses.
-   *
-   * Deploys two deterministic ERC-1167 wallet clones and approves them for `token`.
-   * Can only be called once per user — subsequent calls revert with `UserAlreadyRegistered`.
-   *
-   * @returns `{ hash, wallets }` — `wallets` is parsed from the `UserRegistered` event.
-   * @throws {DisperseSubwalletNotFoundError} if no `UserRegistered` event matching the singleton is found.
-   */
   async register(args) {
     return withTelemetry(this.#telemetry, "fhe-disperse.singleton.register", async () => {
       assertChecksumAddress(args.token, "token", "register");
@@ -2473,6 +2467,9 @@ var ConfidentialDisperseClient = class {
       } catch (err) {
         throw this.#mapRevert("register", err, { user: userAddress }, userAddress);
       }
+      if (args.waitForReceipt === false) {
+        return { hash, wallets: void 0, pending: true };
+      }
       const receipt = await this.publicClient.waitForTransactionReceipt({ hash });
       const events = parseEventLogs({
         abi: disperseConfidentialAbi,
@@ -2532,32 +2529,6 @@ var ConfidentialDisperseClient = class {
     const user = this.#userAddressFromOverride(args.account, "recoverERC20FromWallets");
     return this.#write("recoverERC20FromWallets", [args.token, args.to], args.account, { user });
   }
-  /**
-   * Disperse confidential tokens to multiple recipients.
-   *
-   * SDK responsibilities:
-   * 1. Validates input deterministically (lengths, zero addresses, per-amount
-   *    uint64 bounds, wallet-mode subtotal overflow, batch-limit for the
-   *    selected mode) — using the same {@link validateDisperseInputs} helper
-   *    `preflightDisperse` uses, so an oversized or malformed batch is rejected
-   *    before any FHE encryption time is spent.
-   * 2. For wallet modes: computes group subtotals using the contract's exact split rule.
-   * 3. Encrypts amounts + subtotals in a single batch call (one input proof).
-   * 4. Computes `msg.value` for gas-fee modes; `0` for token-fee mode.
-   * 5. Dispatches to the correct contract function based on `mode`.
-   *
-   * **Silent-zero transfers.** ERC-7984 transfers do not revert when the sender's encrypted balance is insufficient — the transfer succeeds and moves an encrypted zero instead. This is by design: reverting would leak balance information. The transaction receipt alone cannot tell you whether value actually moved.
-   *
-   * **Amount units:** TokenOps confidential (ERC-7984) tokens use a 6-decimals
-   * convention (1 token = 1_000_000 base units), not the 18 decimals typical of
-   * ERC-20. Amount parameters are base units of the token's actual decimals:
-   * for the CTTT test token (6 decimals) `1_000_000n` = 1 CTTT, while the
-   * transparent TTT test token uses 18 decimals. Every entry of `amounts[]`
-   * follows this convention.
-   *
-   * @throws {TokenOpsSdkError} on input validation failure (first deterministic error).
-   * @throws {TokenOpsSdkError} if no encryptor is available at call time.
-   */
   async disperse(args) {
     return withTelemetry(this.#telemetry, "fhe-disperse.singleton.disperse", async () => {
       const { token, mode, recipients, amounts } = args;
@@ -2590,7 +2561,8 @@ var ConfidentialDisperseClient = class {
           wallet,
           userAddr,
           enc,
-          gasFeeOverride: args.gasFeeOverride
+          gasFeeOverride: args.gasFeeOverride,
+          waitForReceipt: args.waitForReceipt
         });
       }
       return this.#disperseWallet({
@@ -2602,7 +2574,8 @@ var ConfidentialDisperseClient = class {
         wallet,
         userAddr,
         enc,
-        gasFeeOverride: args.gasFeeOverride
+        gasFeeOverride: args.gasFeeOverride,
+        waitForReceipt: args.waitForReceipt
       });
     });
   }
@@ -2863,32 +2836,6 @@ var ConfidentialDisperseClient = class {
     assertNonZeroChecksumAddress(to, "to", "withdrawGasFee");
     return this.#write("withdrawGasFee", [to, amount], account);
   }
-  /**
-   * Withdraw accumulated encrypted token fees.
-   *
-   * The amount is encrypted by the caller — pass plaintext `amount` and an
-   * encryptor, or pass `encryptedInput` directly. The contract caps the
-   * withdrawal at the available reserve via `FHE.min`.
-   *
-   * **Amount units:** TokenOps confidential (ERC-7984) tokens use a 6-decimals
-   * convention (1 token = 1_000_000 base units), not the 18 decimals typical of
-   * ERC-20. Amount parameters are base units of the token's actual decimals:
-   * for the CTTT test token (6 decimals) `1_000_000n` = 1 CTTT, while the
-   * transparent TTT test token uses 18 decimals.
-   *
-   * Returns the tx hash plus the **transferred** handle parsed from the
-   * `TokenFeeWithdrawn` event. Decrypt the handle via Zama's `userDecrypt`
-   * to view the actual amount moved (which can be less than requested when
-   * the reserve was smaller than the request). The caller is granted
-   * persistent ACL on this handle by the contract.
-   *
-   * **`encryptedInput` is bound to (this singleton, this caller).** Zama's
-   * KMSVerifier rejects proofs whose `contractAddress` or `userAddress`
-   * don't match the executing tx. If you pre-encrypt on a different chain's
-   * singleton, or for a different caller, the on-chain submission will
-   * revert with a generic verification failure. The plaintext `amount`
-   * path is safer when the caller / chain isn't fixed yet.
-   */
   async withdrawTokenFee(args) {
     assertChecksumAddress(args.token, "token", "withdrawTokenFee");
     assertNonZeroChecksumAddress(args.to, "to", "withdrawTokenFee");
@@ -2920,6 +2867,9 @@ var ConfidentialDisperseClient = class {
     } catch (err) {
       throw this.#mapRevert("withdrawTokenFee", err, void 0, accountAddress(account));
     }
+    if (args.waitForReceipt === false) {
+      return { hash, transferredHandle: void 0, pending: true };
+    }
     const receipt = await this.publicClient.waitForTransactionReceipt({ hash });
     const events = parseEventLogs({
       abi: disperseConfidentialAbi,
@@ -3050,6 +3000,7 @@ var ConfidentialDisperseClient = class {
     } catch (err) {
       throw this.#mapRevert("disperse[direct]", err, { user: userAddr }, userAddr);
     }
+    if (args.waitForReceipt === false) return { hash, distributions: void 0, pending: true };
     const distributions = await this.#parseDirectDistributions(hash);
     return { hash, distributions };
   }
@@ -3100,6 +3051,7 @@ var ConfidentialDisperseClient = class {
       } catch (err) {
         throw this.#mapRevert("disperse[wallet-token-fee]", err, { user: userAddr }, userAddr);
       }
+      if (args.waitForReceipt === false) return { hash: hash2, distributions: void 0, pending: true };
       const distributions2 = await this.#parseWalletDistributions(hash2);
       return { hash: hash2, distributions: distributions2 };
     }
@@ -3137,6 +3089,7 @@ var ConfidentialDisperseClient = class {
     } catch (err) {
       throw this.#mapRevert("disperse[wallet]", err, { user: userAddr }, userAddr);
     }
+    if (args.waitForReceipt === false) return { hash, distributions: void 0, pending: true };
     const distributions = await this.#parseWalletDistributions(hash);
     return { hash, distributions };
   }

package/dist/{chunk-IUKKNJ2R.cjs → chunk-DFK5GCJP.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkPZZK3O3S_cjs = require('./chunk-PZZK3O3S.cjs');
-var chunkAREQJHKA_cjs = require('./chunk-AREQJHKA.cjs');
+var chunkE4IV4M4E_cjs = require('./chunk-E4IV4M4E.cjs');
+var chunkVHKMWWBA_cjs = require('./chunk-VHKMWWBA.cjs');
 var chunkJK4XMMKM_cjs = require('./chunk-JK4XMMKM.cjs');
 var chunk67OV5CX2_cjs = require('./chunk-67OV5CX2.cjs');
 var merkleTree = require('@openzeppelin/merkle-tree');
@@ -148,7 +148,7 @@ function validateCampaignRecipientsInternal(recipients, method) {
     seen.set(key, index);
   });
 }
-async function encryptRoster({ instance, recipients, encryptor, submitter }, method) {
+async function encryptRoster({ instance, recipients, encryptor }, method) {
   validateCampaignRecipientsInternal(recipients, method);
   if (!viem.isAddress(instance, { strict: false })) {
     throw new chunk67OV5CX2_cjs.InvalidArgumentError({
@@ -165,73 +165,36 @@ async function encryptRoster({ instance, recipients, encryptor, submitter }, met
       reason: "is the zero address; inputs must be bound to the airdrop instance"
     });
   }
-  const enc = chunkPZZK3O3S_cjs.resolveEncryptor(encryptor);
+  const enc = chunkE4IV4M4E_cjs.resolveEncryptor(encryptor);
   if (!enc) {
     throw new chunk67OV5CX2_cjs.MissingEncryptorError(method, {
       hint: "Pass an encryptor instance, or a lazy factory that returns one."
     });
   }
-  if (submitter !== void 0) {
-    if (!viem.isAddress(submitter, { strict: false })) {
-      throw new chunk67OV5CX2_cjs.InvalidArgumentError({
-        method,
-        argument: "submitter",
-        reason: "is not a 20-byte hex address",
-        value: submitter
-      });
-    }
-    if (viem.isAddressEqual(submitter, viem.zeroAddress)) {
-      throw new chunk67OV5CX2_cjs.InvalidArgumentError({
-        method,
-        argument: "submitter",
-        reason: "is the zero address; no proof can be bound to it, so no leaf would be claimable"
-      });
-    }
-  }
   const airdrop = chunkJK4XMMKM_cjs.normaliseAddress(instance);
   const accounts = recipients.map((r) => chunkJK4XMMKM_cjs.normaliseAddress(r.recipient));
-  if (submitter !== void 0) {
-    const boundTo = chunkJK4XMMKM_cjs.normaliseAddress(submitter);
-    const chunks = [];
-    for (let i = 0; i < recipients.length; i += MERKLE_BATCH_LIMIT) {
-      chunks.push(recipients.slice(i, i + MERKLE_BATCH_LIMIT));
-    }
-    const encryptedChunks = await Promise.all(
-      chunks.map(
-        (chunk) => chunkPZZK3O3S_cjs.encryptUint64Batch({
-          encryptor: enc,
-          contractAddress: airdrop,
-          userAddress: boundTo,
-          values: chunk.map((r) => r.cumulativeTotal)
-        })
-      )
-    );
-    return accounts.map((account, i) => {
-      const chunk = encryptedChunks[Math.floor(i / MERKLE_BATCH_LIMIT)];
-      return {
-        account,
-        boundTo,
-        handle: chunk.handles[i % MERKLE_BATCH_LIMIT],
-        inputProof: chunk.inputProof
-      };
-    });
+  const chunks = [];
+  for (let i = 0; i < recipients.length; i += MERKLE_BATCH_LIMIT) {
+    chunks.push(recipients.slice(i, i + MERKLE_BATCH_LIMIT));
   }
-  const encrypted = await Promise.all(
-    recipients.map(
-      (r, i) => chunkPZZK3O3S_cjs.encryptUint64({
+  const encryptedChunks = await Promise.all(
+    chunks.map(
+      (chunk) => chunkE4IV4M4E_cjs.encryptUint64Batch({
         encryptor: enc,
         contractAddress: airdrop,
-        userAddress: accounts[i],
-        value: r.cumulativeTotal
+        userAddress: airdrop,
+        values: chunk.map((r) => r.cumulativeTotal)
       })
     )
   );
-  return accounts.map((account, i) => ({
-    account,
-    boundTo: account,
-    handle: encrypted[i].handle,
-    inputProof: encrypted[i].inputProof
-  }));
+  return accounts.map((account, i) => {
+    const chunk = encryptedChunks[Math.floor(i / MERKLE_BATCH_LIMIT)];
+    return {
+      account,
+      handle: chunk.handles[i % MERKLE_BATCH_LIMIT],
+      inputProof: chunk.inputProof
+    };
+  });
 }
 async function encryptCampaignAmounts(args) {
   return encryptRoster(args, "encryptCampaignAmounts");
@@ -239,13 +202,9 @@ async function encryptCampaignAmounts(args) {
 async function buildMerkleCampaign({
   instance,
   recipients,
-  encryptor,
-  submitter
+  encryptor
 }) {
-  const leaves = await encryptRoster(
-    { instance, recipients, encryptor, submitter },
-    "buildMerkleCampaign"
-  );
+  const leaves = await encryptRoster({ instance, recipients, encryptor }, "buildMerkleCampaign");
   return buildMerkleTreeInternal({ instance, leaves }, "buildMerkleCampaign");
 }
 async function planMerkleCampaign({
@@ -255,8 +214,7 @@ async function planMerkleCampaign({
   creator,
   userSalt,
   recipients,
-  encryptor,
-  submitter
+  encryptor
 }) {
   validateCampaignRecipientsInternal(recipients, "planMerkleCampaign");
   const initCodeHashBefore = await factory.getMerkleInitCodeHash({ params, mode });
@@ -269,11 +227,10 @@ async function planMerkleCampaign({
   const campaign = await buildMerkleCampaign({
     instance: predictedAddress,
     recipients,
-    encryptor,
-    submitter
+    encryptor
   });
   const initCodeHashAfter = await factory.getMerkleInitCodeHash({ params, mode });
-  chunkAREQJHKA_cjs.assertPredictionFresh({
+  chunkVHKMWWBA_cjs.assertPredictionFresh({
     variant: "merkle",
     initCodeHashBefore,
     initCodeHashAfter,
@@ -286,14 +243,12 @@ async function rotateMerkleRoot({
   airdrop,
   recipients,
   encryptor,
-  submitter,
   account
 }) {
   const campaign = await buildMerkleCampaign({
     instance: airdrop.address,
     recipients,
-    encryptor,
-    submitter
+    encryptor
   });
   const hash = await airdrop.setMerkleRoot({ newRoot: campaign.root, account });
   return { ...campaign, hash };
@@ -311,7 +266,7 @@ var ASSIGNABLE_ROLES = [
 function planInstanceRoleSplit(args) {
   const { assignment, caller, airdropType } = args;
   if (assignment.feeCollector !== void 0) {
-    throw new chunkAREQJHKA_cjs.FeeCollectorSelfAdministeredError({ requestedGrantee: assignment.feeCollector });
+    throw new chunkVHKMWWBA_cjs.FeeCollectorSelfAdministeredError({ requestedGrantee: assignment.feeCollector });
   }
   const steps = [];
   for (const { key, role, variant } of ASSIGNABLE_ROLES) {
@@ -339,6 +294,32 @@ function planInstanceRoleSplit(args) {
   }
   return steps;
 }
+function encodeInstanceRoleSplit(args) {
+  const constants = {
+    DEFAULT_ADMIN_ROLE: DEFAULT_ADMIN_ROLE_CONSTANT,
+    ...args.roleConstants
+  };
+  const resolved = args.steps.map((step, i) => {
+    const role = constants[step.role];
+    if (role === void 0) {
+      throw new chunk67OV5CX2_cjs.InvalidArgumentError({
+        method: "encodeInstanceRoleSplit",
+        argument: `roleConstants.${step.role}`,
+        reason: `steps[${i}] needs the ${step.role} constant; read it off the instance`
+      });
+    }
+    return { step, role };
+  });
+  return resolved.map(({ step, role }) => ({
+    to: args.airdrop,
+    data: viem.encodeFunctionData({
+      abi: chunkE4IV4M4E_cjs.merkleConfidentialAirdropAbi,
+      functionName: step.kind === "grant" ? "grantRole" : "revokeRole",
+      args: [role, step.account]
+    }),
+    value: 0n
+  }));
+}
 function roleGetterAbiEntry(name) {
   return {
     inputs: [],
@@ -422,8 +403,10 @@ async function grantInstanceRoles(args) {
   return outcomes;
 }
 
+exports.MERKLE_BATCH_LIMIT = MERKLE_BATCH_LIMIT;
 exports.buildMerkleCampaign = buildMerkleCampaign;
 exports.buildMerkleTree = buildMerkleTree;
+exports.encodeInstanceRoleSplit = encodeInstanceRoleSplit;
 exports.encryptCampaignAmounts = encryptCampaignAmounts;
 exports.grantInstanceRoles = grantInstanceRoles;
 exports.leafOf = leafOf;