fix(tpu-v2): fix tpu-v2 wait for payment spend and extract secret #2261
There are no files selected for viewing
This file contains 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 |
|---|---|---|
|
|
@@ -162,7 +162,7 @@ pub mod erc20; | |
| use erc20::get_token_decimals; | ||
|
|
||
| pub(crate) mod eth_swap_v2; | ||
| use eth_swap_v2::{extract_id_from_tx_data, EthPaymentType, PaymentMethod, SpendTxSearchParams}; | ||
|
|
||
| /// https://github.com/artemii235/etomic-swap/blob/master/contracts/EtomicSwap.sol | ||
| /// Dev chain (195.201.137.5:8565) contract address: 0x83965C539899cC0F918552e5A26915de40ee8852 | ||
|
|
@@ -2587,73 +2587,27 @@ impl MarketCoinOps for EthCoin { | |
| }, | ||
| }; | ||
|
|
||
| let id = try_tx_s!(extract_id_from_tx_data(tx.unsigned().data(), &SWAP_CONTRACT, &func_name).await); | ||
|
|
||
| let find_params = SpendTxSearchParams { | ||
| swap_contract_address, | ||
| event_name: "ReceiverSpent", | ||
| abi_contract: &SWAP_CONTRACT, | ||
| swap_id: &try_tx_s!(id.as_slice().try_into()), | ||
| from_block: args.from_block, | ||
| wait_until: args.wait_until, | ||
| check_every: args.check_every, | ||
| }; | ||
| let tx_hash = self | ||
| .find_transaction_hash_by_event(find_params) | ||
| .await | ||
| .map_err(|e| TransactionErr::Plain(e.get_inner().to_string()))?; | ||
|
|
||
| let spend_tx = self | ||
| .wait_for_spend_transaction(tx_hash, args.wait_until, args.check_every) | ||
| .await | ||
| .map_err(|e| TransactionErr::Plain(e.get_inner().to_string()))?; | ||
| Ok(TransactionEnum::from(spend_tx)) | ||
| } | ||
|
|
||
| fn tx_enum_from_bytes(&self, bytes: &[u8]) -> Result<TransactionEnum, MmError<TxMarshalingErr>> { | ||
|
|
@@ -4537,7 +4491,9 @@ impl EthCoin { | |
| let function = ERC20_CONTRACT.function("balanceOf")?; | ||
| let data = function.encode_input(&[Token::Address(address)])?; | ||
|
|
||
| let res = coin | ||
| .call_request(address, *token_addr, None, Some(data.into()), BlockNumber::Latest) | ||
| .await?; | ||
| let decoded = function.decode_output(&res.0)?; | ||
| match decoded[0] { | ||
| Token::Uint(number) => Ok(number), | ||
|
|
@@ -4601,7 +4557,7 @@ impl EthCoin { | |
| let function = ERC20_CONTRACT.function("balanceOf")?; | ||
| let data = function.encode_input(&[Token::Address(address)])?; | ||
| let res = self | ||
| .call_request(address, token_address, None, Some(data.into()), BlockNumber::Latest) | ||
| .await?; | ||
| let decoded = function.decode_output(&res.0)?; | ||
|
|
||
|
|
@@ -4628,7 +4584,7 @@ impl EthCoin { | |
| let my_address = self.derivation_method.single_addr_or_err().await?; | ||
| let data = function.encode_input(&[Token::Address(my_address), Token::Uint(token_id_u256)])?; | ||
| let result = self | ||
| .call_request(my_address, token_addr, None, Some(data.into()), BlockNumber::Latest) | ||
| .await?; | ||
| let decoded = function.decode_output(&result.0)?; | ||
| match decoded[0] { | ||
|
|
@@ -4659,7 +4615,7 @@ impl EthCoin { | |
| let data = function.encode_input(&[Token::Uint(token_id_u256)])?; | ||
| let my_address = self.derivation_method.single_addr_or_err().await?; | ||
| let result = self | ||
| .call_request(my_address, token_addr, None, Some(data.into()), BlockNumber::Latest) | ||
| .await?; | ||
| let decoded = function.decode_output(&result.0)?; | ||
| match decoded[0] { | ||
|
|
@@ -4737,6 +4693,7 @@ impl EthCoin { | |
| to: Address, | ||
| value: Option<U256>, | ||
| data: Option<Bytes>, | ||
| block_number: BlockNumber, | ||
| ) -> Result<Bytes, web3::Error> { | ||
| let request = CallRequest { | ||
| from: Some(from), | ||
|
|
@@ -4748,7 +4705,7 @@ impl EthCoin { | |
| ..CallRequest::default() | ||
| }; | ||
|
|
||
| self.call(request, Some(BlockId::Number(block_number))).await | ||
| } | ||
|
|
||
| pub fn allowance(&self, spender: Address) -> Web3RpcFut<U256> { | ||
|
|
@@ -4764,7 +4721,7 @@ impl EthCoin { | |
| let data = function.encode_input(&[Token::Address(my_address), Token::Address(spender)])?; | ||
|
|
||
| let res = coin | ||
| .call_request(my_address, *token_addr, None, Some(data.into()), BlockNumber::Latest) | ||
| .await?; | ||
| let decoded = function.decode_output(&res.0)?; | ||
|
|
||
|
|
@@ -4864,25 +4821,30 @@ impl EthCoin { | |
| Box::new(fut.boxed().compat()) | ||
| } | ||
|
|
||
| /// Returns events from `from_block` to `to_block` or current `latest` block. | ||
| /// According to ["eth_getLogs" doc](https://docs.infura.io/api/networks/ethereum/json-rpc-methods/eth_getlogs) `toBlock` is optional, default is "latest". | ||
| async fn events_from_block( | ||
| &self, | ||
| swap_contract_address: Address, | ||
| event_name: &str, | ||
| from_block: u64, | ||
| to_block: Option<u64>, | ||
| swap_contract: &Contract, | ||
| ) -> MmResult<Vec<Log>, FindPaymentSpendError> { | ||
| let contract_event = swap_contract.event(event_name)?; | ||
| let mut filter_builder = FilterBuilder::default() | ||
| .topics(Some(vec![contract_event.signature()]), None, None, None) | ||
| .from_block(BlockNumber::Number(from_block.into())) | ||
| .address(vec![swap_contract_address]); | ||
| if let Some(block) = to_block { | ||
| filter_builder = filter_builder.to_block(BlockNumber::Number(block.into())); | ||
| } | ||
| let filter = filter_builder.build(); | ||
| let events_logs = self | ||
| .logs(filter) | ||
| .await | ||
| .map_err(|e| FindPaymentSpendError::Transport(e.to_string()))?; | ||
| Ok(events_logs) | ||
| } | ||
|
|
||
| fn validate_payment(&self, input: ValidatePaymentInput) -> ValidatePaymentFut<()> { | ||
|
|
@@ -5192,9 +5154,16 @@ impl EthCoin { | |
| .single_addr_or_err() | ||
| .await | ||
| .map_err(|e| ERRL!("{}", e))?; | ||
| coin.call_request( | ||
| my_address, | ||
| swap_contract_address, | ||
| None, | ||
| Some(data.into()), | ||
| // TODO worth reviewing places where we could use BlockNumber::Pending | ||
| BlockNumber::Latest, | ||
|
Comment on lines
+5162
to
+5163
There was a problem hiding this comment. Worth opening an issue instead of leaving a todo. We check confirmations explicitly when needed in swaps so using pending for all other methods should work I assume. What do you think? There was a problem hiding this comment.
You're right we explicitly wait for transaction confirmations before critical steps like the secret reveal. However, I think it would also be valuable to provide the opportunity to explicitly choose between Issue #2325 |
||
| ) | ||
| .await | ||
| .map_err(|e| ERRL!("{}", e)) | ||
| }; | ||
|
|
||
| Box::new(fut.boxed().compat().and_then(move |bytes| { | ||
|
|
@@ -5244,10 +5213,16 @@ impl EthCoin { | |
| let to_block = current_block.min(from_block + self.logs_block_range); | ||
|
|
||
| let spend_events = try_s!( | ||
| self.events_from_block( | ||
| swap_contract_address, | ||
| "ReceiverSpent", | ||
| from_block, | ||
| Some(to_block), | ||
| &SWAP_CONTRACT | ||
| ) | ||
| .await | ||
| ); | ||
|
|
||
| let found = spend_events.iter().find(|event| &event.data.0[..32] == id.as_slice()); | ||
|
|
||
| if let Some(event) = found { | ||
|
|
@@ -7006,6 +6981,7 @@ impl ParseCoinAssocTypes for EthCoin { | |
| } | ||
|
|
||
| fn parse_address(&self, address: &str) -> Result<Self::Address, Self::AddressParseError> { | ||
| // crate `Address::from_str` supports both address variants with and without `0x` prefix | ||
| Address::from_str(address).map_to_mm(|e| EthAssocTypesError::InvalidHexString(e.to_string())) | ||
| } | ||
|
|
||
|
|
@@ -7038,6 +7014,10 @@ impl ToBytes for Address { | |
| fn to_bytes(&self) -> Vec<u8> { self.0.to_vec() } | ||
| } | ||
|
|
||
| impl AddrToString for Address { | ||
| fn addr_to_string(&self) -> String { eth_addr_to_hex(self) } | ||
| } | ||
|
|
||
| impl ToBytes for BigUint { | ||
| fn to_bytes(&self) -> Vec<u8> { self.to_bytes_be() } | ||
| } | ||
|
|
@@ -7347,14 +7327,20 @@ impl TakerCoinSwapOpsV2 for EthCoin { | |
| self.sign_and_broadcast_taker_payment_spend_impl(gen_args, secret).await | ||
| } | ||
|
|
||
| /// Wrapper for [EthCoin::find_taker_payment_spend_tx_impl] | ||
| async fn find_taker_payment_spend_tx( | ||
| &self, | ||
| taker_payment: &Self::Tx, | ||
| from_block: u64, | ||
| wait_until: u64, | ||
| ) -> MmResult<Self::Tx, FindPaymentSpendError> { | ||
| const CHECK_EVERY: f64 = 10.; | ||
| self.find_taker_payment_spend_tx_impl(taker_payment, from_block, wait_until, CHECK_EVERY) | ||
| .await | ||
| } | ||
|
|
||
| async fn extract_secret_v2(&self, _secret_hash: &[u8], spend_tx: &Self::Tx) -> Result<[u8; 32], String> { | ||
| self.extract_secret_v2_impl(spend_tx).await | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's confusing why we use 5s sleep and in other situations we use
check_every. but i see you preserved the logic as it was 👍we can leave a todo about this (if there is no justification).
i think we should always do
check_every, as that's the expected wait time when failure or no result found. using a constant like 5s might not play well with certain (check_every&wait_until) pair.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, I decided to leave time sleep in legacy as it is, as Im not sure about the reason of using
check_everyand 5 sec in different places. When it comes to legacy Im trying to balance between "do the refactor when we need it" and "Does it work? Dont touch it".I used check_every everywhere in
find_taker_payment_spend_tx_impl(its an new protocol alternative of legacywait_for_htlc_tx_spend). So we can have a fresh view of this behaviour.