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

package/dist/{chunk-6HCT4QIX.js → chunk-GHGF65LN.js}

@@ -8,29 +8,32 @@ var DEPLOYED_ADDRESSES = {
       // mainnet omitted — not deployed.
     }
   },
-  // Airdrop v2 (tokenops-fhe-airdrop-v2 @ c5c12c2). The four contracts deploy
-  // together in one scripted run, so a chain either has all of them or none —
-  // which is what `chainsWithDeployment` assumes.
+  // Airdrop v2 (tokenops-fhe-airdrop-v2 @ AIRDROP_CONTRACTS_COMMIT). The four
+  // contracts deploy together in one scripted run, so a chain either has all of
+  // them or none - which is what `chainsWithDeployment` assumes.
   //
-  // Every address moved again at c5c12c2. The internal-audit round changed the
-  // factory and all three implementations, and CREATE3 returns a consumed salt's
-  // EXISTING address without comparing codehashes - so the run bumps the canonical
-  // salt version (2.0.0 → 2.0.2) rather than redeploying over itself. A campaign
-  // planned against the previous factory therefore predicts an address the new
-  // factory will never produce; `PredictionDriftError` is what catches that.
+  // Deployed with the CREATE3 salt version
+  // "sdk-preview-13cad511", set at deploy time; the contracts branch is unchanged
+  // and still names "2.0.2", which is already consumed on Sepolia, so a redeploy
+  // needs its own fresh salt version. A salt change is needed
+  // at all because CREATE3 returns a consumed salt's EXISTING address without
+  // comparing codehashes, so redeploying changed bytecode under the same salt
+  // would silently resolve to the old contracts. A campaign planned against a
+  // previous factory therefore predicts an address the new factory will never
+  // produce; `PredictionDriftError` is what catches that.
   fheAirdrop: {
     airdropFactory: {
-      [sepolia.id]: "0xA10ff713cfeE5348313Cda0B2CA1b190A1194cab"
+      [sepolia.id]: "0xD5906f366Ff50909F403c8EDfDe680015563046a"
       // mainnet omitted — ZamaConfig-gated, not deployed.
     },
     ecdsaImplementation: {
-      [sepolia.id]: "0x8d4E8F379f73D5488a76B6C3CC8a2fD489936BDe"
+      [sepolia.id]: "0xE27A2aF9dCBda2B06535d5502e6dbB90364b43bA"
     },
     merkleImplementation: {
-      [sepolia.id]: "0x4B4F43Ed9aB3F9D10468b59C03d14f55A9d4E82F"
+      [sepolia.id]: "0xccea0A916dBe5aB939915a402942EE6AFDcD505E"
     },
     complianceManagerImplementation: {
-      [sepolia.id]: "0x14bdE71e6b32b50dF1a5Dca1bccD150a319168e2"
+      [sepolia.id]: "0x076719596c21F0Eb358AC45649C3db387D98FADf"
     }
   },
   fheDisperse: {

package/dist/{chunk-TWT3STIX.js → chunk-K3R27WX4.js}

@@ -2,7 +2,7 @@ import { mapZamaError } from './chunk-WMACINXO.js';
 import { resolveEncryptor, encryptUint64Batch, scaleRatio, encryptUint64 } from './chunk-6GNR22OV.js';
 import { getFhevmAclAddress, requireFhevmAclAddress, ACL_ALLOWED_EVENT } from './chunk-ZWXJTBZO.js';
 import { erc7984OperatorAbi } from './chunk-7VELUOMI.js';
-import { SDK_VERSION } from './chunk-NWFMBLSQ.js';
+import { SDK_VERSION } from './chunk-7KY4K4PH.js';
 import { mapContractRevert, isContractRevert } from './chunk-4RAAATVY.js';
 import { normaliseAddress } from './chunk-ZA673I3O.js';
 import { asEncryptedHandle, asTxHash } from './chunk-KWFFIJYX.js';
@@ -1650,6 +1650,8 @@ var ConfidentialVestingManagerClient = class {
    * {@link OperatorNotApprovedError} (the SDK's mapping of the on-chain
    * `ERC7984UnauthorizedSpender` revert, whose message is the canonical
    * `OPERATOR_NOT_APPROVED_REMEDIATION` copy).
+   * Both helpers wait for their receipt by default; a Safe / multisig signer
+   * passes `waitForReceipt: false` to them.
    *
    * @returns Transaction hash. Parse the `VestingCreated` event to extract the `vestingId`.
    * @example
@@ -1706,6 +1708,8 @@ var ConfidentialVestingManagerClient = class {
    * {@link OperatorNotApprovedError} (the SDK's mapping of the on-chain
    * `ERC7984UnauthorizedSpender` revert, whose message is the canonical
    * `OPERATOR_NOT_APPROVED_REMEDIATION` copy).
+   * Both helpers wait for their receipt by default; a Safe / multisig signer
+   * passes `waitForReceipt: false` to them.
    *
    * @returns Transaction hash.
    */
@@ -1929,51 +1933,6 @@ var ConfidentialVestingManagerClient = class {
     }
     return this.#simpleWrite("batchRevokeVesting", [vestingIds], account);
   }
-  /**
-   * Split a vesting into two positions.
-   *
-   * The `numerator/denominator` ratio is auto-scaled via `scaleRatio` to the
-   * universal split constant `FHE_SPLIT_DENOMINATOR` (`90_090_000` =
-   * LCM(1..16, 10_000)) unless `args.preScaled` is set. Every confidential
-   * split lands on the same plaintext denominator so the constant itself
-   * leaks no information about the split's shape; only the encrypted
-   * numerator carries the share. `90_090_000` is well above the contract's
-   * `MIN_SPLIT_DENOMINATOR` (10_000) floor. The SDK encrypts `numerator` —
-   * pass plaintext.
-   *
-   * Two natural input shapes both produce exact integer numerators against
-   * the universal denominator:
-   * - `n/m` with `m ∈ 1..16` (halves, thirds, …, sixteenths)
-   * - `bps/10_000` (basis points)
-   *
-   * Use the {@link share} builder to construct them without manual math:
-   * `share.fraction(1, 7)` or `share.basisPoints(250)` → pass the returned
-   * `{ numerator, denominator }` with `preScaled: true`.
-   *
-   * @param args.numerator Plaintext share numerator (kept confidential on-chain).
-   * @param args.denominator Plaintext denominator — auto-scaled to 90_090_000.
-   * @param args.newRecipient Recipient address for the split-off position.
-   * @returns `{ hash, newVestingId }` — the receipt-derived id of the
-   *          newly-created vesting position, required for any follow-up call
-   *          (claim, transfer, disclose) on the split-off position.
-   * @example
-   * const { newVestingId } = await manager.splitVesting({
-   *   vestingId,
-   *   numerator: 1n, denominator: 2n,   // 50% split; SDK scales to 45_045_000 / 90_090_000
-   *   newRecipient: "0xNewRecipient",
-   * });
-   *
-   * @example
-   * // Basis-point style via the guided builder:
-   * const ratio = share.basisPoints(250);    // 2.5%
-   * const { newVestingId } = await manager.splitVesting({
-   *   vestingId,
-   *   numerator: ratio.numerator,
-   *   denominator: ratio.denominator,
-   *   preScaled: true,
-   *   newRecipient: "0xNewRecipient",
-   * });
-   */
   async splitVesting(args) {
     const wallet = this.#requireWallet("splitVesting");
     const account = this.#resolveAccount(wallet, args.account, "splitVesting");
@@ -2026,6 +1985,9 @@ var ConfidentialVestingManagerClient = class {
         accountAddress(account)
       );
     }
+    if (args.waitForReceipt === false) {
+      return { hash, newVestingId: void 0, pending: true };
+    }
     const receipt = await this.publicClient.waitForTransactionReceipt({ hash });
     const ours = receipt.logs.filter(
       (log) => log.address.toLowerCase() === this.address.toLowerCase()

package/dist/{chunk-GCJFAY4X.js → chunk-KJUNBOJQ.js}

@@ -1,9 +1,9 @@
-import { resolveEncryptor, encryptUint64Batch, encryptUint64 } from './chunk-BXX5TETM.js';
-import { assertPredictionFresh, FeeCollectorSelfAdministeredError } from './chunk-LEYYG4RF.js';
+import { merkleConfidentialAirdropAbi, resolveEncryptor, encryptUint64Batch } from './chunk-67Q6KSVV.js';
+import { assertPredictionFresh, FeeCollectorSelfAdministeredError } from './chunk-YMWMIWBP.js';
 import { normaliseAddress } from './chunk-ZA673I3O.js';
 import { InvalidArgumentError, MissingWalletClientError, MissingAccountError, ContractRevertError, MissingEncryptorError, isTokenOpsSdkError, UnknownWriteFailureError } from './chunk-QBJ7O2B4.js';
 import { StandardMerkleTree } from '@openzeppelin/merkle-tree';
-import { keccak256, encodeAbiParameters, isAddress, isAddressEqual, zeroAddress } from 'viem';
+import { keccak256, encodeAbiParameters, isAddress, isAddressEqual, zeroAddress, encodeFunctionData } from 'viem';
 
 function leafOf(args) {
   const inner = keccak256(
@@ -146,7 +146,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 (!isAddress(instance, { strict: false })) {
     throw new InvalidArgumentError({
@@ -169,67 +169,30 @@ async function encryptRoster({ instance, recipients, encryptor, submitter }, met
       hint: "Pass an encryptor instance, or a lazy factory that returns one."
     });
   }
-  if (submitter !== void 0) {
-    if (!isAddress(submitter, { strict: false })) {
-      throw new InvalidArgumentError({
-        method,
-        argument: "submitter",
-        reason: "is not a 20-byte hex address",
-        value: submitter
-      });
-    }
-    if (isAddressEqual(submitter, zeroAddress)) {
-      throw new InvalidArgumentError({
-        method,
-        argument: "submitter",
-        reason: "is the zero address; no proof can be bound to it, so no leaf would be claimable"
-      });
-    }
-  }
   const airdrop = normaliseAddress(instance);
   const accounts = recipients.map((r) => normaliseAddress(r.recipient));
-  if (submitter !== void 0) {
-    const boundTo = 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) => 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) => encryptUint64({
+  const encryptedChunks = await Promise.all(
+    chunks.map(
+      (chunk) => 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");
@@ -237,13 +200,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({
@@ -253,8 +212,7 @@ async function planMerkleCampaign({
   creator,
   userSalt,
   recipients,
-  encryptor,
-  submitter
+  encryptor
 }) {
   validateCampaignRecipientsInternal(recipients, "planMerkleCampaign");
   const initCodeHashBefore = await factory.getMerkleInitCodeHash({ params, mode });
@@ -267,8 +225,7 @@ async function planMerkleCampaign({
   const campaign = await buildMerkleCampaign({
     instance: predictedAddress,
     recipients,
-    encryptor,
-    submitter
+    encryptor
   });
   const initCodeHashAfter = await factory.getMerkleInitCodeHash({ params, mode });
   assertPredictionFresh({
@@ -284,14 +241,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 };
@@ -337,6 +292,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 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: encodeFunctionData({
+      abi: merkleConfidentialAirdropAbi,
+      functionName: step.kind === "grant" ? "grantRole" : "revokeRole",
+      args: [role, step.account]
+    }),
+    value: 0n
+  }));
+}
 function roleGetterAbiEntry(name) {
   return {
     inputs: [],
@@ -420,4 +401,4 @@ async function grantInstanceRoles(args) {
   return outcomes;
 }
 
-export { buildMerkleCampaign, buildMerkleTree, encryptCampaignAmounts, grantInstanceRoles, leafOf, planInstanceRoleSplit, planMerkleCampaign, rotateMerkleRoot, validateCampaignRecipients };
+export { MERKLE_BATCH_LIMIT, buildMerkleCampaign, buildMerkleTree, encodeInstanceRoleSplit, encryptCampaignAmounts, grantInstanceRoles, leafOf, planInstanceRoleSplit, planMerkleCampaign, rotateMerkleRoot, validateCampaignRecipients };

package/dist/{chunk-6XOAYDC6.cjs → chunk-PO3A2AQX.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
-var chunkJVNJSDQ4_cjs = require('./chunk-JVNJSDQ4.cjs');
+var chunk6AYJRUGP_cjs = require('./chunk-6AYJRUGP.cjs');
 
 // src/fhe-vesting/advanced/factory-advanced.ts
-var ConfidentialVestingFactoryAdvancedClient = class extends chunkJVNJSDQ4_cjs.ConfidentialVestingFactoryClient {
+var ConfidentialVestingFactoryAdvancedClient = class extends chunk6AYJRUGP_cjs.ConfidentialVestingFactoryClient {
   /**
    * Compute the deterministic CREATE2 clone address as the factory would have
    * computed it at `args.blockNumber`.
@@ -20,7 +20,7 @@ var ConfidentialVestingFactoryAdvancedClient = class extends chunkJVNJSDQ4_cjs.C
     if (hasOptions) {
       return this.publicClient.readContract({
         address: this.address,
-        abi: chunkJVNJSDQ4_cjs.confidentialVestingFactoryAbi,
+        abi: chunk6AYJRUGP_cjs.confidentialVestingFactoryAbi,
         functionName: "predictManagerAddressWithOptions",
         args: [
           args.token,
@@ -34,7 +34,7 @@ var ConfidentialVestingFactoryAdvancedClient = class extends chunkJVNJSDQ4_cjs.C
     }
     return this.publicClient.readContract({
       address: this.address,
-      abi: chunkJVNJSDQ4_cjs.confidentialVestingFactoryAbi,
+      abi: chunk6AYJRUGP_cjs.confidentialVestingFactoryAbi,
       functionName: "predictManagerAddress",
       args: [args.token, args.userSalt, args.deployer],
       blockNumber: args.blockNumber

package/dist/{chunk-TND5NDV7.cjs → chunk-QHDMPT7I.cjs}

@@ -1,9 +1,10 @@
 'use strict';
 
-var chunk4AWQJQXY_cjs = require('./chunk-4AWQJQXY.cjs');
-var chunkPG3WXT3K_cjs = require('./chunk-PG3WXT3K.cjs');
+var chunkE4IV4M4E_cjs = require('./chunk-E4IV4M4E.cjs');
+var chunkYAL6JSAZ_cjs = require('./chunk-YAL6JSAZ.cjs');
 var chunk67OV5CX2_cjs = require('./chunk-67OV5CX2.cjs');
 var react = require('react');
+var viem = require('viem');
 var wagmi = require('wagmi');
 
 var FHE_AIRDROP_KEY = "tokenops-sdk";
@@ -39,10 +40,14 @@ function normalizeKeyArg(value) {
   if (typeof value === "string" && value.startsWith("0x")) return value.toLowerCase();
   return value;
 }
+function staleUntilNonZeroAddress(query) {
+  const data = query.state.data;
+  return data !== void 0 && !viem.isAddressEqual(data, viem.zeroAddress) ? Infinity : 0;
+}
 function tryResolveAirdropFactoryAddress(override, chainId) {
   if (override) return override;
   if (chainId === void 0) return void 0;
-  return chunkPG3WXT3K_cjs.getFheAirdropFactoryAddress(chainId);
+  return chunkYAL6JSAZ_cjs.getFheAirdropFactoryAddress(chainId);
 }
 function computeAirdropFactoryResolutionError(override, chainId) {
   if (override) return void 0;
@@ -54,7 +59,7 @@ function computeAirdropFactoryResolutionError(override, chainId) {
       clientLabel: "ConfidentialAirdropFactoryClient"
     });
   }
-  const resolved = chunkPG3WXT3K_cjs.getFheAirdropFactoryAddress(chainId);
+  const resolved = chunkYAL6JSAZ_cjs.getFheAirdropFactoryAddress(chainId);
   if (!resolved) {
     return new chunk67OV5CX2_cjs.DeploymentAddressUnavailableError({
       reason: "registry-not-deployed",
@@ -78,13 +83,13 @@ function useMemoAirdropFactoryClient(opts = {}) {
   const client = react.useMemo(() => {
     if (!publicClient) return void 0;
     if (!resolvedAddress) return void 0;
-    return chunk4AWQJQXY_cjs.createConfidentialAirdropFactoryClient({
+    return chunkE4IV4M4E_cjs.createConfidentialAirdropFactoryClient({
       publicClient,
       ...walletClient ? { walletClient } : {},
       address: resolvedAddress,
       ...chainId !== void 0 ? { chainId } : {},
       // Lazy — invoked per-encryption inside the headless client.
-      encryptor: () => chunk4AWQJQXY_cjs.resolveEncryptor(encryptorSourceRef.current),
+      encryptor: () => chunkE4IV4M4E_cjs.resolveEncryptor(encryptorSourceRef.current),
       ...telemetry ? { telemetry } : {}
     });
   }, [publicClient, walletClient, resolvedAddress, chainId, telemetry]);
@@ -105,7 +110,7 @@ function useMemoAirdropBaseClient(opts) {
   const client = react.useMemo(() => {
     if (!publicClient) return void 0;
     if (!opts.address) return void 0;
-    return chunk4AWQJQXY_cjs.createAirdropBaseClient({
+    return chunkE4IV4M4E_cjs.createAirdropBaseClient({
       publicClient,
       ...walletClient ? { walletClient } : {},
       address: opts.address,
@@ -123,7 +128,7 @@ function useMemoMerkleAirdropClient(opts) {
   const client = react.useMemo(() => {
     if (!publicClient) return void 0;
     if (!opts.address) return void 0;
-    return chunk4AWQJQXY_cjs.createMerkleAirdropClient({
+    return chunkE4IV4M4E_cjs.createMerkleAirdropClient({
       publicClient,
       ...walletClient ? { walletClient } : {},
       address: opts.address,
@@ -141,7 +146,7 @@ function useMemoComplianceManagerClient(opts) {
   const client = react.useMemo(() => {
     if (!publicClient) return void 0;
     if (!opts.address) return void 0;
-    return chunk4AWQJQXY_cjs.createComplianceManagerClient({
+    return chunkE4IV4M4E_cjs.createComplianceManagerClient({
       publicClient,
       ...walletClient ? { walletClient } : {},
       address: opts.address,
@@ -159,11 +164,11 @@ function useMemoEcdsaAirdropClient(opts) {
   const client = react.useMemo(() => {
     if (!publicClient) return void 0;
     if (!opts.address) return void 0;
-    return chunk4AWQJQXY_cjs.createEcdsaAirdropClient({
+    return chunkE4IV4M4E_cjs.createEcdsaAirdropClient({
       publicClient,
       ...walletClient ? { walletClient } : {},
       address: opts.address,
-      dedupMode: opts.dedupMode,
+      ...opts.dedupMode !== void 0 ? { dedupMode: opts.dedupMode } : {},
       ...chainId !== void 0 ? { chainId } : {},
       ...telemetry ? { telemetry } : {}
     });
@@ -176,6 +181,7 @@ var AIRDROP_FN = {
   // instance reads
   claimedAmount: "getClaimedAmount",
   paused: "paused",
+  dedupMode: "dedupMode",
   window: "window",
   config: "config",
   merkleRoot: "merkleRoot",
@@ -192,20 +198,29 @@ var AIRDROP_FN = {
   resolvedGasFee: "resolvedGasFee",
   customFee: "customFee",
   implementations: "implementations",
+  tokenOf: "tokenOf",
+  complianceManagerOf: "complianceManagerOf",
   compliancePolicy: "compliancePolicy",
   upgradeabilityPolicy: "upgradeabilityPolicy",
   factoryHasRole: "factoryHasRole",
   factoryRoleMembers: "factoryRoleMembers",
+  effectiveDelegateToCompliance: "effectiveDelegateToCompliance",
+  effectiveUpgradeable: "effectiveUpgradeable",
+  complianceDelegate: "complianceDelegate",
+  ecdsaInitCodeHash: "getEcdsaInitCodeHash",
+  predictEcdsaAddress: "predictEcdsaAirdropAddress",
+  merkleInitCodeHash: "getMerkleInitCodeHash",
+  predictMerkleAddress: "predictMerkleAirdropAddress",
   // compliance-manager reads
   complianceInfo: "complianceInfo",
   activeDelegate: "isActiveDelegate",
-  clientDelegates: "clientDelegates",
   complianceHasRole: "complianceHasRole",
   complianceRoleMembers: "complianceRoleMembers"
 };
 var airdropKeys = {
   /** One account's cumulative delivered total. Keyed on the CLAIM IDENTITY, never the sender. */
   claimedAmount: (s, account) => airdropQueryKey({ ...s, fn: AIRDROP_FN.claimedAmount, args: [account] }),
+  dedupMode: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.dedupMode, args: [] }),
   paused: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.paused, args: [] }),
   window: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.window, args: [] }),
   config: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.config, args: [] }),
@@ -223,15 +238,17 @@ var airdropKeys = {
   isSignatureValidAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.isSignatureValid }),
   fees: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.fees, args: [] }),
   customFee: (s, creator) => airdropQueryKey({ ...s, fn: AIRDROP_FN.customFee, args: [creator] }),
-  customFeeAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.customFee }),
   resolvedGasFee: (s, creator) => airdropQueryKey({ ...s, fn: AIRDROP_FN.resolvedGasFee, args: [creator] }),
   /** Every creator's resolved fee; the default and any override both move it. */
   resolvedGasFeeAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.resolvedGasFee }),
+  registry: (s, offset, limit) => airdropQueryKey({ ...s, fn: AIRDROP_FN.registry, args: [offset, limit] }),
   /** Every registry page, whatever offset/limit was queried. */
   registryAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.registry }),
   isAirdrop: (s, candidate) => airdropQueryKey({ ...s, fn: AIRDROP_FN.isAirdrop, args: [candidate] }),
   /** Every genuineness answer from this factory; a create adds one address. */
   isAirdropAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.isAirdrop }),
