Skip to content

fix: Compute payout is greater than total collateral#319

Merged
bors[bot] merged 1 commit into
mainfrom
fix/computed-payout-is-greater-than-total-collateral
Mar 27, 2023
Merged

fix: Compute payout is greater than total collateral#319
bors[bot] merged 1 commit into
mainfrom
fix/computed-payout-is-greater-than-total-collateral

Conversation

@holzeis

@holzeis holzeis commented Mar 22, 2023

Copy link
Copy Markdown
Contributor

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

@luckysori luckysori left a comment

Copy link
Copy Markdown
Contributor

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
Copy Markdown
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

bors Bot commented Mar 23, 2023

Copy link
Copy Markdown
Contributor

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
Copy Markdown
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

bors Bot commented Mar 23, 2023

Copy link
Copy Markdown
Contributor

Build failed:

@holzeis

holzeis commented Mar 24, 2023

Copy link
Copy Markdown
Contributor Author

@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
Copy Markdown
Contributor

bors r+

@bors

bors Bot commented Mar 27, 2023

Copy link
Copy Markdown
Contributor

@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

Development

Successfully merging this pull request may close these issues.

Computed payout is greater than total collateral App is unable to accept DLC channel offer with certain parameters

2 participants