fixes after rebase

Author: wischli

test/integration/recon-end-to-end/BeforeAfter.sol

@@ -291,13 +291,13 @@ abstract contract BeforeAfter is Setup {
         BeforeAfterVars storage _structToUpdate = before ? _before : _after;
 
         if (_getShareToken() != address(0)) {
-            _structToUpdate.escrowShareTokenBalance = MockERC20(_getShareToken()).balanceOf(address(globalEscrow));
+            _structToUpdate.escrowShareTokenBalance = MockERC20(_getShareToken()).balanceOf(_getPoolEscrowAddress());
             _structToUpdate.totalShareSupply = MockERC20(_getShareToken()).totalSupply();
         }
 
         if (address(_getVault()) != address(0)) {
             _structToUpdate.escrowAssetBalance[address(_getVault())] =
-                MockERC20(_getVault().asset()).balanceOf(address(globalEscrow));
+                MockERC20(_getVault().asset()).balanceOf(_getPoolEscrowForVault(_getVault()));
             _structToUpdate.poolEscrowAssetBalance =
                 MockERC20(_getVault().asset()).balanceOf(address(poolEscrowFactory.escrow(_getVault().poolId())));
             _structToUpdate.actualAssets = MockERC20(_getVault().asset()).balanceOf(address(_getVault()));

test/integration/recon-end-to-end/CryticToFoundry.sol

@@ -193,13 +193,22 @@ contract CryticToFoundry is Test, TargetFunctions, FoundryAsserts {
     // Reproducer: echidna/reproducers/9143144158582049584.txt
     // Async vault: deploy → deposit_queue_cancel → hub_notifyDeposit → maxDeposit
     function test_vault_maxDeposit_12() public {
-        shortcut_deployNewTokenPoolAndShare(58, 3725620682615936983603445291889200717745835437975087272030550155022530317057, false, true, true, false);
+        shortcut_deployNewTokenPoolAndShare(
+            58, 3725620682615936983603445291889200717745835437975087272030550155022530317057, false, true, true, false
+        );
 
         balanceSheet_submitQueuedShares(2986799447496935121812250855886100387);
 
         switch_actor(270);
 
-        shortcut_deposit_queue_cancel(4662387785827488946, 238, 1577203754821733349138040342627210308022144620756482427698354874963446062794, 326587208, 53058427172526584712949480, 124879742162045852864037660195030038286);
+        shortcut_deposit_queue_cancel(
+            4662387785827488946,
+            238,
+            1577203754821733349138040342627210308022144620756482427698354874963446062794,
+            326587208,
+            53058427172526584712949480,
+            124879742162045852864037660195030038286
+        );
 
         switch_share_class(7);
 

test/integration/recon-end-to-end/Setup.sol

@@ -13,7 +13,6 @@ import {ReconAssetIdManager} from "./managers/ReconAssetIdManager.sol";
 import {ReconShareClassManager} from "./managers/ReconShareClassManager.sol";
 import {BatchRequestManagerHarness} from "./mocks/BatchRequestManagerHarness.sol";
 
-import {Escrow} from "../../../src/misc/Escrow.sol";
 import {D18, d18} from "../../../src/misc/types/D18.sol";
 
 import {MockAdapter} from "../../core/mocks/MockAdapter.sol";
@@ -54,16 +53,18 @@ import {FullRestrictions} from "../../../src/hooks/FullRestrictions.sol";
 import {IdentityValuation} from "../../../src/valuations/IdentityValuation.sol";
 
 import {SyncManager} from "../../../src/vaults/SyncManager.sol";
+import {IBaseVault} from "../../../src/vaults/interfaces/IBaseVault.sol";
 import {AsyncRequestManager} from "../../../src/vaults/AsyncRequestManager.sol";
 import {AsyncVaultFactory} from "../../../src/vaults/factories/AsyncVaultFactory.sol";
-import {RefundEscrowFactory} from "../../../src/vaults/factories/RefundEscrowFactory.sol";
 import {SyncDepositVaultFactory} from "../../../src/vaults/factories/SyncDepositVaultFactory.sol";
 
 import {vm} from "@chimera/Hevm.sol";
 import {Utils} from "@recon/Utils.sol";
 import {BaseSetup} from "@chimera/BaseSetup.sol";
 import {ActorManager} from "@recon/ActorManager.sol";
 import {AssetManager} from "@recon/AssetManager.sol";
+import {SubsidyManager} from "../../../src/utils/SubsidyManager.sol";
+import {RefundEscrowFactory} from "../../../src/utils/RefundEscrowFactory.sol";
 
 // Hub
 
@@ -99,7 +100,7 @@ abstract contract Setup is
     FullRestrictions fullRestrictions;
     IRoot root;
     BalanceSheet balanceSheet;
-    Escrow globalEscrow;
+    SubsidyManager subsidyManager;
 
     // Mocks
     MessageDispatcher messageDispatcher;
@@ -192,22 +193,27 @@ abstract contract Setup is
         // Dependencies
         root = new Root(48 hours, address(this));
         gateway = new MockGateway();
-        globalEscrow = new Escrow(address(this));
-        root.endorse(address(globalEscrow));
 
         balanceSheet = new BalanceSheet(root, address(this));
-        fullRestrictions = new FullRestrictions(
-            address(root), address(spoke), address(balanceSheet), address(globalEscrow), address(spoke), address(this)
-        );
         refundEscrowFactory = new RefundEscrowFactory(address(this));
-        asyncRequestManager = new AsyncRequestManager(globalEscrow, refundEscrowFactory, address(this));
+        subsidyManager = new SubsidyManager(refundEscrowFactory, address(this));
+        asyncRequestManager = new AsyncRequestManager(subsidyManager, address(this));
         syncManager = new SyncManager(address(this));
         asyncVaultFactory = new AsyncVaultFactory(address(this), asyncRequestManager, address(this));
         syncVaultFactory = new SyncDepositVaultFactory(address(root), syncManager, asyncRequestManager, address(this));
         tokenFactory = new TokenFactory(address(this), address(this));
         poolEscrowFactory = new PoolEscrowFactory(address(root), address(this));
         vaultRegistry = new VaultRegistry(address(this));
         spoke = new Spoke(tokenFactory, address(this));
+        fullRestrictions = new FullRestrictions(
+            address(root),
+            address(spoke),
+            address(balanceSheet),
+            address(spoke), // crosschainSource_ (same chain = spoke)
+            address(this),
+            address(poolEscrowFactory),
+            address(0) // poolEscrow_
+        );
 
         tokenRecoverer = new TokenRecoverer(IRoot(address(root)), address(this));
         Root(address(root)).rely(address(tokenRecoverer));
@@ -238,7 +244,6 @@ abstract contract Setup is
         balanceSheet.file("poolEscrowProvider", address(poolEscrowFactory));
 
         balanceSheet.file("gateway", address(gateway));
-        poolEscrowFactory.file("gateway", address(gateway));
         poolEscrowFactory.file("balanceSheet", address(balanceSheet));
         address[] memory tokenWards = new address[](2);
         tokenWards[0] = address(spoke);
@@ -347,6 +352,16 @@ abstract contract Setup is
 
     /// === Helper Functions === ///
 
+    /// @dev Returns the PoolEscrow address for the current pool
+    function _getPoolEscrowAddress() internal view returns (address) {
+        return address(poolEscrowFactory.escrow(_getPool()));
+    }
+
+    /// @dev Returns the PoolEscrow address for a specific vault's pool
+    function _getPoolEscrowForVault(IBaseVault vault) internal view returns (address) {
+        return address(poolEscrowFactory.escrow(vault.poolId()));
+    }
+
     /// @dev Returns a random actor from the list of actors
     /// @dev This is useful for cases where we want to have caller and recipient be different actors
     /// @param entropy The determines which actor is chosen from the array
@@ -367,7 +382,6 @@ abstract contract Setup is
         // Root endorsements (from CommonDeployer and SpokeDeployer)
         root.endorse(address(balanceSheet));
         root.endorse(address(asyncRequestManager));
-        root.endorse(address(globalEscrow));
 
         // Rely Spoke (from SpokeDeployer)
         asyncVaultFactory.rely(address(spoke));
@@ -383,7 +397,6 @@ abstract contract Setup is
         vaultRegistry.rely(address(spoke));
 
         // Rely async requests manager
-        globalEscrow.rely(address(asyncRequestManager));
         asyncRequestManager.rely(address(asyncVaultFactory));
         asyncRequestManager.rely(address(syncVaultFactory));
         asyncRequestManager.rely(address(messageDispatcher));
@@ -408,19 +421,20 @@ abstract contract Setup is
         balanceSheet.rely(address(syncManager));
         balanceSheet.rely(address(messageDispatcher));
         balanceSheet.rely(address(gateway));
-        // Rely global escrow
-        globalEscrow.rely(address(asyncRequestManager));
-        globalEscrow.rely(address(syncManager));
-        globalEscrow.rely(address(spoke));
-        globalEscrow.rely(address(balanceSheet));
+
+        // Rely SubsidyManager and RefundEscrowFactory
+        subsidyManager.rely(address(root));
+        subsidyManager.rely(address(asyncRequestManager));
+        refundEscrowFactory.rely(address(subsidyManager));
+        refundEscrowFactory.file("controller", address(asyncRequestManager));
+        refundEscrowFactory.file("root", address(root));
 
         // Rely Root (from all deployers)
         spoke.rely(address(root));
         spoke.rely(address(vaultRegistry));
         asyncRequestManager.rely(address(root));
         syncManager.rely(address(root));
         balanceSheet.rely(address(root));
-        globalEscrow.rely(address(root));
         asyncVaultFactory.rely(address(root));
         syncVaultFactory.rely(address(root));
         tokenFactory.rely(address(root));

test/integration/recon-end-to-end/mocks/BatchRequestManagerHarness.sol

@@ -69,6 +69,7 @@ contract BatchRequestManagerHarness is BatchRequestManager {
                     })
                 ),
                 0, // extraGasLimit
+                false, // unpaidMode
                 refund
             );
         }
