viem 2.55.8 → 2.55.11

package/_cjs/tempo/actions/earn.js

@@ -49,6 +49,7 @@ const Abis = require("../Abis.js");
 const Addresses = require("../Addresses.js");
 const errors_js_1 = require("../errors.js");
 const utils_js_1 = require("../internal/utils.js");
+const zone_js_1 = require("../zones/zone.js");
 const policyActions = require("./policy.js");
 const tokenActions = require("./token.js");
 const zoneActions = require("./zone.js");
@@ -159,7 +160,7 @@ 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)
@@ -184,7 +185,7 @@ async function deposit(client, parameters) {
         const [args, assetToken] = await Promise.all([
             toDepositArgs(client, parameters),
             (0, readContract_js_1.readContract)(client, {
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 address: parameters.vault,
                 functionName: 'asset',
             }),
@@ -205,7 +206,7 @@ async function deposit(client, parameters) {
         })();
         return (0, utils_js_1.defineCall)({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             functionName: 'deposit',
             args: [
                 internal_Token.toBaseUnits(args.assetAmount, undefined),
@@ -232,7 +233,7 @@ async function deposit(client, parameters) {
     function extractEvent(logs, parameters) {
         const { vault } = parameters;
         const [log] = (0, parseEventLogs_js_1.parseEventLogs)({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'Deposited',
             logs: logs.filter((log) => (0, isAddressEqual_js_1.isAddressEqual)(log.address, vault)),
         });
@@ -268,7 +269,7 @@ async function depositSync(client, parameters) {
         caller: args.caller,
         receipt,
         recipient: args.receiver,
-        shareAmount: args.shares,
+        shareAmount: args.earnShares,
     };
 }
 async function depositShares(client, parameters) {
@@ -277,7 +278,7 @@ async function depositShares(client, parameters) {
 (function (depositShares) {
     async function inner(action, client, parameters) {
         const engine = await (0, readContract_js_1.readContract)(client, {
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             address: parameters.vault,
             functionName: 'engine',
         });
@@ -301,8 +302,8 @@ async function depositShares(client, parameters) {
         })();
         return (0, utils_js_1.defineCall)({
             address: vault,
-            abi: Abis.vaultAdapter,
-            functionName: 'depositShares',
+            abi: Abis.earnVault,
+            functionName: 'depositVenueShares',
             args: [venueShareAmount, recipient, earnShareAmountMin],
         });
     }
@@ -323,7 +324,7 @@ async function depositShares(client, parameters) {
     function extractEvent(logs, parameters) {
         const { vault } = parameters;
         const [log] = (0, parseEventLogs_js_1.parseEventLogs)({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'VenueSharesDeposited',
             logs: logs.filter((log) => (0, isAddressEqual_js_1.isAddressEqual)(log.address, vault)),
         });
@@ -358,7 +359,7 @@ async function depositSharesSync(client, parameters) {
         caller: args.caller,
         earnShareAmount: args.earnShares,
         receipt,
-        receivedVenueShareAmount: args.receivedVenueShares,
+        receivedVenueShareAmount: args.receivedEngineShares,
         recipient: args.receiver,
         venueShareAmount: args.requestedVenueShares,
     };
@@ -372,13 +373,23 @@ async function privateDeposit(client, parameters) {
         const chainId = client.chain?.id;
         if (!chainId)
             throw new Error('`chain` is required.');
-        const { actionId = ox_1.Hex.random(32), assetAmount, callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, recipient, recoveryRecipient, returnMemo, withdrawalMemo, } = parameters;
+        const { actionId = ox_1.Hex.random(32), assetAmount, callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, portalAddress: portalAddress_, recipient, recoveryRecipient, returnMemo, vault, withdrawalMemo, zoneId, } = parameters;
+        const portalAddress = portalAddress_ ?? (0, zone_js_1.getPortalAddress)(chainId, zoneId);
         const readParameters = pickReadParameters(parameters);
         const [fromBlock, config] = await Promise.all([
             (0, getBlockNumber_js_1.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 (!(0, isAddressEqual_js_1.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,
@@ -387,20 +398,14 @@ async function privateDeposit(client, parameters) {
             zoneId: config.zoneId,
         });
         const shareAmountMin = resolveMinimumShareAmount(parameters);
-        const direct = (0, isAddressEqual_js_1.isAddressEqual)(assetToken, config.vaultAsset);
-        const data = (0, encodeAbiParameters_js_1.encodeAbiParameters)(Abis.zoneGatewayCallbackData, [
+        const data = (0, encodeAbiParameters_js_1.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 {
@@ -428,15 +433,16 @@ async function privateDepositSync(client, parameters) {
     return zoneActions.requestWithdrawalSync(client, parameters);
 }
 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 = (0, getAbiItem_js_1.getAbiItem)({
-        abi: Abis.zoneGateway,
+        abi: Abis.earnRouter,
         name: 'EarnDeposit',
     });
     const observerId = (0, stringify_js_1.stringify)([
         'waitForPrivateDeposit',
         client.uid,
         gateway,
+        vault,
         actionId,
         fromBlock,
     ]);
@@ -460,7 +466,7 @@ async function waitForPrivateDeposit(client, parameters) {
             try {
                 const [log] = await (0, getLogs_js_1.getLogs)(client, {
                     address: gateway,
-                    args: { actionId },
+                    args: { actionId, earnVault: vault },
                     event,
                     fromBlock,
                     strict: true,
@@ -473,7 +479,7 @@ 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,
@@ -495,37 +501,43 @@ async function waitForPrivateDeposit(client, parameters) {
 }
 async function getFeeState(client, parameters) {
     const { recipient, vault, ...rest } = parameters;
+    const fees = await (0, readContract_js_1.readContract)(client, {
+        ...rest,
+        abi: Abis.earnVault,
+        address: vault,
+        functionName: 'earnFees',
+    });
     const contracts = [
         (0, utils_js_1.defineCall)({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'currentFeeConfigId',
         }),
         (0, utils_js_1.defineCall)({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'feesActive',
         }),
         (0, utils_js_1.defineCall)({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'highWaterMark',
         }),
         (0, utils_js_1.defineCall)({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'previewAccruedFees',
         }),
         (0, utils_js_1.defineCall)({
-            address: vault,
-            abi: Abis.vaultAdapter,
+            address: fees,
+            abi: Abis.earnFees,
             functionName: 'targetBase',
         }),
     ];
     const feeConfig = async (configId) => toFeeConfig(await (0, readContract_js_1.readContract)(client, {
         ...rest,
-        abi: Abis.vaultAdapter,
-        address: vault,
+        abi: Abis.earnFees,
+        address: fees,
         functionName: 'feeConfig',
         args: [configId],
     }));
@@ -536,9 +548,9 @@ async function getFeeState(client, parameters) {
             contracts: [
                 ...contracts,
                 (0, utils_js_1.defineCall)({
-                    address: vault,
-                    abi: Abis.vaultAdapter,
-                    functionName: 'claimableFeeShares',
+                    address: fees,
+                    abi: Abis.earnFees,
+                    functionName: 'claimableEarnShares',
                     args: [recipient],
                 }),
             ],
@@ -580,13 +592,13 @@ async function getPosition(client, parameters) {
         contracts: [
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'asset',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'shareToken',
+                abi: Abis.earnVault,
+                functionName: 'earnShare',
             }),
         ],
         deployless: true,
@@ -624,7 +636,7 @@ async function getPosition(client, parameters) {
     });
     const value = await (0, readContract_js_1.readContract)(client, {
         ...rest,
-        abi: Abis.vaultAdapter,
+        abi: Abis.earnVault,
         address: vault,
         args: [shareBalance],
         functionName: 'previewRedeem',
@@ -651,7 +663,7 @@ async function getRedeemQuote(client, parameters) {
         const { shareAmount, vault } = args;
         return (0, utils_js_1.defineCall)({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             args: [shareAmount],
             functionName: 'previewRedeem',
         });
@@ -660,16 +672,24 @@ async function getRedeemQuote(client, parameters) {
 })(getRedeemQuote || (exports.getRedeemQuote = getRedeemQuote = {}));
 async function getVault(client, parameters) {
     const { vault, ...rest } = parameters;
-    const engine = await (0, readContract_js_1.readContract)(client, {
-        ...rest,
-        abi: Abis.vaultAdapter,
-        address: vault,
-        functionName: 'engine',
-    });
+    const [engine, fees] = await Promise.all([
+        (0, readContract_js_1.readContract)(client, {
+            ...rest,
+            abi: Abis.earnVault,
+            address: vault,
+            functionName: 'engine',
+        }),
+        (0, readContract_js_1.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 (0, multicall_js_1.multicall)(client, {
         ...rest,
         allowFailure: false,
-        contracts: getVault.calls({ engine, vault }),
+        contracts: getVault.calls({ engine, fees, vault }),
         deployless: true,
     });
     if (!(0, isAddressEqual_js_1.isAddressEqual)(engine, engine_))
@@ -693,109 +713,109 @@ async function getVault(client, parameters) {
 }
 (function (getVault) {
     function calls(args) {
-        const { engine, vault } = args;
+        const { engine, fees, vault } = args;
         return [
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'asset',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'engine',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'shareToken',
+                abi: Abis.earnVault,
+                functionName: 'earnShare',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'operator',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'emergencyGuardian',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'asyncJanitor',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'engineMigrationMode',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'depositsPaused',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 functionName: 'engineShares',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'shareSupply',
+                abi: Abis.earnVault,
+                functionName: 'totalEarnShares',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'isSynced',
+                abi: Abis.earnVault,
+                functionName: 'isAccountingAligned',
             }),
             (0, utils_js_1.defineCall)({
                 address: vault,
-                abi: Abis.vaultAdapter,
-                functionName: 'pendingRedeemCount',
+                abi: Abis.earnVault,
+                functionName: 'openRedeemRequestCount',
             }),
             (0, utils_js_1.defineCall)({
-                address: vault,
-                abi: Abis.vaultAdapter,
+                address: fees,
+                abi: Abis.earnFees,
                 functionName: 'feesActive',
             }),
             (0, utils_js_1.defineCall)({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'totalAssets',
             }),
             (0, utils_js_1.defineCall)({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'name',
             }),
             (0, utils_js_1.defineCall)({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'symbol',
             }),
             (0, utils_js_1.defineCall)({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.asyncRedeem],
             }),
             (0, utils_js_1.defineCall)({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.exactWithdraw],
             }),
             (0, utils_js_1.defineCall)({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.inKindDeposit],
             }),
             (0, utils_js_1.defineCall)({
                 address: engine,
-                abi: Abis.vaultEngine,
+                abi: Abis.earnEngine,
                 functionName: 'supportsInterface',
                 args: [interfaceIds.syncRedeem],
             }),
@@ -815,7 +835,7 @@ async function getWithdrawQuote(client, parameters) {
         const { assetAmount, vault } = args;
         return (0, utils_js_1.defineCall)({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             args: [assetAmount],
             functionName: 'previewWithdraw',
         });
@@ -830,9 +850,9 @@ async function redeem(client, parameters) {
         const [args, shareToken] = await Promise.all([
             toRedeemArgs(client, parameters),
             (0, readContract_js_1.readContract)(client, {
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 address: parameters.vault,
-                functionName: 'shareToken',
+                functionName: 'earnShare',
             }),
         ]);
         return (await action(client, {
@@ -851,7 +871,7 @@ async function redeem(client, parameters) {
         })();
         return (0, utils_js_1.defineCall)({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             functionName: 'redeem',
             args: [
                 internal_Token.toBaseUnits(args.shareAmount, undefined),
@@ -878,7 +898,7 @@ async function redeem(client, parameters) {
     function extractEvent(logs, parameters) {
         const { vault } = parameters;
         const [log] = (0, parseEventLogs_js_1.parseEventLogs)({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'Redeemed',
             logs: logs.filter((log) => (0, isAddressEqual_js_1.isAddressEqual)(log.address, vault)),
         });
@@ -914,7 +934,7 @@ async function redeemSync(client, parameters) {
         caller: args.caller,
         receipt,
         recipient: args.receiver,
-        shareAmount: args.shares,
+        shareAmount: args.earnShares,
     };
 }
 async function privateRedeem(client, parameters) {
@@ -926,15 +946,23 @@ async function privateRedeem(client, parameters) {
         const chainId = client.chain?.id;
         if (!chainId)
             throw new Error('`chain` is required.');
-        const { actionId = ox_1.Hex.random(32), callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, recipient, recoveryRecipient, returnMemo, shareAmount, withdrawalMemo, } = parameters;
+        const { actionId = ox_1.Hex.random(32), callbackGas = zoneGatewayCallbackGas, fallbackRecipient = parameters.recoveryRecipient, gateway, portalAddress: portalAddress_, recipient, recoveryRecipient, returnMemo, shareAmount, vault, withdrawalMemo, zoneId, } = parameters;
+        const portalAddress = portalAddress_ ?? (0, zone_js_1.getPortalAddress)(chainId, zoneId);
         const readParameters = pickReadParameters(parameters);
         const [fromBlock, config] = await Promise.all([
             (0, getBlockNumber_js_1.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 ((0, isAddressEqual_js_1.isAddressEqual)(assetToken, config.shareToken))
-            throw new Error('`assetToken` cannot be the gateway vault share token.');
+        const assetToken = parameters.assetToken ?? config.privateAsset;
+        if (!(0, isAddressEqual_js_1.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,
@@ -951,23 +979,19 @@ async function privateRedeem(client, parameters) {
                 const assetAmount = await getRedeemQuote(client, {
                     ...readParameters,
                     shareAmount,
-                    vault: config.vaultAdapter,
+                    vault: config.vault,
                 });
                 return tempo_1.EarnShares.minimumOutput(assetAmount, parameters.slippageBps);
             })(),
         ]);
-        const direct = (0, isAddressEqual_js_1.isAddressEqual)(assetToken, config.vaultAsset);
-        const data = (0, encodeAbiParameters_js_1.encodeAbiParameters)(Abis.zoneGatewayCallbackData, [
+        const data = (0, encodeAbiParameters_js_1.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 {
@@ -995,15 +1019,16 @@ async function privateRedeemSync(client, parameters) {
     return zoneActions.requestWithdrawalSync(client, parameters);
 }
 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 = (0, getAbiItem_js_1.getAbiItem)({
-        abi: Abis.zoneGateway,
+        abi: Abis.earnRouter,
         name: 'EarnRedeem',
     });
     const observerId = (0, stringify_js_1.stringify)([
         'waitForPrivateRedeem',
         client.uid,
         gateway,
+        vault,
         actionId,
         fromBlock,
     ]);
@@ -1027,7 +1052,7 @@ async function waitForPrivateRedeem(client, parameters) {
             try {
                 const [log] = await (0, getLogs_js_1.getLogs)(client, {
                     address: gateway,
-                    args: { actionId },
+                    args: { actionId, earnVault: vault },
                     event,
                     fromBlock,
                     strict: true,
@@ -1040,7 +1065,7 @@ 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,
@@ -1068,9 +1093,9 @@ async function withdrawExact(client, parameters) {
         const [args, shareToken] = await Promise.all([
             toWithdrawExactArgs(client, parameters),
             (0, readContract_js_1.readContract)(client, {
-                abi: Abis.vaultAdapter,
+                abi: Abis.earnVault,
                 address: parameters.vault,
-                functionName: 'shareToken',
+                functionName: 'earnShare',
             }),
         ]);
         return (await action(client, {
@@ -1089,7 +1114,7 @@ async function withdrawExact(client, parameters) {
         })();
         return (0, utils_js_1.defineCall)({
             address: vault,
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             functionName: 'withdrawExact',
             args: [
                 internal_Token.toBaseUnits(args.assetAmount, undefined),
@@ -1118,7 +1143,7 @@ async function withdrawExact(client, parameters) {
     function extractEvent(logs, parameters) {
         const { vault } = parameters;
         const [log] = (0, parseEventLogs_js_1.parseEventLogs)({
-            abi: Abis.vaultAdapter,
+            abi: Abis.earnVault,
             eventName: 'WithdrewExact',
             logs: logs.filter((log) => (0, isAddressEqual_js_1.isAddressEqual)(log.address, vault)),
         });
@@ -1154,7 +1179,7 @@ async function withdrawExactSync(client, parameters) {
         caller: args.caller,
         receipt,
         recipient: args.receiver,
-        shareAmount: args.sharesBurned,
+        shareAmount: args.earnSharesBurned,
     };
 }
 const zoneGatewayCallbackGas = 10000000n;
@@ -1184,54 +1209,79 @@ 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 (0, multicall_js_1.multicall)(client, {
+    const { flow, gateway, vault, zoneId, zonePortal, ...rest } = parameters;
+    const [vaultAsset, shareToken, allowedZoneId, routerVault, privateAsset, routerVaultAsset, routerShareToken, supportsFlow,] = await (0, multicall_js_1.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 (!(0, isAddressEqual_js_1.isAddressEqual)(routerVault, vault))
+        throw new Error('Zone gateway is configured for a different Earn vault.');
+    if (!(0, isAddressEqual_js_1.isAddressEqual)(routerVaultAsset, vaultAsset))
+        throw new Error('Zone gateway vault asset does not match the Earn vault.');
+    if (!(0, isAddressEqual_js_1.isAddressEqual)(routerShareToken, shareToken))
+        throw new Error('Zone gateway share token does not match the Earn vault.');
+    return {
+        privateAsset,
+        shareToken,
+        vault,
+        vaultAsset,
+        zoneId,
+        zonePortal,
+    };
 }
 const interfaceIds = {
     asyncRedeem: '0xa1a6a1d7',
     exactWithdraw: '0x0adfb0b9',
-    inKindDeposit: '0x7d28a2f2',
-    syncRedeem: '0x370457f4',
+    inKindDeposit: '0xce4790a9',
+    syncRedeem: '0x94a2d467',
 };
 function toFeeConfig(config) {
     return {
@@ -1240,8 +1290,20 @@ function toFeeConfig(config) {
     };
 }
 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,
+    };
 }
 async function toDepositArgs(client, parameters) {
     const { vault } = parameters;
@@ -1348,9 +1410,9 @@ async function toBaseUnitsLive(client, options) {
     if (amount.decimals !== undefined)
         return internal_Token.toBaseUnits(amount, amount.decimals);
     const address = await (0, readContract_js_1.readContract)(client, {
-        abi: Abis.vaultAdapter,
+        abi: Abis.earnVault,
         address: vault,
-        functionName: token,
+        functionName: token === 'asset' ? 'asset' : 'earnShare',
     });
     const { decimals } = await (0, utils_js_1.resolveTokenWithDecimals)(client, {
         token: address,