Skip to content

Commit 79085d9

Browse files
authored
Merge pull request #55 from aave/fix/mpsc0x/small-optimizations
feat: always check for 0x0 address returned by get_reserve_address_b…
2 parents 7ef317a + 822a67e commit 79085d9

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

aave-core/sources/aave-logic/validation_logic.move

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,9 @@ module aave_pool::validation_logic {
650650
for (i in 0..reserves_count) {
651651
if (user_config::is_borrowing(user_config_map, i)) {
652652
let reserve_address = pool::get_reserve_address_by_id(i);
653+
if (reserve_address == @0x0) {
654+
continue;
655+
};
653656
let reserve_configuration =
654657
pool::get_reserve_configuration(reserve_address);
655658
assert!(

aave-core/sources/aave-pool/pool.move

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,9 @@ module aave_pool::pool {
463463
user_config::get_collateral_mask()
464464
);
465465
let asset_address = get_reserve_address_by_id(asset_id);
466+
if (asset_address == @0x0) {
467+
return (false, @0x0, 0)
468+
};
466469
let reserves_config_map = get_reserve_configuration(asset_address);
467470
let ceiling = reserve_config::get_debt_ceiling(&reserves_config_map);
468471
if (ceiling != 0) {
@@ -489,6 +492,9 @@ module aave_pool::pool {
489492
user_config::get_borrowing_mask()
490493
);
491494
let asset_address = get_reserve_address_by_id(asset_id);
495+
if (asset_address == @0x0) {
496+
return (false, @0x0)
497+
};
492498
let reserves_config_map = get_reserve_configuration(asset_address);
493499

494500
if (reserve_config::get_siloed_borrowing(&reserves_config_map)) {

aave-core/sources/aave-pool/pool_fee_manager.move

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ module aave_pool::pool_fee_manager {
165165
assert!(
166166
only_pool_admin(from_address), error_config::get_ecaller_not_pool_admin()
167167
);
168-
// Check fee amount
169-
assert!(amount != 0, error_config::get_einvalid_amount());
170168

171169
let fee_config = fee_config_ref();
172170
// Create signer for the resource account

0 commit comments

Comments
 (0)