Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-30 12:36:36 -05:00
Code Issues Projects Releases Packages Wiki Activity
2772 commits 74 branches 28 tags 90 MiB
Commit graph

2772 commits

This branch
This branch
All branches
Author SHA1 Message Date
patrini32
f5f8af92a0 check for punish timelock in fn refund, not yet expired timelock in cancel and remove breaking database changes 2024-06-25 17:23:15 +03:00
patrini32
0caf678192 better comments 2024-06-25 17:23:15 +03:00
patrini32
f2973bf5cc remove missleading comment 2024-06-25 17:23:15 +03:00
patrini32
f66c16a381 provide better comments 2024-06-25 17:23:15 +03:00
patrini32
08a97ba1b7 provide better comments 2024-06-25 17:23:15 +03:00
patrini32
2c37e6e4f4 Revert "Reimplement tx_punish check without breaking database changes" 
This reverts commit ab33bcde8f.
 2024-06-25 17:23:15 +03:00
patrini32
1f9ac64166 Revert "fix formatting" 
This reverts commit 990206596b.
 2024-06-25 17:23:15 +03:00
patrini32
a133321255 fix formatting 2024-06-25 17:23:15 +03:00
patrini32
756f817daa Reimplement tx_punish check without breaking database changes 2024-06-25 17:23:15 +03:00
patrini32
8866e60323 Use transaction created by check_for_tx_cancel and delete construct_tx_cancel 2024-06-25 17:23:15 +03:00
patrini32
4b444140c0 Remove redundant comment 2024-06-25 17:23:15 +03:00
patrini32
6c2c205dd8 Remove redundant debug print 2024-06-25 17:23:15 +03:00
patrini32
5f392e3b7b return accidentally removed code 2024-06-25 17:23:15 +03:00
patrini32
1d2223c54d Return accidentally deleted check for RpcVerifyAlreadyInChain 2024-06-25 17:23:15 +03:00
patrini32
8ac04e0d16 Check if Alice already published tx_cancel/tx_punish if we get an error when trying to cancel/refund. Test: use cli::cancel and cli::refund to check if cli::cancel sets state to BtcCancelled 2024-06-25 17:23:15 +03:00
patrini32
5dc717d3e8 formalize description 2024-06-25 17:23:15 +03:00
patrini32
7f80966b86 better description 2024-06-25 17:23:15 +03:00
patrini32
dc84437f63 better description 2024-06-25 17:23:15 +03:00
patrini32
25ff29d633 Refactor and describe 'subscription' deletion 2024-06-25 17:23:15 +03:00
patrini32
aabff429bc fix formatting: delete whitespaces 2024-06-25 17:23:15 +03:00
patrini32
25ebcf731d fix formatting 2024-06-25 17:23:15 +03:00
patrini32
70220d1581 Add comments about logic 2024-06-25 17:23:15 +03:00
patrini32
8b9f1b04c9 refactor and print successful refund message only if it succeeded 2024-06-25 17:23:15 +03:00
patrini32
1c6e757f02 Use assert_bob_punished 2024-06-25 17:23:15 +03:00
patrini32
789f25be3f Add missing comma 2024-06-25 17:23:15 +03:00
patrini32
4635d0aae9 use original approach and add timelock check 2024-06-25 17:23:15 +03:00
patrini32
4421db7aad Revert "introduce better approach for checking for error" 
This reverts commit 7844ad1483.
 2024-06-25 17:23:15 +03:00
patrini32
ca8a9cbc0b Revert "Fix multiple things" 
This reverts commit d00293de35.
 2024-06-25 17:23:15 +03:00
patrini32
c9e3c40987 Fix multiple things 2024-06-25 17:23:15 +03:00
patrini32
e2b6538199 introduce better approach for checking for error 2024-06-25 17:23:15 +03:00
patrini32
a9a1724ad3 implement refund and lock check 2024-06-25 17:23:15 +03:00
patrini32
957c33bffe Fix stupid errors 2024-06-25 17:23:15 +03:00
patrini32
7e5c1ae45a fix formatting and typo 2024-06-25 17:23:15 +03:00
patrini32
391fb226b5 Add test to CI 2024-06-25 17:23:15 +03:00
patrini32
8e4fd2cc3b Add test and rustify code 2024-06-25 17:23:15 +03:00
patrini32
4f8907a4b0 prettify error, when bob tries to cancel and refund after disconnecting 2024-06-25 17:23:15 +03:00
Byron Hambly
21fed8c291
Merge pull request #1689 from comit-network/dependabot/cargo/uuid-1.9.1 
build(deps): bump uuid from 1.9.0 to 1.9.1
 2024-06-25 15:34:43 +02:00
