viem 2.55.8 → 2.55.11

package/_esm/tempo/actions/earn.js

@@ -25,13 +25,14 @@ import * as Abis from '../Abis.js';
 import * as Addresses from '../Addresses.js';
 import { GetVaultEngineChangedError, WaitForPrivateDepositTimeoutError, WaitForPrivateRedeemTimeoutError, } from '../errors.js';
 import { defineCall, pickWriteParameters, resolveCallParameters, resolveTokenWithDecimals, } from '../internal/utils.js';
+import { getPortalAddress } from '../zones/zone.js';
 import * as policyActions from './policy.js';
 import * as tokenActions from './token.js';
 import * as zoneActions from './zone.js';
 /** TIP-403 policy ID that allows every sender, recipient, and mint recipient. */
 export const alwaysAllowPolicyId = 1n;
 /**
- * Creates and attaches an admission-only TIP-403 policy to an Earn vault share
+ * Creates and attaches an admission-only TIP-403 policy to an Earn share
  * token. Existing holders remain able to send shares while recipients and mint
  * recipients must belong to the same whitelist.
  *
@@ -60,7 +61,7 @@ export const alwaysAllowPolicyId = 1n;
  *   })
  * ```
  *
- * @param client - Client authorized to change the vault share token policy.
+ * @param client - Client authorized to change the Earn share token policy.
  * @param parameters - Share token, administrator, and initial members.
  * @returns The configured policy IDs and transaction receipts.
  */
@@ -127,7 +128,7 @@ export async function configureExitSafePolicy(client, parameters) {
     };
 }
 /**
- * Verifies that an Earn vault share token uses the expected exit-safe TIP-403
+ * Verifies that an Earn share token uses the expected exit-safe TIP-403
  * policy and that every required member can receive transfers and mints.
  *
  * @example
@@ -202,7 +203,7 @@ export async function validateExitSafePolicy(client, parameters) {
         })),
     ]);
     if (tokenPolicyId !== policy.transferPolicyId)
-        throw new Error('Earn vault share token transfer policy mismatch.');
+        throw new Error('Earn share token transfer policy mismatch.');
     if (compound[0] !== policy.senderPolicyId ||
         compound[1] !== policy.recipientPolicyId ||
         compound[2] !== policy.mintRecipientPolicyId)
@@ -220,7 +221,7 @@ export async function validateExitSafePolicy(client, parameters) {
         throw new Error(`Required TIP-403 member is unauthorized: ${unauthorized.member}`);
 }
 /**
- * Deposits assets into a vault and mints vault shares to `recipient`. The
+ * Deposits assets into a vault and mints Earn shares to `recipient`. The
  * transaction includes the required asset approval.
  *
  * @example
@@ -257,7 +258,7 @@ export async function deposit(client, parameters) {
         const [args, assetToken] = await Promise.all([
             toDepositArgs(client, parameters),
             readContract(client, {
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 address: parameters.vault,
                 functionName: 'asset',
             }),
@@ -285,7 +286,7 @@ export async function deposit(client, parameters) {
         })();
         return defineCall({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             functionName: 'deposit',
             args: [
                 internal_Token.toBaseUnits(args.assetAmount, undefined),
@@ -328,7 +329,7 @@ export async function deposit(client, parameters) {
         // Earn contracts are user-deployed: several adapters can emit the same
         // signature in one receipt, so filter by emitting address before decode.
         const [log] = parseEventLogs({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'Deposited',
             logs: logs.filter((log) => isAddressEqual(log.address, vault)),
         });
@@ -405,11 +406,11 @@ export async function depositSync(client, parameters) {
         caller: args.caller,
         receipt,
         recipient: args.receiver,
-        shareAmount: args.shares,
+        shareAmount: args.earnShares,
     };
 }
 /**
- * Deposits venue shares into a vault and mints vault shares to `recipient`.
+ * Deposits venue shares into a vault and mints Earn shares to `recipient`.
  * The transaction includes the required venue share approval.
  *
  * @example
@@ -445,7 +446,7 @@ export async function depositShares(client, parameters) {
     /** @internal Shared dispatch; reads the engine for the approval. */
     async function inner(action, client, parameters) {
         const engine = await readContract(client, {
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             address: parameters.vault,
             functionName: 'engine',
         });
@@ -476,8 +477,8 @@ export async function depositShares(client, parameters) {
         })();
         return defineCall({
             address: vault,
-            abi: Abis.vaultAdapter,
-            functionName: 'depositShares',
+            abi: Abis.earnVault,
+            functionName: 'depositVenueShares',
             args: [venueShareAmount, recipient, earnShareAmountMin],
         });
     }
