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] Deactivate tokens with platform coin #1525

Merged
merged 62 commits into from
Dec 5, 2022
Merged

[r2r] Deactivate tokens with platform coin #1525

merged 62 commits into from
Dec 5, 2022

Conversation

borngraced
Copy link
Member

@borngraced borngraced commented Nov 1, 2022 •
edited
Loading

fixes: #1493

@borngraced borngraced self-assigned this Nov 1, 2022
@borngraced borngraced changed the title [wip] Deactivate tokens with platform coin [r2r] Deactivate tokens with platform coin Nov 1, 2022
shamardy
shamardy reviewed Nov 2, 2022
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.

Thanks for the PR. Just a few questions to start :)

mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs Outdated Show resolved Hide resolved
@borngraced borngraced assigned borngraced and unassigned borngraced Nov 2, 2022
@borngraced borngraced changed the title [r2r] Deactivate tokens with platform coin [wip] Deactivate tokens with platform coin Nov 2, 2022
@borngraced
Copy link
Member Author

@sergeyboyko0791 This is now ready for a review.
@shamardy I re implemented this feature in a more viable way so I'll need a fresh review from your side too. also added the unit test you suggested earlier!

@borngraced borngraced changed the title [wip] Deactivate tokens with platform coin [r2r] Deactivate tokens with platform coin Nov 11, 2022
@borngraced
Merge remote-tracking branch 'origin/dev' into deactivate_tokens_with…
1fe0906 
…_platform_coin

# Conflicts:
#	mm2src/coins/eth.rs
#	mm2src/coins/lightning.rs
#	mm2src/coins/qrc20.rs
#	mm2src/coins/solana.rs
#	mm2src/coins/solana/spl.rs
#	mm2src/coins/tendermint/tendermint_coin.rs
#	mm2src/coins/test_coin.rs
#	mm2src/coins/utxo/bch.rs
#	mm2src/coins/utxo/qtum.rs
#	mm2src/coins/utxo/slp.rs
#	mm2src/coins/utxo/utxo_standard.rs
#	mm2src/coins/z_coin.rs
#	mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs
#	mm2src/mm2_main/tests/docker_tests/slp_tests.rs
@borngraced
fix conflicts
85c71c2
@borngraced
fix lightning coin
f6fec26 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced borngraced changed the title [wip] Deactivate tokens with platform coin [r2r] Deactivate tokens with platform coin Nov 30, 2022
sergeyboyko0791
sergeyboyko0791 suggested changes Nov 30, 2022
View reviewed changes
Copy link

@sergeyboyko0791 sergeyboyko0791 left a comment

Choose a reason for hiding this comment

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

Next review iteration

mm2src/coins/lp_coins.rs Outdated Show resolved Hide resolved
mm2src/coins/lp_coins.rs Outdated Show resolved Hide resolved
mm2src/coins/lp_coins.rs Outdated Show resolved Hide resolved
mm2src/coins/rpc_command/init_create_account.rs Show resolved Hide resolved
mm2src/coins_activation/src/lightning_activation.rs Outdated Show resolved Hide resolved
mm2src/coins_activation/src/standalone_coin/init_standalone_coin.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/lp_ordermatch.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/lp_ordermatch.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/lp_swap.rs Outdated Show resolved Hide resolved
@borngraced
refactord cancel_and_remove_coin()
17762e2 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
fix review notes
9e7afb7 
Signed-off-by: borngraced <samuelonoja970@gmail.com>

Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
minor fix
f8f4bd9 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
sergeyboyko0791
sergeyboyko0791 suggested changes Dec 1, 2022
View reviewed changes
Copy link

@sergeyboyko0791 sergeyboyko0791 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I think the last review iteration from me

mm2src/mm2_main/src/lp_ordermatch.rs Show resolved Hide resolved
mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs Outdated Show resolved Hide resolved
@borngraced
impl test_disable_eth_coin_with_token unit test
8cd0212 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
shamardy
shamardy requested changes Dec 2, 2022
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.

Next review iteration

mm2src/coins_activation/src/l2/init_l2.rs Outdated Show resolved Hide resolved
mm2src/coins/lp_coins.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/tests/mm2_tests/bch_and_slp_tests.rs Outdated Show resolved Hide resolved
@borngraced
save dev state
29fb702 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced borngraced changed the title [r2r] Deactivate tokens with platform coin [wip] Deactivate tokens with platform coin Dec 4, 2022
@borngraced
move test_disable_eth_coin_with_token to eth_tests
1611a30 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
fix wasm
c8d890f 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
Merge remote-tracking branch 'origin/dev' into deactivate_tokens_with…
4e3eb50 
…_platform_coin

# Conflicts:
#	mm2src/coins_activation/src/token.rs
#	mm2src/mm2_main/tests/mm2_tests/mod.rs
#	mm2src/mm2_main/tests/mm2_tests/tendermint_tests.rs
@borngraced
fix token.rs
26e9a95 
Signed-off-by: borngraced <samuelonoja970@gmail.com>

Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced borngraced changed the title [wip] Deactivate tokens with platform coin [r2r] Deactivate tokens with platform coin Dec 5, 2022
@borngraced
fix cargo fmt
51881ae 
Signed-off-by: borngraced <samuelonoja970@gmail.com>

Signed-off-by: borngraced <samuelonoja970@gmail.com>
sergeyboyko0791
sergeyboyko0791 suggested changes Dec 5, 2022
View reviewed changes
Copy link

@sergeyboyko0791 sergeyboyko0791 left a comment

Choose a reason for hiding this comment

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

Great, almost done!
A few minor changes please :)

mm2src/coins/lp_coins.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/tests/mm2_tests/eth_tests.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/tests/mm2_tests/eth_tests.rs Outdated Show resolved Hide resolved
mm2src/mm2_main/tests/mm2_tests/eth_tests.rs Outdated Show resolved Hide resolved
@borngraced
minor fixes
60e242a 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
@borngraced
fix add_l2
d1feadb 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
sergeyboyko0791
sergeyboyko0791 previously approved these changes Dec 5, 2022
View reviewed changes
Copy link

@sergeyboyko0791 sergeyboyko0791 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

shamardy
shamardy previously approved these changes Dec 5, 2022
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.

Thanks for the huge work 🔥 ! A few non-blockers.

mm2src/mm2_main/src/rpc/lp_commands/lp_commands_legacy.rs Outdated Show resolved Hide resolved
mm2src/coins/lp_coins.rs Outdated Show resolved Hide resolved
mm2src/coins/lp_coins.rs Outdated Show resolved Hide resolved
@borngraced
non blocker fixes
4e74e44 
Signed-off-by: borngraced <samuelonoja970@gmail.com>
shamardy
shamardy approved these changes Dec 5, 2022
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.

Re-approve

@sergeyboyko0791 sergeyboyko0791 merged commit a6046fd into dev Dec 5, 2022
@sergeyboyko0791 sergeyboyko0791 deleted the deactivate_tokens_with_platform_coin branch December 5, 2022 16:33
@borngraced borngraced mentioned this pull request Feb 17, 2023
Merged
@shamardy shamardy mentioned this pull request Feb 20, 2023
Closed
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

@sergeyboyko0791 sergeyboyko0791 sergeyboyko0791 left review comments

Assignees

@borngraced borngraced

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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