viem 2.55.8 → 2.55.10

package/_esm/tempo/Abis.js

@@ -2973,11 +2973,11 @@ export const abis = [
     ...validatorConfig,
     ...validatorConfigV2,
 ];
-// Earn source: tempoxyz/earn at 6b7729fd9b9e9751ebd57460c43817217af7771d. Do not modify manually.
+// Earn source: tempoxyz/earn at 4794b0ce4f611af7afe87587522e0087e690422f. Do not modify manually.
 export const earnFactory = [
     {
         type: 'function',
-        name: 'computeShareSalt',
+        name: 'computeEarnShareSalt',
         inputs: [
             {
                 name: 'params',
@@ -3095,14 +3095,76 @@ export const earnFactory = [
             },
         ],
         outputs: [
-            { name: 'shareToken', type: 'address' },
-            { name: 'vaultAdapter', type: 'address' },
+            { name: 'earnShare', type: 'address' },
+            { name: 'earnVault', type: 'address' },
+            { name: 'earnFees', type: 'address' },
         ],
         stateMutability: 'nonpayable',
     },
     {
         type: 'function',
-        name: 'predictShareToken',
+        name: 'predictEarnFees',
+        inputs: [
+            {
+                name: 'params',
+                type: 'tuple',
+                components: [
+                    { name: 'deploymentId', type: 'bytes32' },
+                    { name: 'engine', type: 'address' },
+                    { name: 'owner', type: 'address' },
+                    {
+                        name: 'controls',
+                        type: 'tuple',
+                        components: [
+                            { name: 'emergencyGuardian', type: 'address' },
+                            { name: 'asyncJanitor', type: 'address' },
+                            { name: 'migrationMode', type: 'uint8' },
+                        ],
+                    },
+                    {
+                        name: 'fees',
+                        type: 'tuple',
+                        components: [
+                            { name: 'administrator', type: 'address' },
+                            { name: 'guardian', type: 'address' },
+                            { name: 'fixedFeeCap', type: 'uint96' },
+                            { name: 'excessFeeCap', type: 'uint96' },
+                            {
+                                name: 'initialConfig',
+                                type: 'tuple',
+                                components: [
+                                    { name: 'fixedFeeCount', type: 'uint8' },
+                                    {
+                                        name: 'fixedFees',
+                                        type: 'tuple[4]',
+                                        components: [
+                                            { name: 'account', type: 'address' },
+                                            { name: 'rate', type: 'uint96' },
+                                        ],
+                                    },
+                                    {
+                                        name: 'excess',
+                                        type: 'tuple',
+                                        components: [
+                                            { name: 'enabled', type: 'bool' },
+                                            { name: 'account', type: 'address' },
+                                            { name: 'annualTargetRate', type: 'uint96' },
+                                            { name: 'excessFeeRate', type: 'uint96' },
+                                        ],
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+            },
+        ],
+        outputs: [{ name: '', type: 'address' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'predictEarnShare',
         inputs: [
             {
                 name: 'params',
@@ -3165,33 +3227,45 @@ export const earnFactory = [
         type: 'event',
         name: 'EarnStackDeployed',
         inputs: [
-            { name: 'vaultAdapter', type: 'address', indexed: true },
-            { name: 'shareToken', type: 'address', indexed: true },
-            { name: 'engine', type: 'address', indexed: true },
+            { name: 'earnVault', type: 'address', indexed: true },
+            { name: 'earnShare', type: 'address', indexed: true },
+            { name: 'earnFees', type: 'address', indexed: true },
+            { name: 'engine', type: 'address', indexed: false },
             { name: 'asset', type: 'address', indexed: false },
             { name: 'owner', type: 'address', indexed: false },
             { name: 'deploymentId', type: 'bytes32', indexed: false },
             { name: 'emergencyGuardian', type: 'address', indexed: false },
             { name: 'asyncJanitor', type: 'address', indexed: false },
             { name: 'migrationMode', type: 'uint8', indexed: false },
-            { name: 'shareSalt', type: 'bytes32', indexed: false },
+            { name: 'earnShareSalt', type: 'bytes32', indexed: false },
             { name: 'controlConfigHash', type: 'bytes32', indexed: false },
             { name: 'feeConfigHash', type: 'bytes32', indexed: false },
+            { name: 'earnFeesSalt', type: 'bytes32', indexed: false },
         ],
         anonymous: false,
     },
     { type: 'error', name: 'AdminHandoffFailed', inputs: [] },
+    {
+        type: 'error',
+        name: 'EarnShareAlreadyExists',
+        inputs: [{ name: 'earnShare', type: 'address' }],
+    },
+    { type: 'error', name: 'EarnShareSupplyNotZero', inputs: [] },
     { type: 'error', name: 'EmptyDeploymentId', inputs: [] },
-    { type: 'error', name: 'EmptyShareMetadata', inputs: [] },
+    { type: 'error', name: 'EmptyEarnShareMetadata', inputs: [] },
     { type: 'error', name: 'FactoryCannotBeFinalOwner', inputs: [] },
-    { type: 'error', name: 'InvalidAdapterImplementation', inputs: [] },
-    { type: 'error', name: 'IssuerGrantFailed', inputs: [] },
+    { type: 'error', name: 'FailedDeployment', inputs: [] },
     {
         type: 'error',
-        name: 'ShareTokenAlreadyExists',
-        inputs: [{ name: 'shareToken', type: 'address' }],
+        name: 'InsufficientBalance',
+        inputs: [
+            { name: 'balance', type: 'uint256' },
+            { name: 'needed', type: 'uint256' },
+        ],
     },
-    { type: 'error', name: 'ShareTokenSupplyNotZero', inputs: [] },
+    { type: 'error', name: 'InvalidEarnFeesImplementation', inputs: [] },
+    { type: 'error', name: 'InvalidEarnVaultImplementation', inputs: [] },
+    { type: 'error', name: 'IssuerGrantFailed', inputs: [] },
     { type: 'error', name: 'ZeroAddress', inputs: [] },
 ];
 export const erc4626Engine = [
@@ -3204,8 +3278,8 @@ export const erc4626Engine = [
     },
     {
         type: 'function',
-        name: 'initializeCore',
-        inputs: [{ name: 'core_', type: 'address' }],
+        name: 'initializeEarnVault',
+        inputs: [{ name: 'earnVault_', type: 'address' }],
         outputs: [],
         stateMutability: 'nonpayable',
     },
@@ -3237,22 +3311,22 @@ export const erc4626Engine = [
         outputs: [],
         stateMutability: 'nonpayable',
     },
-    {
-        type: 'event',
-        name: 'CoreInitialized',
-        inputs: [{ name: 'core', type: 'address', indexed: true }],
-        anonymous: false,
-    },
     {
         type: 'event',
         name: 'Deposited',
         inputs: [
-            { name: 'receiver', type: 'address', indexed: true },
+            { name: 'earnVault', type: 'address', indexed: true },
             { name: 'assets', type: 'uint256', indexed: false },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'engineShares', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
+    {
+        type: 'event',
+        name: 'EarnVaultInitialized',
+        inputs: [{ name: 'earnVault', type: 'address', indexed: true }],
+        anonymous: false,
+    },
     {
         type: 'event',
         name: 'OwnershipTransferStarted',
@@ -3276,7 +3350,7 @@ export const erc4626Engine = [
         name: 'Redeemed',
         inputs: [
             { name: 'receiver', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'engineShares', type: 'uint256', indexed: false },
             { name: 'assets', type: 'uint256', indexed: false },
         ],
         anonymous: false,
@@ -3286,8 +3360,8 @@ export const erc4626Engine = [
         name: 'VenueSharesDeposited',
         inputs: [
             { name: 'from', type: 'address', indexed: true },
-            { name: 'requestedShares', type: 'uint256', indexed: false },
-            { name: 'receivedShares', type: 'uint256', indexed: false },
+            { name: 'requestedVenueShares', type: 'uint256', indexed: false },
+            { name: 'receivedEngineShares', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -3297,17 +3371,26 @@ export const erc4626Engine = [
         inputs: [
             { name: 'receiver', type: 'address', indexed: true },
             { name: 'assets', type: 'uint256', indexed: false },
-            { name: 'sharesBurned', type: 'uint256', indexed: false },
+            { name: 'engineSharesBurned', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
     { type: 'error', name: 'AlreadyInitialized', inputs: [] },
-    { type: 'error', name: 'CoreNotSet', inputs: [] },
+    { type: 'error', name: 'EarnVaultNotSet', inputs: [] },
     { type: 'error', name: 'EmptyMetadata', inputs: [] },
-    { type: 'error', name: 'NoSharesReceived', inputs: [] },
     {
         type: 'error',
-        name: 'NotCore',
+        name: 'InsufficientAssetsReceived',
+        inputs: [
+            { name: 'minimumAssets', type: 'uint256' },
+            { name: 'actualAssets', type: 'uint256' },
+        ],
+    },
+    { type: 'error', name: 'InvalidVenueShareDecimals', inputs: [] },
+    { type: 'error', name: 'NoVenueSharesReceived', inputs: [] },
+    {
+        type: 'error',
+        name: 'NotEarnVault',
         inputs: [{ name: 'caller', type: 'address' }],
     },
     {
@@ -3324,7 +3407,7 @@ export const erc4626Engine = [
     { type: 'error', name: 'TransferFailed', inputs: [] },
     { type: 'error', name: 'ZeroAddress', inputs: [] },
 ];
-export const vaultAdapter = [
+export const earnVault = [
     { type: 'constructor', inputs: [], stateMutability: 'nonpayable' },
     {
         type: 'function',
@@ -3332,20 +3415,20 @@ export const vaultAdapter = [
         inputs: [],
         outputs: [
             { name: 'feeAssets', type: 'uint256' },
-            { name: 'feeShares', type: 'uint256' },
+            { name: 'feeEarnShares', type: 'uint256' },
         ],
         stateMutability: 'nonpayable',
     },
     {
         type: 'function',
-        name: 'anchorEngineShares',
+        name: 'anchorEarnShares',
         inputs: [],
         outputs: [{ name: '', type: 'uint256' }],
         stateMutability: 'view',
     },
     {
         type: 'function',
-        name: 'anchorSupply',
+        name: 'anchorEngineShares',
         inputs: [],
         outputs: [{ name: '', type: 'uint256' }],
         stateMutability: 'view',
@@ -3366,28 +3449,14 @@ export const vaultAdapter = [
     },
     {
         type: 'function',
-        name: 'cancelRedeemAsync',
-        inputs: [{ name: 'requestId', type: 'bytes32' }],
-        outputs: [],
-        stateMutability: 'nonpayable',
-    },
-    {
-        type: 'function',
-        name: 'claimFeeShares',
+        name: 'cancelRedeem',
         inputs: [
-            { name: 'to', type: 'address' },
-            { name: 'shares', type: 'uint256' },
+            { name: 'requestId', type: 'bytes32' },
+            { name: 'minReceiverEarnShares', type: 'uint256' },
         ],
         outputs: [],
         stateMutability: 'nonpayable',
     },
-    {
-        type: 'function',
-        name: 'claimableFeeShares',
-        inputs: [{ name: 'recipient', type: 'address' }],
-        outputs: [{ name: 'shares', type: 'uint256' }],
-        stateMutability: 'view',
-    },
     {
         type: 'function',
         name: 'contribute',
@@ -3397,9 +3466,16 @@ export const vaultAdapter = [
     },
     {
         type: 'function',
-        name: 'currentFeeConfigId',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint64' }],
+        name: 'convertEngineSharesToEarnShares',
+        inputs: [{ name: 'engineShares_', type: 'uint256' }],
+        outputs: [{ name: 'earnShares', type: 'uint256' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'convertToEngineShares',
+        inputs: [{ name: 'earnShares', type: 'uint256' }],
+        outputs: [{ name: 'engineShares_', type: 'uint256' }],
         stateMutability: 'view',
     },
     {
@@ -3408,14 +3484,21 @@ export const vaultAdapter = [
         inputs: [
             { name: 'assets', type: 'uint256' },
             { name: 'receiver', type: 'address' },
-            { name: 'minShares', type: 'uint256' },
+            { name: 'minEarnShares', type: 'uint256' },
         ],
-        outputs: [{ name: 'shares', type: 'uint256' }],
+        outputs: [{ name: 'earnShares', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
     {
         type: 'function',
-        name: 'depositShares',
+        name: 'depositSwapOverride',
+        inputs: [{ name: 'inputToken', type: 'address' }],
+        outputs: [{ name: 'swapAdapter', type: 'address' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'depositVenueShares',
         inputs: [
             { name: 'venueShares', type: 'uint256' },
             { name: 'receiver', type: 'address' },
@@ -3440,9 +3523,16 @@ export const vaultAdapter = [
     },
     {
         type: 'function',
-        name: 'emergencyFeesDisabled',
+        name: 'earnFees',
         inputs: [],
-        outputs: [{ name: '', type: 'bool' }],
+        outputs: [{ name: '', type: 'address' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'earnShare',
+        inputs: [],
+        outputs: [{ name: '', type: 'address' }],
         stateMutability: 'view',
     },
     {
@@ -3473,13 +3563,6 @@ export const vaultAdapter = [
         outputs: [{ name: '', type: 'uint256' }],
         stateMutability: 'view',
     },
-    {
-        type: 'function',
-        name: 'excessFeeCap',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint96' }],
-        stateMutability: 'view',
-    },
     {
         type: 'function',
         name: 'feeAdministrator',
@@ -3487,39 +3570,6 @@ export const vaultAdapter = [
         outputs: [{ name: '', type: 'address' }],
         stateMutability: 'view',
     },
-    {
-        type: 'function',
-        name: 'feeConfig',
-        inputs: [{ name: 'configId', type: 'uint64' }],
-        outputs: [
-            {
-                name: '',
-                type: 'tuple',
-                components: [
-                    { name: 'fixedFeeCount', type: 'uint8' },
-                    {
-                        name: 'fixedFees',
-                        type: 'tuple[4]',
-                        components: [
-                            { name: 'account', type: 'address' },
-                            { name: 'rate', type: 'uint96' },
-                        ],
-                    },
-                    {
-                        name: 'excess',
-                        type: 'tuple',
-                        components: [
-                            { name: 'enabled', type: 'bool' },
-                            { name: 'account', type: 'address' },
-                            { name: 'annualTargetRate', type: 'uint96' },
-                            { name: 'excessFeeRate', type: 'uint96' },
-                        ],
-                    },
-                ],
-            },
-        ],
-        stateMutability: 'view',
-    },
     {
         type: 'function',
         name: 'feeGuardian',
@@ -3527,23 +3577,6 @@ export const vaultAdapter = [
         outputs: [{ name: '', type: 'address' }],
         stateMutability: 'view',
     },
-    {
-        type: 'function',
-        name: 'feeRemainder',
-        inputs: [
-            { name: 'configId', type: 'uint64' },
-            { name: 'slot', type: 'uint8' },
-        ],
-        outputs: [{ name: '', type: 'uint256' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'feesActive',
-        inputs: [],
-        outputs: [{ name: '', type: 'bool' }],
-        stateMutability: 'view',
-    },
     {
         type: 'function',
         name: 'finalizeRedeem',
@@ -3555,26 +3588,13 @@ export const vaultAdapter = [
         outputs: [],
         stateMutability: 'nonpayable',
     },
-    {
-        type: 'function',
-        name: 'fixedFeeCap',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint96' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'highWaterMark',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint256' }],
-        stateMutability: 'view',
-    },
     {
         type: 'function',
         name: 'initialize',
         inputs: [
             { name: 'engine_', type: 'address' },
-            { name: 'shareToken_', type: 'address' },
+            { name: 'earnShare_', type: 'address' },
+            { name: 'earnFees_', type: 'address' },
             { name: 'operator_', type: 'address' },
             {
                 name: 'controlInit_',
@@ -3626,7 +3646,7 @@ export const vaultAdapter = [
     },
     {
         type: 'function',
-        name: 'isSynced',
+        name: 'isAccountingAligned',
         inputs: [],
         outputs: [{ name: '', type: 'bool' }],
         stateMutability: 'view',
@@ -3636,12 +3656,19 @@ export const vaultAdapter = [
         name: 'migrateEngine',
         inputs: [
             { name: 'newEngine', type: 'address' },
-            { name: 'minNewShares', type: 'uint256' },
+            { name: 'minNewEngineShares', type: 'uint256' },
             { name: 'minAssetsRetained', type: 'uint256' },
         ],
-        outputs: [{ name: 'newShares', type: 'uint256' }],
+        outputs: [{ name: 'newEngineShares', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
+    {
+        type: 'function',
+        name: 'openRedeemRequestCount',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint256' }],
+        stateMutability: 'view',
+    },
     {
         type: 'function',
         name: 'operator',
@@ -3660,63 +3687,18 @@ export const vaultAdapter = [
                 components: [
                     { name: 'receiver', type: 'address' },
                     { name: 'requester', type: 'address' },
-                    { name: 'burnedEarnToken', type: 'uint256' },
+                    { name: 'burnedEarnShares', type: 'uint256' },
                     { name: 'venueShares', type: 'uint256' },
-                    { name: 'requestValue', type: 'uint256' },
-                    { name: 'highWaterValue', type: 'uint256' },
-                    { name: 'targetValue', type: 'uint256' },
-                    { name: 'feeConfigId', type: 'uint64' },
-                    { name: 'requestedAt', type: 'uint40' },
                     { name: 'open', type: 'bool' },
                 ],
             },
         ],
         stateMutability: 'view',
     },
-    {
-        type: 'function',
-        name: 'pendingRedeemCount',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint256' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'previewAccruedFees',
-        inputs: [],
-        outputs: [
-            {
-                name: 'result',
-                type: 'tuple',
-                components: [
-                    { name: 'activeAssets', type: 'uint256' },
-                    { name: 'positiveAccrualAssets', type: 'uint256' },
-                    { name: 'fixedFeeAssets', type: 'uint256' },
-                    { name: 'excessFeeAssets', type: 'uint256' },
-                    { name: 'totalFeeAssets', type: 'uint256' },
-                    { name: 'totalFeeShares', type: 'uint256' },
-                    { name: 'preFeeValuePerShare', type: 'uint256' },
-                    { name: 'postFeeValuePerShare', type: 'uint256' },
-                    { name: 'targetValuePerShare', type: 'uint256' },
-                    { name: 'allocationCount', type: 'uint8' },
-                    {
-                        name: 'allocations',
-                        type: 'tuple[5]',
-                        components: [
-                            { name: 'account', type: 'address' },
-                            { name: 'feeAssets', type: 'uint256' },
-                            { name: 'feeShares', type: 'uint256' },
-                        ],
-                    },
-                ],
-            },
-        ],
-        stateMutability: 'view',
-    },
     {
         type: 'function',
         name: 'previewRedeem',
-        inputs: [{ name: 'shares', type: 'uint256' }],
+        inputs: [{ name: 'earnShares', type: 'uint256' }],
         outputs: [{ name: 'assets', type: 'uint256' }],
         stateMutability: 'view',
     },
@@ -3724,14 +3706,14 @@ export const vaultAdapter = [
         type: 'function',
         name: 'previewWithdraw',
         inputs: [{ name: 'assets', type: 'uint256' }],
-        outputs: [{ name: 'shares', type: 'uint256' }],
+        outputs: [{ name: 'earnShares', type: 'uint256' }],
         stateMutability: 'view',
     },
     {
         type: 'function',
         name: 'redeem',
         inputs: [
-            { name: 'shares', type: 'uint256' },
+            { name: 'earnShares', type: 'uint256' },
             { name: 'receiver', type: 'address' },
             { name: 'minAssets', type: 'uint256' },
         ],
@@ -3740,15 +3722,32 @@ export const vaultAdapter = [
     },
     {
         type: 'function',
-        name: 'requestRedeemAsync',
+        name: 'redeemSwapOverride',
+        inputs: [{ name: 'outputToken', type: 'address' }],
+        outputs: [{ name: 'swapAdapter', type: 'address' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'requestRedeem',
         inputs: [
-            { name: 'shares', type: 'uint256' },
+            { name: 'earnShares', type: 'uint256' },
             { name: 'engineData', type: 'bytes' },
             { name: 'receiver', type: 'address' },
         ],
         outputs: [{ name: 'requestId', type: 'bytes32' }],
         stateMutability: 'nonpayable',
     },
+    {
+        type: 'function',
+        name: 'setDepositSwapOverride',
+        inputs: [
+            { name: 'inputToken', type: 'address' },
+            { name: 'swapAdapter', type: 'address' },
+        ],
+        outputs: [],
+        stateMutability: 'nonpayable',
+    },
     {
         type: 'function',
         name: 'setDepositsPaused',
@@ -3801,49 +3800,17 @@ export const vaultAdapter = [
     },
     {
         type: 'function',
-        name: 'shareSupply',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint256' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'shareToken',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'sharesToTokens',
-        inputs: [{ name: 'shares', type: 'uint256' }],
-        outputs: [{ name: '', type: 'uint256' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'targetBase',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint256' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'targetStartedAt',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint40' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'tokensToShares',
-        inputs: [{ name: 'tokens', type: 'uint256' }],
-        outputs: [{ name: '', type: 'uint256' }],
-        stateMutability: 'view',
+        name: 'setRedeemSwapOverride',
+        inputs: [
+            { name: 'outputToken', type: 'address' },
+            { name: 'swapAdapter', type: 'address' },
+        ],
+        outputs: [],
+        stateMutability: 'nonpayable',
     },
     {
         type: 'function',
-        name: 'totalClaimableFeeShares',
+        name: 'totalEarnShares',
         inputs: [],
         outputs: [{ name: '', type: 'uint256' }],
         stateMutability: 'view',
@@ -3854,9 +3821,9 @@ export const vaultAdapter = [
         inputs: [
             { name: 'assets', type: 'uint256' },
             { name: 'receiver', type: 'address' },
-            { name: 'maxShares', type: 'uint256' },
+            { name: 'maxEarnShares', type: 'uint256' },
         ],
-        outputs: [{ name: 'sharesBurned', type: 'uint256' }],
+        outputs: [{ name: 'earnSharesBurned', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
     {
@@ -3867,7 +3834,7 @@ export const vaultAdapter = [
             { name: 'assets', type: 'uint256', indexed: false },
             { name: 'venueShares', type: 'uint256', indexed: false },
             { name: 'anchorEngineShares', type: 'uint256', indexed: false },
-            { name: 'anchorSupply', type: 'uint256', indexed: false },
+            { name: 'anchorEarnShares', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -3880,6 +3847,15 @@ export const vaultAdapter = [
         ],
         anonymous: false,
     },
+    {
+        type: 'event',
+        name: 'DepositSwapOverrideSet',
+        inputs: [
+            { name: 'inputToken', type: 'address', indexed: true },
+            { name: 'swapAdapter', type: 'address', indexed: true },
+        ],
+        anonymous: false,
+    },
     {
         type: 'event',
         name: 'Deposited',
@@ -3887,7 +3863,7 @@ export const vaultAdapter = [
             { name: 'caller', type: 'address', indexed: true },
             { name: 'receiver', type: 'address', indexed: true },
             { name: 'assets', type: 'uint256', indexed: false },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'earnShares', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -3906,93 +3882,22 @@ export const vaultAdapter = [
         inputs: [
             { name: 'oldEngine', type: 'address', indexed: true },
             { name: 'newEngine', type: 'address', indexed: true },
-            { name: 'oldShares', type: 'uint256', indexed: false },
+            { name: 'oldEngineShares', type: 'uint256', indexed: false },
             { name: 'assetsMoved', type: 'uint256', indexed: false },
-            { name: 'newShares', type: 'uint256', indexed: false },
-            { name: 'shareSupply', type: 'uint256', indexed: false },
+            { name: 'newEngineShares', type: 'uint256', indexed: false },
+            { name: 'totalEarnShares', type: 'uint256', indexed: false },
             { name: 'anchorEngineShares', type: 'uint256', indexed: false },
-            { name: 'anchorSupply', type: 'uint256', indexed: false },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'FeeBaselinesInitialized',
-        inputs: [
-            { name: 'highWaterMark', type: 'uint256', indexed: false },
-            { name: 'targetBase', type: 'uint256', indexed: false },
-            { name: 'targetStartedAt', type: 'uint40', indexed: false },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'FeeConfigurationSet',
-        inputs: [
-            { name: 'configId', type: 'uint64', indexed: true },
-            { name: 'configHash', type: 'bytes32', indexed: true },
-            { name: 'reactivated', type: 'bool', indexed: false },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'FeeDustWaived',
-        inputs: [
-            { name: 'configId', type: 'uint64', indexed: true },
-            { name: 'slot', type: 'uint8', indexed: true },
-            { name: 'remainder', type: 'uint256', indexed: false },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'FeeSharesAllocated',
-        inputs: [
-            { name: 'configId', type: 'uint64', indexed: true },
-            { name: 'recipient', type: 'address', indexed: true },
-            { name: 'feeAssets', type: 'uint256', indexed: false },
-            { name: 'feeShares', type: 'uint256', indexed: false },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'FeeSharesClaimed',
-        inputs: [
-            { name: 'recipient', type: 'address', indexed: true },
-            { name: 'to', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'FeesAccrued',
-        inputs: [
-            { name: 'configId', type: 'uint64', indexed: true },
-            { name: 'activeAssets', type: 'uint256', indexed: false },
-            { name: 'positiveAccrualAssets', type: 'uint256', indexed: false },
-            { name: 'feeAssets', type: 'uint256', indexed: false },
-            { name: 'feeShares', type: 'uint256', indexed: false },
-            { name: 'highWaterMark', type: 'uint256', indexed: false },
-            { name: 'targetValuePerShare', type: 'uint256', indexed: false },
+            { name: 'anchorEarnShares', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
-    {
-        type: 'event',
-        name: 'FeesDisabled',
-        inputs: [{ name: 'guardian', type: 'address', indexed: true }],
-        anonymous: false,
-    },
     {
         type: 'event',
         name: 'RedeemCancelled',
         inputs: [
             { name: 'requestId', type: 'bytes32', indexed: true },
             { name: 'receiver', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'earnShares', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -4002,9 +3907,9 @@ export const vaultAdapter = [
         inputs: [
             { name: 'requestId', type: 'bytes32', indexed: true },
             { name: 'receiver', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'earnShares', type: 'uint256', indexed: false },
             { name: 'asset', type: 'address', indexed: false },
-            { name: 'amount', type: 'uint256', indexed: false },
+            { name: 'assets', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -4015,7 +3920,16 @@ export const vaultAdapter = [
             { name: 'requestId', type: 'bytes32', indexed: true },
             { name: 'requester', type: 'address', indexed: true },
             { name: 'receiver', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'earnShares', type: 'uint256', indexed: false },
+        ],
+        anonymous: false,
+    },
+    {
+        type: 'event',
+        name: 'RedeemSwapOverrideSet',
+        inputs: [
+            { name: 'outputToken', type: 'address', indexed: true },
+            { name: 'swapAdapter', type: 'address', indexed: true },
         ],
         anonymous: false,
     },
@@ -4025,7 +3939,7 @@ export const vaultAdapter = [
         inputs: [
             { name: 'caller', type: 'address', indexed: true },
             { name: 'receiver', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'earnShares', type: 'uint256', indexed: false },
             { name: 'assets', type: 'uint256', indexed: false },
         ],
         anonymous: false,
@@ -4049,7 +3963,7 @@ export const vaultAdapter = [
             { name: 'caller', type: 'address', indexed: true },
             { name: 'receiver', type: 'address', indexed: true },
             { name: 'assets', type: 'uint256', indexed: false },
-            { name: 'sharesBurned', type: 'uint256', indexed: false },
+            { name: 'earnSharesBurned', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -4066,23 +3980,20 @@ export const vaultAdapter = [
         name: 'EngineCapabilityUnsupported',
         inputs: [{ name: 'interfaceId', type: 'bytes4' }],
     },
-    { type: 'error', name: 'ExceedsMaxShares', inputs: [] },
+    { type: 'error', name: 'ExceedsMaxEarnShares', inputs: [] },
     {
         type: 'error',
         name: 'ExcessiveConversionLoss',
         inputs: [
-            { name: 'inputShares', type: 'uint256' },
-            { name: 'representedShares', type: 'uint256' },
+            { name: 'inputEngineShares', type: 'uint256' },
+            { name: 'representedEngineShares', type: 'uint256' },
         ],
     },
-    { type: 'error', name: 'FeeCapTooHigh', inputs: [] },
-    { type: 'error', name: 'FeesPermanentlyDisabled', inputs: [] },
-    { type: 'error', name: 'InitialShareSupplyNotZero', inputs: [] },
-    { type: 'error', name: 'InsufficientClaimableFeeShares', inputs: [] },
+    { type: 'error', name: 'InitialEarnShareSupplyNotZero', inputs: [] },
     { type: 'error', name: 'InsufficientOutput', inputs: [] },
-    { type: 'error', name: 'InvalidFeeClaimReceiver', inputs: [] },
-    { type: 'error', name: 'InvalidFeeConfiguration', inputs: [] },
-    { type: 'error', name: 'InvalidShareDecimals', inputs: [] },
+    { type: 'error', name: 'InvalidEarnDecimals', inputs: [] },
+    { type: 'error', name: 'InvalidEngineShareScale', inputs: [] },
+    { type: 'error', name: 'InvalidSwapOverride', inputs: [] },
     {
         type: 'error',
         name: 'MinimumAssetsNotMet',
@@ -4093,13 +4004,21 @@ export const vaultAdapter = [
     },
     {
         type: 'error',
-        name: 'MinimumSharesNotMet',
+        name: 'MinimumEarnSharesNotMet',
+        inputs: [
+            { name: 'minimumEarnShares', type: 'uint256' },
+            { name: 'actualEarnShares', type: 'uint256' },
+        ],
+    },
+    {
+        type: 'error',
+        name: 'MinimumEngineSharesNotMet',
         inputs: [
-            { name: 'minimumShares', type: 'uint256' },
-            { name: 'actualShares', type: 'uint256' },
+            { name: 'minimumEngineShares', type: 'uint256' },
+            { name: 'actualEngineShares', type: 'uint256' },
         ],
     },
-    { type: 'error', name: 'NoShareSupply', inputs: [] },
+    { type: 'error', name: 'NoEarnShares', inputs: [] },
     { type: 'error', name: 'NotEmergencyGuardianOrOperator', inputs: [] },
     { type: 'error', name: 'NotEngine', inputs: [] },
     { type: 'error', name: 'NotFeeAdministrator', inputs: [] },
@@ -4114,16 +4033,462 @@ export const vaultAdapter = [
         name: 'RequestNotOpen',
         inputs: [{ name: 'requestId', type: 'bytes32' }],
     },
-    { type: 'error', name: 'ResidualBacking', inputs: [] },
-    { type: 'error', name: 'SameEngine', inputs: [] },
-    { type: 'error', name: 'TokenCallFailed', inputs: [] },
-    { type: 'error', name: 'TokenCallFalse', inputs: [] },
+    { type: 'error', name: 'ResidualBacking', inputs: [] },
+    { type: 'error', name: 'SameEngine', inputs: [] },
+    { type: 'error', name: 'TokenCallFailed', inputs: [] },
+    { type: 'error', name: 'TokenCallFalse', inputs: [] },
+    { type: 'error', name: 'ZeroAddress', inputs: [] },
+    { type: 'error', name: 'ZeroAmount', inputs: [] },
+    { type: 'error', name: 'ZeroMinimumAssets', inputs: [] },
+    { type: 'error', name: 'ZeroMinimumEarnShares', inputs: [] },
+    { type: 'error', name: 'ZeroMinimumEngineShares', inputs: [] },
+];
+export const earnFees = [
+    { type: 'constructor', inputs: [], stateMutability: 'nonpayable' },
+    {
+        type: 'function',
+        name: 'accrueFees',
+        inputs: [],
+        outputs: [
+            {
+                name: 'result',
+                type: 'tuple',
+                components: [
+                    { name: 'activeAssets', type: 'uint256' },
+                    { name: 'positiveAccrualAssets', type: 'uint256' },
+                    { name: 'fixedFeeAssets', type: 'uint256' },
+                    { name: 'excessFeeAssets', type: 'uint256' },
+                    { name: 'totalFeeAssets', type: 'uint256' },
+                    { name: 'totalFeeEarnShares', type: 'uint256' },
+                    { name: 'preFeeValuePerEarnShare', type: 'uint256' },
+                    { name: 'postFeeValuePerEarnShare', type: 'uint256' },
+                    { name: 'targetValuePerEarnShare', type: 'uint256' },
+                    { name: 'allocationCount', type: 'uint8' },
+                    {
+                        name: 'allocations',
+                        type: 'tuple[5]',
+                        components: [
+                            { name: 'account', type: 'address' },
+                            { name: 'feeAssets', type: 'uint256' },
+                            { name: 'feeEarnShares', type: 'uint256' },
+                        ],
+                    },
+                ],
+            },
+        ],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'claim',
+        inputs: [
+            { name: 'to', type: 'address' },
+            { name: 'earnShares', type: 'uint256' },
+        ],
+        outputs: [],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'claimableEarnShares',
+        inputs: [{ name: 'recipient', type: 'address' }],
+        outputs: [{ name: 'earnShares', type: 'uint256' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'closeRedeemRequest',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'currentFeeConfigId',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint64' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'disableFees',
+        inputs: [{ name: 'guardian', type: 'address' }],
+        outputs: [],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'earnShare',
+        inputs: [],
+        outputs: [{ name: '', type: 'address' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'earnShareScale',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint256' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'earnVault',
+        inputs: [],
+        outputs: [{ name: '', type: 'address' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'excessFeeCap',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint96' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'feeConfig',
+        inputs: [{ name: 'configId', type: 'uint64' }],
+        outputs: [
+            {
+                name: '',
+                type: 'tuple',
+                components: [
+                    { name: 'fixedFeeCount', type: 'uint8' },
+                    {
+                        name: 'fixedFees',
+                        type: 'tuple[4]',
+                        components: [
+                            { name: 'account', type: 'address' },
+                            { name: 'rate', type: 'uint96' },
+                        ],
+                    },
+                    {
+                        name: 'excess',
+                        type: 'tuple',
+                        components: [
+                            { name: 'enabled', type: 'bool' },
+                            { name: 'account', type: 'address' },
+                            { name: 'annualTargetRate', type: 'uint96' },
+                            { name: 'excessFeeRate', type: 'uint96' },
+                        ],
+                    },
+                ],
+            },
+        ],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'feeRemainder',
+        inputs: [
+            { name: 'configId', type: 'uint64' },
+            { name: 'slot', type: 'uint8' },
+        ],
+        outputs: [{ name: '', type: 'uint256' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'feesActive',
+        inputs: [],
+        outputs: [{ name: '', type: 'bool' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'feesDisabled',
+        inputs: [],
+        outputs: [{ name: '', type: 'bool' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'fixedFeeCap',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint96' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'highWaterMark',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint256' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'initialize',
+        inputs: [
+            { name: 'earnVault_', type: 'address' },
+            { name: 'earnShare_', type: 'address' },
+            {
+                name: 'init',
+                type: 'tuple',
+                components: [
+                    { name: 'administrator', type: 'address' },
+                    { name: 'guardian', type: 'address' },
+                    { name: 'fixedFeeCap', type: 'uint96' },
+                    { name: 'excessFeeCap', type: 'uint96' },
+                    {
+                        name: 'initialConfig',
+                        type: 'tuple',
+                        components: [
+                            { name: 'fixedFeeCount', type: 'uint8' },
+                            {
+                                name: 'fixedFees',
+                                type: 'tuple[4]',
+                                components: [
+                                    { name: 'account', type: 'address' },
+                                    { name: 'rate', type: 'uint96' },
+                                ],
+                            },
+                            {
+                                name: 'excess',
+                                type: 'tuple',
+                                components: [
+                                    { name: 'enabled', type: 'bool' },
+                                    { name: 'account', type: 'address' },
+                                    { name: 'annualTargetRate', type: 'uint96' },
+                                    { name: 'excessFeeRate', type: 'uint96' },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+            },
+        ],
+        outputs: [],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'initializeBaselines',
+        inputs: [],
+        outputs: [],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'pendingFeeSnapshot',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [
+            {
+                name: '',
+                type: 'tuple',
+                components: [
+                    { name: 'burnedEarnShares', type: 'uint256' },
+                    { name: 'requestValue', type: 'uint256' },
+                    { name: 'highWaterValue', type: 'uint256' },
+                    { name: 'targetValue', type: 'uint256' },
+                    { name: 'feeConfigId', type: 'uint64' },
+                    { name: 'requestedAt', type: 'uint40' },
+                    { name: 'open', type: 'bool' },
+                ],
+            },
+        ],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'previewAccruedFees',
+        inputs: [],
+        outputs: [
+            {
+                name: 'result',
+                type: 'tuple',
+                components: [
+                    { name: 'activeAssets', type: 'uint256' },
+                    { name: 'positiveAccrualAssets', type: 'uint256' },
+                    { name: 'fixedFeeAssets', type: 'uint256' },
+                    { name: 'excessFeeAssets', type: 'uint256' },
+                    { name: 'totalFeeAssets', type: 'uint256' },
+                    { name: 'totalFeeEarnShares', type: 'uint256' },
+                    { name: 'preFeeValuePerEarnShare', type: 'uint256' },
+                    { name: 'postFeeValuePerEarnShare', type: 'uint256' },
+                    { name: 'targetValuePerEarnShare', type: 'uint256' },
+                    { name: 'allocationCount', type: 'uint8' },
+                    {
+                        name: 'allocations',
+                        type: 'tuple[5]',
+                        components: [
+                            { name: 'account', type: 'address' },
+                            { name: 'feeAssets', type: 'uint256' },
+                            { name: 'feeEarnShares', type: 'uint256' },
+                        ],
+                    },
+                ],
+            },
+        ],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'recordRedeemRequest',
+        inputs: [
+            { name: 'requestId', type: 'bytes32' },
+            { name: 'burnedEarnShares', type: 'uint256' },
+            { name: 'requestValue', type: 'uint256' },
+        ],
+        outputs: [],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'setFeeConfig',
+        inputs: [
+            {
+                name: 'config',
+                type: 'tuple',
+                components: [
+                    { name: 'fixedFeeCount', type: 'uint8' },
+                    {
+                        name: 'fixedFees',
+                        type: 'tuple[4]',
+                        components: [
+                            { name: 'account', type: 'address' },
+                            { name: 'rate', type: 'uint96' },
+                        ],
+                    },
+                    {
+                        name: 'excess',
+                        type: 'tuple',
+                        components: [
+                            { name: 'enabled', type: 'bool' },
+                            { name: 'account', type: 'address' },
+                            { name: 'annualTargetRate', type: 'uint96' },
+                            { name: 'excessFeeRate', type: 'uint96' },
+                        ],
+                    },
+                ],
+            },
+        ],
+        outputs: [{ name: 'configId', type: 'uint64' }],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'settleCancelledRedeem',
+        inputs: [
+            { name: 'requestId', type: 'bytes32' },
+            { name: 'returnedValue', type: 'uint256' },
+            { name: 'activeSupply', type: 'uint256' },
+            { name: 'activeAssets', type: 'uint256' },
+            { name: 'totalReentryEarnShares', type: 'uint256' },
+        ],
+        outputs: [{ name: 'feeEarnShares', type: 'uint256' }],
+        stateMutability: 'nonpayable',
+    },
+    {
+        type: 'function',
+        name: 'shouldChargeRedeem',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        outputs: [{ name: '', type: 'bool' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'targetBase',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint256' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'targetStartedAt',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint40' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'function',
+        name: 'totalClaimableEarnShares',
+        inputs: [],
+        outputs: [{ name: '', type: 'uint256' }],
+        stateMutability: 'view',
+    },
+    {
+        type: 'event',
+        name: 'FeeBaselinesInitialized',
+        inputs: [
+            { name: 'highWaterMark', type: 'uint256', indexed: false },
+            { name: 'targetBase', type: 'uint256', indexed: false },
+            { name: 'targetStartedAt', type: 'uint40', indexed: false },
+        ],
+        anonymous: false,
+    },
+    {
+        type: 'event',
+        name: 'FeeConfigurationSet',
+        inputs: [
+            { name: 'configId', type: 'uint64', indexed: true },
+            { name: 'configHash', type: 'bytes32', indexed: true },
+            { name: 'reactivated', type: 'bool', indexed: false },
+        ],
+        anonymous: false,
+    },
+    {
+        type: 'event',
+        name: 'FeeDustWaived',
+        inputs: [
+            { name: 'configId', type: 'uint64', indexed: true },
+            { name: 'slot', type: 'uint8', indexed: true },
+            { name: 'remainder', type: 'uint256', indexed: false },
+        ],
+        anonymous: false,
+    },
+    {
+        type: 'event',
+        name: 'FeeEarnSharesAllocated',
+        inputs: [
+            { name: 'configId', type: 'uint64', indexed: true },
+            { name: 'recipient', type: 'address', indexed: true },
+            { name: 'feeAssets', type: 'uint256', indexed: false },
+            { name: 'feeEarnShares', type: 'uint256', indexed: false },
+        ],
+        anonymous: false,
+    },
+    {
+        type: 'event',
+        name: 'FeeEarnSharesClaimed',
+        inputs: [
+            { name: 'recipient', type: 'address', indexed: true },
+            { name: 'to', type: 'address', indexed: true },
+            { name: 'earnShares', type: 'uint256', indexed: false },
+        ],
+        anonymous: false,
+    },
+    {
+        type: 'event',
+        name: 'FeesAccrued',
+        inputs: [
+            { name: 'configId', type: 'uint64', indexed: true },
+            { name: 'activeAssets', type: 'uint256', indexed: false },
+            { name: 'positiveAccrualAssets', type: 'uint256', indexed: false },
+            { name: 'feeAssets', type: 'uint256', indexed: false },
+            { name: 'feeEarnShares', type: 'uint256', indexed: false },
+            { name: 'highWaterMark', type: 'uint256', indexed: false },
+            { name: 'targetValuePerEarnShare', type: 'uint256', indexed: false },
+        ],
+        anonymous: false,
+    },
+    {
+        type: 'event',
+        name: 'FeesDisabled',
+        inputs: [{ name: 'guardian', type: 'address', indexed: true }],
+        anonymous: false,
+    },
+    { type: 'error', name: 'AlreadyInitialized', inputs: [] },
+    { type: 'error', name: 'FeeCapTooHigh', inputs: [] },
+    { type: 'error', name: 'FeesPermanentlyDisabled', inputs: [] },
+    { type: 'error', name: 'InsufficientClaimableEarnShares', inputs: [] },
+    { type: 'error', name: 'InvalidFeeClaimReceiver', inputs: [] },
+    { type: 'error', name: 'InvalidFeeConfiguration', inputs: [] },
+    { type: 'error', name: 'NotEarnVault', inputs: [] },
+    { type: 'error', name: 'ReentrantCall', inputs: [] },
     { type: 'error', name: 'ZeroAddress', inputs: [] },
     { type: 'error', name: 'ZeroAmount', inputs: [] },
-    { type: 'error', name: 'ZeroMinimumAssets', inputs: [] },
-    { type: 'error', name: 'ZeroMinimumShares', inputs: [] },
 ];
-export const vaultEngine = [
+export const earnEngine = [
     {
         type: 'function',
         name: 'asset',
@@ -4135,7 +4500,7 @@ export const vaultEngine = [
         type: 'function',
         name: 'deposit',
         inputs: [{ name: 'assets', type: 'uint256' }],
-        outputs: [{ name: 'shares', type: 'uint256' }],
+        outputs: [{ name: 'engineShares', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
     {
@@ -4145,6 +4510,13 @@ export const vaultEngine = [
         outputs: [{ name: '', type: 'string' }],
         stateMutability: 'view',
     },
+    {
+        type: 'function',
+        name: 'shareScale',
+        inputs: [],
+        outputs: [{ name: 'scale', type: 'uint256' }],
+        stateMutability: 'view',
+    },
     {
         type: 'function',
         name: 'supportsInterface',
@@ -4170,20 +4542,20 @@ export const vaultEngine = [
         type: 'function',
         name: 'totalShares',
         inputs: [],
-        outputs: [{ name: 'shares', type: 'uint256' }],
+        outputs: [{ name: 'engineShares', type: 'uint256' }],
         stateMutability: 'view',
     },
     {
         type: 'function',
         name: 'valueOf',
-        inputs: [{ name: 'shares', type: 'uint256' }],
+        inputs: [{ name: 'engineShares', type: 'uint256' }],
         outputs: [{ name: 'assets', type: 'uint256' }],
         stateMutability: 'view',
     },
     {
         type: 'function',
         name: 'previewRedeem',
-        inputs: [{ name: 'shares', type: 'uint256' }],
+        inputs: [{ name: 'engineShares', type: 'uint256' }],
         outputs: [{ name: 'assets', type: 'uint256' }],
         stateMutability: 'view',
     },
@@ -4191,8 +4563,9 @@ export const vaultEngine = [
         type: 'function',
         name: 'redeem',
         inputs: [
-            { name: 'shares', type: 'uint256' },
+            { name: 'engineShares', type: 'uint256' },
             { name: 'receiver', type: 'address' },
+            { name: 'minAssets', type: 'uint256' },
         ],
         outputs: [{ name: 'assets', type: 'uint256' }],
         stateMutability: 'nonpayable',
@@ -4201,7 +4574,7 @@ export const vaultEngine = [
         type: 'function',
         name: 'previewWithdraw',
         inputs: [{ name: 'assets', type: 'uint256' }],
-        outputs: [{ name: 'shares', type: 'uint256' }],
+        outputs: [{ name: 'engineShares', type: 'uint256' }],
         stateMutability: 'view',
     },
     {
@@ -4211,42 +4584,42 @@ export const vaultEngine = [
             { name: 'assets', type: 'uint256' },
             { name: 'receiver', type: 'address' },
         ],
-        outputs: [{ name: 'shares', type: 'uint256' }],
+        outputs: [{ name: 'engineShares', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
 ];
-export const vaultEngineAsync = [
+export const earnEngineAsyncRedeem = [
     {
         type: 'function',
         name: 'cancelRedeem',
         inputs: [{ name: 'requestId', type: 'bytes32' }],
-        outputs: [{ name: 'shares', type: 'uint256' }],
+        outputs: [{ name: 'engineShares', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
     {
         type: 'function',
         name: 'requestRedeem',
         inputs: [
-            { name: 'shares', type: 'uint256' },
+            { name: 'engineShares', type: 'uint256' },
             { name: 'requestData', type: 'bytes' },
         ],
         outputs: [{ name: 'requestId', type: 'bytes32' }],
         stateMutability: 'nonpayable',
     },
 ];
-export const vaultEngineShares = [
+export const earnEngineInKindDeposit = [
     {
         type: 'function',
-        name: 'depositShares',
+        name: 'depositInKind',
         inputs: [
-            { name: 'shares', type: 'uint256' },
+            { name: 'venueShares', type: 'uint256' },
             { name: 'from', type: 'address' },
         ],
-        outputs: [{ name: 'sharesReceived', type: 'uint256' }],
+        outputs: [{ name: 'engineSharesReceived', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
 ];
-export const vaultRewards = [
+export const earnContributionController = [
     {
         type: 'function',
         name: 'active',
@@ -4259,9 +4632,10 @@ export const vaultRewards = [
         name: 'fund',
         inputs: [
             { name: 'funder', type: 'address' },
-            { name: 'requested', type: 'uint256' },
+            { name: 'requestedAssets', type: 'uint256' },
+            { name: 'maxEarnShareSupply', type: 'uint256' },
         ],
-        outputs: [{ name: 'funded', type: 'uint256' }],
+        outputs: [{ name: 'fundedAssets', type: 'uint256' }],
         stateMutability: 'nonpayable',
     },
     {
@@ -4276,11 +4650,19 @@ export const vaultRewards = [
         name: 'Funded',
         inputs: [
             { name: 'funder', type: 'address', indexed: true },
-            { name: 'requested', type: 'uint256', indexed: false },
-            { name: 'funded', type: 'uint256', indexed: false },
+            { name: 'requestedAssets', type: 'uint256', indexed: false },
+            { name: 'fundedAssets', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
+    {
+        type: 'error',
+        name: 'EarnShareSupplyOutOfBounds',
+        inputs: [
+            { name: 'earnShareSupply', type: 'uint256' },
+            { name: 'maxEarnShareSupply', type: 'uint256' },
+        ],
+    },
     { type: 'error', name: 'Inactive', inputs: [] },
     { type: 'error', name: 'NotSelf', inputs: [] },
     {
@@ -4313,6 +4695,7 @@ export const vedaEngine = [
         outputs: [
             { name: 'open', type: 'bool' },
             { name: 'paid', type: 'bool' },
+            { name: 'claimable', type: 'bool' },
             { name: 'recorded', type: 'bool' },
             {
                 name: 'request',
@@ -4354,19 +4737,13 @@ export const vedaEngine = [
         ],
         anonymous: false,
     },
-    {
-        type: 'event',
-        name: 'CoreInitialized',
-        inputs: [{ name: 'core', type: 'address', indexed: true }],
-        anonymous: false,
-    },
     {
         type: 'event',
         name: 'Deposited',
         inputs: [
-            { name: 'receiver', type: 'address', indexed: true },
+            { name: 'earnVault', type: 'address', indexed: true },
             { name: 'assets', type: 'uint256', indexed: false },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'engineShares', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -4380,6 +4757,12 @@ export const vedaEngine = [
         ],
         anonymous: false,
     },
+    {
+        type: 'event',
+        name: 'EarnVaultInitialized',
+        inputs: [{ name: 'earnVault', type: 'address', indexed: true }],
+        anonymous: false,
+    },
     {
         type: 'event',
         name: 'FinalizeFailed',
@@ -4400,6 +4783,15 @@ export const vedaEngine = [
         ],
         anonymous: false,
     },
+    {
+        type: 'event',
+        name: 'MaxRateAgeUpdated',
+        inputs: [
+            { name: 'oldMaxRateAge', type: 'uint64', indexed: false },
+            { name: 'newMaxRateAge', type: 'uint64', indexed: false },
+        ],
+        anonymous: false,
+    },
     {
         type: 'event',
         name: 'OwnershipTransferStarted',
@@ -4423,7 +4815,7 @@ export const vedaEngine = [
         name: 'RedeemCancelledOnQueue',
         inputs: [
             { name: 'requestId', type: 'bytes32', indexed: true },
-            { name: 'shares', type: 'uint128', indexed: false },
+            { name: 'venueShares', type: 'uint128', indexed: false },
         ],
         anonymous: false,
     },
@@ -4443,7 +4835,7 @@ export const vedaEngine = [
         inputs: [
             { name: 'requestId', type: 'bytes32', indexed: true },
             { name: 'assetOut', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint128', indexed: false },
+            { name: 'venueShares', type: 'uint128', indexed: false },
         ],
         anonymous: false,
     },
@@ -4452,7 +4844,7 @@ export const vedaEngine = [
         name: 'Redeemed',
         inputs: [
             { name: 'receiver', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
+            { name: 'engineShares', type: 'uint256', indexed: false },
             { name: 'assets', type: 'uint256', indexed: false },
         ],
         anonymous: false,
@@ -4486,13 +4878,28 @@ export const vedaEngine = [
         ],
         anonymous: false,
     },
+    {
+        type: 'event',
+        name: 'VedaPeripheryUpdated',
+        inputs: [
+            { name: 'registryVersion', type: 'uint64', indexed: true },
+            { name: 'oldTeller', type: 'address', indexed: true },
+            { name: 'oldQueue', type: 'address', indexed: true },
+            { name: 'oldAccountant', type: 'address', indexed: false },
+            { name: 'newTeller', type: 'address', indexed: false },
+            { name: 'newQueue', type: 'address', indexed: false },
+            { name: 'newAccountant', type: 'address', indexed: false },
+            { name: 'validatedRate', type: 'uint256', indexed: false },
+        ],
+        anonymous: false,
+    },
     {
         type: 'event',
         name: 'WithdrewExact',
         inputs: [
             { name: 'receiver', type: 'address', indexed: true },
             { name: 'assets', type: 'uint256', indexed: false },
-            { name: 'sharesBurned', type: 'uint256', indexed: false },
+            { name: 'engineSharesBurned', type: 'uint256', indexed: false },
         ],
         anonymous: false,
     },
@@ -4502,13 +4909,17 @@ export const vedaEngine = [
         name: 'AssetsNotArrived',
         inputs: [{ name: 'requestId', type: 'bytes32' }],
     },
-    { type: 'error', name: 'CannotSweepBackingShares', inputs: [] },
+    { type: 'error', name: 'CannotSweepVenueShares', inputs: [] },
+    {
+        type: 'error',
+        name: 'ClaimNotClaimable',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
+    },
     {
         type: 'error',
         name: 'ClaimNotOpen',
         inputs: [{ name: 'requestId', type: 'bytes32' }],
     },
-    { type: 'error', name: 'CoreNotSet', inputs: [] },
     {
         type: 'error',
         name: 'CreditExceedsBalance',
@@ -4518,266 +4929,230 @@ export const vedaEngine = [
             { name: 'wantTotal', type: 'uint256' },
         ],
     },
-    { type: 'error', name: 'NoSharesReceived', inputs: [] },
+    { type: 'error', name: 'DepositsNotPaused', inputs: [] },
     {
         type: 'error',
-        name: 'NotAuthorizedForwarder',
-        inputs: [{ name: 'caller', type: 'address' }],
+        name: 'DuplicateRequest',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
     },
+    { type: 'error', name: 'EarnVaultNotSet', inputs: [] },
     {
         type: 'error',
-        name: 'NotCore',
-        inputs: [{ name: 'caller', type: 'address' }],
+        name: 'InvalidAsset',
+        inputs: [
+            { name: 'expected', type: 'address' },
+            { name: 'actual', type: 'address' },
+        ],
     },
-    { type: 'error', name: 'NotSelf', inputs: [] },
+    { type: 'error', name: 'InvalidMaxRateAge', inputs: [] },
     {
         type: 'error',
-        name: 'OwnableInvalidOwner',
-        inputs: [{ name: 'owner', type: 'address' }],
+        name: 'InvalidRateTimestamp',
+        inputs: [
+            { name: 'updatedAt', type: 'uint256' },
+            { name: 'currentTime', type: 'uint256' },
+        ],
     },
     {
         type: 'error',
-        name: 'OwnableUnauthorizedAccount',
+        name: 'InvalidVedaPeriphery',
         inputs: [{ name: 'account', type: 'address' }],
     },
-    { type: 'error', name: 'ReentrantCall', inputs: [] },
     {
         type: 'error',
-        name: 'RequestDetailsNotRecorded',
-        inputs: [{ name: 'requestId', type: 'bytes32' }],
+        name: 'InvalidVedaPeripheryWiring',
+        inputs: [
+            { name: 'component', type: 'address' },
+            { name: 'expected', type: 'address' },
+            { name: 'actual', type: 'address' },
+        ],
     },
     {
         type: 'error',
-        name: 'SharesTooLarge',
-        inputs: [{ name: 'shares', type: 'uint256' }],
-    },
-    { type: 'error', name: 'TransferFailed', inputs: [] },
-    { type: 'error', name: 'ZeroAddress', inputs: [] },
-];
-export const zoneGateway = [
-    {
-        type: 'function',
-        name: 'defaultSwapper',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'shareToken',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
+        name: 'InvalidVedaRateBounds',
+        inputs: [
+            { name: 'minRate', type: 'uint256' },
+            { name: 'maxRate', type: 'uint256' },
+        ],
     },
+    { type: 'error', name: 'InvalidVenueShareDecimals', inputs: [] },
+    { type: 'error', name: 'NoPublishedVedaPeriphery', inputs: [] },
+    { type: 'error', name: 'NoVenueSharesReceived', inputs: [] },
     {
-        type: 'function',
-        name: 'supportsFlow',
-        inputs: [{ name: 'flow', type: 'uint8' }],
-        outputs: [{ name: '', type: 'bool' }],
-        stateMutability: 'pure',
+        type: 'error',
+        name: 'NotAuthorizedForwarder',
+        inputs: [{ name: 'caller', type: 'address' }],
     },
     {
-        type: 'function',
-        name: 'vaultAdapter',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
+        type: 'error',
+        name: 'NotEarnVault',
+        inputs: [{ name: 'caller', type: 'address' }],
     },
+    { type: 'error', name: 'NotSelf', inputs: [] },
     {
-        type: 'function',
-        name: 'vaultAsset',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
+        type: 'error',
+        name: 'OwnableInvalidOwner',
+        inputs: [{ name: 'owner', type: 'address' }],
     },
     {
-        type: 'function',
-        name: 'zoneId',
-        inputs: [],
-        outputs: [{ name: '', type: 'uint32' }],
-        stateMutability: 'view',
+        type: 'error',
+        name: 'OwnableUnauthorizedAccount',
+        inputs: [{ name: 'account', type: 'address' }],
     },
     {
-        type: 'function',
-        name: 'zoneMessenger',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
+        type: 'error',
+        name: 'RateChangedWithinTransaction',
+        inputs: [
+            { name: 'expected', type: 'uint256' },
+            { name: 'actual', type: 'uint256' },
+        ],
     },
+    { type: 'error', name: 'ReentrantCall', inputs: [] },
     {
-        type: 'function',
-        name: 'zonePortal',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
+        type: 'error',
+        name: 'RequestDetailsNotRecorded',
+        inputs: [{ name: 'requestId', type: 'bytes32' }],
     },
     {
-        type: 'event',
-        name: 'EarnDeposit',
+        type: 'error',
+        name: 'SolveUnderfunded',
         inputs: [
-            { name: 'actionId', type: 'bytes32', indexed: true },
-            { name: 'inputToken', type: 'address', indexed: true },
-            { name: 'inputAmount', type: 'uint256', indexed: false },
-            { name: 'vaultAssets', type: 'uint256', indexed: false },
-            { name: 'shares', type: 'uint256', indexed: false },
-            { name: 'zoneDepositHash', type: 'bytes32', indexed: false },
+            { name: 'asset', type: 'address' },
+            { name: 'delivered', type: 'uint256' },
+            { name: 'required', type: 'uint256' },
         ],
-        anonymous: false,
     },
     {
-        type: 'event',
-        name: 'EarnRedeem',
+        type: 'error',
+        name: 'StaleAccountantRate',
         inputs: [
-            { name: 'actionId', type: 'bytes32', indexed: true },
-            { name: 'outputToken', type: 'address', indexed: true },
-            { name: 'shares', type: 'uint256', indexed: false },
-            { name: 'vaultAssets', type: 'uint256', indexed: false },
-            { name: 'outputAmount', type: 'uint256', indexed: false },
-            { name: 'zoneDepositHash', type: 'bytes32', indexed: false },
+            { name: 'updatedAt', type: 'uint256' },
+            { name: 'currentTime', type: 'uint256' },
+            { name: 'maxAge', type: 'uint256' },
         ],
-        anonymous: false,
-    },
-];
-export const zoneGatewayBase = [
-    {
-        type: 'function',
-        name: 'acceptOwnership',
-        inputs: [],
-        outputs: [],
-        stateMutability: 'nonpayable',
     },
+    { type: 'error', name: 'TransferFailed', inputs: [] },
     {
-        type: 'function',
-        name: 'depositSwapperFor',
-        inputs: [{ name: 'token', type: 'address' }],
-        outputs: [{ name: 'swapper', type: 'address' }],
-        stateMutability: 'view',
+        type: 'error',
+        name: 'VedaRateOutOfBounds',
+        inputs: [
+            { name: 'rate', type: 'uint256' },
+            { name: 'minRate', type: 'uint256' },
+            { name: 'maxRate', type: 'uint256' },
+        ],
     },
     {
-        type: 'function',
-        name: 'owner',
-        inputs: [],
-        outputs: [{ name: '', type: 'address' }],
-        stateMutability: 'view',
+        type: 'error',
+        name: 'VenueSharesTooLarge',
+        inputs: [{ name: 'venueShares', type: 'uint256' }],
     },
+    { type: 'error', name: 'ZeroAddress', inputs: [] },
+];
+export const earnRouter = [
     {
         type: 'function',
-        name: 'pendingOwner',
+        name: 'STABLECOIN_DEX',
         inputs: [],
         outputs: [{ name: '', type: 'address' }],
         stateMutability: 'view',
     },
     {
         type: 'function',
-        name: 'redeemSwapperFor',
-        inputs: [{ name: 'token', type: 'address' }],
-        outputs: [{ name: 'swapper', type: 'address' }],
-        stateMutability: 'view',
-    },
-    {
-        type: 'function',
-        name: 'renounceOwnership',
-        inputs: [],
-        outputs: [],
-        stateMutability: 'nonpayable',
-    },
-    {
-        type: 'function',
-        name: 'setDepositRoute',
-        inputs: [
-            { name: 'inputToken', type: 'address' },
-            { name: 'swapper', type: 'address' },
-        ],
-        outputs: [],
-        stateMutability: 'nonpayable',
-    },
-    {
-        type: 'function',
-        name: 'setRedeemRoute',
+        name: 'onWithdrawalReceived',
         inputs: [
-            { name: 'outputToken', type: 'address' },
-            { name: 'swapper', type: 'address' },
+            { name: 'sourceZoneId', type: 'uint32' },
+            { name: 'sourcePortal', type: 'address' },
+            { name: '', type: 'bytes32' },
+            { name: 'token', type: 'address' },
+            { name: 'amount', type: 'uint128' },
+            { name: 'callbackData', type: 'bytes' },
         ],
-        outputs: [],
+        outputs: [{ name: '', type: 'bytes4' }],
         stateMutability: 'nonpayable',
     },
     {
         type: 'function',
-        name: 'transferOwnership',
-        inputs: [{ name: 'newOwner', type: 'address' }],
-        outputs: [],
-        stateMutability: 'nonpayable',
+        name: 'supportsFlow',
+        inputs: [{ name: 'flow', type: 'uint8' }],
+        outputs: [{ name: '', type: 'bool' }],
+        stateMutability: 'pure',
     },
     {
         type: 'event',
-        name: 'DepositRouteUpdated',
+        name: 'EarnDeposit',
         inputs: [
+            { name: 'actionId', type: 'bytes32', indexed: true },
+            { name: 'earnVault', type: 'address', indexed: true },
             { name: 'inputToken', type: 'address', indexed: true },
-            { name: 'swapper', type: 'address', indexed: true },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'OwnershipTransferStarted',
-        inputs: [
-            { name: 'previousOwner', type: 'address', indexed: true },
-            { name: 'newOwner', type: 'address', indexed: true },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'OwnershipTransferred',
-        inputs: [
-            { name: 'previousOwner', type: 'address', indexed: true },
-            { name: 'newOwner', type: 'address', indexed: true },
+            { name: 'inputAmount', type: 'uint256', indexed: false },
+            { name: 'vaultAssets', type: 'uint256', indexed: false },
+            { name: 'earnShares', type: 'uint256', indexed: false },
+            { name: 'zoneDepositHash', type: 'bytes32', indexed: false },
         ],
         anonymous: false,
     },
     {
         type: 'event',
-        name: 'RedeemRouteUpdated',
+        name: 'EarnRedeem',
         inputs: [
+            { name: 'actionId', type: 'bytes32', indexed: true },
+            { name: 'earnVault', type: 'address', indexed: true },
             { name: 'outputToken', type: 'address', indexed: true },
-            { name: 'swapper', type: 'address', indexed: true },
-        ],
-        anonymous: false,
-    },
-    {
-        type: 'event',
-        name: 'TokenRescued',
-        inputs: [
-            { name: 'token', type: 'address', indexed: true },
-            { name: 'receiver', type: 'address', indexed: true },
-            { name: 'amount', type: 'uint256', indexed: false },
+            { name: 'earnShares', type: 'uint256', indexed: false },
+            { name: 'vaultAssets', type: 'uint256', indexed: false },
+            { name: 'outputAmount', type: 'uint256', indexed: false },
+            { name: 'zoneDepositHash', type: 'bytes32', indexed: false },
         ],
         anonymous: false,
     },
+    { type: 'error', name: 'AmountOverflow', inputs: [] },
+    { type: 'error', name: 'BadFlow', inputs: [] },
+    { type: 'error', name: 'InsufficientOutput', inputs: [] },
+    { type: 'error', name: 'InvalidEarnVault', inputs: [] },
+    { type: 'error', name: 'InvalidSourcePortal', inputs: [] },
+    { type: 'error', name: 'InvalidTargetPortal', inputs: [] },
+    { type: 'error', name: 'InvalidToken', inputs: [] },
+    { type: 'error', name: 'NotZoneMessenger', inputs: [] },
+    { type: 'error', name: 'ReentrantCall', inputs: [] },
+    { type: 'error', name: 'ResidualBalance', inputs: [] },
+    { type: 'error', name: 'TokenCallFailed', inputs: [] },
+    { type: 'error', name: 'TokenCallFalse', inputs: [] },
+    { type: 'error', name: 'WrongEarnShare', inputs: [] },
+    { type: 'error', name: 'WrongOutputToken', inputs: [] },
+    { type: 'error', name: 'WrongSourceAsset', inputs: [] },
+    { type: 'error', name: 'ZeroAddress', inputs: [] },
+    { type: 'error', name: 'ZeroAmount', inputs: [] },
 ];
-// `ZoneGateway.CallbackData` parameter for `encodeAbiParameters`.
-export const zoneGatewayCallbackData = [
+// `ZoneOnlyEarnRouter.CallbackData` parameter for `encodeAbiParameters`.
+export const earnRouterCallbackData = [
     {
         components: [
             { name: 'flow', type: 'uint8' },
+            { name: 'earnVault', type: 'address' },
             { name: 'outputToken', type: 'address' },
-            { name: 'keyIndex', type: 'uint256' },
+            { name: 'minVaultAssets', type: 'uint128' },
+            { name: 'minEarnShares', type: 'uint128' },
+            { name: 'minOutputAmount', type: 'uint128' },
+            { name: 'actionId', type: 'bytes32' },
             {
                 components: [
-                    { name: 'ephemeralPubkeyX', type: 'bytes32' },
-                    { name: 'ephemeralPubkeyYParity', type: 'uint8' },
-                    { name: 'ciphertext', type: 'bytes' },
-                    { name: 'nonce', type: 'bytes12' },
-                    { name: 'tag', type: 'bytes16' },
+                    { name: 'keyIndex', type: 'uint256' },
+                    {
+                        components: [
+                            { name: 'ephemeralPubkeyX', type: 'bytes32' },
+                            { name: 'ephemeralPubkeyYParity', type: 'uint8' },
+                            { name: 'ciphertext', type: 'bytes' },
+                            { name: 'nonce', type: 'bytes12' },
+                            { name: 'tag', type: 'bytes16' },
+                        ],
+                        name: 'encrypted',
+                        type: 'tuple',
+                    },
+                    { name: 'refundRecipient', type: 'address' },
                 ],
-                name: 'encrypted',
+                name: 'zoneReturn',
                 type: 'tuple',
             },
-            { name: 'minVaultAssets', type: 'uint128' },
-            { name: 'minVaultShares', type: 'uint128' },
-            { name: 'minOutputAmount', type: 'uint128' },
-            { name: 'actionId', type: 'bytes32' },
-            { name: 'refundRecipient', type: 'address' },
         ],
         name: 'callbackData',
         type: 'tuple',