[r2r] Swap watcher node basic functionality #1457
Merged
Conversation
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
caglaryucekaya
requested review from
artemii235,
shamardy,
onur-ozkan,
borngraced,
laruh and
sergeyboyko0791
caglaryucekaya
changed the title
borngraced
requested changes
Sep 2, 2022
artemii235
requested changes
Sep 2, 2022
caglaryucekaya
changed the title
sergeyboyko0791
suggested changes
Sep 2, 2022
| fn watcher_validate_taker_payment( | ||
| &self, | ||
| _input: WatcherValidatePaymentInput, | ||
| ) -> Box<dyn Future<Item = (), Error = String> + Send>; |
There was a problem hiding this comment.
Could you please add corresponding WatcherValidatePayment error?
Probably at the next sprint.
onur-ozkan
reviewed
Sep 7, 2022
mm2src/coins/utxo/utxo_common.rs
Outdated
Comment on lines
990
to
991
| .get(0) | ||
| .ok_or("Transaction doesn't have any outputs")?) |
There was a problem hiding this comment.
How about doing this validation as the first step of the function(no need create lock_time, n_time, etc. if the input is invalid anyway) and leave here as input.prev_transaction.outputs[0].value?
| ) -> TransactionFut { | ||
| let my_address = try_tx_fus!(coin.as_ref().derivation_method.iguana_or_err()).clone(); | ||
| let mut prev_transaction: UtxoTx = try_tx_fus!(deserialize(maker_payment_tx).map_err(|e| ERRL!("{:?}", e))); | ||
| prev_transaction.tx_hash_algo = coin.as_ref().tx_hash_algo; |
There was a problem hiding this comment.
You can drop mutability of prev_transaction since it's done with mutability after this line.
| @@ -779,4 +800,4 @@ pub fn withdraw_max_and_send_v1(mm: &MarketMakerIt, coin: &str, to: &str) -> Tra | |||
| assert_eq!(rc.0, StatusCode::OK, "send_raw_transaction request failed {}", rc.1); | |||
|
|
|||
| tx_details | |||
| } | |||
| } | |||
There was a problem hiding this comment.
Could you please add empty newline? Otherwise there will be problem for git calculating diffs of this file.
caglaryucekaya
changed the title
caglaryucekaya
changed the title
caglaryucekaya
dismissed stale reviews from borngraced and artemii235
via
c403935
caglaryucekaya
changed the title
laruh
previously approved these changes
Sep 15, 2022
|
@sergeyboyko0791 It's waiting for your final approval. |
sergeyboyko0791
suggested changes
Sep 22, 2022
caglaryucekaya
changed the title
caglaryucekaya
changed the title
sergeyboyko0791
previously approved these changes
Sep 22, 2022
|
@caglaryucekaya we've just pushed ETH tests fix, please merge it, and then we can merge this branch as well 🙂 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The first template for the swap watcher node implementation for UTXO. If the use_watchers config is set to true, the taker broadcasts a signed preimage of the maker payment to the network. If is_watcher config is set to true, the watcher node receives the message, waits for the maker to spend the taker payment, extracts the secret, adds it to the signed preimage of the maker payment and spends it. The remaining functionality will be added in the upcoming PRs.