Byron Hambly
5390a50eda
Merge pull request #1688 from comit-network/dependabot/cargo/serde_json-1.0.118 
build(deps): bump serde_json from 1.0.117 to 1.0.118
 2024-06-25 15:34:33 +02:00
dependabot[bot]
5551f513d5
build(deps): bump uuid from 1.9.0 to 1.9.1 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.9.0...1.9.1)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-25 11:49:47 +00:00
dependabot[bot]
fbf1c3dabf
build(deps): bump serde_json from 1.0.117 to 1.0.118 
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.117 to 1.0.118.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.117...v1.0.118)

---
updated-dependencies:
- dependency-name: serde_json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-25 11:48:33 +00:00
Byron Hambly
23a4d624da
Merge pull request #1687 from ikmckenz/add-missing-test 
Add concurrent_bobs_after_xmr_lock_proof_sent test to ci
 2024-06-25 10:37:50 +02:00
Ian McKenzie
3fc934a189 Add concurrent_bobs_after_xmr_lock_proof_sent test to ci 2024-06-24 21:27:13 -07:00
Byron Hambly
194fa1b1cb
Merge pull request #1686 from comit-network/dependabot/cargo/strum-0.26.3 
build(deps): bump strum from 0.26.2 to 0.26.3
 2024-06-24 14:00:21 +02:00
Byron Hambly
58baa48eba
Merge pull request #1685 from comit-network/dependabot/cargo/uuid-1.9.0 
build(deps): bump uuid from 1.8.0 to 1.9.0
 2024-06-24 14:00:02 +02:00
Byron Hambly
6f57517c05
Merge pull request #1684 from comit-network/dependabot/cargo/proptest-1.5.0 
build(deps): bump proptest from 1.4.0 to 1.5.0
 2024-06-24 13:59:52 +02:00
dependabot[bot]
2068a4cf78
build(deps): bump strum from 0.26.2 to 0.26.3 
Bumps [strum](https://github.com/Peternator7/strum) from 0.26.2 to 0.26.3.
- [Release notes](https://github.com/Peternator7/strum/releases)
- [Changelog](https://github.com/Peternator7/strum/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Peternator7/strum/compare/v0.26.2...v0.26.3)

---
updated-dependencies:
- dependency-name: strum
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 11:12:44 +00:00
dependabot[bot]
dabe1abb21
build(deps): bump uuid from 1.8.0 to 1.9.0 
Bumps [uuid](https://github.com/uuid-rs/uuid) from 1.8.0 to 1.9.0.
- [Release notes](https://github.com/uuid-rs/uuid/releases)
- [Commits](https://github.com/uuid-rs/uuid/compare/1.8.0...1.9.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 11:10:02 +00:00
dependabot[bot]
cca0d0027e
build(deps): bump proptest from 1.4.0 to 1.5.0 
Bumps [proptest](https://github.com/proptest-rs/proptest) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/proptest-rs/proptest/releases)
- [Changelog](https://github.com/proptest-rs/proptest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/proptest-rs/proptest/compare/v1.4.0...v1.5.0)

---
updated-dependencies:
- dependency-name: proptest
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-06-24 11:09:33 +00:00
dependabot[bot]
4d557d1ef9
build(deps): bump mockito from 1.3.0 to 1.4.0 (#1567) 
* build(deps): bump mockito from 1.3.0 to 1.3.1

Bumps [mockito](https://github.com/lipanski/mockito) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/lipanski/mockito/releases)
- [Commits](https://github.com/lipanski/mockito/compare/1.3.0...1.3.1)

---
updated-dependencies:
- dependency-name: mockito
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix: breaking change in mockito async

* bump mockito to 1.4

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Byron Hambly <byron@hambly.dev>
 2024-06-19 15:35:05 +02:00
Byron Hambly
1d5df5498c
Merge pull request #1682 from comit-network/dependabot/cargo/serial_test-3.1.1 
build(deps): bump serial_test from 3.0.0 to 3.1.1
 2024-06-19 15:21:14 +02:00