Skip to content

fix: patching usdc is no longer needed #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sakulstra wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: patching usdc is no longer needed #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a05ca
fix: patching usdc is no longer needed
sakulstra Mar 19, 2024
1da9bd8
fix: move patches deal to lib to it's easier to use from the outside
sakulstra Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions diffs/preTestEngineAvaV3Gauntlet_postTestEngineAvaV3Gauntlet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

### Reserve altered

#### WETH.e ([0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB](https://snowtrace.io/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB))
#### WETH.e ([0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB](https://snowscan.xyz/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB))

| description | value before | value after |
| --- | --- | --- |
| reserveFactor | 10 % | 15 % |
| interestRateStrategy | [0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6](https://snowtrace.io/address/0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6) | [0xc76EF342898f1AE7E6C4632627Df683FAD8563DD](https://snowtrace.io/address/0xc76EF342898f1AE7E6C4632627Df683FAD8563DD) |
| interestRateStrategy | [0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6](https://snowscan.xyz/address/0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6) | [0xc76EF342898f1AE7E6C4632627Df683FAD8563DD](https://snowscan.xyz/address/0xc76EF342898f1AE7E6C4632627Df683FAD8563DD) |
| stableRateSlope1 | 0 % | 4 % |
| optimalUsageRatio | 45 % | 80 % |
| maxExcessUsageRatio | 55 % | 20 % |
Expand All @@ -18,34 +18,34 @@
| stableRateSlope2 | 0 % | 80 % |
| interestRate | ![before](/.assets/be291dc02d59fb42923f19f29caa401129501a47.svg) | ![after](/.assets/2bed3d1cc40e3ecced7768caf9f6695c5217d96f.svg) |

#### MAI ([0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b](https://snowtrace.io/address/0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b))
#### MAI ([0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b](https://snowscan.xyz/address/0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b))

| description | value before | value after |
| --- | --- | --- |
| reserveFactor | 10 % | 20 % |
| interestRateStrategy | [0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82](https://snowtrace.io/address/0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82) | [0xfab05a6aF585da2F96e21452F91E812452996BD3](https://snowtrace.io/address/0xfab05a6aF585da2F96e21452F91E812452996BD3) |
| interestRateStrategy | [0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82](https://snowscan.xyz/address/0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82) | [0xfab05a6aF585da2F96e21452F91E812452996BD3](https://snowscan.xyz/address/0xfab05a6aF585da2F96e21452F91E812452996BD3) |
| variableRateSlope2 | 60 % | 75 % |
| stableRateSlope2 | 60 % | 75 % |
| optimalUsageRatio | 90 % | 80 % |
| maxExcessUsageRatio | 10 % | 20 % |
| interestRate | ![before](/.assets/24aea288aafbdead424aa0c4d79f42141f457a50.svg) | ![after](/.assets/b075925b933e4a9a254e5b3a21a83a6eae64a797.svg) |

#### USDt ([0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7](https://snowtrace.io/address/0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7))
#### USDt ([0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7](https://snowscan.xyz/address/0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7))

| description | value before | value after |
| --- | --- | --- |
| interestRateStrategy | [0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82](https://snowtrace.io/address/0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82) | [0xfab05a6aF585da2F96e21452F91E812452996BD3](https://snowtrace.io/address/0xfab05a6aF585da2F96e21452F91E812452996BD3) |
| interestRateStrategy | [0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82](https://snowscan.xyz/address/0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82) | [0xfab05a6aF585da2F96e21452F91E812452996BD3](https://snowscan.xyz/address/0xfab05a6aF585da2F96e21452F91E812452996BD3) |
| variableRateSlope2 | 60 % | 75 % |
| stableRateSlope2 | 60 % | 75 % |
| optimalUsageRatio | 90 % | 80 % |
| maxExcessUsageRatio | 10 % | 20 % |
| interestRate | ![before](/.assets/24aea288aafbdead424aa0c4d79f42141f457a50.svg) | ![after](/.assets/b075925b933e4a9a254e5b3a21a83a6eae64a797.svg) |

#### FRAX ([0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64](https://snowtrace.io/address/0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64))
#### FRAX ([0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64](https://snowscan.xyz/address/0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64))

| description | value before | value after |
| --- | --- | --- |
| interestRateStrategy | [0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82](https://snowtrace.io/address/0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82) | [0xfab05a6aF585da2F96e21452F91E812452996BD3](https://snowtrace.io/address/0xfab05a6aF585da2F96e21452F91E812452996BD3) |
| interestRateStrategy | [0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82](https://snowscan.xyz/address/0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82) | [0xfab05a6aF585da2F96e21452F91E812452996BD3](https://snowscan.xyz/address/0xfab05a6aF585da2F96e21452F91E812452996BD3) |
| variableRateSlope2 | 60 % | 75 % |
| stableRateSlope2 | 60 % | 75 % |
| optimalUsageRatio | 90 % | 80 % |
Expand Down
2 changes: 1 addition & 1 deletion diffs/preTestEngineCollateralEdgeBonus_postTestEngineCollateralEdgeBonus.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Reserves altered

#### AAVE.e ([0x63a72806098Bd3D9520cC43356dD78afe5D386D9](https://snowtrace.io/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9))
#### AAVE.e ([0x63a72806098Bd3D9520cC43356dD78afe5D386D9](https://snowscan.xyz/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9))

| description | value before | value after |
| --- | --- | --- |
Expand Down
2 changes: 1 addition & 1 deletion diffs/preTestEngineCollateral_postTestEngineCollateral.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Reserves altered

#### AAVE.e ([0x63a72806098Bd3D9520cC43356dD78afe5D386D9](https://snowtrace.io/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9))
#### AAVE.e ([0x63a72806098Bd3D9520cC43356dD78afe5D386D9](https://snowscan.xyz/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9))

| description | value before | value after |
| --- | --- | --- |
Expand Down
70 changes: 17 additions & 53 deletions src/CommonTestBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity >=0.7.5 <0.9.0;

import 'forge-std/StdJson.sol';
import 'forge-std/Test.sol';
import {VmSafe} from 'forge-std/Vm.sol';
import {VmSafe, Vm} from 'forge-std/Vm.sol';
import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
import {AaveV2EthereumAssets} from 'aave-address-book/AaveV2Ethereum.sol';
Expand All @@ -23,17 +23,7 @@ struct ReserveTokens {
address variableDebtToken;
}

contract CommonTestBase is Test {
using stdJson for string;

address public constant ETH_MOCK_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;

address public constant EOA = 0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045;

function executePayload(Vm vm, address payload) internal {
GovV3Helpers.executePayload(vm, payload);
}

library StdDealPatch {
/**
* @notice deal doesn't support amounts stored in a script right now.
* This function patches deal to mock and transfer funds instead.
Expand All @@ -42,10 +32,10 @@ contract CommonTestBase is Test {
* @param amount the amount to deal
* @return bool true if the caller has changed due to prank usage
*/
function _patchedDeal(address asset, address user, uint256 amount) internal returns (bool) {
function deal(Vm vm, address asset, address user, uint256 amount) internal returns (bool) {
if (block.chainid == ChainIds.MAINNET) {
// FXS
if (asset == 0x3432B6A60D23Ca0dFCa7761B7ab56459D9C964D0) {
if (asset == AaveV3EthereumAssets.FXS_UNDERLYING) {
vm.prank(0xF977814e90dA44bFA03b6295A0616a897441aceC);
IERC20(asset).transfer(user, amount);
return true;
Expand Down Expand Up @@ -86,11 +76,6 @@ contract CommonTestBase is Test {
IERC20(asset).transfer(user, amount);
return true;
}
if (asset == AaveV3EthereumAssets.USDC_UNDERLYING) {
vm.prank(0xcEe284F754E854890e311e3280b767F80797180d);
IERC20(asset).transfer(user, amount);
return true;
}
}
if (block.chainid == ChainIds.OPTIMISM) {
// sUSD
Expand All @@ -99,11 +84,6 @@ contract CommonTestBase is Test {
IERC20(asset).transfer(user, amount);
return true;
}
if (asset == AaveV3OptimismAssets.USDCn_UNDERLYING) {
vm.prank(0xf491d040110384DBcf7F241fFE2A546513fD873d);
IERC20(asset).transfer(user, amount);
return true;
}
}
if (block.chainid == ChainIds.GNOSIS) {
if (asset == AaveV3GnosisAssets.EURe_UNDERLYING) {
Expand All @@ -112,36 +92,20 @@ contract CommonTestBase is Test {
return true;
}
}
if (block.chainid == ChainIds.POLYGON) {
if (asset == AaveV3PolygonAssets.USDCn_UNDERLYING) {
vm.prank(0xe7804c37c13166fF0b37F5aE0BB07A3aEbb6e245);
IERC20(asset).transfer(user, amount);
return true;
}
}
if (block.chainid == ChainIds.ARBITRUM) {
if (asset == AaveV3ArbitrumAssets.USDCn_UNDERLYING) {
vm.prank(0x47c031236e19d024b42f8AE6780E44A573170703);
IERC20(asset).transfer(user, amount);
return true;
}
}
if (block.chainid == ChainIds.AVALANCHE) {
if (asset == AaveV3AvalancheAssets.USDC_UNDERLYING) {
vm.prank(0x9f8c163cBA728e99993ABe7495F06c0A3c8Ac8b9);
IERC20(asset).transfer(user, amount);
return true;
}
}
if (block.chainid == ChainIds.BASE) {
if (asset == AaveV3BaseAssets.USDC_UNDERLYING) {
vm.prank(0x20FE51A9229EEf2cF8Ad9E89d91CAb9312cF3b7A);
IERC20(asset).transfer(user, amount);
return true;
}
}
return false;
}
}

contract CommonTestBase is Test {
using stdJson for string;

address public constant ETH_MOCK_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;

address public constant EOA = 0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045;

function executePayload(Vm vm, address payload) internal {
GovV3Helpers.executePayload(vm, payload);
}

/**
* Patched version of deal
Expand All @@ -152,7 +116,7 @@ contract CommonTestBase is Test {
function deal2(address asset, address user, uint256 amount) internal {
(VmSafe.CallerMode mode, address oldSender, ) = vm.readCallers();
if (mode != VmSafe.CallerMode.None) vm.stopPrank();
bool patched = _patchedDeal(asset, user, amount);
bool patched = StdDealPatch.deal(vm, asset, user, amount);
if (!patched) {
deal(asset, user, amount);
}
Expand Down
20 changes: 17 additions & 3 deletions tests/CommonTestBase.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
pragma solidity ^0.8.0;

import 'forge-std/Test.sol';
import {CommonTestBase} from '../src/CommonTestBase.sol';
import {AaveV2EthereumAssets} from 'aave-address-book/AaveV2Ethereum.sol';
import {CommonTestBase, StdDealPatch} from '../src/CommonTestBase.sol';
import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';

contract CommonTestBaseTest is CommonTestBase {
function setUp() public {
Expand All @@ -16,7 +16,21 @@ contract CommonTestBaseTest is CommonTestBase {

function test_deal2_shouldMaintainCurrentCaller() public {
assertEq(this.call(), address(this));
deal2(AaveV2EthereumAssets.USDC_UNDERLYING, address(this), 100e6);
deal2(AaveV3EthereumAssets.USDC_UNDERLYING, address(this), 100e6);
assertEq(this.call(), address(this));
}
}

contract DealMainnetTest is Test {
function setUp() public {
vm.createSelectFork('mainnet', 19467834);
}

function test_fxs() public {
StdDealPatch.deal(vm, AaveV3EthereumAssets.FXS_UNDERLYING, address(this), 1e18);
}

function test_ldo() public {
StdDealPatch.deal(vm, AaveV3EthereumAssets.LDO_UNDERLYING, address(this), 1e18);
}
}