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

MVP swaps support for SLP tokens and PIRATE. #1067

Merged
merged 54 commits into from
Sep 29, 2021
Merged

MVP swaps support for SLP tokens and PIRATE. #1067

merged 54 commits into from
Sep 29, 2021

Commits on Jun 24, 2021

  1. WIP. Made full order matching and swap test with RICK and FUSD.

    @artemii235
    artemii235 committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    e80440d View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. WIP. Implementing traits for SlpToken.

    @artemii235
    artemii235 committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    7f3a6fd View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. WIP. Implemented SLP withdraw. Added BchCoin.

    @artemii235
    artemii235 committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    4eab690 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. WIP. Avoiding usage of SLP UTXOs for normal BCH. Some tests fail.

    @artemii235
    artemii235 committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    d56561e View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. WIP. Added UtxoTxBuilder. All tests pass.

    @artemii235
    artemii235 committed Jul 1, 2021
    Configuration menu
    Copy the full SHA
    146957a View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2021

  1. Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap 

    # Conflicts:
#	mm2src/coins/lp_coins.rs
#	mm2src/coins/utxo/utxo_common.rs
#	mm2src/lp_swap/maker_swap.rs
#	mm2src/mm2_bitcoin/keys/src/lib.rs
#	mm2src/mm2_tests.rs
    @artemii235
    artemii235 committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    31a86ef View commit details
    Browse the repository at this point in the history

  2. Fixes after merge.

    @artemii235
    artemii235 committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    559e43c View commit details
    Browse the repository at this point in the history

  3. WIP. Refactoring tx builder. Code doesn't compile.

    @artemii235
    artemii235 committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    525e133 View commit details
    Browse the repository at this point in the history

  4. WIP. RICK/FUSD trade failed with the "transaction was rejected by net… 

    …work rules" on RICK side.
    @artemii235
    artemii235 committed Jul 2, 2021
    Configuration menu
    Copy the full SHA
    19d070a View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2021

  1. Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap

    @artemii235
    artemii235 committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    6fb2e95 View commit details
    Browse the repository at this point in the history

  2. WIP. Refactored BCH unspents retrieval.

    @artemii235
    artemii235 committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    73ca5f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Fix Clippy and WASM.

    @artemii235
    artemii235 committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    a814811 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. WIP. Added tx_size arg to get_htlc_spend_fee.

    @artemii235
    artemii235 committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    64f41c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. WIP.Properly handle ActualTxFee::FixedPerKb case in get_htlc_spend_fee.

    @artemii235
    artemii235 committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    78328fb View commit details
    Browse the repository at this point in the history

  2. WIP. Remove bitcoin-cash-slp dependency. Build SLP sending script in … 

    …MM2 entirely.
    @artemii235
    artemii235 committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    d95bf80 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. WIP. Add more checks in parse_slp_script.

    @artemii235
    artemii235 committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    1b296ac View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap 

    # Conflicts:
#	mm2src/mm2_tests.rs
    @artemii235
    artemii235 committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    85448b8 View commit details
    Browse the repository at this point in the history

  3. WIP. Remove RICK/FUSD from trade_test_electrum_and_eth_coins - will m… 

    …ove to docker_tests.
    @artemii235
    artemii235 committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    99eabf8 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. WIP. Moving SLP trading tests to docker_tests.

    @artemii235
    artemii235 committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    3e1fea6 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2021

  1. WIP. Added docker_tests_common and few SLP-related tests.

    @artemii235
    artemii235 committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    693cf04 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2021

  1. Fix zhtlc feature compilation. Check that RICK/ZOMBIE trade test pass.

    @artemii235
    artemii235 committed Jul 22, 2021
    Configuration menu
    Copy the full SHA
    294e9e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2021

  1. WIP. Researching tx building with Sapling spends.

    @artemii235
    artemii235 committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    2eb1bcc View commit details
    Browse the repository at this point in the history

  2. WIP. Dummy add_sapling_spend that doesn't work yet.

    @artemii235
    artemii235 committed Jul 23, 2021
    Configuration menu
    Copy the full SHA
    3c79ee3 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2021

  1. WIP. Sent the shielded spend transaction using pure Rust code.

    @artemii235
    artemii235 committed Jul 26, 2021
    Configuration menu
    Copy the full SHA
    03cecc1 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2021

  1. Sent and refunded dex fee on ZOMBIE chain.

    @artemii235
    artemii235 committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    29d4896 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2021

  1. WIP. Added send_outputs and started using it in z_send_dex_fee and z_… 

    …send_htlc.
    @artemii235
    artemii235 committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    015e3d3 View commit details
    Browse the repository at this point in the history

  2. Add SendOutputsErr::InsufficientBalance and return it accordingly in … 

    …send_outputs.
    @artemii235
    artemii235 committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    c39e439 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2021

  1. WIP. Making dex fee a shielded output with the public OVK.

    @artemii235
    artemii235 committed Jul 29, 2021
    Configuration menu
    Copy the full SHA
    4e18aae View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2021

  1. WIP. Made dex fee a shielded output with the public OVK. Implemented … 

    …validation.
    @artemii235
    artemii235 committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    e76462c View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2021

  1. WIP. Try using cached commitment tree.

    @artemii235
    artemii235 committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    d34d04c View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2021

  1. WIP. Adding the DB to cache the Sapling data.

    @artemii235
    artemii235 committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    2738b32 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2021

  1. WIP. Refactored send_outputs to use cached Sapling data.

    @artemii235
    artemii235 committed Aug 5, 2021
    Configuration menu
    Copy the full SHA
    c889f2a View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2021

  1. WIP. Refactor to avoid unwraps etc.

    @artemii235
    artemii235 committed Aug 6, 2021
    Configuration menu
    Copy the full SHA
    f6b999c View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2021

  1. Verbose tx format hotfix for tBCH electrum. tBCH and USDF activation … 

    …examples.
    @artemii235
    artemii235 committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    b9a4c28 View commit details
    Browse the repository at this point in the history

  2. WIP. ZCoin withdraw.

    @artemii235
    artemii235 committed Aug 9, 2021
    Configuration menu
    Copy the full SHA
    4a907e0 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2021

  1. Add separate methods to get BCH/SLP unspents for balance display. 

    Did that to avoid locking the mutex on each balance call.
