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

Use 2of2 multisig deposit tx version for manual payout #3694

Merged

Conversation

@chimp1984
Copy link
Contributor

chimp1984 commented Nov 26, 2019

With v1.2 we use 2of2 multisig for deposit tx. This commit changes the
manual payout window to reflect that.

  • Remove unused code from legacy arbitration
  • Fix comments
With v1.2 we use 2of2 multisig for deposit tx. This commit changes the
manual payout window to reflect that.

- Remove unused code from legacy arbitration
- Fix comments
@chimp1984 chimp1984 requested review from ripcurlx and sqrrm as code owners Nov 26, 2019
This was referenced Nov 26, 2019
@julianknutsen

This comment has been minimized.

Copy link
Contributor

julianknutsen commented Nov 26, 2019

Do either of these need to make it into v1.2.4?

@chimp1984

This comment has been minimized.

Copy link
Contributor Author

chimp1984 commented Nov 26, 2019

Do either of these need to make it into v1.2.4?

Not super important, but this one might be useful in case we need a manual payout with a 1.2. trade.

Copy link
Member

ripcurlx left a comment

utACK - I'll cherry-pick this into the release branch

@ripcurlx ripcurlx merged commit b25a793 into bisq-network:master Nov 27, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@chimp1984 chimp1984 deleted the chimp1984:use-2of2-multisig-for-manual-payout branch Dec 7, 2019
@ripcurlx ripcurlx mentioned this pull request Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.