feat(trading-proto-upgrade): locked amounts, kmd burn and other impl #2046
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -111,16 +111,17 @@ use crate::nft::{find_wallet_nft_amount, WithdrawNftResult}; | |
| use v2_activation::{build_address_and_priv_key_policy, EthActivationV2Error}; | ||
|
|
||
| mod nonce; | ||
| use crate::coin_errors::ValidatePaymentResult; | ||
| use crate::{PrivKeyPolicy, TransactionResult, WithdrawFrom}; | ||
| use nonce::ParityNonce; | ||
|
|
||
| /// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol | ||
| /// Dev chain (195.201.137.5:8565) contract address: 0x83965C539899cC0F918552e5A26915de40ee8852 | ||
| /// Ropsten: https://ropsten.etherscan.io/address/0x7bc1bbdd6a0a722fc9bffc49c921b685ecb84b94 | ||
| /// ETH mainnet: https://etherscan.io/address/0x8500AFc0bc5214728082163326C2FF0C73f4a871 | ||
| pub const SWAP_CONTRACT_ABI: &str = include_str!("eth/swap_contract_abi.json"); | ||
| /// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md | ||
| pub const ERC20_ABI: &str = include_str!("eth/erc20_abi.json"); | ||
| /// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md | ||
| const ERC721_ABI: &str = include_str!("eth/erc721_abi.json"); | ||
| /// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1155.md | ||
|
|
@@ -417,7 +418,7 @@ pub struct EthCoinImpl { | |
| ticker: String, | ||
| pub coin_type: EthCoinType, | ||
| priv_key_policy: EthPrivKeyPolicy, | ||
| pub my_address: Address, | ||
| sign_message_prefix: Option<String>, | ||
| swap_contract_address: Address, | ||
| fallback_swap_contract: Option<Address>, | ||
|
|
@@ -1128,13 +1129,13 @@ impl SwapOps for EthCoin { | |
| } | ||
|
|
||
| #[inline] | ||
| async fn validate_maker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> { | ||
| self.validate_payment(input).compat().await | ||
| } | ||
|
|
||
| #[inline] | ||
| async fn validate_taker_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentResult<()> { | ||
| self.validate_payment(input).compat().await | ||
| } | ||
|
|
||
| fn check_if_my_payment_sent( | ||
|
|
@@ -1481,7 +1482,7 @@ impl WatcherOps for EthCoin { | |
| .watcher_reward | ||
| .clone() | ||
| .ok_or_else(|| ValidatePaymentError::WatcherRewardError("Watcher reward not found".to_string()))); | ||
| let expected_reward_amount = try_f!(wei_from_big_decimal(&watcher_reward.amount, ETH_DECIMALS)); | ||
|
|
||
| let expected_swap_contract_address = try_f!(input | ||
| .swap_contract_address | ||
|
|
@@ -1659,10 +1660,12 @@ impl WatcherOps for EthCoin { | |
| .map_to_mm(ValidatePaymentError::TxDeserializationError)?; | ||
| let total_amount = match input.spend_type { | ||
| WatcherSpendType::MakerPaymentSpend => { | ||
| if !matches!(watcher_reward.reward_target, RewardTarget::None) | ||
| || watcher_reward.send_contract_reward_on_spend | ||
| { | ||
| trade_amount + expected_reward_amount | ||
| } else { | ||
| trade_amount | ||
| } | ||
| }, | ||
| WatcherSpendType::TakerPaymentRefund => trade_amount + expected_reward_amount, | ||
|
|
@@ -1737,7 +1740,6 @@ impl WatcherOps for EthCoin { | |
| }; | ||
| let expected_swap_contract_address = self.swap_contract_address; | ||
| let fallback_swap_contract = self.fallback_swap_contract; | ||
|
|
||
| let fut = async move { | ||
| let tx_from_rpc = selfi.web3.eth().transaction(TransactionId::Hash(tx.hash)).await?; | ||
|
|
@@ -1781,7 +1783,7 @@ impl WatcherOps for EthCoin { | |
| .get_taker_watcher_reward(&input.maker_coin, None, None, None, input.wait_until) | ||
| .await | ||
| .map_err(|err| ValidatePaymentError::WatcherRewardError(err.into_inner().to_string()))?; | ||
| let expected_reward_amount = wei_from_big_decimal(&watcher_reward.amount, ETH_DECIMALS)?; | ||
|
|
||
| match &selfi.coin_type { | ||
| EthCoinType::Eth => { | ||
|
|
@@ -1992,7 +1994,6 @@ impl WatcherOps for EthCoin { | |
| RewardTarget::PaymentSender | ||
| }; | ||
|
|
||
| let amount = match reward_amount { | ||
| Some(amount) => amount, | ||
| None => self.get_watcher_reward_amount(wait_until).await?, | ||
|
|
@@ -2002,7 +2003,7 @@ impl WatcherOps for EthCoin { | |
|
|
||
| Ok(WatcherReward { | ||
| amount, | ||
| is_exact_amount: false, | ||
| reward_target, | ||
| send_contract_reward_on_spend, | ||
| }) | ||
|
|
@@ -3365,7 +3366,7 @@ impl EthCoin { | |
| let data = match &args.watcher_reward { | ||
| Some(reward) => { | ||
| let reward_amount = try_tx_fus!(wei_from_big_decimal(&reward.amount, self.decimals)); | ||
| if !matches!(reward.reward_target, RewardTarget::None) || reward.send_contract_reward_on_spend { | ||
| value += reward_amount; | ||
| } | ||
|
|
||
|
|
@@ -3403,14 +3404,33 @@ impl EthCoin { | |
| let mut value = U256::from(0); | ||
| let mut amount = trade_amount; | ||
|
|
||
| debug!("Using watcher reward {:?} for swap payment", args.watcher_reward); | ||
|
|
||
| let data = match args.watcher_reward { | ||
| Some(reward) => { | ||
| let reward_amount = match reward.reward_target { | ||
| RewardTarget::Contract | RewardTarget::PaymentSender => { | ||
| let eth_reward_amount = try_tx_fus!(wei_from_big_decimal(&reward.amount, ETH_DECIMALS)); | ||
| value += eth_reward_amount; | ||
| eth_reward_amount | ||
| }, | ||
| RewardTarget::PaymentSpender => { | ||
| let token_reward_amount = | ||
| try_tx_fus!(wei_from_big_decimal(&reward.amount, self.decimals)); | ||
| amount += token_reward_amount; | ||
| token_reward_amount | ||
| }, | ||
| _ => { | ||
| // TODO tests passed without this change, need to research on how it worked | ||
| if reward.send_contract_reward_on_spend { | ||
| let eth_reward_amount = | ||
| try_tx_fus!(wei_from_big_decimal(&reward.amount, ETH_DECIMALS)); | ||
| value += eth_reward_amount; | ||
| eth_reward_amount | ||
| } else { | ||
| 0.into() | ||
| } | ||
|
Comment on lines
+3430
to
+3438
Collaborator
There was a problem hiding this comment. Can you please specify which tests pass? As I can see when
Author
There was a problem hiding this comment. IIRC, all watcher tests were passing with old testnet environment but started to fail after switching to dockerized Geth. And when it's true, the contract attempts to send additional ETH, which isn't available on its balance. With this change, the reward ETH is also transferred to a contract during payment, making ETH/ERC20 watcher tests pass.
I agree with this. My goal was to make tests green and learn ETH watchers code/understand it better. It seems that
Collaborator
There was a problem hiding this comment.
Yeah, missed this since I was looking for cases with
Sure. Thanks a lot for offering your help on this :) |
||
| }, | ||
| }; | ||
|
|
||
| try_tx_fus!(function.encode_input(&[ | ||
|
|
@@ -4319,7 +4339,11 @@ impl EthCoin { | |
| )?; | ||
|
|
||
| match watcher_reward.reward_target { | ||
| RewardTarget::None | RewardTarget::PaymentReceiver => { | ||
| if watcher_reward.send_contract_reward_on_spend { | ||
| expected_value += actual_reward_amount | ||
| } | ||
| }, | ||
| RewardTarget::PaymentSender | RewardTarget::PaymentSpender | RewardTarget::Contract => { | ||
| expected_value += actual_reward_amount | ||
| }, | ||
|
|
@@ -4407,7 +4431,23 @@ impl EthCoin { | |
| ))); | ||
| } | ||
|
|
||
| let expected_reward_amount = match watcher_reward.reward_target { | ||
| RewardTarget::Contract | RewardTarget::PaymentSender => { | ||
| wei_from_big_decimal(&watcher_reward.amount, ETH_DECIMALS)? | ||
| }, | ||
| RewardTarget::PaymentSpender => { | ||
| wei_from_big_decimal(&watcher_reward.amount, selfi.decimals)? | ||
| }, | ||
| _ => { | ||
| // TODO tests passed without this change, need to research on how it worked | ||
| if watcher_reward.send_contract_reward_on_spend { | ||
| wei_from_big_decimal(&watcher_reward.amount, ETH_DECIMALS)? | ||
| } else { | ||
| 0.into() | ||
| } | ||
| }, | ||
| }; | ||
|
|
||
| let actual_reward_amount = get_function_input_data(&decoded, function, 8) | ||
| .map_to_mm(ValidatePaymentError::TxDeserializationError)? | ||
| .into_uint() | ||
|
|
@@ -4428,7 +4468,11 @@ impl EthCoin { | |
| expected_value += actual_reward_amount | ||
| }, | ||
| RewardTarget::PaymentSpender => expected_amount += actual_reward_amount, | ||
| _ => { | ||
| if watcher_reward.send_contract_reward_on_spend { | ||
| expected_value += actual_reward_amount | ||
| } | ||
| }, | ||
| }; | ||
|
|
||
| if decoded[1] != Token::Uint(expected_amount) { | ||
|
|
@@ -4442,7 +4486,7 @@ impl EthCoin { | |
| if tx_from_rpc.value != expected_value { | ||
| return MmError::err(ValidatePaymentError::WrongPaymentTx(format!( | ||
| "Payment tx value arg {:?} is invalid, expected {:?}", | ||
| tx_from_rpc.value, expected_value | ||
| ))); | ||
| } | ||
| }, | ||
|
|
@@ -4579,8 +4623,8 @@ impl EthCoin { | |
| .map_err(|_| WatcherRewardError::RPCError("Error getting the gas price".to_string()))?; | ||
|
|
||
| let gas_cost_wei = U256::from(REWARD_GAS_AMOUNT) * gas_price; | ||
| let gas_cost_eth = u256_to_big_decimal(gas_cost_wei, ETH_DECIMALS) | ||
| .map_err(|e| WatcherRewardError::InternalError(e.to_string()))?; | ||
| Ok(gas_cost_eth) | ||
| } | ||
|
|
||
|
|
@@ -5598,7 +5642,7 @@ pub async fn eth_coin_from_conf_and_request( | |
|
|
||
| /// Displays the address in mixed-case checksum form | ||
| /// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md | ||
| pub fn checksum_address(addr: &str) -> String { | ||
| let mut addr = addr.to_lowercase(); | ||
| if addr.starts_with("0x") { | ||
| addr.replace_range(..2, ""); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.