@@ -127,6 +128,7 @@ contract BatchRequestManagerHarness is BatchRequestManager {
                     })
                 ),
                 0, // extraGasLimit
+                false, // unpaidMode
                 refund
             );
         }

test/integration/recon-end-to-end/mocks/MockGateway.sol

@@ -35,16 +35,26 @@ contract MockGateway {
     function rely(address user) public {}
 
     // Mock implementation of repay
-    function repay(uint16 centrifugeId, bytes memory batch) public payable {}
+    function repay(uint16 centrifugeId, bytes memory batch, address refund) public payable {}
 
     // Mock implementation of retry
     function retry(uint16 centrifugeId, bytes memory message) public {}
 
     // Mock implementation of send
-    function send(uint16 centrifugeId, bytes memory message) public {}
+    function send(uint16 centrifugeId, bytes memory message, bool unpaidMode, address refund) public payable {}
 
-    // Mock implementation of setUnpaidMode
-    function setUnpaidMode(bool enabled) public {}
+    // Mock implementation of withBatch
+    function withBatch(bytes memory callbackData, uint256 callbackValue, address refund) external payable {}
+    function withBatch(bytes memory callbackData, address refund) external payable {}
+
+    // Mock implementation of lockCallback
+    function lockCallback() external {}
+
+    // Mock implementation of updateManager
+    function updateManager(uint64 poolId, address who, bool canManage) external {}
+
+    // Mock implementation of blockOutgoing
+    function blockOutgoing(uint16 centrifugeId, uint64 poolId, bool canSend) external {}
 
     // Mock implementation of setRefundAddress
     function setRefundAddress(uint64 poolId, address refund) public {}

test/integration/recon-end-to-end/properties/Properties.sol

@@ -144,7 +144,7 @@ abstract contract Properties is BeforeAfter, Asserts, VaultProperties {
                         _getVault()
                     )][_getActor()].claimableCancelDepositRequest
                 - _after.investments[address(_getVault())][_getActor()].claimableCancelDepositRequest;
