Archives
/
xmr-btc-swap
mirror of https://github.com/comit-network/xmr-btc-swap
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
275 Commits
61 Branches
25 Tags
10 MiB
pr/1676
dependabot/cargo/serde_json-1.0.120
dependabot/cargo/hyper-1.4.0
master
dependabot/cargo/jsonrpsee-core-0.23.2
dependabot/cargo/jsonrpsee-0.22.5
reduce-check-interval-monero-asb
reduce-check-interval-monero-alice
pr/1427
transfer-proof-acknowledgement
dependabot/cargo/ed25519-dalek-2.1.1
early-tracing-init
monero-wallet-rpc-update
dependabot/cargo/bdk-0.29.0
cooperative-xmr-redeem
staging
rpc-server
roc
kill-monero-rpc-on-signal-receive
bump-rustc-version-for-release-bins-ci
change-xmr-node-moneroworld
wallet-force-sync-on-first-subscribe
rpc-server-tracing-log-files
dependabot/cargo/libp2p-0.48.0
0.11.x
trying
wait-for-cancel-timelock-when-enc-sig-fails
bungy-corrupted-database
feature/libp2p-release
sqlite
sqlite2
print-priv-view-key
docs
relay-fee-debug
rendezvous-demo
rendezvous-asb-refactor
rendezvous-cli
swap-setup-proto-rishab
cleanup-module-boundaries
debug-remodel-tor
swap-setup-proto
discover-makers-cli
quote-protocol-refactor
debug-remodel-tor-same-port
small-ux-improvements
quote-websocket
random-branch
xmr-adaptor-signatures
xmr-adaptor-signatures-publish-on-testnet
refactor-network-code
no-transfer-proof-failure
on-chain-protocol
remove-bytes-serde-module
remodel-tor
quad9-dns
quote-protocol-libp2p-relay
asb-systemd-setup
manual-sync
fix-confirmations
test-refactor
demo
0.10.0
0.10.1
0.10.2
0.11.0
0.11.1
0.12.0
0.12.1
0.12.2
0.12.3
0.13.0
0.13.1
0.13.2
0.4.0
0.5.0
0.6.0
0.7.0
0.8.0
0.8.1
0.8.2
0.8.3
0.9.0
preview
v0.1
v0.2
v0.3
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a9bb4e6bed'
${ noResults }
Commit Graph

275 Commits (a9bb4e6bedcc8e1199b60e1fa624dd05abf9d943)
 

Author SHA1 Message Date
rishflab a9bb4e6bed
Merge pull request #41 from rishflab/automated 
Simplify swap and recovery execution
 4 years ago
rishflab 1c401aad31 Fix clippy warnings and formatting 4 years ago
rishflab cdffb619dc
Merge pull request #48 from comit-network/revert-35-no-transfer-proof 
Revert "No need to send Monero transfer proof from Alice to Bob"
 4 years ago
rishflab fcec465bdb Revert "No need to send Monero transfer proof from Alice to Bob" 4 years ago
rishflab b06321a40f WIP: cleanup 4 years ago
rishflab 47c3ddc6f7 Fix happy path test 
Poll bob swarm to send encsig after calling send message3. Comment
out unimplmented wait for transaction finality trait. Dial alice.
 4 years ago
rishflab 729e65da5b
Merge pull request #49 from comit-network/cargo-lock 
Push cargo lock to git as we are building a binary
 4 years ago
rishflab fa243e2fd7
Merge pull request #5 from D4nte/rishflab-automated 
Save state0 in the swarm to process message0
 4 years ago
Franck Royer 2abeba17f9
Save state0 in the swarm to process message0 4 years ago
Franck Royer 62db4fb430
Push cargo lock to git as we are building a binary 4 years ago
rishflab d8218a7bea Remove mspc channel from new executor 4 years ago
Franck Royer 2db9ebd28b make new_swarm public 4 years ago
Franck Royer 9e13034e54 Extract execution details from driving loop 4 years ago
rishflab 24631d464d Add test for recursive executor 4 years ago
rishflab dca15b6872 Removed unused binary 4 years ago
rishflab 3b005bd15c Resolve rebase issues, restructure code and fix warnings 4 years ago
Franck Royer 437c1cbb80 Started to extract some steps 
Tealised that the whole point is for them to be idempotent to be useful
 4 years ago