+  tokenOf: (s, airdrop) => airdropQueryKey({ ...s, fn: AIRDROP_FN.tokenOf, args: [airdrop] }),
+  complianceManagerOf: (s, airdrop) => airdropQueryKey({ ...s, fn: AIRDROP_FN.complianceManagerOf, args: [airdrop] }),
   implementations: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.implementations, args: [] }),
   compliancePolicy: (s, creator) => airdropQueryKey({ ...s, fn: AIRDROP_FN.compliancePolicy, args: [creator] }),
   compliancePolicyAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.compliancePolicy }),
@@ -240,22 +257,50 @@ var airdropKeys = {
   factoryHasRole: (s, role, holder) => airdropQueryKey({ ...s, fn: AIRDROP_FN.factoryHasRole, args: [role, holder] }),
   factoryHasRoleAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.factoryHasRole }),
   factoryRoleMembers: (s, role) => airdropQueryKey({ ...s, fn: AIRDROP_FN.factoryRoleMembers, args: [role] }),
-  factoryRoleMembersAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.factoryRoleMembers }),
+  effectiveDelegateToCompliance: (s, creator) => airdropQueryKey({ ...s, fn: AIRDROP_FN.effectiveDelegateToCompliance, args: [creator] }),
+  /** Every creator's effective compliance default; the factory-wide default moves them all. */
+  effectiveDelegateToComplianceAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.effectiveDelegateToCompliance }),
+  effectiveUpgradeable: (s, creator) => airdropQueryKey({ ...s, fn: AIRDROP_FN.effectiveUpgradeable, args: [creator] }),
+  /** Every creator's effective upgradeability; the factory-wide default moves them all. */
+  effectiveUpgradeableAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.effectiveUpgradeable }),
+  complianceDelegate: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.complianceDelegate, args: [] }),
+  /** Keyed on `mode` only: `params` does not affect the hash (see `useEcdsaInitCodeHash`). */
+  ecdsaInitCodeHash: (s, mode) => airdropQueryKey({ ...s, fn: AIRDROP_FN.ecdsaInitCodeHash, args: [mode] }),
+  ecdsaInitCodeHashAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.ecdsaInitCodeHash }),
+  predictEcdsaAddress: (s, mode, deployer, userSalt) => airdropQueryKey({ ...s, fn: AIRDROP_FN.predictEcdsaAddress, args: [mode, deployer, userSalt] }),
+  predictEcdsaAddressAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.predictEcdsaAddress }),
+  merkleInitCodeHash: (s, mode) => airdropQueryKey({ ...s, fn: AIRDROP_FN.merkleInitCodeHash, args: [mode] }),
+  merkleInitCodeHashAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.merkleInitCodeHash }),
+  predictMerkleAddress: (s, mode, deployer, userSalt) => airdropQueryKey({
+    ...s,
+    fn: AIRDROP_FN.predictMerkleAddress,
+    args: [mode, deployer, userSalt]
+  }),
+  predictMerkleAddressAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.predictMerkleAddress }),
   complianceInfo: (s) => airdropQueryKey({ ...s, fn: AIRDROP_FN.complianceInfo, args: [] }),
   activeDelegate: (s, delegate) => airdropQueryKey({ ...s, fn: AIRDROP_FN.activeDelegate, args: [delegate] }),
