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

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

Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
e80440d
WIP. Made full order matching and swap test with RICK and FUSD.
artemii235 Jun 24, 2021
7f3a6fd
WIP. Implementing traits for SlpToken.
artemii235 Jun 28, 2021
4eab690
WIP. Implemented SLP withdraw. Added BchCoin.
artemii235 Jun 29, 2021
d56561e
WIP. Avoiding usage of SLP UTXOs for normal BCH. Some tests fail.
artemii235 Jun 30, 2021
146957a
WIP. Added UtxoTxBuilder. All tests pass.
artemii235 Jul 1, 2021
31a86ef
Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap
artemii235 Jul 2, 2021
559e43c
Fixes after merge.
artemii235 Jul 2, 2021
525e133
WIP. Refactoring tx builder. Code doesn't compile.
artemii235 Jul 2, 2021
19d070a
WIP. RICK/FUSD trade failed with the "transaction was rejected by net…
artemii235 Jul 2, 2021
6fb2e95
Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap
artemii235 Jul 8, 2021
73ca5f3
WIP. Refactored BCH unspents retrieval.
artemii235 Jul 8, 2021
a814811
Fix Clippy and WASM.
artemii235 Jul 9, 2021
64f41c1
WIP. Added tx_size arg to get_htlc_spend_fee.
artemii235 Jul 12, 2021
78328fb
WIP.Properly handle ActualTxFee::FixedPerKb case in get_htlc_spend_fee.
artemii235 Jul 13, 2021
d95bf80
WIP. Remove bitcoin-cash-slp dependency. Build SLP sending script in …
artemii235 Jul 13, 2021
1b296ac
WIP. Add more checks in parse_slp_script.
artemii235 Jul 14, 2021
85448b8
Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap
artemii235 Jul 14, 2021
99eabf8
WIP. Remove RICK/FUSD from trade_test_electrum_and_eth_coins - will m…
artemii235 Jul 14, 2021
3e1fea6
WIP. Moving SLP trading tests to docker_tests.
artemii235 Jul 15, 2021
693cf04
WIP. Added docker_tests_common and few SLP-related tests.
artemii235 Jul 16, 2021
294e9e1
Fix zhtlc feature compilation. Check that RICK/ZOMBIE trade test pass.
artemii235 Jul 22, 2021
2eb1bcc
WIP. Researching tx building with Sapling spends.
artemii235 Jul 23, 2021
3c79ee3
WIP. Dummy add_sapling_spend that doesn't work yet.
artemii235 Jul 23, 2021
03cecc1
WIP. Sent the shielded spend transaction using pure Rust code.
artemii235 Jul 26, 2021
29d4896
Sent and refunded dex fee on ZOMBIE chain.
artemii235 Jul 27, 2021
015e3d3
WIP. Added send_outputs and started using it in z_send_dex_fee and z_…
artemii235 Jul 28, 2021
c39e439
Add SendOutputsErr::InsufficientBalance and return it accordingly in …
artemii235 Jul 28, 2021
4e18aae
WIP. Making dex fee a shielded output with the public OVK.
artemii235 Jul 29, 2021
e76462c
WIP. Made dex fee a shielded output with the public OVK. Implemented …
artemii235 Jul 30, 2021
d34d04c
WIP. Try using cached commitment tree.
artemii235 Aug 2, 2021
2738b32
WIP. Adding the DB to cache the Sapling data.
artemii235 Aug 3, 2021
c889f2a
WIP. Refactored send_outputs to use cached Sapling data.
artemii235 Aug 5, 2021
f6b999c
WIP. Refactor to avoid unwraps etc.
artemii235 Aug 6, 2021
b9a4c28
Verbose tx format hotfix for tBCH electrum. tBCH and USDF activation …
artemii235 Aug 9, 2021
4a907e0
WIP. ZCoin withdraw.
artemii235 Aug 9, 2021
f2fa882
Add separate methods to get BCH/SLP unspents for balance display.
artemii235 Aug 10, 2021
2aae2b6
Extract recently_spent from SlpTxPreimage to avoid occasional deadlocks.
artemii235 Aug 10, 2021
87da267
WIP. Implemented withdraw for ZCoin.
artemii235 Aug 11, 2021
22eeb00
WIP. Building Sapling cache DB for ARRR.
artemii235 Aug 11, 2021
0bcf72e
Restore sapling_state_cache_loop. Add ARRRConsensusParams. Sent first…
artemii235 Aug 12, 2021
8bb893d
Use ARRRConsensusParams to build tx in z_p2sh_spend.
artemii235 Aug 12, 2021
4cd6ffc
Increase TAKER_FEE_RECV_TIMEOUT to 600.
artemii235 Aug 12, 2021
0290e8e
Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap
artemii235 Sep 14, 2021
ef3d05b
WIP. Fixing after merging from dev.
artemii235 Sep 14, 2021
99f8f6a
Fixes after merge.
artemii235 Sep 15, 2021
e45795a
Fixes after merge.
artemii235 Sep 15, 2021
7da678f
Fix WASM.
artemii235 Sep 15, 2021
2f9c175
Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap
artemii235 Sep 15, 2021
4896ef0
Fix after merge.
artemii235 Sep 15, 2021
e206da6
One more fix.
artemii235 Sep 15, 2021
db516b0
Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap
artemii235 Sep 27, 2021
7efd2c8
Fixes after merge.
artemii235 Sep 27, 2021
f78069d
Merge remote-tracking branch 'origin/dev' into mm2.1-slp-swap
artemii235 Sep 27, 2021
4d79dc2
Review fixes.
artemii235 Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,5 @@ iguana/exchanges/manychains

# coins configuration file
/coins
# MM2 conf to avoid occasional adding to git by someone
MM2.json
205 changes: 12 additions & 193 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ hyper = { version = "0.14.11", features = ["client", "http2", "server", "tcp"] }
tokio = { version = "1.7", features = ["io-util", "rt-multi-thread", "net"] }

[dev-dependencies]
bitcoin-cash-slp = "0.3.1"
mocktopus = "0.7.0"
rand6 = { version = "0.6", package = "rand" }
secp256k1 = { version = "0.20", features = ["rand"] }
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-build-stage-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
mkdir upload
echo 2.1.$(Build.BuildId)_$(Build.SourceBranchName)_$(COMMIT_HASH)_$(Agent.OS)_Release > MM_VERSION
cat MM_VERSION
cargo build --release --bin mm2
cargo build --release --bin mm2 --features zhtlc
displayName: 'Build MM2 Release'
# Build WASM with the debug symbols.
- bash: |
Expand Down
Loading