Skip to content

use latest block #235

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

Draft
adhusson wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

use latest block #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9962531
test: always use latest block
adhusson Jan 29, 2025
5f28858
Merge branch 'main' into test/latest-block
adhusson Feb 11, 2025
d4e3769
add fixed blocknums on ma3
adhusson Feb 11, 2025
4aa58b7
Merge remote-tracking branch 'origin/main' into test/latest-block
MathisGD Feb 17, 2025
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
2 changes: 1 addition & 1 deletion test/fork/ParaswapAdapterForkTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ contract ParaswapAdapterForkTest is ForkTest {
address internal WETH = getAddress("WETH");

function setUp() public override {
// block.chainid is only available after super.setUp
// block.chainid is only reliable after super.setUp
if (config.chainid != 1) return;

config.blockNumber = 20842056;
Expand Down
2 changes: 0 additions & 2 deletions test/fork/helpers/NetworkConfig.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ abstract contract NetworkConfig is CommonBase {

if (config.chainid == 1) {
config.network = "ethereum";
config.blockNumber = 21230000;
config.markets.push(ConfigMarket({collateralToken: "WETH", loanToken: "DAI", lltv: 800000000000000000}));

setAddress("DAI", 0x6B175474E89094C44Da98b954EedeAC495271d0F);
Expand Down Expand Up @@ -60,7 +59,6 @@ abstract contract NetworkConfig is CommonBase {
/* BASE NETWORK */
} else if (config.chainid == 8453) {
config.network = "base";
config.blockNumber = 25641890;
config.markets.push(ConfigMarket({collateralToken: "WETH", loanToken: "WETH", lltv: 800000000000000000}));

setAddress("DAI", 0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb);
Expand Down
3 changes: 1 addition & 2 deletions test/fork/migration/AaveV3MigrationAdapterForkTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ contract AaveV3MigrationAdapterForkTest is MigrationForkTest {
if (block.chainid == 1) {
_initMarket(WST_ETH, WETH);
collateralSupplied = 10_000 ether;
}
if (block.chainid == 8453) {
} else if (block.chainid == 8453) {
_initMarket(CB_ETH, WETH);
// To avoid getting above the Aave supply cap.
collateralSupplied = 2 ether;
Expand Down
6 changes: 6 additions & 0 deletions test/fork/migration/AaveV3OptimizerMigrationAdapterForkTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ contract AaveV3OptimizerMigrationAdapterForkTest is MigrationForkTest {
AaveV3OptimizerMigrationAdapter internal migrationAdapter;

function setUp() public override {
// block.chainid is only reliable after super.setUp
if (config.chainid == 1) {
config.blockNumber = 21230000;
} else if (config.chainid == 8453) {
config.blockNumber = 25641890;
}
super.setUp();

if (block.chainid != 1) return;
Expand Down