-  activeDelegateAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.activeDelegate }),
-  clientDelegates: (s, index) => airdropQueryKey({ ...s, fn: AIRDROP_FN.clientDelegates, args: [index] }),
-  clientDelegatesAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.clientDelegates }),
   complianceHasRole: (s, role, holder) => airdropQueryKey({ ...s, fn: AIRDROP_FN.complianceHasRole, args: [role, holder] }),
   complianceHasRoleAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.complianceHasRole }),
-  complianceRoleMembers: (s, role) => airdropQueryKey({ ...s, fn: AIRDROP_FN.complianceRoleMembers, args: [role] }),
-  complianceRoleMembersAll: (s) => airdropQueryKeyPrefix({ ...s, fn: AIRDROP_FN.complianceRoleMembers })
+  complianceRoleMembers: (s, role) => airdropQueryKey({ ...s, fn: AIRDROP_FN.complianceRoleMembers, args: [role] })
 };
+function invalidateAfterCreate(queryClient, scope, airdrop) {
+  for (const queryKey of [
+    airdropKeys.registryAll(scope),
+    airdropKeys.isAirdropAll(scope),
+    airdropKeys.preflightCreateAll(scope),
+    airdropKeys.tokenOf(scope, airdrop),
+    airdropKeys.complianceManagerOf(scope, airdrop)
+  ]) {
+    void queryClient.invalidateQueries({ queryKey });
+  }
+}
 
 exports.AIRDROP_FN = AIRDROP_FN;
 exports.airdropKeys = airdropKeys;
 exports.airdropQueryKey = airdropQueryKey;
 exports.airdropQueryKeyPrefix = airdropQueryKeyPrefix;
+exports.invalidateAfterCreate = invalidateAfterCreate;
+exports.staleUntilNonZeroAddress = staleUntilNonZeroAddress;
 exports.useMemoAirdropBaseClient = useMemoAirdropBaseClient;
 exports.useMemoAirdropFactoryClient = useMemoAirdropFactoryClient;
 exports.useMemoComplianceManagerClient = useMemoComplianceManagerClient;