-            // claiming a cancel deposit request means that the globalEscrow token balance decreases
+            // claiming a cancel deposit request means that the PoolEscrow token balance decreases
             uint256 escrowAssetBalanceDelta =
                 _before.escrowAssetBalance[address(_getVault())] - _after.escrowAssetBalance[address(_getVault())];
             eq(
@@ -173,7 +173,7 @@ abstract contract Properties is BeforeAfter, Asserts, VaultProperties {
                         _getVault()
                     )][_getActor()].claimableCancelRedeemRequest
                 - _after.investments[address(_getVault())][_getActor()].claimableCancelRedeemRequest;
-            // claiming a cancel redeem request means that the globalEscrow tranche token balance decreases
+            // claiming a cancel redeem request means that the PoolEscrow tranche token balance decreases
             uint256 escrowTrancheTokenBalanceDelta = _before.escrowShareTokenBalance - _after.escrowShareTokenBalance;
             eq(
                 claimableCancelRedeemRequestDelta,
@@ -452,7 +452,7 @@ abstract contract Properties is BeforeAfter, Asserts, VaultProperties {
         }
 
         IBaseVault vault = _getVault();
-        uint256 max = IShareToken(vault.share()).balanceOf(address(globalEscrow));
+        uint256 max = IShareToken(vault.share()).balanceOf(_getPoolEscrowForVault(vault));
         address[] memory actors = _getActors();
 
         uint256 acc; // Use acc to get maxMint for each actor
@@ -1090,7 +1090,7 @@ abstract contract Properties is BeforeAfter, Asserts, VaultProperties {
     /// @dev Can we donate to this address?
     /// We explicitly preventing donations since we check for exact balances
     function _canDonate(address to) internal view returns (bool) {
-        if (to == address(globalEscrow)) {
+        if (to == _getPoolEscrowAddress()) {
             return false;
         }
 
@@ -1749,7 +1749,7 @@ abstract contract Properties is BeforeAfter, Asserts, VaultProperties {
         try spoke.shareToken(poolId, scId) returns (IShareToken shareToken) {
             uint256 actualSupply = shareToken.totalSupply();
             // escrow holds tokens that have been redeemed
-            uint256 balancesSummed = shareToken.balanceOf(address(asyncRequestManager.globalEscrow()));
+            uint256 balancesSummed = shareToken.balanceOf(_getPoolEscrowAddress());
             // Check 2: Sum of balances equals total supply
             address[] memory actors = _getActors();
             for (uint256 k = 0; k < actors.length; k++) {

test/integration/recon-end-to-end/properties/VaultProperties.sol

@@ -4,9 +4,9 @@ pragma solidity 0.8.28;
 import {ERC7540Properties} from "./ERC7540Properties.sol";
 
 import {D18} from "../../../../src/misc/types/D18.sol";
-import {IERC20, IERC20Metadata} from "../../../../src/misc/interfaces/IERC20.sol";
 import {CastLib} from "../../../../src/misc/libraries/CastLib.sol";
 import {MathLib} from "../../../../src/misc/libraries/MathLib.sol";
+import {IERC20, IERC20Metadata} from "../../../../src/misc/interfaces/IERC20.sol";
 
 import {PoolId} from "../../../../src/core/types/PoolId.sol";
 import {AssetId} from "../../../../src/core/types/AssetId.sol";
@@ -119,7 +119,7 @@ abstract contract VaultProperties is Setup, Asserts, ERC7540Properties {
     /// @dev Property: depositing maxDeposit blocks the user from depositing more
     /// @dev Property: depositing maxDeposit does not increase the pendingDeposit
     /// @dev Property: depositing maxDeposit doesn't mint more than maxMint shares
-    /// @dev Property: For async vaults, validates globalEscrow share transfers
+    /// @dev Property: For async vaults, validates PoolEscrow share transfers
     /// @dev Property: For sync vaults, validates PoolEscrow state changes
     function vault_maxDeposit(
         uint64,
@@ -161,7 +161,7 @@ abstract contract VaultProperties is Setup, Asserts, ERC7540Properties {
             uint256 maxDepositAfter = _getVault().maxDeposit(_getActor());
 
             if (isAsyncVault) {
-                // For async vaults, validate globalEscrow share transfers instead of poolEscrow
+                // For async vaults, validate PoolEscrow share transfers
                 claimState.sharesReturned = shares;
                 _updateAsyncClaimStateAfter(claimState, _getVault(), _getActor());
                 _validateAsyncVaultClaim(claimState, "vault_maxDeposit");
@@ -455,11 +455,10 @@ abstract contract VaultProperties is Setup, Asserts, ERC7540Properties {
     }
 
     /// @notice Tracks share balances for async vault claim operations
-    /// @dev During claim operations (vault.deposit/mint), shares transfer from globalEscrow to receiver
-    /// @dev PoolEscrow does NOT change during claims
+    /// @dev During claim operations (vault.deposit/mint), shares transfer from PoolEscrow to receiver
     struct AsyncClaimState {
-        uint256 globalEscrowSharesBefore;
-        uint256 globalEscrowSharesAfter;
+        uint256 poolEscrowSharesBefore;
+        uint256 poolEscrowSharesAfter;
         uint256 receiverSharesBefore;
         uint256 receiverSharesAfter;
         uint256 sharesReturned;
@@ -723,16 +722,16 @@ abstract contract VaultProperties is Setup, Asserts, ERC7540Properties {
     }
 
     /// @dev Captures async claim state before vault.deposit() operation
-    /// @notice Tracks globalEscrow and receiver share balances
+    /// @notice Tracks PoolEscrow and receiver share balances
     function _captureAsyncClaimStateBefore(IBaseVault vault, address receiver)
         internal
         view
         returns (AsyncClaimState memory state)
     {
         address shareToken = vault.share();
-        address globalEscrowAddr = address(asyncRequestManager.globalEscrow());
+        address poolEscrowAddr = _getPoolEscrowForVault(vault);
 
-        state.globalEscrowSharesBefore = IERC20(shareToken).balanceOf(globalEscrowAddr);
+        state.poolEscrowSharesBefore = IERC20(shareToken).balanceOf(poolEscrowAddr);
         state.receiverSharesBefore = IERC20(shareToken).balanceOf(receiver);
 
         (state.maxMintBefore,,,,,,,,,) = asyncRequestManager.investments(vault, _getActor());
@@ -746,34 +745,34 @@ abstract contract VaultProperties is Setup, Asserts, ERC7540Properties {
         view
     {
         address shareToken = vault.share();
-        address globalEscrowAddr = address(asyncRequestManager.globalEscrow());
+        address poolEscrowAddr = _getPoolEscrowForVault(vault);
 
-        state.globalEscrowSharesAfter = IERC20(shareToken).balanceOf(globalEscrowAddr);
+        state.poolEscrowSharesAfter = IERC20(shareToken).balanceOf(poolEscrowAddr);
         state.receiverSharesAfter = IERC20(shareToken).balanceOf(receiver);
 
         (state.maxMintAfter,,,,,,,,,) = asyncRequestManager.investments(vault, _getActor());
     }
 
     /// @dev Validates async vault claim operations
-    /// @notice During claims, globalEscrow shares transfer to receiver, PoolEscrow does NOT change
+    /// @notice During claims, PoolEscrow shares transfer to receiver
     /// @notice This validation works for all cases including when sharesReturned == 0
     function _validateAsyncVaultClaim(AsyncClaimState memory state, string memory operationName) internal {
-        uint256 globalEscrowDecrease = state.globalEscrowSharesBefore - state.globalEscrowSharesAfter;
+        uint256 poolEscrowDecrease = state.poolEscrowSharesBefore - state.poolEscrowSharesAfter;
         uint256 receiverIncrease = state.receiverSharesAfter - state.receiverSharesBefore;
         eq(
-            globalEscrowDecrease,
+            poolEscrowDecrease,
             state.sharesReturned,
-            string.concat(operationName, ": globalEscrow must decrease by exact shares returned")
+            string.concat(operationName, ": PoolEscrow must decrease by exact shares returned")
         );
         eq(
             receiverIncrease,
             state.sharesReturned,
             string.concat(operationName, ": receiver must receive exact shares returned")
         );
         eq(
-            globalEscrowDecrease,
+            poolEscrowDecrease,
             receiverIncrease,
-            string.concat(operationName, ": shares leaving globalEscrow must equal shares received")
+            string.concat(operationName, ": shares leaving PoolEscrow must equal shares received")
         );
 
         uint128 maxMintDecrease = state.maxMintBefore - state.maxMintAfter;