Skip to content

Optimization and increased security on token transfer operations #41

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

Merged
merged 4 commits into from
Jul 31, 2025
+44 −181
Merged

Optimization and increased security on token transfer operations #41

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
562a720
optimization: early return on 0 transfer amount
mpsc0x Jul 31, 2025
0eeae28
adder assertion for amount > 0 in transfer method
mpsc0x Jul 31, 2025
120a1d4
Merge branch 'main' into feat/mpsc0x/token-transfer-fix
mpsc0x Jul 31, 2025
c38ecde
fixed unit tests
mpsc0x Jul 31, 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
1 change: 1 addition & 0 deletions aave-core/sources/aave-pool/pool_token_logic.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ module aave_pool::pool_token_logic {
amount: u256,
a_token_address: address
) {
assert!(amount > 0, error_config::get_einvalid_amount());
let sender_address = signer::address_of(sender);
let underlying_asset =
a_token_factory::get_underlying_asset_address(a_token_address);
Expand Down
3 changes: 3 additions & 0 deletions aave-core/sources/aave-tokens/token_base.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,9 @@ module aave_pool::token_base {
index: u256,
metadata_address: address
) acquires ManagedFungibleAsset, TokenBaseState {
if (amount == 0) {
return;
};
// NOTE: in `ray_div`, while `amount` can be less precision than Ray
// precision, `index` must be expressed in Ray precision.
let amount_scaled = wad_ray_math::ray_div(amount, index);
Expand Down
40 changes: 40 additions & 0 deletions aave-core/tests/aave-pool/drop_reserve_remaining_assets_tests.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
0
);

supply_logic::set_user_use_reserve_as_collateral(
user1, underlying_token_address, true
);

supply_logic::set_user_use_reserve_as_collateral(
user2, underlying_token_address, true
);

// User2 borrows 500 tokens
let borrow_amount = 500;
borrow_logic::borrow(
Expand Down Expand Up @@ -409,6 +417,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
0
);

supply_logic::set_user_use_reserve_as_collateral(
user1, underlying_token_address, true
);

supply_logic::set_user_use_reserve_as_collateral(
user2, underlying_token_address, true
);

let borrow_amount = 500;
borrow_logic::borrow(
user2,
Expand Down Expand Up @@ -660,6 +676,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
0
);

supply_logic::set_user_use_reserve_as_collateral(
user1, underlying_token_address, true
);

supply_logic::set_user_use_reserve_as_collateral(
user2, underlying_token_address, true
);

let borrow_amount = 500;
borrow_logic::borrow(
user2,
Expand Down Expand Up @@ -911,6 +935,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
0
);

supply_logic::set_user_use_reserve_as_collateral(
user1, underlying_token_address, true
);

supply_logic::set_user_use_reserve_as_collateral(
user2, underlying_token_address, true
);

let borrow_amount = 500;
borrow_logic::borrow(
user2,
Expand Down Expand Up @@ -1163,6 +1195,14 @@ module aave_pool::drop_reserve_remaining_assets_tests {
0
);

supply_logic::set_user_use_reserve_as_collateral(
user1, underlying_token_address, true
);

supply_logic::set_user_use_reserve_as_collateral(
user2, underlying_token_address, true
);

let borrow_amount = 500;
borrow_logic::borrow(
user2,
Expand Down
181 changes: 0 additions & 181 deletions aave-core/tests/aave-pool/pool_token_logic_tests.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,187 +1501,6 @@ module aave_pool::pool_token_logic_tests {
assert!(user2_balance == transfer_amount, TEST_SUCCESS);
}

#[
test(
aave_pool = @aave_pool,
aave_role_super_admin = @aave_acl,
aave_std = @std,
underlying_tokens_admin = @aave_mock_underlyings,
user1 = @0x41,
user2 = @0x42
)
]
// User 1 deposits 1000 U_1
// User 1 transfers 0 u1_a_token to user 2 (amount == 0 and sender != recipient)
fun test_transfer_when_amount_is_zero_and_sender_not_equal_recipient(
aave_pool: &signer,
aave_role_super_admin: &signer,
aave_std: &signer,
underlying_tokens_admin: &signer,
user1: &signer,
user2: &signer
) {
// start the timer
set_time_has_started_for_testing(aave_std);

let user1_address = signer::address_of(user1);
let user2_address = signer::address_of(user2);
create_account_for_test(user1_address);
create_account_for_test(user2_address);

init_reserves(
aave_pool,
aave_role_super_admin,
aave_std,
underlying_tokens_admin
);

let underlying_u1_token_address =
mock_underlying_token_factory::token_address(utf8(b"U_1"));
// user1 mint 1000 U_1
mock_underlying_token_factory::mint(
underlying_tokens_admin,
user1_address,
(convert_to_currency_decimals(underlying_u1_token_address, 1000) as u64),
underlying_u1_token_address
);

// user1 deposit 1000 U_1 to the pool
let supply_u1_amount =
convert_to_currency_decimals(underlying_u1_token_address, 1000);
supply_logic::supply(
user1,
underlying_u1_token_address,
supply_u1_amount,
user1_address,
0
);

let reserve_data = pool::get_reserve_data(underlying_u1_token_address);
let u1_a_token_address = pool::get_reserve_a_token_address(reserve_data);
let user1_balance = a_token_factory::balance_of(
user1_address, u1_a_token_address
);
assert!(user1_balance == supply_u1_amount, TEST_SUCCESS);

// user1 transfer 0 u1_a_token to user2
let transfer_amount = convert_to_currency_decimals(u1_a_token_address, 0);
pool_token_logic::transfer(
user1,
user2_address,
transfer_amount,
u1_a_token_address
);

// check BalanceTransfer emitted events
let balance_transfer_emitted_events = emitted_events<BalanceTransfer>();
// make sure event of type was emitted
assert!(vector::length(&balance_transfer_emitted_events) == 1, TEST_SUCCESS);

let user1_balance = a_token_factory::balance_of(
user1_address, u1_a_token_address
);
assert!(
user1_balance == supply_u1_amount - transfer_amount,
TEST_SUCCESS
);
let user2_balance = a_token_factory::balance_of(
user2_address, u1_a_token_address
);
assert!(user2_balance == transfer_amount, TEST_SUCCESS);
}

#[
test(
aave_pool = @aave_pool,
aave_role_super_admin = @aave_acl,
aave_std = @std,
underlying_tokens_admin = @aave_mock_underlyings,
user1 = @0x41,
user2 = @0x42
)
]
// User 1 deposits 1000 U_1
// User 1 transfers 0 u1_a_token to user 1 (amount == 0 and sender == recipient)
fun test_transfer_when_amount_is_zero_and_sender_equal_recipient(
aave_pool: &signer,
aave_role_super_admin: &signer,
aave_std: &signer,
underlying_tokens_admin: &signer,
user1: &signer,
user2: &signer
) {
// start the timer
set_time_has_started_for_testing(aave_std);

let user1_address = signer::address_of(user1);
let user2_address = signer::address_of(user2);
create_account_for_test(user1_address);
create_account_for_test(user2_address);

init_reserves(
aave_pool,
aave_role_super_admin,
aave_std,
underlying_tokens_admin
);

let underlying_u1_token_address =
mock_underlying_token_factory::token_address(utf8(b"U_1"));
// user1 mint 1000 U_1
mock_underlying_token_factory::mint(
underlying_tokens_admin,
user1_address,
(convert_to_currency_decimals(underlying_u1_token_address, 1000) as u64),
underlying_u1_token_address
);

// user1 deposit 1000 U_1 to the pool
let supply_u1_amount =
convert_to_currency_decimals(underlying_u1_token_address, 1000);
supply_logic::supply(
user1,
underlying_u1_token_address,
supply_u1_amount,
user1_address,
0
);

let reserve_data = pool::get_reserve_data(underlying_u1_token_address);
let u1_a_token_address = pool::get_reserve_a_token_address(reserve_data);
let user1_balance = a_token_factory::balance_of(
user1_address, u1_a_token_address
);
assert!(user1_balance == supply_u1_amount, TEST_SUCCESS);

// user1 transfer 0 u1_a_token to user1
let transfer_amount = convert_to_currency_decimals(u1_a_token_address, 0);
pool_token_logic::transfer(
user1,
user1_address,
transfer_amount,
u1_a_token_address
);

// check BalanceTransfer emitted events
let balance_transfer_emitted_events = emitted_events<BalanceTransfer>();
// make sure event of type was emitted
assert!(vector::length(&balance_transfer_emitted_events) == 1, TEST_SUCCESS);

let user1_balance = a_token_factory::balance_of(
user1_address, u1_a_token_address
);
assert!(
user1_balance == supply_u1_amount - transfer_amount,
TEST_SUCCESS
);

let user2_balance = a_token_factory::balance_of(
user2_address, u1_a_token_address
);
assert!(user2_balance == transfer_amount, TEST_SUCCESS);
}

#[
test(
aave_pool = @aave_pool,
Expand Down
Loading