diff --git a/deployments/Base.json b/deployments/Base.json index def45ff2..61e97c71 100644 --- a/deployments/Base.json +++ b/deployments/Base.json @@ -14,5 +14,12 @@ "EngineProxy": "0xa5D8b733108D798d8faAf78eE1CaF9fE335cE233", "MulticallerWithSender": "0xabcA02D1B960399D7D65EBF4047E80391af5d6A2", "Zap": "0x64b6Ae998Fbba6d24dD7a2469842119A014835CD" + }, + "Multi Collateral": { + "Zap": "0x84f531d85fAA7Be42f8a248B87e40f760e558F7C", + "Pay": "0x127Fb7602bF3De092d351f922791cF9a149A4837", + "EngineImplementation": "0xFb7747a95B23a1512E8b8dda828E48E91b790e56", + "EngineProxy": "0xC4d15a1726CF9B51E1591eac6D1576016064DCe0", + "MulticallerWithSender": "0x7E1cec3d06B45d84263d954A0E2bc6A8683E1351" } } \ No newline at end of file diff --git a/src/utils/MulticallerWithSender.sol b/src/utils/MulticallerWithSender.sol index eb29f441..9b842cd3 100644 --- a/src/utils/MulticallerWithSender.sol +++ b/src/utils/MulticallerWithSender.sol @@ -116,7 +116,7 @@ contract MulticallerWithSender { if iszero( call( gas(), // Remaining gas. - 0xa5D8b733108D798d8faAf78eE1CaF9fE335cE233, // Engine Proxy address. + 0xC4d15a1726CF9B51E1591eac6D1576016064DCe0, // Engine Proxy address. calldataload(values.offset), // ETH to send. memPtr, // Start of input calldata in memory. calldataload(o), // Size of input calldata. diff --git a/test/MulticallerWithSender.t.sol b/test/MulticallerWithSender.t.sol index 813df8f9..16d704e3 100644 --- a/test/MulticallerWithSender.t.sol +++ b/test/MulticallerWithSender.t.sol @@ -11,12 +11,13 @@ contract MulticallerWithSenderTest is Bootstrap { MWS mws; EIP7412Mock eip7412Mock; address constant DEPLOYED_ENGINE = - 0x480381d10Ffb87359364308f2b160d06532e3a01; + 0xC4d15a1726CF9B51E1591eac6D1576016064DCe0; address payable constant DEPLOYED_MWS = - payable(0xFCf78b0583c712a6B7ea6280e3aD72E508dA3a80); + payable(0x7E1cec3d06B45d84263d954A0E2bc6A8683E1351); + uint256 constant BASE_BLOCK_NUMBER_AFTER_DEPLOYMENT = 23_712_358; function setUp() public { - vm.rollFork(BASE_BLOCK_NUMBER); + vm.rollFork(BASE_BLOCK_NUMBER_AFTER_DEPLOYMENT); initializeBase(); mws = MWS(DEPLOYED_MWS);