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

feat: initial chainswaps #133

Merged
merged 25 commits into from
Apr 27, 2024
Merged

feat: initial chainswaps #133

merged 25 commits into from
Apr 27, 2024

Conversation

jackstar12
Copy link
Member

No description provided.

@jackstar12 jackstar12 force-pushed the chain-swaps branch 6 times, most recently from 770e07b to 5bbd21d Compare April 4, 2024 13:55
boltz/api.go Outdated Show resolved Hide resolved
boltz/swaptree.go Outdated Show resolved Hide resolved
Comment on lines 237 to 240
fmt.Println("expected")
fmt.Println(txscript.DisasmString(expectedScript))
fmt.Println("actual")
fmt.Println(txscript.DisasmString(actual))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rm

database/chain.go Outdated Show resolved Hide resolved
database/chain.go Outdated Show resolved Hide resolved
database/chain.go Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
nursery/chain.go Outdated Show resolved Hide resolved
rpcserver/router.go Show resolved Hide resolved
nursery/refund.go Outdated Show resolved Hide resolved
@jackstar12 jackstar12 force-pushed the chain-swaps branch 3 times, most recently from 0ed11a8 to 9eaa51e Compare April 9, 2024 12:55
@jackstar12 jackstar12 marked this pull request as ready for review April 11, 2024 10:28
boltz/api.go Outdated Show resolved Hide resolved
boltz/api.go Outdated Show resolved Hide resolved
boltz/swaptree.go Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
nursery/refund.go Outdated Show resolved Hide resolved
rpcserver/router.go Outdated Show resolved Hide resolved
rpcserver/router.go Outdated Show resolved Hide resolved
rpcserver/router.go Outdated Show resolved Hide resolved
rpcserver/router.go Show resolved Hide resolved
jackstar12 and others added 2 commits April 15, 2024 09:04
Co-authored-by: michael1011 <me@michael1011.at>
kilrau

This comment was marked as duplicate.

@kilrau kilrau self-requested a review April 24, 2024 12:39
Copy link
Member

@kilrau kilrau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As just discussed, db migration is still missing

@kilrau kilrau linked an issue Apr 24, 2024 that may be closed by this pull request
@kilrau kilrau self-requested a review April 25, 2024 16:57
Copy link
Member

@kilrau kilrau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

db migration works now (implemented in 75dfa6f in a different branch). Let's merge this one if good with you @michael1011

Copy link
Member

@michael1011 michael1011 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor wording things. Can be merged afterwards

boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
boltzrpc/boltzrpc.proto Outdated Show resolved Hide resolved
rpcserver/router.go Outdated Show resolved Hide resolved
rpcserver/router.go Outdated Show resolved Hide resolved
jackstar12 and others added 7 commits April 26, 2024 17:03
* feat: chain swap cli

* fix: chain swap help description

* fix: help output missing , statement

* fix: chain swap help description from/to

* fix: createswap,createreverseswap,createchainswap help description

* fix: autoswapper -> autoswap in help outputs, comments

* fix: typo

* refactor: dont implicitly select wallets

* fix: check for state in timeout condition when querying refundable swaps

* fix: only set fees of valid outputs after transaction was created

* feat: implicitly set external pay in cli when not specifying from wallet

* chore: cleanup

* fix: check if value is less than fee when constructing transaction

* feat: return output specific errors when creating transactions

* fix: refund help description

* fix: --from-external, --to-address help output

* refactor: dont default to mainchain when creating swap

* refactor: use from and to wallet terminology everywhere

* chore: add db migration

* fix: display correct refund transaction when refunding in cli

* fix: show correct timeout in cli

* feat: recover pending chain swaps

* fix: correctly set external pay when creating submarine swap

* feat: display currency of lockup tx in cli

* fix: dont try to broadcast empty transaction

---------

Co-authored-by: Kilian <19181985+kilrau@users.noreply.github.com>
can be added back later when batching has been refactored
@jackstar12 jackstar12 merged commit e85d88a into master Apr 27, 2024
2 checks passed
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.

Liquid <> Mainchain Swaps
3 participants