#1034
    @artemii235
    artemii235 committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    f2fa882 View commit details
    Browse the repository at this point in the history

  2. Extract recently_spent from SlpTxPreimage to avoid occasional deadlocks.

    @artemii235
    artemii235 committed Aug 10, 2021
    Configuration menu
    Copy the full SHA
    2aae2b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2021

  1. WIP. Implemented withdraw for ZCoin.

    @artemii235
    artemii235 committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    87da267 View commit details
    Browse the repository at this point in the history

  2. WIP. Building Sapling cache DB for ARRR.

    @artemii235
    artemii235 committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    22eeb00 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2021

  1. Restore sapling_state_cache_loop. Add ARRRConsensusParams. Sent first… 

    … HTLC on PIRATE.
    @artemii235
    artemii235 committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    0bcf72e View commit details
    Browse the repository at this point in the history

  2. Use ARRRConsensusParams to build tx in z_p2sh_spend.

    @artemii235
    artemii235 committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    8bb893d View commit details
    Browse the repository at this point in the history

  3. Increase TAKER_FEE_RECV_TIMEOUT to 600.

    @artemii235
    artemii235 committed Aug 12, 2021
    Configuration menu
    Copy the full SHA
    4cd6ffc View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2021

  1. Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap 

    # Conflicts:
#	Cargo.lock
#	Cargo.toml
#	mm2src/coins/lp_coins.rs
#	mm2src/coins/qrc20.rs
#	mm2src/coins/utxo.rs
#	mm2src/coins/utxo/qtum.rs
#	mm2src/coins/utxo/slp.rs
#	mm2src/coins/utxo/utxo_common.rs
#	mm2src/coins/utxo/utxo_standard.rs
#	mm2src/coins/utxo/utxo_tests.rs
#	mm2src/docker_tests.rs
#	mm2src/docker_tests/qrc20_tests.rs
#	mm2src/lp_ordermatch/best_orders.rs
#	mm2src/mm2_tests.rs
    @artemii235
    artemii235 committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    0290e8e View commit details
    Browse the repository at this point in the history

  2. WIP. Fixing after merging from dev.

    @artemii235
    artemii235 committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    ef3d05b View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. Fixes after merge.

    @artemii235
    artemii235 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    99f8f6a View commit details
    Browse the repository at this point in the history

  2. Fixes after merge.

    @artemii235
    artemii235 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    e45795a View commit details
    Browse the repository at this point in the history

  3. Fix WASM.

    @artemii235
    artemii235 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    7da678f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap 

    # Conflicts:
#	mm2src/coins/utxo/slp.rs
#	mm2src/coins/utxo/utxo_tests.rs
#	mm2src/lp_ordermatch/best_orders.rs
    @artemii235
    artemii235 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    2f9c175 View commit details
    Browse the repository at this point in the history

  5. Fix after merge.

    @artemii235
    artemii235 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    4896ef0 View commit details
    Browse the repository at this point in the history

  6. One more fix.

    @artemii235
    artemii235 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    e206da6 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap 

    # Conflicts:
#	etomic_build/client/enable_tBCH
#	mm2src/docker_tests.rs
#	mm2src/mm2_bitcoin/keys/src/cashaddress.rs
    @artemii235
    artemii235 committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    db516b0 View commit details
    Browse the repository at this point in the history

  2. Fixes after merge.

    @artemii235
    artemii235 committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    7efd2c8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap

    @artemii235
    artemii235 committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    f78069d View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Review fixes.

    @artemii235
    artemii235 committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    4d79dc2 View commit details
    Browse the repository at this point in the history