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

fix: Compute payout is greater than total collateral #319

Merged
merged 1 commit into from
Mar 27, 2023

Conversation

holzeis
Copy link
Contributor

@holzeis holzeis commented Mar 22, 2023

Resolves #289.
Resolves #306.

The rust-dlc branch that we depend on has already been rebased onto master, so we can fix the bug like this.

@holzeis holzeis requested a review from luckysori March 22, 2023 12:52
@holzeis holzeis self-assigned this Mar 22, 2023
@holzeis holzeis changed the title fix: Update commit hash to our rust-dlc fork. fix: Compute payout is greater than total collateral Mar 22, 2023
@luckysori luckysori force-pushed the fix/computed-payout-is-greater-than-total-collateral branch from faed5e8 to 106f5cd Compare March 23, 2023 03:18
Copy link
Contributor

@luckysori luckysori left a comment

Choose a reason for hiding this comment

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

I approve my own changes.

@luckysori
Copy link
Contributor

bors r+

bors bot added a commit that referenced this pull request Mar 23, 2023
319: fix: Compute payout is greater than total collateral r=luckysori a=holzeis

Resolves #289. 
Resolves #306.

The `rust-dlc` [branch](p2pderivatives/rust-dlc#97) that we depend on has already been rebased onto `master`, so we can fix the bug like this.


Co-authored-by: Lucas Soriano del Pino <lucas_soriano@fastmail.com>
@bors
Copy link
Contributor

bors bot commented Mar 23, 2023

Build failed:

@luckysori luckysori force-pushed the fix/computed-payout-is-greater-than-total-collateral branch from 106f5cd to e6ec260 Compare March 23, 2023 05:25
@luckysori
Copy link
Contributor

bors retry

bors bot added a commit that referenced this pull request Mar 23, 2023
319: fix: Compute payout is greater than total collateral r=luckysori a=holzeis

Resolves #289. 
Resolves #306.

The `rust-dlc` [branch](p2pderivatives/rust-dlc#97) that we depend on has already been rebased onto `master`, so we can fix the bug like this.


Co-authored-by: Lucas Soriano del Pino <lucas_soriano@fastmail.com>
@bors
Copy link
Contributor

bors bot commented Mar 23, 2023

Build failed:

@holzeis
Copy link
Contributor Author

holzeis commented Mar 24, 2023

@luckysori why don't we just take the one commit that fixes the issue referenced in this PR instead of adding up multiple things here?

To fix bug where generated payout was greater than total collateral.
@luckysori luckysori force-pushed the fix/computed-payout-is-greater-than-total-collateral branch from e6ec260 to 766368e Compare March 27, 2023 07:14
@luckysori
Copy link
Contributor

bors r+

@bors
Copy link
Contributor

bors bot commented Mar 27, 2023

@bors bors bot merged commit e8f20c2 into main Mar 27, 2023
@bors bors bot deleted the fix/computed-payout-is-greater-than-total-collateral branch March 27, 2023 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants