Skip to content
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

Jump to bottom

[r2r] save pubkeys with prefix #1717

Merged
merged 7 commits into from
Mar 20, 2023
Merged

[r2r] save pubkeys with prefix #1717

merged 7 commits into from
Mar 20, 2023

Conversation

borngraced
Copy link
Member

@borngraced borngraced commented Mar 15, 2023 •
edited
Loading

ref: #1646

@borngraced
use pubkeys with prefix
3c11e54 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced borngraced self-assigned this Mar 15, 2023
@borngraced borngraced marked this pull request as ready for review March 15, 2023 11:07
@borngraced
Copy link
Member Author

@smk762 please can you help test this branch to confirm full pubkeys are saved with the prefix on your end. thanks :)

@smk762
Copy link

smk762 commented Mar 15, 2023

I've completed 3 swaps and none were added to MM2.db at all.

In logs:

15 11:38:50, stats_swaps:227] ERROR Error taker_swap:322] Swap event must be Started and Negotiated on getting swap 0e39eab1-e94f-4444-98bb-c09173dc798b pubkeys
· 2023-03-15 19:38:50 +0800 [swap uuid=0e39eab1-e94f-4444-98bb-c09173dc798b] Finished
15 11:39:06, stats_swaps:142] ERROR Error maker_swap:1945] Swap event must be Started and Negotiated on getting swap 0e39eab1-e94f-4444-98bb-c09173dc798b pubkeys

@borngraced
match start event separately
813d932 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
Copy link
Member Author

I've completed 3 swaps and none were added to MM2.db at all.

In logs:

15 11:38:50, stats_swaps:227] ERROR Error taker_swap:322] Swap event must be Started and Negotiated on getting swap 0e39eab1-e94f-4444-98bb-c09173dc798b pubkeys
· 2023-03-15 19:38:50 +0800 [swap uuid=0e39eab1-e94f-4444-98bb-c09173dc798b] Finished
15 11:39:06, stats_swaps:142] ERROR Error maker_swap:1945] Swap event must be Started and Negotiated on getting swap 0e39eab1-e94f-4444-98bb-c09173dc798b pubkeys

fixed, let's go again please 😄

@borngraced borngraced mentioned this pull request Mar 16, 2023
Closed
@smk762 smk762 self-requested a review March 16, 2023 09:20
smk762
smk762 previously approved these changes Mar 16, 2023
View reviewed changes
@borngraced
improve error msgs
26e33bc 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
shamardy
shamardy requested changes Mar 17, 2023
View reviewed changes
Copy link
Collaborator

@shamardy shamardy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this fix!

mm2src/mm2_main/src/lp_swap/maker_swap.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/lp_swap/taker_swap.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/lp_swap/maker_swap.rs Show resolved Hide resolved
@borngraced
return error if key is none
3da25ad 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
use SwapPubkeys::new()
8bb457d 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
remove SwapPubkeys::new()
d03e822 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
shamardy
shamardy requested changes Mar 20, 2023
View reviewed changes
Copy link
Collaborator

@shamardy shamardy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please add this PR link to this changelog entry https://github.com/KomodoPlatform/atomicDEX-API/blob/d03e8223378c5fab718f49f0bd864a575af18f7d/CHANGELOG.md?plain=1#L27

@borngraced
update CHANGELOG.md
30e6fea 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
shamardy
shamardy approved these changes Mar 20, 2023
View reviewed changes
Copy link
Collaborator

@shamardy shamardy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@shamardy shamardy merged commit 7d5f586 into dev Mar 20, 2023
@shamardy shamardy deleted the swap_pubkeys branch March 20, 2023 14:04
@ca333 ca333 mentioned this pull request Mar 27, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shamardy shamardy shamardy approved these changes

@smk762 smk762 smk762 left review comments

Assignees

@borngraced borngraced

Labels
under review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@borngraced @smk762 @shamardy