@@ -514,7 +515,7 @@ export async function depositShares(client, parameters) {
         // Earn contracts are user-deployed: several adapters can emit the same
         // signature in one receipt, so filter by emitting address before decode.
         const [log] = parseEventLogs({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'VenueSharesDeposited',
             logs: logs.filter((log) => isAddressEqual(log.address, vault)),
         });
@@ -592,7 +593,7 @@ export async function depositSharesSync(client, parameters) {
         caller: args.caller,
         earnShareAmount: args.earnShares,
         receipt,
-        receivedVenueShareAmount: args.receivedVenueShares,
+        receivedVenueShareAmount: args.receivedEngineShares,
         recipient: args.receiver,
         venueShareAmount: args.requestedVenueShares,
     };
@@ -610,7 +611,9 @@ export async function depositSharesSync(client, parameters) {
  *   recipient: '0x...',
  *   recoveryRecipient: '0x...',
  *   shareAmountMin: 99_500_000n,
+ *   vault: '0x...',
  *   vaultAssetAmountMin: 99_000_000n,
+ *   zoneId: 7,
  * })
  * const hash = await Actions.earn.privateDeposit(zoneClient, prepared)
  * ```
@@ -625,8 +628,8 @@ export async function privateDeposit(client, parameters) {
 }
 (function (privateDeposit) {
     /**
-     * Builds an encrypted Zone withdrawal that deposits into the gateway's
-     * vault and returns the resulting shares to the Zone.
+     * Builds an encrypted Zone withdrawal that deposits into the selected vault
+     * and returns the resulting shares to the Zone.
      *
      * @param client - Parent-chain client.
      * @param parameters - Deposit intent and recovery parameters.
@@ -636,13 +639,23 @@ export async function privateDeposit(client, parameters) {
         const chainId = client.chain?.id;
         if (!chainId)
             throw new Error('`chain` is required.');
-        const { actionId = Hex.random(32), assetAmount, callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, recipient, recoveryRecipient, returnMemo, withdrawalMemo, } = parameters;
+        const { actionId = Hex.random(32), assetAmount, callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, portalAddress: portalAddress_, recipient, recoveryRecipient, returnMemo, vault, withdrawalMemo, zoneId, } = parameters;
+        const portalAddress = portalAddress_ ?? getPortalAddress(chainId, zoneId);
         const readParameters = pickReadParameters(parameters);
         const [fromBlock, config] = await Promise.all([
             getBlockNumber(client, { cacheTime: 0 }),
-            getZoneGatewayConfig(client, { ...readParameters, gateway }),
+            getZoneGatewayConfig(client, {
+                ...readParameters,
+                flow: 0,
+                gateway,
+                vault,
+                zoneId,
+                zonePortal: portalAddress,
+            }),
         ]);
-        const assetToken = parameters.assetToken ?? config.vaultAsset;
+        const assetToken = parameters.assetToken ?? config.privateAsset;
+        if (!isAddressEqual(assetToken, config.privateAsset))
+            throw new Error('`assetToken` must match the Zone gateway private asset.');
         const { encrypted, keyIndex } = await zoneActions.encryptedDeposit.prepareRecipient(client, {
             ...readParameters,
             memo: returnMemo,
@@ -651,20 +664,14 @@ export async function privateDeposit(client, parameters) {
             zoneId: config.zoneId,
         });
         const shareAmountMin = resolveMinimumShareAmount(parameters);
-        const direct = isAddressEqual(assetToken, config.vaultAsset);
-        const data = encodeAbiParameters(Abis.zoneGatewayCallbackData, [
+        const data = encodeAbiParameters(Abis.earnRouterCallbackData, [
             {
+                actionId,
                 flow: 0,
-                outputToken: config.shareToken,
-                keyIndex,
-                encrypted,
-                minVaultAssets: direct
-                    ? assetAmount
-                    : (parameters.vaultAssetAmountMin ?? 0n),
-                minVaultShares: shareAmountMin,
+                minEarnShares: shareAmountMin,
                 minOutputAmount: 0n,
-                actionId,
-                refundRecipient: recoveryRecipient,
+                minVaultAssets: parameters.vaultAssetAmountMin ?? assetAmount,
+                zoneReturn: { encrypted, keyIndex, refundRecipient: recoveryRecipient },
             },
         ]);
         return {
@@ -714,6 +721,7 @@ export async function privateDepositSync(client, parameters) {
  *   actionId: prepared.actionId,
  *   fromBlock: prepared.fromBlock,
  *   gateway: '0x...',
+ *   vault: '0x...',
  * })
  * ```
  *