Franck Royer 66866f8fbd Remove rng argument 4 years ago
Franck Royer 6c0df836ca Deal with Btc Punished. 4 years ago
Franck Royer 6437b529eb Punish Bob if t2 is reached 4 years ago
Franck Royer 8ff1824126 Remove abort function 4 years ago
Franck Royer 58ca33dd04 Remove warnings 4 years ago
Franck Royer c501d84278 Park abort function for now 4 years ago
Franck Royer 4c4a10098c Complete Refund path 4 years ago
Franck Royer bff83bbe99 Progress on Cancellation path 4 years ago
Franck Royer 8e31a3af6a Add steps from `EncSignLearned` 4 years ago
Franck Royer 8976a03b3d Implemented Alice transition from `BtcLocked` to `XmrLocked` 4 years ago
Franck Royer 75e7fedfed Implemented Alice transition from `Negotiated` to `BtcLocked` 4 years ago
Franck Royer c4cd64d134 Implemented Alice transition from `Started` to `Negotiated` 4 years ago
Franck Royer 0fe5131a8a Fix import format 4 years ago
rishflab ae94b170fd Cleanup 
Move state machine executors into seperate files

Remove check for ack message from Alice. Seems like a bad idea to
rely on an acknowledgement message instead of looking at the
blockchain.

Fix warnings
 4 years ago
rishflab ff7daf16f3 WIP: Test simplified swap execution 4 years ago
rishflab dd07e2f882 Add Alice execution path 
Consolidate and simplify swap execution. Generators are no longer
needed. Consolidate recovery and swap data structures. The
recursive calls can be replaced with a loop if returning prior to
completion is desired for testing purposes.

Fill out alice abort path

Move state machine executors into seperate files

Not compiling due to recursion/async issues

Fix async recursion compilation errors

Fix Bob swap execution

Remove check for ack message from Alice. Seems like a bad idea to
rely on an acknowledgement message instead of looking at the
blockchain.

Fix Bob abort

Fix warnings

Xmr lock complete

Add TxCancel submit to XmrLocked

Bob swap completed

Remove alice
 4 years ago
Daniel Karzel 95c4e5d809
Merge pull request #45 from comit-network/user-interface-feedback-validation 
Collect validation questions and map them to prototypes
 4 years ago
Daniel Karzel 8addecc927 Collect validation questions and map them to prototypes 4 years ago
Daniel Karzel 96e984794d
Merge pull request #42 from comit-network/xmr-btc-user-interface-definition 
XMR<>BTC user interface prototype details
 4 years ago
Daniel Karzel 075e17029e
Apply suggestions from code review 
Co-authored-by: Philipp Hoenisch <philipp@coblox.tech>
 4 years ago
Daniel Karzel 2548283c13
Apply suggestions from code review 
Co-authored-by: Franck Royer <franck@coblox.tech>
 4 years ago
Daniel Karzel 2de8093659 Re-word the CORS header issue and add some fixes 4 years ago
Daniel Karzel 4b6f914409 XMR<>BTC user interface prototype details 
This document sums up assumptions and limitations of the current setup and protocol.
It outlines how the UI prototypes for XMR<>BTC swaps are planned and why.
 4 years ago
rishflab 9542f162f6
Merge pull request #35 from comit-network/no-transfer-proof 
No need to send Monero transfer proof from Alice to Bob
 4 years ago
rishflab 379aff50cf Fix rebase conflicts 4 years ago
Lucas Soriano del Pino 620216a596 Remove need to send Monero transfer proof from Alice to Bob 4 years ago
Lucas Soriano del Pino 0288e004c5 Make Alice watch for Monero lock transaction without transfer proof 4 years ago
Lucas Soriano del Pino 7371dfb055 Test that a watch only wallet can be loaded from address + view key 4 years ago
rishflab e7682a42a4
Merge pull request #36 from comit-network/recovery 
Recover from a failed swap
 4 years ago
Lucas Soriano del Pino 483c819e17 Correctly re-export types from bitcoin and monero modules 4 years ago
Lucas Soriano del Pino f5ff50157e Some more fixes and comments after testing Alice's recovery 4 years ago
Lucas Soriano del Pino bea99185ed Use correct default values for monerod_url* 
*`monerod_url` is an incorrect name as it's actually a
`monero_wallet_rpc_url`. This is fixed in another branch.
 4 years ago
Lucas Soriano del Pino 5930af3587 Move some things around in recover module 4 years ago