viem 2.55.8 → 2.55.11

package/tempo/actions/earn.ts

@@ -62,6 +62,7 @@ import {
   resolveTokenWithDecimals,
 } from '../internal/utils.js'
 import type { TransactionReceipt } from '../Transaction.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'
@@ -69,9 +70,9 @@ import * as zoneActions from './zone.js'
 /** TIP-403 policy ID that allows every sender, recipient, and mint recipient. */
 export const alwaysAllowPolicyId = 1n
 
-/** Admission-only TIP-403 policy attached to an Earn vault share token. */
+/** Admission-only TIP-403 policy attached to an Earn share token. */
 export type ExitSafePolicy = {
-  /** Compound policy attached to the vault share token. */
+  /** Compound policy attached to the Earn share token. */
   transferPolicyId: bigint
   /** Sender policy. Must be {@link alwaysAllowPolicyId} so holders can exit. */
   senderPolicyId: bigint
@@ -87,14 +88,14 @@ export type ExitSafePolicyReceipts = {
   eligibilityPolicy: TransactionReceipt
   /** Compound policy creation receipt. */
   compoundPolicy: TransactionReceipt
-  /** Vault share token policy update receipt. */
+  /** Earn share token policy update receipt. */
   tokenPolicy: TransactionReceipt
   /** Eligibility policy admin transfer receipt, when an administrator is provided. */
   policyAdmin?: TransactionReceipt | undefined
 }
 
 /**
- * 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.
  *
@@ -123,7 +124,7 @@ export type ExitSafePolicyReceipts = {
  *   })
  * ```
  *
- * @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.
  */
@@ -205,9 +206,9 @@ export namespace configureExitSafePolicy {
   export type Args = {
     /** Address that will administer recipient eligibility. */
     accessAdministrator: Address
-    /** Addresses initially eligible to receive or be minted vault shares. */
+    /** Addresses initially eligible to receive or be minted Earn shares. */
     initialMembers: readonly Address[]
-    /** Earn vault share token. */
+    /** Earn share token. */
     shareToken: Address
   }
   export type Parameters<
@@ -224,7 +225,7 @@ export namespace configureExitSafePolicy {
 }
 
 /**
- * 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
@@ -307,7 +308,7 @@ export async function validateExitSafePolicy<chain extends Chain | undefined>(
     ])
 
   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 ||
@@ -337,9 +338,9 @@ export namespace validateExitSafePolicy {
     accessAdministrator: Address
     /** Expected exit-safe policy IDs. */
     policy: ExitSafePolicy
-    /** Addresses that must be eligible to receive or be minted vault shares. */
+    /** Addresses that must be eligible to receive or be minted Earn shares. */
     requiredMembers: readonly Address[]
-    /** Earn vault share token. */
+    /** Earn share token. */
     shareToken: Address
   }
   export type Parameters = Omit<ReadParameters, 'account'> & Args
@@ -349,7 +350,7 @@ export namespace validateExitSafePolicy {
 }
 
 /**
- * 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
@@ -391,17 +392,17 @@ export namespace deposit {
   export type Args = {
     /** Assets to deposit; base units or `{ formatted, decimals? }` (asset decimals). */
     assetAmount: internal_Token.AmountInput
-    /** Vault share recipient. @default `account.address` */
+    /** Earn share recipient. @default `account.address` */
     recipient?: Address | undefined
     /** Vault address. */
     vault: Address
   } & OneOf<
     | {
-        /** Minimum vault share output to accept; must be greater than zero. */
+        /** Minimum Earn share output to accept; must be greater than zero. */
         shareAmountMin: bigint
       }
     | {
-        /** Quoted vault share output; floored by `slippageBps`. */
+        /** Quoted Earn share output; floored by `slippageBps`. */
         shareAmount: bigint
         /** Slippage tolerance in basis points under `shareAmount` (50 = 0.5%). */
         slippageBps: number
@@ -428,7 +429,7 @@ export namespace deposit {
     const [args, assetToken] = await Promise.all([
       toDepositArgs(client, parameters as never),
       readContract(client, {
-        abi: Abis.vaultAdapter,
+        abi: Abis.earnVault,
         address: parameters.vault,
         functionName: 'asset',
       }),
@@ -457,7 +458,7 @@ export namespace deposit {
     })()
     return defineCall({
       address: vault,
-      abi: Abis.vaultAdapter,
+      abi: Abis.earnVault,
       functionName: 'deposit',
       args: [
         internal_Token.toBaseUnits(args.assetAmount, undefined),
@@ -470,17 +471,17 @@ export namespace deposit {
     export type Args = {
       /** Assets to deposit; base units or `{ formatted, decimals? }` (asset decimals). */
       assetAmount: internal_Token.AmountInput
-      /** Vault share recipient. */
+      /** Earn share recipient. */
       recipient: Address
       /** Vault address. */
       vault: Address
     } & OneOf<
       | {
-          /** Minimum vault share output to accept. */
+          /** Minimum Earn share output to accept. */
           shareAmountMin: bigint
         }
       | {
-          /** Quoted vault share output; floored by `slippageBps`. */
+          /** Quoted Earn share output; floored by `slippageBps`. */
           shareAmount: bigint
           /** Slippage tolerance in basis points under `shareAmount` (50 = 0.5%). */
           slippageBps: number
@@ -526,7 +527,7 @@ export namespace deposit {
     // 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)),
     })
@@ -567,7 +568,7 @@ export namespace deposit {
   >(
     client: Client<Transport, chain, account>,
     parameters: deposit.Parameters<chain, account>,
-  ): Promise<SimulateContractReturnType<typeof Abis.vaultAdapter, 'deposit'>> {
+  ): Promise<SimulateContractReturnType<typeof Abis.earnVault, 'deposit'>> {
     return simulateContract(client, {
       ...pickWriteParameters(parameters as never),
       ...deposit.call(await toDepositArgs(client, parameters as never)),
@@ -620,7 +621,7 @@ export async function depositSync<
     caller: args.caller,
     receipt,
     recipient: args.receiver,
-    shareAmount: args.shares,
+    shareAmount: args.earnShares,
   }
 }
 
@@ -637,9 +638,9 @@ export namespace depositSync {
     caller: Address
     /** Transaction receipt. */
     receipt: TransactionReceipt
-    /** Vault share recipient. */
+    /** Earn share recipient. */
     recipient: Address
-    /** Vault shares minted. */
+    /** Earn shares minted. */
     shareAmount: bigint
   }>
   // TODO: exhaustive error type
@@ -647,7 +648,7 @@ export namespace depositSync {
 }
 
 /**
- * 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
@@ -690,7 +691,7 @@ export namespace depositShares {
   export type Args = {
     /** Venue shares to deposit, base units. */
     venueShareAmount: bigint
-    /** Vault share recipient. @default `account.address` */
+    /** Earn share recipient. @default `account.address` */
     recipient?: Address | undefined
     /** Vault address. */
     vault: Address
@@ -698,11 +699,11 @@ export namespace depositShares {
     venueShareToken: Address
   } & OneOf<
     | {
-        /** Minimum vault share output to accept; must be greater than zero. */
+        /** Minimum Earn share output to accept; must be greater than zero. */
         earnShareAmountMin: bigint
       }
     | {
-        /** Quoted vault share output; floored by `slippageBps`. */
+        /** Quoted Earn share output; floored by `slippageBps`. */
         earnShareAmount: bigint
         /** Slippage tolerance in basis points under `earnShareAmount` (50 = 0.5%). */
         slippageBps: number
@@ -727,7 +728,7 @@ export namespace depositShares {
     parameters: depositShares.Parameters<chain, account>,
   ): Promise<ReturnType<action>> {
     const engine = await readContract(client, {
-      abi: Abis.vaultAdapter,
+      abi: Abis.earnVault,
       address: parameters.vault,
       functionName: 'engine',
     })
@@ -759,8 +760,8 @@ export namespace depositShares {
     })()
     return defineCall({
       address: vault,
-      abi: Abis.vaultAdapter,
-      functionName: 'depositShares',
+      abi: Abis.earnVault,
+      functionName: 'depositVenueShares',
       args: [venueShareAmount, recipient, earnShareAmountMin],
     })
   }
@@ -768,17 +769,17 @@ export namespace depositShares {
     export type Args = {
       /** Venue shares to deposit, base units. */
       venueShareAmount: bigint
-      /** Vault share recipient. */
+      /** Earn share recipient. */
       recipient: Address
       /** Vault address. */
       vault: Address
     } & OneOf<
       | {
-          /** Minimum vault share output to accept. */
+          /** Minimum Earn share output to accept. */
           earnShareAmountMin: bigint
         }
       | {
-          /** Quoted vault share output; floored by `slippageBps`. */
+          /** Quoted Earn share output; floored by `slippageBps`. */
           earnShareAmount: bigint
           /** Slippage tolerance in basis points under `earnShareAmount` (50 = 0.5%). */
           slippageBps: number
@@ -825,7 +826,7 @@ export namespace depositShares {
     // 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)),
     })
@@ -867,7 +868,7 @@ export namespace depositShares {
     client: Client<Transport, chain, account>,
     parameters: depositShares.Parameters<chain, account>,
   ): Promise<
-    SimulateContractReturnType<typeof Abis.vaultAdapter, 'depositShares'>
+    SimulateContractReturnType<typeof Abis.earnVault, 'depositVenueShares'>
   > {
     return simulateContract(client, {
       ...pickWriteParameters(parameters as never),
@@ -922,7 +923,7 @@ export async function depositSharesSync<
     caller: args.caller,
     earnShareAmount: args.earnShares,
     receipt,
-    receivedVenueShareAmount: args.receivedVenueShares,
+    receivedVenueShareAmount: args.receivedEngineShares,
     recipient: args.receiver,
     venueShareAmount: args.requestedVenueShares,
   }
@@ -938,13 +939,13 @@ export namespace depositSharesSync {
   export type ReturnValue = Compute<{
     /** Depositing caller. */
     caller: Address
-    /** Vault shares minted. */
+    /** Earn shares minted. */
     earnShareAmount: bigint
     /** Transaction receipt. */
     receipt: TransactionReceipt
     /** Venue shares measured as received by the engine. */
     receivedVenueShareAmount: bigint
-    /** Vault share recipient. */
+    /** Earn share recipient. */
     recipient: Address
     /** Venue shares requested for pull. */
     venueShareAmount: bigint
@@ -966,7 +967,9 @@ export namespace depositSharesSync {
  *   recipient: '0x...',
  *   recoveryRecipient: '0x...',
  *   shareAmountMin: 99_500_000n,
+ *   vault: '0x...',
  *   vaultAssetAmountMin: 99_000_000n,
+ *   zoneId: 7,
  * })
  * const hash = await Actions.earn.privateDeposit(zoneClient, prepared)
  * ```
@@ -996,8 +999,8 @@ export namespace privateDeposit {
   export type ErrorType = zoneActions.requestWithdrawal.ErrorType
 
   /**
-   * 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.
@@ -1015,17 +1018,30 @@ export namespace privateDeposit {
       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,
@@ -1035,20 +1051,14 @@ export namespace privateDeposit {
         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 {
@@ -1071,9 +1081,9 @@ export namespace privateDeposit {
     export type Args = PrivatePreparationParameters & {
       /** Assets withdrawn from the Zone, base units. */
       assetAmount: bigint
-      /** Asset token withdrawn from the Zone. @default gateway vault asset */
+      /** Private asset withdrawn from the Zone. @default gateway private asset */
       assetToken?: Address | undefined
-      /** Minimum gateway vault assets accepted after swapping `assetToken`. @default `0n` */
+      /** Minimum vault assets accepted after conversion. @default `assetAmount` */
       vaultAssetAmountMin?: bigint | undefined
     } & MinimumShareAmountParameters
     export type ReturnValue = PreparedZoneRequest
@@ -1130,6 +1140,7 @@ export namespace privateDepositSync {
  *   actionId: prepared.actionId,
  *   fromBlock: prepared.fromBlock,
  *   gateway: '0x...',
+ *   vault: '0x...',
  * })
  * ```
  *
@@ -1147,15 +1158,17 @@ export async function waitForPrivateDeposit<chain extends Chain | undefined>(
     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,
   ])
@@ -1186,7 +1199,7 @@ export async function waitForPrivateDeposit<chain extends Chain | undefined>(
           try {
             const [log] = await getLogs(client, {
               address: gateway,
-              args: { actionId },
+              args: { actionId, earnVault: vault },
               event,
               fromBlock,
               strict: true,
@@ -1198,7 +1211,7 @@ export async function waitForPrivateDeposit<chain extends Chain | undefined>(
               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,
@@ -1236,6 +1249,8 @@ export namespace waitForPrivateDeposit {
     pollingInterval?: number | undefined
     /** Timeout in milliseconds; `0` disables it. @default `60_000` */
     timeout?: number | undefined
+    /** Vault address. */
+    vault: Address
   }
   export type ReturnType = {
     /** Correlation id for the completed deposit. */
@@ -1244,7 +1259,7 @@ export namespace waitForPrivateDeposit {
     inputAmount: bigint
     /** Token delivered to the gateway. */
     inputToken: Address
-    /** Vault shares returned to the Zone. */
+    /** Earn shares returned to the Zone. */
     shares: bigint
     /** Parent-chain block containing the gateway event. */
     tempoBlockNumber: bigint
@@ -1289,30 +1304,36 @@ export async function getFeeState<chain extends Chain | undefined>(
   parameters: getFeeState.Parameters,
 ): Promise<getFeeState.ReturnValue> {
   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',
     }),
   ] as const
@@ -1322,8 +1343,8 @@ export async function getFeeState<chain extends Chain | undefined>(
     toFeeConfig(
       await readContract(client, {
         ...rest,
-        abi: Abis.vaultAdapter,
-        address: vault,
+        abi: Abis.earnFees,
+        address: fees,
         functionName: 'feeConfig',
         args: [configId],
       }),
@@ -1336,9 +1357,9 @@ export async function getFeeState<chain extends Chain | undefined>(
         contracts: [
           ...contracts,
           defineCall({
-            address: vault,
-            abi: Abis.vaultAdapter,
-            functionName: 'claimableFeeShares',
+            address: fees,
+            abi: Abis.earnFees,
+            functionName: 'claimableEarnShares',
             args: [recipient],
           }),
         ],
@@ -1373,7 +1394,7 @@ export async function getFeeState<chain extends Chain | undefined>(
 
 export namespace getFeeState {
   export type Args = {
-    /** Optional fee recipient whose claimable vault shares are included. */
+    /** Optional fee recipient whose claimable Earn shares are included. */
     recipient?: Address | undefined
     /** Vault address. */
     vault: Address
@@ -1388,11 +1409,11 @@ export namespace getFeeState {
     configId: bigint
     /** Whether fees are configured and not emergency-disabled. */
     feesActive: boolean
-    /** Post-fee high-water mark per vault share. */
+    /** Post-fee high-water mark per Earn share. */
     highWaterMark: bigint
     /** Pending fee amounts. */
     preview: FeePreview
-    /** Excess-return fee target per vault share. */
+    /** Excess-return fee target per Earn share. */
     targetBase: bigint
   }
   // TODO: exhaustive error type
@@ -1405,22 +1426,22 @@ export type FeeConfig = {
   excess: {
     /** Excess fee recipient. */
     account: Address
-    /** Annual target growth rate, scaled to 18 decimals. */
-    annualTargetRate: bigint
+    /** Annual target growth rate in basis points. */
+    annualTargetRateBps: number
     /** Whether the excess fee is active. */
     enabled: boolean
-    /** Rate applied above the target, scaled to 18 decimals. */
-    excessFeeRate: bigint
+    /** Rate applied above the target in basis points. */
+    excessFeeRateBps: number
   }
-  /** Fixed fee recipients and their 18-decimal rates. */
-  fixedFees: readonly { account: Address; rate: bigint }[]
+  /** Fixed fee recipients and their rates in basis points. */
+  fixedFees: readonly { account: Address; rateBps: number }[]
 }
 
 /** Pending vault fee amounts. */
 export type FeePreview = {
-  /** Assets backing active vault shares. */
+  /** Assets backing active Earn shares. */
   activeAssets: bigint
-  /** Fee allocations in assets and vault shares. */
+  /** Fee allocations in assets and Earn shares. */
   allocations: readonly {
     account: Address
     feeAssets: bigint
@@ -1432,20 +1453,20 @@ export type FeePreview = {
   fixedFeeAssets: bigint
   /** Accrual above the high-water mark, asset units. */
   positiveAccrualAssets: bigint
-  /** Scaled asset value per vault share after fees. */
+  /** Scaled asset value per Earn share after fees. */
   postFeeValuePerShare: bigint
-  /** Scaled asset value per vault share before fees. */
+  /** Scaled asset value per Earn share before fees. */
   preFeeValuePerShare: bigint
-  /** Scaled excess-fee target per vault share. */
+  /** Scaled excess-fee target per Earn share. */
   targetValuePerShare: bigint
   /** Total fee liability, asset units. */
   totalFeeAssets: bigint
-  /** Vault shares minted to cover the total fee. */
+  /** Earn shares minted to cover the total fee. */
   totalFeeShares: bigint
 }
 
 /**
- * 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
@@ -1467,7 +1488,7 @@ export type FeePreview = {
  *
  * @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<
   chain extends Chain | undefined,
@@ -1485,13 +1506,13 @@ export async function getPosition<
     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,
@@ -1530,7 +1551,7 @@ export async function getPosition<
     })
   const value = await readContract(client, {
     ...rest,
-    abi: Abis.vaultAdapter,
+    abi: Abis.earnVault,
     address: vault,
     args: [shareBalance],
     functionName: 'previewRedeem',
@@ -1562,13 +1583,13 @@ export namespace getPosition {
     assetBalance: bigint
     /** Token accepted by the vault. */
     assetToken: Address
-    /** Vault shares the vault may spend from the account. */
+    /** Earn shares the vault may spend from the account. */
     shareAllowance: bigint
-    /** Vault share balance held by the account. */
+    /** Earn share balance held by the account. */
     shareBalance: bigint
-    /** Token representing vault shares. */
+    /** Token representing Earn shares. */
     shareToken: Address
-    /** Current asset value of the vault share balance, including fees. */
+    /** Current asset value of the Earn share balance, including fees. */
     value: bigint
   }
   // TODO: exhaustive error type
@@ -1576,7 +1597,7 @@ export namespace getPosition {
 }
 
 /**
- * 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
@@ -1612,7 +1633,7 @@ export async function getRedeemQuote<chain extends Chain | undefined>(
 
 export namespace getRedeemQuote {
   export type Args = {
-    /** Exact vault share input, base units. */
+    /** Exact Earn share input, base units. */
     shareAmount: bigint
     /** Vault address. */
     vault: Address
@@ -1620,7 +1641,7 @@ export namespace getRedeemQuote {
   export type Parameters = Omit<ReadParameters, 'account'> & Args
   /** Asset output, including fees. */
   export type ReturnValue = ReadContractReturnType<
-    typeof Abis.vaultAdapter,
+    typeof Abis.earnVault,
     'previewRedeem',
     never
   >
@@ -1652,7 +1673,7 @@ export namespace getRedeemQuote {
     const { shareAmount, vault } = args
     return defineCall({
       address: vault,
-      abi: Abis.vaultAdapter,
+      abi: Abis.earnVault,
       args: [shareAmount],
       functionName: 'previewRedeem',
     })
@@ -1688,12 +1709,20 @@ export async function getVault<chain extends Chain | undefined>(
   parameters: getVault.Parameters,
 ): Promise<getVault.ReturnValue> {
   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_,
@@ -1718,7 +1747,7 @@ export async function getVault<chain extends Chain | undefined>(
   ] = await multicall(client, {
     ...rest,
     allowFailure: false,
-    contracts: getVault.calls({ engine, vault }),
+    contracts: getVault.calls({ engine, fees, vault }),
     deployless: true,
   })
   if (!isAddressEqual(engine, engine_))
@@ -1786,131 +1815,131 @@ export namespace getVault {
     engineShares: bigint
     /** Whether fees are configured and not emergency-disabled. */
     feesActive: boolean
-    /** Whether vault share supply matches its asset backing. */
+    /** Whether Earn share supply matches its asset backing. */
     isSynced: boolean
     /** Vault governance address. */
     operator: Address
     /** Open queued redemptions. */
     pendingRedeemCount: bigint
-    /** Active vault share supply. */
+    /** Active Earn share supply. */
     shareSupply: bigint
-    /** Token representing vault shares. */
+    /** Token representing Earn shares. */
     shareToken: Address
   }
   // TODO: exhaustive error type
   export type ErrorType = GetVaultEngineChangedErrorType | BaseErrorType
 
   /**
-   * 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.
    */
-  export function calls(args: Args & { engine: Address }) {
-    const { engine, vault } = args
+  export function calls(args: Args & { engine: Address; fees: Address }) {
+    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],
       }),
@@ -1919,7 +1948,7 @@ export namespace 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
@@ -1941,7 +1970,7 @@ export namespace getVault {
  *
  * @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<chain extends Chain | undefined>(
   client: Client<Transport, chain>,
@@ -1962,9 +1991,9 @@ export namespace getWithdrawQuote {
     vault: Address
   }
   export type Parameters = Omit<ReadParameters, 'account'> & Args
-  /** Required vault share input, ceiling-rounded. */
+  /** Required Earn share input, ceiling-rounded. */
   export type ReturnValue = ReadContractReturnType<
-    typeof Abis.vaultAdapter,
+    typeof Abis.earnVault,
     'previewWithdraw',
     never
   >
@@ -1996,7 +2025,7 @@ export namespace getWithdrawQuote {
     const { assetAmount, vault } = args
     return defineCall({
       address: vault,
-      abi: Abis.vaultAdapter,
+      abi: Abis.earnVault,
       args: [assetAmount],
       functionName: 'previewWithdraw',
     })
@@ -2004,8 +2033,8 @@ export namespace 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
@@ -2043,7 +2072,7 @@ export async function redeem<
 
 export namespace redeem {
   export type Args = {
-    /** Vault shares to redeem; base units or `{ formatted, decimals? }`. */
+    /** Earn shares to redeem; base units or `{ formatted, decimals? }`. */
     shareAmount: internal_Token.AmountInput
     /** Asset recipient. @default `account.address` */
     recipient?: Address | undefined
@@ -2073,7 +2102,7 @@ export namespace redeem {
   // TODO: exhaustive error type
   export type ErrorType = BaseErrorType
 
-  /** @internal Shared dispatch; reads the vault share token for the approval. */
+  /** @internal Shared dispatch; reads the Earn share token for the approval. */
   export async function inner<
     action extends typeof sendTransaction | typeof sendTransactionSync,
     chain extends Chain | undefined,
@@ -2086,9 +2115,9 @@ export namespace redeem {
     const [args, shareToken] = await Promise.all([
       toRedeemArgs(client, parameters as never),
       readContract(client, {
-        abi: Abis.vaultAdapter,
+        abi: Abis.earnVault,
         address: parameters.vault,
-        functionName: 'shareToken',
+        functionName: 'earnShare',
       }),
     ])
     return (await action(client, {
@@ -2098,7 +2127,7 @@ export namespace redeem {
   }
 
   /**
-   * 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.
@@ -2115,7 +2144,7 @@ export namespace redeem {
     })()
     return defineCall({
       address: vault,
-      abi: Abis.vaultAdapter,
+      abi: Abis.earnVault,
       functionName: 'redeem',
       args: [
         internal_Token.toBaseUnits(args.shareAmount, undefined),
@@ -2126,7 +2155,7 @@ export namespace redeem {
   }
   export namespace call {
     export type Args = {
-      /** Vault shares to redeem; base units or `{ formatted, decimals? }`. */
+      /** Earn shares to redeem; base units or `{ formatted, decimals? }`. */
       shareAmount: internal_Token.AmountInput
       /** Asset recipient. */
       recipient: Address
@@ -2147,7 +2176,7 @@ export namespace redeem {
   }
 
   /**
-   * 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.
@@ -2155,7 +2184,7 @@ export namespace redeem {
    */
   export function calls(
     args: call.Args & {
-      /** Vault share token approved for the redemption. */
+      /** Earn share token approved for the redemption. */
       shareToken: Address
     },
   ) {
@@ -2184,7 +2213,7 @@ export namespace redeem {
     // 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)),
     })
@@ -2193,7 +2222,7 @@ export namespace redeem {
   }
 
   /**
-   * 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.
@@ -2213,7 +2242,7 @@ export namespace redeem {
   }
 
   /**
-   * Simulates a redemption, assuming enough vault share allowance.
+   * Simulates a redemption, assuming enough Earn share allowance.
    *
    * @param client - Client.
    * @param parameters - Parameters.
@@ -2225,7 +2254,7 @@ export namespace redeem {
   >(
     client: Client<Transport, chain, account>,
     parameters: redeem.Parameters<chain, account>,
-  ): Promise<SimulateContractReturnType<typeof Abis.vaultAdapter, 'redeem'>> {
+  ): Promise<SimulateContractReturnType<typeof Abis.earnVault, 'redeem'>> {
     return simulateContract(client, {
       ...pickWriteParameters(parameters as never),
       ...redeem.call(await toRedeemArgs(client, parameters as never)),
@@ -2234,7 +2263,7 @@ export namespace 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
@@ -2278,7 +2307,7 @@ export async function redeemSync<
     caller: args.caller,
     receipt,
     recipient: args.receiver,
-    shareAmount: args.shares,
+    shareAmount: args.earnShares,
   }
 }
 
@@ -2297,7 +2326,7 @@ export namespace redeemSync {
     receipt: TransactionReceipt
     /** Asset recipient. */
     recipient: Address
-    /** Vault shares burned. */
+    /** Earn shares burned. */
     shareAmount: bigint
   }>
   // TODO: exhaustive error type
@@ -2305,7 +2334,7 @@ export namespace redeemSync {
 }
 
 /**
- * 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
@@ -2316,6 +2345,8 @@ export namespace redeemSync {
  *   recoveryRecipient: '0x...',
  *   shareAmount: 100_000_000n,
  *   slippageBps: 50,
+ *   vault: '0x...',
+ *   zoneId: 7,
  * })
  * const hash = await Actions.earn.privateRedeem(zoneClient, prepared)
  * ```
@@ -2345,7 +2376,7 @@ export namespace privateRedeem {
   export type ErrorType = zoneActions.requestWithdrawal.ErrorType
 
   /**
-   * 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.
@@ -2363,20 +2394,31 @@ export namespace privateRedeem {
       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, {
@@ -2397,23 +2439,19 @@ export namespace privateRedeem {
         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 {
@@ -2434,33 +2472,26 @@ export namespace privateRedeem {
   export namespace prepare {
     export type Parameters = Omit<ReadParameters, 'account'> &
       PrivatePreparationParameters & {
-        /** Vault shares withdrawn from the Zone, base units. */
+        /** Earn shares withdrawn from the Zone, base units. */
         shareAmount: bigint
-      } & (
-        | ({
-            /** Asset token returned to the Zone. @default gateway vault asset */
-            assetToken?: undefined
-          } & OneOf<
-            | {
-                /** Minimum assets returned to the Zone. */
-                assetAmountMin: bigint
-              }
-            | {
-                /** Quoted assets returned to the Zone. */
-                assetAmount: bigint
-                /** Slippage tolerance under `assetAmount` (50 = 0.5%). */
-                slippageBps: number
-              }
-            | {
-                /** Slippage tolerance under a live vault quote (50 = 0.5%). */
-                slippageBps: number
-              }
-          >)
-        | ({
-            /** Asset token returned to the Zone after a swap. */
-            assetToken: Address
-          } & MinimumAssetAmountParameters)
-      )
+        /** Private asset returned to the Zone. Must match the gateway. @default gateway private asset */
+        assetToken?: Address | undefined
+      } & OneOf<
+        | {
+            /** Minimum assets returned to the Zone. */
+            assetAmountMin: bigint
+          }
+        | {
+            /** Quoted assets returned to the Zone. */
+            assetAmount: bigint
+            /** Slippage tolerance under `assetAmount` (50 = 0.5%). */
+            slippageBps: number
+          }
+        | {
+            /** Slippage tolerance under a live vault quote (50 = 0.5%). */
+            slippageBps: number
+          }
+      >
     export type ReturnValue = PreparedZoneRequest
     export type ErrorType = BaseErrorType
   }
@@ -2515,6 +2546,7 @@ export namespace privateRedeemSync {
  *   actionId: prepared.actionId,
  *   fromBlock: prepared.fromBlock,
  *   gateway: '0x...',
+ *   vault: '0x...',
  * })
  * ```
  *
@@ -2532,15 +2564,17 @@ export async function waitForPrivateRedeem<chain extends Chain | undefined>(
     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,
   ])
@@ -2571,7 +2605,7 @@ export async function waitForPrivateRedeem<chain extends Chain | undefined>(
           try {
             const [log] = await getLogs(client, {
               address: gateway,
-              args: { actionId },
+              args: { actionId, earnVault: vault },
               event,
               fromBlock,
               strict: true,
@@ -2583,7 +2617,7 @@ export async function waitForPrivateRedeem<chain extends Chain | undefined>(
               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,
@@ -2621,6 +2655,8 @@ export namespace waitForPrivateRedeem {
     pollingInterval?: number | undefined
     /** Timeout in milliseconds; `0` disables it. @default `60_000` */
     timeout?: number | undefined
+    /** Vault address. */
+    vault: Address
   }
   export type ReturnType = {
     /** Correlation id for the completed redemption. */
@@ -2629,7 +2665,7 @@ export namespace waitForPrivateRedeem {
     outputAmount: bigint
     /** Token returned to the Zone. */
     outputToken: Address
-    /** Vault shares redeemed. */
+    /** Earn shares redeemed. */
     shares: bigint
     /** Parent-chain block containing the gateway event. */
     tempoBlockNumber: bigint
@@ -2647,8 +2683,8 @@ export namespace waitForPrivateRedeem {
 }
 
 /**
- * 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
@@ -2695,7 +2731,7 @@ export namespace withdrawExact {
     vault: Address
   } & OneOf<
     | {
-        /** Maximum vault share input to burn. */
+        /** Maximum Earn share input to burn. */
         shareAmountMax: bigint
       }
     | {
@@ -2703,7 +2739,7 @@ export namespace withdrawExact {
         slippageBps: number
       }
     | {
-        /** Quoted vault share input; raised by `slippageBps`. */
+        /** Quoted Earn share input; raised by `slippageBps`. */
         shareAmount: bigint
         /** Slippage tolerance in basis points over `shareAmount` (50 = 0.5%). */
         slippageBps: number
@@ -2717,7 +2753,7 @@ export namespace withdrawExact {
   // TODO: exhaustive error type
   export type ErrorType = BaseErrorType
 
-  /** @internal Shared dispatch; reads the vault share token for the approval. */
+  /** @internal Shared dispatch; reads the Earn share token for the approval. */
   export async function inner<
     action extends typeof sendTransaction | typeof sendTransactionSync,
     chain extends Chain | undefined,
@@ -2730,9 +2766,9 @@ export namespace withdrawExact {
     const [args, shareToken] = await Promise.all([
       toWithdrawExactArgs(client, parameters as never),
       readContract(client, {
-        abi: Abis.vaultAdapter,
+        abi: Abis.earnVault,
         address: parameters.vault,
-        functionName: 'shareToken',
+        functionName: 'earnShare',
       }),
     ])
     return (await action(client, {
@@ -2759,7 +2795,7 @@ export namespace withdrawExact {
     })()
     return defineCall({
       address: vault,
-      abi: Abis.vaultAdapter,
+      abi: Abis.earnVault,
       functionName: 'withdrawExact',
       args: [
         internal_Token.toBaseUnits(args.assetAmount, undefined),
@@ -2778,11 +2814,11 @@ export namespace withdrawExact {
       vault: Address
     } & OneOf<
       | {
-          /** Maximum vault share input to burn. */
+          /** Maximum Earn share input to burn. */
           shareAmountMax: bigint
         }
       | {
-          /** Quoted vault share input; raised by `slippageBps`. */
+          /** Quoted Earn share input; raised by `slippageBps`. */
           shareAmount: bigint
           /** Slippage tolerance in basis points over `shareAmount` (50 = 0.5%). */
           slippageBps: number
@@ -2791,7 +2827,7 @@ export namespace withdrawExact {
   }
 
   /**
-   * 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.
@@ -2799,7 +2835,7 @@ export namespace withdrawExact {
    */
   export function calls(
     args: call.Args & {
-      /** Vault share token approved for the withdrawal. */
+      /** Earn share token approved for the withdrawal. */
       shareToken: Address
     },
   ) {
@@ -2830,7 +2866,7 @@ export namespace withdrawExact {
     // 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)),
     })
@@ -2839,7 +2875,7 @@ export namespace withdrawExact {
   }
 
   /**
-   * 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.
@@ -2861,7 +2897,7 @@ export namespace withdrawExact {
   }
 
   /**
-   * Simulates an exact withdrawal, assuming enough vault share allowance.
+   * Simulates an exact withdrawal, assuming enough Earn share allowance.
    *
    * @param client - Client.
    * @param parameters - Parameters.
@@ -2874,7 +2910,7 @@ export namespace withdrawExact {
     client: Client<Transport, chain, account>,
     parameters: withdrawExact.Parameters<chain, account>,
   ): Promise<
-    SimulateContractReturnType<typeof Abis.vaultAdapter, 'withdrawExact'>
+    SimulateContractReturnType<typeof Abis.earnVault, 'withdrawExact'>
   > {
     return simulateContract(client, {
       ...pickWriteParameters(parameters as never),
@@ -2930,7 +2966,7 @@ export async function withdrawExactSync<
     caller: args.caller,
     receipt,
     recipient: args.receiver,
-    shareAmount: args.sharesBurned,
+    shareAmount: args.earnSharesBurned,
   }
 }
 
@@ -2950,33 +2986,20 @@ export namespace withdrawExactSync {
     receipt: TransactionReceipt
     /** Asset recipient. */
     recipient: Address
-    /** Vault shares burned. */
+    /** Earn shares burned. */
     shareAmount: bigint
   }>
   // TODO: exhaustive error type
   export type ErrorType = BaseErrorType
 }
 
-type MinimumAssetAmountParameters = OneOf<
-  | {
-      /** Minimum assets returned to the Zone. */
-      assetAmountMin: bigint
-    }
-  | {
-      /** Quoted assets returned to the Zone. */
-      assetAmount: bigint
-      /** Slippage tolerance under `assetAmount` (50 = 0.5%). */
-      slippageBps: number
-    }
->
-
 type MinimumShareAmountParameters = OneOf<
   | {
-      /** Minimum vault shares returned to the Zone. */
+      /** Minimum Earn shares returned to the Zone. */
       shareAmountMin: bigint
     }
   | {
-      /** Quoted vault shares returned to the Zone. */
+      /** Quoted Earn shares returned to the Zone. */
       shareAmount: bigint
       /** Slippage tolerance under `shareAmount` (50 = 0.5%). */
       slippageBps: number
@@ -2990,16 +3013,22 @@ type PrivatePreparationParameters = {
   callbackGas?: bigint | undefined
   /** Public recipient if the parent-chain callback fails. @default `recoveryRecipient` */
   fallbackRecipient?: Address | undefined
-  /** Gateway identifying the vault and Zone configuration. */
+  /** Zone gateway address. */
   gateway: Address
+  /** Source Zone portal on the parent chain. @default Derived from `zoneId` */
+  portalAddress?: Address | undefined
   /** Encrypted recipient for the returned tokens. */
   recipient: Address
   /** Public recipient if the encrypted return fails. */
   recoveryRecipient: Address
   /** Optional memo encrypted with the returned Zone deposit. */
   returnMemo?: Hex.Hex | undefined
+  /** Vault address. */
+  vault: Address
   /** Optional memo attached to the Zone withdrawal. */
   withdrawalMemo?: Hex.Hex | undefined
+  /** Source Zone receiving the output. */
+  zoneId: number
 }
 
 type PreparedZoneRequest = {
@@ -3068,75 +3097,107 @@ function pickReadParameters(parameters: Omit<ReadParameters, 'account'>) {
 
 async function getZoneGatewayConfig<chain extends Chain | undefined>(
   client: Client<Transport, chain>,
-  parameters: Omit<ReadParameters, 'account'> & { gateway: Address },
+  parameters: Omit<ReadParameters, 'account'> & {
+    flow: 0 | 1
+    gateway: Address
+    vault: Address
+    zoneId: number
+    zonePortal: Address
+  },
 ) {
-  const { gateway, ...rest } = parameters
+  const { flow, gateway, vault, zoneId, zonePortal, ...rest } = parameters
   const [
-    vaultAdapter,
     vaultAsset,
     shareToken,
-    zoneId,
-    zonePortal,
-    supportsAsyncFlow,
+    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',
 } as const
 
-/** Trims the decoded `IVaultFees.FeeConfig` to its active fixed-fee count. */
+/** Trims the decoded `FeeConfig` to its active fixed-fee count. */
 function toFeeConfig(
-  config: ReadContractReturnType<typeof Abis.vaultAdapter, 'feeConfig'>,
+  config: ReadContractReturnType<typeof Abis.earnFees, 'feeConfig'>,
 ): FeeConfig {
   return {
     excess: config.excess,
@@ -3144,15 +3205,32 @@ function toFeeConfig(
   }
 }
 
-/** Trims the decoded `IVaultFees.FeePreview` to its active allocation count. */
+/** Maps decoded fee fields to the action result. */
 function toFeePreview(
-  preview: ReadContractReturnType<
-    typeof Abis.vaultAdapter,
-    'previewAccruedFees'
-  >,
+  preview: ReadContractReturnType<typeof Abis.earnFees, 'previewAccruedFees'>,
 ): FeePreview {
-  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 */
@@ -3278,7 +3356,7 @@ function maximumInput(shareAmount: bigint, slippageBps: number): bigint {
 
 /**
  * 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(
@@ -3294,9 +3372,9 @@ async function toBaseUnitsLive(
   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,