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.

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

Dev #1067

Merged
merged 16 commits into from
May 13, 2019
Merged

Dev #1067

merged 16 commits into from
May 13, 2019

Conversation

jl777
Copy link
Owner

@jl777 jl777 commented May 13, 2019

Remove ZEX, add ZEXO

@jl777 jl777 merged commit a5b8bce into beta May 13, 2019
DeckerSU pushed a commit to DeckerSU/SuperNET that referenced this pull request Nov 5, 2022
…7#1067)

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

* WIP. Implementing traits for SlpToken.

* WIP. Implemented SLP withdraw. Added BchCoin.

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

* WIP. Added UtxoTxBuilder. All tests pass.

* Fixes after merge.

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

* WIP. RICK/FUSD trade failed with the "transaction was rejected by network rules" on RICK side.

* WIP. Refactored BCH unspents retrieval.

* Fix Clippy and WASM.

* WIP. Added tx_size arg to get_htlc_spend_fee.

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

* WIP. Remove bitcoin-cash-slp dependency. Build SLP sending script in MM2 entirely.

* WIP. Add more checks in parse_slp_script.

* WIP. Remove RICK/FUSD from trade_test_electrum_and_eth_coins - will move to docker_tests.

* WIP. Moving SLP trading tests to docker_tests.

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

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

* WIP. Researching tx building with Sapling spends.

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

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

* Sent and refunded dex fee on ZOMBIE chain.

* WIP. Added send_outputs and started using it in z_send_dex_fee and z_send_htlc.

* Add SendOutputsErr::InsufficientBalance and return it accordingly in send_outputs.

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

* WIP. Made dex fee a shielded output with the public OVK. Implemented validation.

* WIP. Try using cached commitment tree.

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

* WIP. Refactored send_outputs to use cached Sapling data.

* WIP. Refactor to avoid unwraps etc.

* Verbose tx format hotfix for tBCH electrum. tBCH and USDF activation examples.

* WIP. ZCoin withdraw.

* Add separate methods to get BCH/SLP unspents for balance display.
Did that to avoid locking the mutex on each balance call.
jl777#1034

* Extract recently_spent from SlpTxPreimage to avoid occasional deadlocks.

* WIP. Implemented withdraw for ZCoin.

* WIP. Building Sapling cache DB for ARRR.

* Restore sapling_state_cache_loop. Add ARRRConsensusParams. Sent first HTLC on PIRATE.

* Use ARRRConsensusParams to build tx in z_p2sh_spend.

* Increase TAKER_FEE_RECV_TIMEOUT to 600.

* WIP. Fixing after merging from dev.

* Fixes after merge.

* Fixes after merge.

* Fix WASM.

* Fix after merge.

* One more fix.

* Fixes after merge.

* Review fixes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants