Dry allowanceHolder use in test

test/integration/Across.t.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.25;
 import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {BridgeSettlerIntegrationTest} from "./BridgeSettler.t.sol";
-import {ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
 import {IBridgeSettlerActions} from "src/bridge/IBridgeSettlerActions.sol";
 import {LibBytes} from "../utils/LibBytes.sol";
 import {ISpokePool} from "src/core/Across.sol";
@@ -82,7 +81,7 @@ contract AcrossTest is BridgeSettlerIntegrationTest {
         deal(address(this), amount);
         (bool success,) = address(WETH).call{value: amount}(abi.encodeWithSignature("deposit()"));
         assertTrue(success, "Deposit failed");
-        WETH.approve(address(ALLOWANCE_HOLDER), amount);
+        WETH.approve(address(allowanceHolder), amount);
 
         bytes[] memory bridgeActions = ActionDataBuilder.build(
             _getDefaultTransferFrom(address(WETH), amount),
@@ -93,7 +92,7 @@ contract AcrossTest is BridgeSettlerIntegrationTest {
 
         uint256 balanceBefore = WETH.balanceOf(spokePool);
         vm.expectCall(spokePool, acrossCall(2000, 2000));
-        ALLOWANCE_HOLDER.exec(
+        allowanceHolder.exec(
             address(bridgeSettler),
             address(WETH),
             amount,

test/integration/BebopPairTest.t.sol

@@ -9,7 +9,6 @@ import {ActionDataBuilder} from "../utils/ActionDataBuilder.sol";
 import {Settler} from "src/Settler.sol";
 import {ISettlerActions} from "src/ISettlerActions.sol";
 import {IBebopSettlement} from "src/core/Bebop.sol";
-import {ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
 
 import {SettlerBasePairTest} from "./SettlerBasePairTest.t.sol";
 
@@ -368,7 +367,7 @@ abstract contract BebopPairTest is SettlerBasePairTest {
         Settler _settler = settler;
         IERC20 _fromToken = fromToken();
 
-        bytes[] memory actions = _buildRestrictedTargetActions(address(ALLOWANCE_HOLDER));
+        bytes[] memory actions = _buildRestrictedTargetActions(address(allowanceHolder));
 
         ISettlerBase.AllowedSlippage memory allowedSlippage = ISettlerBase.AllowedSlippage({
             recipient: payable(address(0)), buyToken: IERC20(address(0)), minAmountOut: 0

test/integration/CCIP.t.sol

@@ -5,7 +5,6 @@ import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {Vm} from "@forge-std/Vm.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {BridgeSettlerIntegrationTest} from "./BridgeSettler.t.sol";
-import {ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
 import {IBridgeSettlerActions} from "src/bridge/IBridgeSettlerActions.sol";
 import {InvalidFeeToken, InvalidTokenAmountsLength} from "src/core/SettlerErrors.sol";
 import {LibBytes} from "../utils/LibBytes.sol";
@@ -40,7 +39,7 @@ contract CCIPTest is BridgeSettlerIntegrationTest {
 
         deal(address(USDC), address(this), 2000e6);
         deal(address(this), 10 ether);
-        USDC.approve(address(ALLOWANCE_HOLDER), 2000e6);
+        USDC.approve(address(allowanceHolder), 2000e6);
     }
 
     function getOnRamp(uint64 destinationChainSelector) internal view returns (address onRamp) {
@@ -97,7 +96,7 @@ contract CCIPTest is BridgeSettlerIntegrationTest {
 
         // Execute and verify
         vm.expectCall(CCIP_ROUTER, fee, abi.encodeCall(IRouterClient.ccipSend, (ARBITRUM_SELECTOR, message)));
-        ALLOWANCE_HOLDER.exec{value: fee}(
+        allowanceHolder.exec{value: fee}(
             address(bridgeSettler),
             address(USDC),
             amount,
@@ -143,7 +142,7 @@ contract CCIPTest is BridgeSettlerIntegrationTest {
 
         // Execute
         vm.expectCall(CCIP_ROUTER, fee, abi.encodeCall(IRouterClient.ccipSend, (BASE_SELECTOR, message)));
-        ALLOWANCE_HOLDER.exec{value: fee}(
+        allowanceHolder.exec{value: fee}(
             address(bridgeSettler),
             address(USDC),
             amount,
@@ -199,7 +198,7 @@ contract CCIPTest is BridgeSettlerIntegrationTest {
         // Execute
         vm.expectCall(CCIP_ROUTER, fee, abi.encodeCall(IRouterClient.ccipSend, (ARBITRUM_SELECTOR, message)));
         vm.recordLogs();
-        ALLOWANCE_HOLDER.exec{value: fee}(
+        allowanceHolder.exec{value: fee}(
             address(bridgeSettler),
             address(USDC),
             amount,
@@ -256,7 +255,7 @@ contract CCIPTest is BridgeSettlerIntegrationTest {
 
         // Should revert because feeToken is not address(0)
         vm.expectRevert(InvalidFeeToken.selector);
-        ALLOWANCE_HOLDER.exec(
+        allowanceHolder.exec(
             address(bridgeSettler),
             address(USDC),
             amount,
@@ -296,7 +295,7 @@ contract CCIPTest is BridgeSettlerIntegrationTest {
 
         // Should revert because tokenAmounts length is not 1
         vm.expectRevert(InvalidTokenAmountsLength.selector);
-        ALLOWANCE_HOLDER.exec(
+        allowanceHolder.exec(
             address(bridgeSettler),
             address(USDC),
             amount,

test/integration/DeBridge.t.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.25;
 import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {BridgeSettlerIntegrationTest} from "./BridgeSettler.t.sol";
-import {ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
 import {IBridgeSettlerActions} from "src/bridge/IBridgeSettlerActions.sol";
 import {DeBridge, DLN_SOURCE, IDlnSource} from "src/core/DeBridge.sol";
 import {ActionDataBuilder} from "../utils/ActionDataBuilder.sol";
@@ -72,7 +71,7 @@ contract DeBridgeTest is BridgeSettlerIntegrationTest {
 
         deal(address(this), globalFee);
         deal(address(USDC), address(this), amount);
-        USDC.approve(address(ALLOWANCE_HOLDER), amount);
+        USDC.approve(address(allowanceHolder), amount);
 
         bytes[] memory bridgeActions = ActionDataBuilder.build(
             _getDefaultTransferFrom(address(USDC), amount),
@@ -84,7 +83,7 @@ contract DeBridgeTest is BridgeSettlerIntegrationTest {
         uint256 usdcBalanceBefore = USDC.balanceOf(address(DLN_SOURCE));
         uint256 ethBalanceBefore = address(DLN_SOURCE).balance;
         vm.expectCall(address(DLN_SOURCE), globalFee, deBridgecall(address(USDC), amount));
-        ALLOWANCE_HOLDER.exec{value: globalFee}(
+        allowanceHolder.exec{value: globalFee}(
             address(bridgeSettler),
             address(USDC),
             amount,

test/integration/DodoV2PairTest.t.sol

@@ -4,21 +4,18 @@ pragma solidity ^0.8.25;
 import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {ISettlerBase} from "src/interfaces/ISettlerBase.sol";
-import {BasePairTest} from "./BasePairTest.t.sol";
+import {SettlerBasePairTest} from "./SettlerBasePairTest.t.sol";
 import {ISettlerActions} from "src/ISettlerActions.sol";
 import {ActionDataBuilder} from "../utils/ActionDataBuilder.sol";
-import {MainnetSettler as Settler} from "src/chains/Mainnet/TakerSubmitted.sol";
-import {Shim} from "./SettlerBasePairTest.t.sol";
+import {Settler} from "src/Settler.sol";
 
 import {IAllowanceHolder} from "src/allowanceholder/IAllowanceHolder.sol";
 
-contract DodoV2PairTest is BasePairTest {
+contract DodoV2PairTest is SettlerBasePairTest {
     function _testName() internal pure override returns (string memory) {
         return "USDT-DAI";
     }
 
-    Settler internal settler;
-    IAllowanceHolder internal allowanceHolder;
     uint256 private _amount;
 
     function setUp() public override {
@@ -38,14 +35,6 @@ contract DodoV2PairTest is BasePairTest {
         safeApproveIfBelow(fromToken(), FROM, address(PERMIT2), amount());
         warmPermit2Nonce(FROM);
 
-        allowanceHolder = IAllowanceHolder(0x0000000000001fF3684f28c67538d4D072C22734);
-
-        uint256 forkChainId = (new Shim()).chainId();
-        vm.chainId(31337);
-        settler = new Settler(bytes20(0));
-        vm.etch(address(allowanceHolder), vm.getDeployedCode("AllowanceHolder.sol:AllowanceHolder"));
-        vm.chainId(forkChainId);
-
         // USDT is obnoxious about throwing errors, so let's check here before
         // we run into something inscrutable. Do this here to avoid incorrectly
         // warming storage.

test/integration/LayerZeroOFT.t.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.25;
 import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {BridgeSettlerIntegrationTest} from "./BridgeSettler.t.sol";
-import {ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
 import {IBridgeSettlerActions} from "src/bridge/IBridgeSettlerActions.sol";
 import {PlasmaBridgeSettler} from "src/chains/Plasma/BridgeSettler.sol";
 import {SafeTransferLib} from "src/vendor/SafeTransferLib.sol";
@@ -25,7 +24,7 @@ contract LayerZeroOFTEthereumTest is BridgeSettlerIntegrationTest {
     function testBridgeERC20() public {
         uint256 amount = 10000000;
         deal(address(USDT), address(this), amount, true);
-        USDT.safeApprove(address(ALLOWANCE_HOLDER), amount);
+        USDT.safeApprove(address(allowanceHolder), amount);
 
         IOFT.SendParam memory sendParam = IOFT.SendParam({
             dstEid: uint32(30110), // ARBITRUM
@@ -56,7 +55,7 @@ contract LayerZeroOFTEthereumTest is BridgeSettlerIntegrationTest {
         deal(address(this), fee);
         uint256 balanceBefore = USDT.balanceOf(oft);
         vm.expectCall(oft, fee, abi.encodeCall(IOFT.send, (sendParam, messagingFee, address(this))));
-        ALLOWANCE_HOLDER.exec{value: fee}(
+        allowanceHolder.exec{value: fee}(
             address(bridgeSettler),
             address(USDT),
             amount,

test/integration/MakerPSMLite.t.sol

@@ -7,7 +7,6 @@ import {ISettlerBase} from "src/interfaces/ISettlerBase.sol";
 
 import {IPSM, WAD, DAI, USDS, USDD, USDT, UsddPSM} from "src/core/MakerPSM.sol";
 
-import {Shim} from "./SettlerBasePairTest.t.sol";
 import {MainnetSettlerMetaTxn as SettlerMetaTxn} from "src/chains/Mainnet/MetaTxn.sol";
 
 import {Settler} from "src/Settler.sol";
@@ -51,7 +50,7 @@ contract MakerPsmLiteTest is SettlerMetaTxnPairTest {
     }
 
     modifier setMakerPsmLiteBlockNumber() {
-        uint256 blockNumber = (new Shim()).blockNumber();
+        uint256 blockNumber = vm.getBlockNumber();
         vm.rollFork(makerPsmLiteBlockNumber());
         vm.setEvmVersion("osaka");
         assert(address(makerPsm()).code.length > 0);

test/integration/MaverickV2PairTest.t.sol

@@ -5,7 +5,6 @@ import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {ISettlerBase} from "src/interfaces/ISettlerBase.sol";
 
-import {Shim} from "./SettlerBasePairTest.t.sol";
 import {ActionDataBuilder} from "../utils/ActionDataBuilder.sol";
 import {MainnetSettlerMetaTxn as SettlerMetaTxn} from "src/chains/Mainnet/MetaTxn.sol";
 import {Settler} from "src/Settler.sol";
@@ -34,7 +33,7 @@ abstract contract MaverickV2PairTest is SettlerMetaTxnPairTest {
     }
 
     modifier setMaverickV2Block() {
-        uint256 blockNumber = (new Shim()).blockNumber();
+        uint256 blockNumber = vm.getBlockNumber();
         vm.rollFork(maverickV2BlockNumber());
         vm.setEvmVersion("osaka");
         _;

test/integration/Mayan.t.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.25;
 import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {BridgeSettlerIntegrationTest} from "./BridgeSettler.t.sol";
-import {ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
 import {IBridgeSettlerActions} from "src/bridge/IBridgeSettlerActions.sol";
 import {ArbitrumBridgeSettler} from "src/chains/Arbitrum/BridgeSettler.sol";
 import {IMayanForwarder} from "src/core/Mayan.sol";
@@ -64,7 +63,7 @@ contract MayanTest is BridgeSettlerIntegrationTest {
         bytes32 someExtraBytes = keccak256("someExtraBytesForERC20Transfer");
 
         deal(address(token), address(this), amount);
-        token.approve(address(ALLOWANCE_HOLDER), amount);
+        token.approve(address(allowanceHolder), amount);
 
         bytes[] memory bridgeActions = ActionDataBuilder.build(
             _getDefaultTransferFrom(address(token), amount),
@@ -86,7 +85,7 @@ contract MayanTest is BridgeSettlerIntegrationTest {
             address(mayanProtocol),
             abi.encodeCall(MayanProtocolDummy.mayanERC20Receiver, (address(token), amount, someExtraBytes))
         );
-        ALLOWANCE_HOLDER.exec(
+        allowanceHolder.exec(
             address(bridgeSettler),
             address(token),
             amount,

test/integration/NucleusTeller.t.sol

@@ -5,7 +5,6 @@ import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {Vm} from "@forge-std/Vm.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {BridgeSettlerIntegrationTest} from "./BridgeSettler.t.sol";
-import {ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
 import {IBridgeSettlerActions} from "src/bridge/IBridgeSettlerActions.sol";
 import {INucleusTeller} from "src/core/NucleusTeller.sol";
 import {SafeTransferLib} from "src/vendor/SafeTransferLib.sol";
@@ -76,7 +75,7 @@ contract NucleusTellerMainnetTest is BridgeSettlerIntegrationTest {
         uint256 shareAmount = 1e18;
 
         deal(address(WPAXG), address(this), shareAmount, true);
-        WPAXG.safeApprove(address(ALLOWANCE_HOLDER), shareAmount);
+        WPAXG.safeApprove(address(allowanceHolder), shareAmount);
 
         INucleusTeller.BridgeData memory data = _bridgeData();
         uint256 fee = INucleusTeller(TELLER).previewFee(shareAmount, data);
@@ -94,7 +93,7 @@ contract NucleusTellerMainnetTest is BridgeSettlerIntegrationTest {
 
         vm.expectCall(TELLER, fee, abi.encodeCall(INucleusTeller.bridge, (shareAmount, data)));
         vm.recordLogs();
-        ALLOWANCE_HOLDER.exec{value: fee}(
+        allowanceHolder.exec{value: fee}(
             address(bridgeSettler),
             address(WPAXG),
             shareAmount,
@@ -112,7 +111,7 @@ contract NucleusTellerMainnetTest is BridgeSettlerIntegrationTest {
         uint256 shareAmount = 1e18;
 
         deal(address(WPAXG), address(this), shareAmount, true);
-        WPAXG.safeApprove(address(ALLOWANCE_HOLDER), shareAmount);
+        WPAXG.safeApprove(address(allowanceHolder), shareAmount);
 
         INucleusTeller.BridgeData memory data = _bridgeData();
         uint256 fee = INucleusTeller(TELLER).previewFee(shareAmount, data);
@@ -128,7 +127,7 @@ contract NucleusTellerMainnetTest is BridgeSettlerIntegrationTest {
         uint256 supplyBefore = WPAXG.totalSupply();
 
         vm.recordLogs();
-        ALLOWANCE_HOLDER.exec{value: fee + excess}(
+        allowanceHolder.exec{value: fee + excess}(
             address(bridgeSettler),
             address(WPAXG),
             shareAmount,
@@ -146,7 +145,7 @@ contract NucleusTellerMainnetTest is BridgeSettlerIntegrationTest {
         uint256 depositAmount = 1e18;
 
         deal(address(PAXG), address(this), depositAmount, true);
-        PAXG.safeApprove(address(ALLOWANCE_HOLDER), depositAmount);
+        PAXG.safeApprove(address(allowanceHolder), depositAmount);
 
         INucleusTeller.BridgeData memory data = _bridgeData();
         // PAXG → WPAXG is a 1:1 wrap, so the resulting share count equals the deposit amount.
@@ -169,7 +168,7 @@ contract NucleusTellerMainnetTest is BridgeSettlerIntegrationTest {
             TELLER, fee, abi.encodeCall(INucleusTeller.depositAndBridge, (PAXG, depositAmount, expectedShares, data))
         );
         vm.recordLogs();
-        ALLOWANCE_HOLDER.exec{value: fee}(
+        allowanceHolder.exec{value: fee}(
             address(bridgeSettler),
             address(PAXG),
             depositAmount,

test/integration/SettlerBasePairTest.t.sol

@@ -11,20 +11,9 @@ import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {LibBytes} from "../utils/LibBytes.sol";
 import {SafeTransferLib} from "src/vendor/SafeTransferLib.sol";
 
-import {IAllowanceHolder} from "src/allowanceholder/IAllowanceHolder.sol";
-import {MainnetSettler as Settler} from "src/chains/Mainnet/TakerSubmitted.sol";
-
-contract Shim {
-    // forgefmt: disable-next-line
-    function chainId() external returns (uint256) { // this is non-view (mutable) on purpose
-        return block.chainid;
-    }
-
-    // forgefmt: disable-next-line
-    function blockNumber() external returns (uint256) { // this is non-view (mutable) on purpose
-        return block.number;
-    }
-}
+import {IAllowanceHolder, ALLOWANCE_HOLDER} from "src/allowanceholder/IAllowanceHolder.sol";
+import {MainnetSettler} from "src/chains/Mainnet/TakerSubmitted.sol";
+import {Settler} from "src/Settler.sol";
 
 abstract contract SettlerBasePairTest is BasePairTest {
     using SafeTransferLib for IERC20;
@@ -33,11 +22,11 @@ abstract contract SettlerBasePairTest is BasePairTest {
     uint256 internal constant PERMIT2_MAKER_NONCE = 1;
 
     Settler internal settler;
-    IAllowanceHolder internal allowanceHolder;
+    IAllowanceHolder constant allowanceHolder = ALLOWANCE_HOLDER;
     IZeroEx internal ZERO_EX = IZeroEx(0xDef1C0ded9bec7F1a1670819833240f027b25EfF);
 
     function settlerInitCode() internal virtual returns (bytes memory) {
-        return bytes.concat(type(Settler).creationCode, abi.encode(bytes20(0)));
+        return bytes.concat(type(MainnetSettler).creationCode, abi.encode(bytes20(0)));
     }
 
     function _deploySettler() private returns (Settler r) {
@@ -50,9 +39,8 @@ abstract contract SettlerBasePairTest is BasePairTest {
 
     function setUp() public virtual override {
         super.setUp();
-        allowanceHolder = IAllowanceHolder(0x0000000000001fF3684f28c67538d4D072C22734);
 
-        uint256 forkChainId = (new Shim()).chainId();
+        uint256 forkChainId = vm.getChainId();
         vm.chainId(31337);
         settler = _deploySettler();
         vm.label(address(settler), "Settler");

test/integration/SettlerMetaTxnPairTest.t.sol

@@ -5,7 +5,7 @@ import {IERC20} from "@forge-std/interfaces/IERC20.sol";
 import {ISignatureTransfer} from "@permit2/interfaces/ISignatureTransfer.sol";
 import {ISettlerBase} from "src/interfaces/ISettlerBase.sol";
 
-import {SettlerBasePairTest, Shim} from "./SettlerBasePairTest.t.sol";
+import {SettlerBasePairTest} from "./SettlerBasePairTest.t.sol";
 import {ICurveV2Pool} from "./vendor/ICurveV2Pool.sol";
 import {IZeroEx} from "./vendor/IZeroEx.sol";
 
@@ -42,10 +42,12 @@ abstract contract SettlerMetaTxnPairTest is SettlerBasePairTest {
     function setUp() public virtual override {
         super.setUp();
 
-        uint256 forkChainId = (new Shim()).chainId();
+        uint256 forkChainId = vm.getChainId();
         vm.chainId(31337);
         // Preserve the settlerMetaTxn address for the hardcoded signing hash.
         new NonceBump();
+        new NonceBump();
+        new NonceBump();
         settlerMetaTxn = _deploySettlerMetaTxn();
         vm.chainId(forkChainId);