Skip to content

EthConnector: don't burn NEP-141 on deposit. #133

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
artob merged 2 commits into from
Jun 11, 2021
Merged

EthConnector: don't burn NEP-141 on deposit. #133

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
8793232
EthConnector: don't burn NEP-141 on deposit.
sept-en Jun 9, 2021
fee22ca
Remove method
sept-en Jun 10, 2021
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
8 changes: 0 additions & 8 deletions src/connector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,13 +387,6 @@ impl EthConnectorContract {
self.ft.internal_deposit_eth(owner_id, amount);
}

/// Burn NEAR tokens
fn burn_near(&mut self, owner_id: AccountId, amount: Balance) {
#[cfg(feature = "log")]
sdk::log(&format!("Burn NEAR {} tokens for: {}", amount, owner_id));
self.ft.internal_withdraw(&owner_id, amount);
}

/// Burn ETH tokens
fn burn_eth(&mut self, address: EthAddress, amount: Balance) {
#[cfg(feature = "log")]
Expand Down Expand Up @@ -593,7 +586,6 @@ impl EthConnectorContract {
// Special case when predecessor_account_id is current_account_id
if current_account_id == predecessor_account_id {
let fee = message_data.fee.as_u128();
self.burn_near(current_account_id, args.amount);
// Mint fee to relayer
let relayer = engine.get_relayer(&message_data.relayer.as_bytes());
if fee > 0 && relayer.is_some() {
Expand Down
20 changes: 10 additions & 10 deletions tests/test_connector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,13 +316,13 @@ fn test_eth_deposit_balance_total_supply() {
assert_eq!(balance, DEPOSITED_EVM_FEE);

let balance = total_supply(&master_account, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_EVM_AMOUNT);
assert_eq!(balance, DEPOSITED_EVM_AMOUNT * 2);

let balance = total_supply_eth(&master_account, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_EVM_AMOUNT);

let balance = total_supply_near(&master_account, CONTRACT_ACC);
assert_eq!(balance, 0);
assert_eq!(balance, DEPOSITED_EVM_AMOUNT);
}

#[test]
Expand Down Expand Up @@ -457,7 +457,7 @@ fn test_ft_transfer_call_eth() {
assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);

let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_FEE - transfer_amount);
assert_eq!(balance, DEPOSITED_FEE);

let balance = get_eth_balance(
&master_account,
Expand All @@ -474,10 +474,10 @@ fn test_ft_transfer_call_eth() {
assert_eq!(balance, fee);

let balance = total_supply(&master_account, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_AMOUNT);
assert_eq!(balance, DEPOSITED_AMOUNT + transfer_amount);

let balance = total_supply_near(&master_account, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_AMOUNT - transfer_amount);
assert_eq!(balance, DEPOSITED_AMOUNT);

let balance = total_supply_eth(&master_account, CONTRACT_ACC);
assert_eq!(balance, transfer_amount);
Expand Down Expand Up @@ -558,7 +558,7 @@ fn test_ft_transfer_call_without_relayer() {
assert_eq!(balance, DEPOSITED_AMOUNT - DEPOSITED_FEE);

let balance = get_near_balance(&master_account, CONTRACT_ACC, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_FEE - transfer_amount);
assert_eq!(balance, DEPOSITED_FEE);

let balance = get_eth_balance(
&master_account,
Expand All @@ -575,10 +575,10 @@ fn test_ft_transfer_call_without_relayer() {
assert_eq!(balance, 0);

let balance = total_supply(&master_account, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_AMOUNT);
assert_eq!(balance, DEPOSITED_AMOUNT + transfer_amount);

let balance = total_supply_near(&master_account, CONTRACT_ACC);
assert_eq!(balance, DEPOSITED_AMOUNT - transfer_amount);
assert_eq!(balance, DEPOSITED_AMOUNT);

let balance = total_supply_eth(&master_account, CONTRACT_ACC);
assert_eq!(balance, transfer_amount);
Expand Down Expand Up @@ -1042,13 +1042,13 @@ fn test_deposit_evm_with_zero_fee() {
assert_eq!(balance, 0);

let balance = total_supply(&master_account, CONTRACT_ACC);
assert_eq!(balance, deposited_amount);
assert_eq!(balance, deposited_amount * 2);

let balance = total_supply_eth(&master_account, CONTRACT_ACC);
assert_eq!(balance, deposited_amount);

let balance = total_supply_near(&master_account, CONTRACT_ACC);
assert_eq!(balance, 0);
assert_eq!(balance, deposited_amount);
}

#[test]
Expand Down