@@ -722,15 +730,16 @@ export async function privateDepositSync(client, parameters) {
  * @returns The completed gateway deposit.
  */
 export async function waitForPrivateDeposit(client, parameters) {
-    const { actionId, fromBlock, gateway, pollingInterval = client.pollingInterval, timeout = 60_000, } = parameters;
+    const { actionId, fromBlock, gateway, pollingInterval = client.pollingInterval, timeout = 60_000, vault, } = parameters;
     const event = getAbiItem({
-        abi: Abis.zoneGateway,
+        abi: Abis.earnRouter,
         name: 'EarnDeposit',
     });
     const observerId = stringify([
         'waitForPrivateDeposit',
         client.uid,
         gateway,
+        vault,
         actionId,
         fromBlock,
     ]);
@@ -754,7 +763,7 @@ export async function waitForPrivateDeposit(client, parameters) {
             try {
                 const [log] = await getLogs(client, {
                     address: gateway,
-                    args: { actionId },
+                    args: { actionId, earnVault: vault },
                     event,
                     fromBlock,
                     strict: true,
@@ -767,7 +776,7 @@ export async function waitForPrivateDeposit(client, parameters) {
                     actionId: log.args.actionId,
                     inputAmount: log.args.inputAmount,
                     inputToken: log.args.inputToken,
-                    shares: log.args.shares,
+                    shares: log.args.earnShares,
                     tempoBlockNumber: log.blockNumber,
                     vaultAssets: log.args.vaultAssets,
                     zoneDepositHash: log.args.zoneDepositHash,
@@ -812,30 +821,36 @@ export async function waitForPrivateDeposit(client, parameters) {
  */
 export async function getFeeState(client, parameters) {
     const { recipient, vault, ...rest } = parameters;
+    const fees = await readContract(client, {
+        ...rest,
+        abi: Abis.earnVault,
+        address: vault,
+        functionName: 'earnFees',
+    });
     const contracts = [
         defineCall({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'currentFeeConfigId',
         }),
         defineCall({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'feesActive',
         }),
         defineCall({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'highWaterMark',
         }),
         defineCall({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'previewAccruedFees',
         }),
         defineCall({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'targetBase',
         }),
     ];
@@ -843,8 +858,8 @@ export async function getFeeState(client, parameters) {
     // consistent with the batched id.
     const feeConfig = async (configId) => toFeeConfig(await readContract(client, {
         ...rest,
-        abi: Abis.vaultAdapter,
-        address: vault,
+        abi: Abis.earnFees,
+        address: fees,
         functionName: 'feeConfig',
         args: [configId],
     }));
@@ -855,9 +870,9 @@ export async function getFeeState(client, parameters) {
             contracts: [
                 ...contracts,
                 defineCall({
-                    address: vault,
-                    abi: Abis.vaultAdapter,
-                    functionName: 'claimableFeeShares',
+                    address: fees,
+                    abi: Abis.earnFees,
+                    functionName: 'claimableEarnShares',
                     args: [recipient],
                 }),
             ],
@@ -889,7 +904,7 @@ export async function getFeeState(client, parameters) {
     };
 }
 /**
- * Gets an account's asset and vault share balances, allowances, and current
+ * Gets an account's asset and Earn share balances, allowances, and current
  * share value. The value includes fees.
  *
  * @example
@@ -911,7 +926,7 @@ export async function getFeeState(client, parameters) {
  *
  * @param client - Client.
  * @param parameters - Parameters.
- * @returns The asset and vault share balances, allowances, and value.
+ * @returns The asset and Earn share balances, allowances, and value.
  */
 export async function getPosition(client, parameters) {
     const { account: account_ = client.account, vault, ...rest } = parameters;
@@ -924,13 +939,13 @@ export async function getPosition(client, parameters) {
         contracts: [
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'asset',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'shareToken',
+                abi: Abis.earnVault,
+                functionName: 'earnShare',
             }),
         ],
         deployless: true,
@@ -968,7 +983,7 @@ export async function getPosition(client, parameters) {
     });
     const value = await readContract(client, {
         ...rest,
-        abi: Abis.vaultAdapter,
+        abi: Abis.earnVault,
         address: vault,
         args: [shareBalance],
         functionName: 'previewRedeem',
@@ -984,7 +999,7 @@ export async function getPosition(client, parameters) {
     };
 }
 /**
- * Gets the asset output for an exact vault share input, including fees.
+ * Gets the asset output for an exact Earn share input, including fees.
  *
  * @example
  * ```ts
@@ -1040,7 +1055,7 @@ export async function getRedeemQuote(client, parameters) {
         const { shareAmount, vault } = args;
         return defineCall({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             args: [shareAmount],
             functionName: 'previewRedeem',
         });
@@ -1073,16 +1088,24 @@ export async function getRedeemQuote(client, parameters) {
  */
 export async function getVault(client, parameters) {
     const { vault, ...rest } = parameters;
-    const engine = await readContract(client, {
-        ...rest,
-        abi: Abis.vaultAdapter,
-        address: vault,
-        functionName: 'engine',
-    });
+    const [engine, fees] = await Promise.all([
+        readContract(client, {
+            ...rest,
+            abi: Abis.earnVault,
+            address: vault,
+            functionName: 'engine',
+        }),
+        readContract(client, {
+            ...rest,
+            abi: Abis.earnVault,
+            address: vault,
+            functionName: 'earnFees',
+        }),
+    ]);
     const [assetToken, engine_, shareToken, operator, emergencyGuardian, asyncJanitor, engineMigrationMode, depositsPaused, engineShares, shareSupply, isSynced, pendingRedeemCount, feesActive, totalAssets, name, symbol, asyncRedeem, exactWithdraw, inKindDeposit, syncRedeem,] = await multicall(client, {
         ...rest,
         allowFailure: false,
-        contracts: getVault.calls({ engine, vault }),
+        contracts: getVault.calls({ engine, fees, vault }),
         deployless: true,
     });
     if (!isAddressEqual(engine, engine_))
@@ -1107,116 +1130,116 @@ export async function getVault(client, parameters) {
 }
 (function (getVault) {
     /**
-     * Defines the reads used by {@link getVault}. Pass the vault's current
-     * engine address.
+     * Defines the reads used by {@link getVault}. Pass the current engine and
+     * fee contract addresses.
      *
      * @param args - Arguments.
      * @returns The calls.
      */
     function calls(args) {
-        const { engine, vault } = args;
+        const { engine, fees, vault } = args;
         return [
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'asset',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'engine',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'shareToken',
+                abi: Abis.earnVault,
+                functionName: 'earnShare',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'operator',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'emergencyGuardian',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'asyncJanitor',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'engineMigrationMode',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'depositsPaused',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'engineShares',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'shareSupply',
+                abi: Abis.earnVault,
+                functionName: 'totalEarnShares',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'isSynced',
+                abi: Abis.earnVault,
+                functionName: 'isAccountingAligned',
             }),
             defineCall({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'pendingRedeemCount',
+                abi: Abis.earnVault,
+                functionName: 'openRedeemRequestCount',
             }),
             defineCall({
-                address: vault,
-                abi: Abis.vaultAdapter,
+                address: fees,
+                abi: Abis.earnFees,
                 functionName: 'feesActive',
             }),
             defineCall({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'totalAssets',
             }),
             defineCall({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'name',
             }),
             defineCall({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'symbol',
             }),
             defineCall({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.asyncRedeem],
             }),
             defineCall({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.exactWithdraw],
             }),
             defineCall({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.inKindDeposit],
             }),
             defineCall({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.syncRedeem],
             }),
@@ -1225,7 +1248,7 @@ export async function getVault(client, parameters) {
     getVault.calls = calls;
 })(getVault || (getVault = {}));
 /**
- * Gets the vault shares required for an exact asset output, including fees
+ * Gets the Earn shares required for an exact asset output, including fees
  * and ceiling rounding.
  *
  * @example
@@ -1247,7 +1270,7 @@ export async function getVault(client, parameters) {
  *
  * @param client - Client.
  * @param parameters - Parameters.
- * @returns The required vault share input, ceiling-rounded.
+ * @returns The required Earn share input, ceiling-rounded.
  */
 export async function getWithdrawQuote(client, parameters) {
     const { assetAmount, vault, ...rest } = parameters;
@@ -1282,7 +1305,7 @@ export async function getWithdrawQuote(client, parameters) {
         const { assetAmount, vault } = args;
         return defineCall({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             args: [assetAmount],
             functionName: 'previewWithdraw',
         });
@@ -1290,8 +1313,8 @@ export async function getWithdrawQuote(client, parameters) {
     getWithdrawQuote.call = call;
 })(getWithdrawQuote || (getWithdrawQuote = {}));
 /**
- * Redeems vault shares for assets sent to `recipient`. The transaction
- * includes the required vault share approval.
+ * Redeems Earn shares for assets sent to `recipient`. The transaction
+ * includes the required Earn share approval.
  *
  * @example
  * ```ts
@@ -1321,14 +1344,14 @@ export async function redeem(client, parameters) {
     return redeem.inner(sendTransaction, client, parameters);
 }
 (function (redeem) {
-    /** @internal Shared dispatch; reads the vault share token for the approval. */
+    /** @internal Shared dispatch; reads the Earn share token for the approval. */
     async function inner(action, client, parameters) {
         const [args, shareToken] = await Promise.all([
             toRedeemArgs(client, parameters),
             readContract(client, {
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 address: parameters.vault,
-                functionName: 'shareToken',
+                functionName: 'earnShare',
             }),
         ]);
         return (await action(client, {
@@ -1338,7 +1361,7 @@ export async function redeem(client, parameters) {
     }
     redeem.inner = inner;
     /**
-     * Defines a redeem call without an approval. Provide vault share decimals
+     * Defines a redeem call without an approval. Provide Earn share decimals
      * for formatted inputs and an explicit output bound because this builder performs no reads.
      *
      * @param parameters - Client (optional), followed by the call arguments.
@@ -1354,7 +1377,7 @@ export async function redeem(client, parameters) {
         })();
         return defineCall({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             functionName: 'redeem',
             args: [
                 internal_Token.toBaseUnits(args.shareAmount, undefined),
@@ -1365,7 +1388,7 @@ export async function redeem(client, parameters) {
     }
     redeem.call = call;
     /**
-     * Defines the vault share approval and redeem calls for atomic execution.
+     * Defines the Earn share approval and redeem calls for atomic execution.
      * Pass `shareToken` explicitly because this builder performs no reads.
      *
      * @param args - Arguments.
@@ -1397,7 +1420,7 @@ export async function redeem(client, parameters) {
         // Earn contracts are user-deployed: several adapters can emit the same
         // signature in one receipt, so filter by emitting address before decode.
         const [log] = parseEventLogs({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'Redeemed',
             logs: logs.filter((log) => isAddressEqual(log.address, vault)),
         });
@@ -1407,7 +1430,7 @@ export async function redeem(client, parameters) {
     }
     redeem.extractEvent = extractEvent;
     /**
-     * Estimates gas for a redemption, assuming enough vault share allowance.
+     * Estimates gas for a redemption, assuming enough Earn share allowance.
      *
      * @param client - Client.
      * @param parameters - Parameters.
@@ -1421,7 +1444,7 @@ export async function redeem(client, parameters) {
     }
     redeem.estimateGas = estimateGas;
     /**
-     * Simulates a redemption, assuming enough vault share allowance.
+     * Simulates a redemption, assuming enough Earn share allowance.
      *
      * @param client - Client.
      * @param parameters - Parameters.
@@ -1436,7 +1459,7 @@ export async function redeem(client, parameters) {
     redeem.simulate = simulate;
 })(redeem || (redeem = {}));
 /**
- * Redeems vault shares and returns the confirmed receipt and event data.
+ * Redeems Earn shares and returns the confirmed receipt and event data.
  *
  * @example
  * ```ts
@@ -1474,11 +1497,11 @@ export async function redeemSync(client, parameters) {
         caller: args.caller,
         receipt,
         recipient: args.receiver,
-        shareAmount: args.shares,
+        shareAmount: args.earnShares,
     };
 }
 /**
- * Withdraws vault shares from a Zone and redeems them on the parent chain. Use
+ * Withdraws Earn shares from a Zone and redeems them on the parent chain. Use
  * {@link privateRedeem.prepare} to build the encrypted callback.
  *
  * @example
@@ -1489,6 +1512,8 @@ export async function redeemSync(client, parameters) {
  *   recoveryRecipient: '0x...',
  *   shareAmount: 100_000_000n,
  *   slippageBps: 50,
+ *   vault: '0x...',
+ *   zoneId: 7,
  * })
  * const hash = await Actions.earn.privateRedeem(zoneClient, prepared)
  * ```
@@ -1503,7 +1528,7 @@ export async function privateRedeem(client, parameters) {
 }
 (function (privateRedeem) {
     /**
-     * Builds an encrypted Zone withdrawal that redeems vault shares and returns
+     * Builds an encrypted Zone withdrawal that redeems Earn shares and returns
      * the resulting assets to the Zone.
      *
      * @param client - Parent-chain client.
@@ -1514,15 +1539,23 @@ export async function privateRedeem(client, parameters) {
         const chainId = client.chain?.id;
         if (!chainId)
             throw new Error('`chain` is required.');
-        const { actionId = Hex.random(32), callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, recipient, recoveryRecipient, returnMemo, shareAmount, withdrawalMemo, } = parameters;
+        const { actionId = Hex.random(32), callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, portalAddress: portalAddress_, recipient, recoveryRecipient, returnMemo, shareAmount, vault, withdrawalMemo, zoneId, } = parameters;
+        const portalAddress = portalAddress_ ?? getPortalAddress(chainId, zoneId);
         const readParameters = pickReadParameters(parameters);
         const [fromBlock, config] = await Promise.all([
             getBlockNumber(client, { cacheTime: 0 }),
-            getZoneGatewayConfig(client, { ...readParameters, gateway }),
+            getZoneGatewayConfig(client, {
+                ...readParameters,
+                flow: 1,
+                gateway,
+                vault,
+                zoneId,
+                zonePortal: portalAddress,
+            }),
         ]);
-        const assetToken = parameters.assetToken ?? config.vaultAsset;
-        if (isAddressEqual(assetToken, config.shareToken))
-            throw new Error('`assetToken` cannot be the gateway vault share token.');
+        const assetToken = parameters.assetToken ?? config.privateAsset;
+        if (!isAddressEqual(assetToken, config.privateAsset))
+            throw new Error('`assetToken` must match the Zone gateway private asset.');
         const [{ encrypted, keyIndex }, assetAmountMin] = await Promise.all([
             zoneActions.encryptedDeposit.prepareRecipient(client, {
                 ...readParameters,
@@ -1539,23 +1572,19 @@ export async function privateRedeem(client, parameters) {
                 const assetAmount = await getRedeemQuote(client, {
                     ...readParameters,
                     shareAmount,
-                    vault: config.vaultAdapter,
+                    vault: config.vault,
                 });
                 return EarnShares.minimumOutput(assetAmount, parameters.slippageBps);
             })(),
         ]);
-        const direct = isAddressEqual(assetToken, config.vaultAsset);
-        const data = encodeAbiParameters(Abis.zoneGatewayCallbackData, [
+        const data = encodeAbiParameters(Abis.earnRouterCallbackData, [
             {
-                flow: 1,
-                outputToken: assetToken,
-                keyIndex,
-                encrypted,
-                minVaultAssets: direct ? assetAmountMin : 1n,
-                minVaultShares: 0n,
-                minOutputAmount: direct ? 0n : assetAmountMin,
                 actionId,
-                refundRecipient: recoveryRecipient,
+                flow: 1,
+                minEarnShares: 0n,
+                minOutputAmount: assetAmountMin,
+                minVaultAssets: assetAmountMin,
+                zoneReturn: { encrypted, keyIndex, refundRecipient: recoveryRecipient },
             },
         ]);
         return {
@@ -1605,6 +1634,7 @@ export async function privateRedeemSync(client, parameters) {
  *   actionId: prepared.actionId,
  *   fromBlock: prepared.fromBlock,
  *   gateway: '0x...',
+ *   vault: '0x...',
  * })
  * ```
  *
@@ -1613,15 +1643,16 @@ export async function privateRedeemSync(client, parameters) {
  * @returns The completed gateway redemption.
  */
 export async function waitForPrivateRedeem(client, parameters) {
-    const { actionId, fromBlock, gateway, pollingInterval = client.pollingInterval, timeout = 60_000, } = parameters;
+    const { actionId, fromBlock, gateway, pollingInterval = client.pollingInterval, timeout = 60_000, vault, } = parameters;
     const event = getAbiItem({
-        abi: Abis.zoneGateway,
+        abi: Abis.earnRouter,
         name: 'EarnRedeem',
     });
     const observerId = stringify([
         'waitForPrivateRedeem',
         client.uid,
         gateway,
+        vault,
         actionId,
         fromBlock,
     ]);
@@ -1645,7 +1676,7 @@ export async function waitForPrivateRedeem(client, parameters) {
             try {
                 const [log] = await getLogs(client, {
                     address: gateway,
-                    args: { actionId },
+                    args: { actionId, earnVault: vault },
                     event,
                     fromBlock,
                     strict: true,
@@ -1658,7 +1689,7 @@ export async function waitForPrivateRedeem(client, parameters) {
                     actionId: log.args.actionId,
                     outputAmount: log.args.outputAmount,
                     outputToken: log.args.outputToken,
-                    shares: log.args.shares,
+                    shares: log.args.earnShares,
                     tempoBlockNumber: log.blockNumber,
                     vaultAssets: log.args.vaultAssets,
                     zoneDepositHash: log.args.zoneDepositHash,
@@ -1679,8 +1710,8 @@ export async function waitForPrivateRedeem(client, parameters) {
     return await promise;
 }
 /**
- * Withdraws an exact asset amount to `recipient`, up to the specified vault
- * share limit. The transaction includes the required vault share approval;
+ * Withdraws an exact asset amount to `recipient`, up to the specified Earn
+ * share limit. The transaction includes the required Earn share approval;
  * use {@link redeem} for a full exit.
  *
  * @example
@@ -1711,14 +1742,14 @@ export async function withdrawExact(client, parameters) {
     return withdrawExact.inner(sendTransaction, client, parameters);
 }
 (function (withdrawExact) {
-    /** @internal Shared dispatch; reads the vault share token for the approval. */
+    /** @internal Shared dispatch; reads the Earn share token for the approval. */
     async function inner(action, client, parameters) {
         const [args, shareToken] = await Promise.all([
             toWithdrawExactArgs(client, parameters),
             readContract(client, {
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 address: parameters.vault,
-                functionName: 'shareToken',
+                functionName: 'earnShare',
             }),
         ]);
         return (await action(client, {
@@ -1744,7 +1775,7 @@ export async function withdrawExact(client, parameters) {
         })();
         return defineCall({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             functionName: 'withdrawExact',
             args: [
                 internal_Token.toBaseUnits(args.assetAmount, undefined),
@@ -1755,7 +1786,7 @@ export async function withdrawExact(client, parameters) {
     }
     withdrawExact.call = call;
     /**
-     * Defines the vault share approval and withdrawal calls for atomic
+     * Defines the Earn share approval and withdrawal calls for atomic
      * execution. Pass `shareToken` explicitly because this builder performs no reads.
      *
      * @param args - Arguments.
@@ -1789,7 +1820,7 @@ export async function withdrawExact(client, parameters) {
         // Earn contracts are user-deployed: several adapters can emit the same
         // signature in one receipt, so filter by emitting address before decode.
         const [log] = parseEventLogs({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'WithdrewExact',
             logs: logs.filter((log) => isAddressEqual(log.address, vault)),
         });
@@ -1799,7 +1830,7 @@ export async function withdrawExact(client, parameters) {
     }
     withdrawExact.extractEvent = extractEvent;
     /**
-     * Estimates gas for an exact withdrawal, assuming enough vault share allowance.
+     * Estimates gas for an exact withdrawal, assuming enough Earn share allowance.
      *
      * @param client - Client.
      * @param parameters - Parameters.
@@ -1813,7 +1844,7 @@ export async function withdrawExact(client, parameters) {
     }
     withdrawExact.estimateGas = estimateGas;
     /**
-     * Simulates an exact withdrawal, assuming enough vault share allowance.
+     * Simulates an exact withdrawal, assuming enough Earn share allowance.
      *
      * @param client - Client.
      * @param parameters - Parameters.
@@ -1866,7 +1897,7 @@ export async function withdrawExactSync(client, parameters) {
         caller: args.caller,
         receipt,
         recipient: args.receiver,
-        shareAmount: args.sharesBurned,
+        shareAmount: args.earnSharesBurned,
     };
 }
 const zoneGatewayCallbackGas = 10000000n;
@@ -1896,72 +1927,109 @@ function pickReadParameters(parameters) {
     return { blockOverrides, blockTag: parameters.blockTag, stateOverride };
 }
 async function getZoneGatewayConfig(client, parameters) {
-    const { gateway, ...rest } = parameters;
-    const [vaultAdapter, vaultAsset, shareToken, zoneId, zonePortal, supportsAsyncFlow,] = await multicall(client, {
+    const { flow, gateway, vault, zoneId, zonePortal, ...rest } = parameters;
+    const [vaultAsset, shareToken, allowedZoneId, routerVault, privateAsset, routerVaultAsset, routerShareToken, supportsFlow,] = await multicall(client, {
         ...rest,
         allowFailure: false,
         contracts: [
             {
-                abi: Abis.zoneGateway,
+                abi: Abis.earnVault,
+                address: vault,
+                functionName: 'asset',
+            },
+            {
+                abi: Abis.earnVault,
+                address: vault,
+                functionName: 'earnShare',
+            },
+            {
+                abi: Abis.earnRouter,
                 address: gateway,
-                functionName: 'vaultAdapter',
+                functionName: 'allowedZoneId',
             },
             {
-                abi: Abis.zoneGateway,
+                abi: Abis.earnRouter,
                 address: gateway,
-                functionName: 'vaultAsset',
+                functionName: 'earnVault',
             },
             {
-                abi: Abis.zoneGateway,
+                abi: Abis.earnRouter,
                 address: gateway,
-                functionName: 'shareToken',
+                functionName: 'privateAsset',
             },
             {
-                abi: Abis.zoneGateway,
+                abi: Abis.earnRouter,
                 address: gateway,
-                functionName: 'zoneId',
+                functionName: 'vaultAsset',
             },
             {
-                abi: Abis.zoneGateway,
+                abi: Abis.earnRouter,
                 address: gateway,
-                functionName: 'zonePortal',
+                functionName: 'earnShare',
             },
             {
-                abi: Abis.zoneGateway,
+                abi: Abis.earnRouter,
                 address: gateway,
-                args: [2],
+                args: [flow],
                 functionName: 'supportsFlow',
             },
         ],
         deployless: true,
     });
-    if (supportsAsyncFlow)
-        throw new Error('Async Zone gateways are not supported.');
-    return { shareToken, vaultAdapter, vaultAsset, zoneId, zonePortal };
+    if (!supportsFlow)
+        throw new Error('Zone gateway flow is not supported.');
+    if (allowedZoneId !== zoneId)
+        throw new Error('Zone gateway is configured for a different Zone.');
+    if (!isAddressEqual(routerVault, vault))
+        throw new Error('Zone gateway is configured for a different Earn vault.');
+    if (!isAddressEqual(routerVaultAsset, vaultAsset))
+        throw new Error('Zone gateway vault asset does not match the Earn vault.');
+    if (!isAddressEqual(routerShareToken, shareToken))
+        throw new Error('Zone gateway share token does not match the Earn vault.');
+    return {
+        privateAsset,
+        shareToken,
+        vault,
+        vaultAsset,
+        zoneId,
+        zonePortal,
+    };
 }
 // ERC-165 ids of the optional engine capability interfaces (XOR of each
 // interface's function selectors).
 const interfaceIds = {
-    /** `IVaultEngineAsync`. */
+    /** `IEarnEngineAsyncRedeem`. */
     asyncRedeem: '0xa1a6a1d7',
-    /** `IVaultEngineExactWithdraw`. */
+    /** `IEarnEngineExactWithdraw`. */
     exactWithdraw: '0x0adfb0b9',
-    /** `IVaultEngineShares`. */
-    inKindDeposit: '0x7d28a2f2',
-    /** `IVaultEngineSync`. */
-    syncRedeem: '0x370457f4',
+    /** `IEarnEngineInKindDeposit`. */
+    inKindDeposit: '0xce4790a9',
+    /** `IEarnEngineRedeem`. */
+    syncRedeem: '0x94a2d467',
 };
-/** Trims the decoded `IVaultFees.FeeConfig` to its active fixed-fee count. */
+/** Trims the decoded `FeeConfig` to its active fixed-fee count. */
 function toFeeConfig(config) {
     return {
         excess: config.excess,
         fixedFees: config.fixedFees.slice(0, config.fixedFeeCount),
     };
 }
-/** Trims the decoded `IVaultFees.FeePreview` to its active allocation count. */
+/** Maps decoded fee fields to the action result. */
 function toFeePreview(preview) {
-    const { allocationCount, allocations, ...rest } = preview;
-    return { ...rest, allocations: allocations.slice(0, allocationCount) };
+    const { allocationCount, allocations, postFeeValuePerEarnShare, preFeeValuePerEarnShare, targetValuePerEarnShare, totalFeeEarnShares, ...rest } = preview;
+    return {
+        ...rest,
+        allocations: allocations
+            .slice(0, allocationCount)
+            .map(({ feeEarnShares, ...allocation }) => ({
+            ...allocation,
+            feeShares: feeEarnShares,
+        })),
+        postFeeValuePerShare: postFeeValuePerEarnShare,
+        preFeeValuePerShare: preFeeValuePerEarnShare,
+        targetValuePerShare: targetValuePerEarnShare,
+        totalFeeShares: totalFeeEarnShares,
+    };
 }
 /** Resolves `deposit` parameters into the adapter call args. @internal */
 async function toDepositArgs(client, parameters) {
@@ -2069,7 +2137,7 @@ function maximumInput(shareAmount, slippageBps) {
 }
 /**
  * Converts an amount to base units, resolving missing decimals with live
- * reads of the vault's asset or share token. Vault share tokens are not
+ * reads of the vault's asset or share token. Earn share tokens are not
  * genesis-declared, so nothing is cached. @internal
  */
 async function toBaseUnitsLive(client, options) {
@@ -2079,9 +2147,9 @@ async function toBaseUnitsLive(client, options) {
     if (amount.decimals !== undefined)
         return internal_Token.toBaseUnits(amount, amount.decimals);
     const address = await readContract(client, {
-        abi: Abis.vaultAdapter,
+        abi: Abis.earnVault,
         address: vault,
-        functionName: token,
+        functionName: token === 'asset' ? 'asset' : 'earnShare',
     });
     const { decimals } = await resolveTokenWithDecimals(client, {
         token: address,