ICX hardfork fixes #599
Merged
ICX hardfork fixes #599
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… Fix claimdfchtlc so it cannot be stuck when ext htlc expire.
Mixa84
requested review from
Bushstar,
bvbfan,
monstrobishi,
ShengguangXiao,
surangap and
uzyn
as code owners
| { | ||
| CAmount BTCAmount(static_cast<CAmount>((arith_uint256(submitdfchtlc.amount) * arith_uint256(order->orderPrice) / arith_uint256(COIN)).GetLow64())); | ||
| takerFee = CalculateTakerFee(BTCAmount); | ||
| } | ||
|
|
||
| // refund the rest of locked takerFee if there is difference | ||
| if (offer->takerFee - takerFee) { |
There was a problem hiding this comment.
If this value is negative then still have problem
There was a problem hiding this comment.
It will go into else before EunosPaya, and after it will enter the if and calculate the takerFee as ratio of the current one so offer->takerFee - takerFee will never be negative.
We must preserve old functioning before the fork so that we do not create a hardfork before EunosPaya or when syncing from scratch.
surangap
previously approved these changes
Jul 8, 2021
surangap
approved these changes
Jul 9, 2021
prasannavl
added a commit
that referenced
this pull request
Jul 15, 2021
* v1.8.0 * Remove FortCanning from Eunos regtest setting * Take anchor block deeper to avoid "Anchor too new" error (#531) * Add tests for epic/* * Switch fork to EunosPaya (#584) * Switch canning to paya 2 (#585) * Switch fork to EunosPaya * Remove left over canning changes * Onchain timelock (#562) * Prevent resign during PRE_ENABLED state (#518) * Prevent resign during PRE_ENABLED and staking during PRE_RESIGNED. * Change FortCanning to EunosPaya * Reduce future block time to 30 seconds (#586) * Reduce future time to 30 seconds * Ignore 30s time rule on regtest * Check for and reject entries with duplicates (#592) * Check for and reject duplicates * Allow duplicates as long as overall sigs meet quorum * Add tests. Update confirms to store unique on signer ID. * Restore previous behaviour as collection ignores duplicate CKeyIDs * Hold confirms on BTC TX height, hash and signed CKeyID (#598) * Add hard coded seed for devnet (#601) * Set Eunos and Paya forks (#604) * ICX hardfork fixes (#599) * Add check if HTLC existed to skip refund of burnt takerFee * Fix closing DFI offer not to try to refund amount that is not locked. Fix claimdfchtlc so it cannot be stuck when ext htlc expire. * Adding EunosPaya height check * Recalculate takerFee from original takerFee instead from dex * Fix for ICX txes without change * Adding EunosPAya height check * Change fork height check to simplify code * Fix check on closeoffer * Fix ExistedHTLC * Fix listhtlcs rpc params * Fix passing invalid orderTx in icx_listorders * Fix error message to be consistent with dfc htlc. * Fix test * Fix limit in list RPCs * Fix uninitialized lastTxOut * Change the minimum timeout for HTLCs. Offer expires after 20 blocks. Adapt tests. (#611) * Timelock expiration (#607) * Timelock expiration * Pass height to timelock * Set version to 1.8.0 (#613) * Set testnet EP fork and increment PROTOCOL_VERSION. (#614) Co-authored-by: Mihailo Milenkovic <[email protected]> Co-authored-by: Prasanna Loganathar <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What kind of PR is this?:
/kind fix
What this PR does / why we need it:
PR contains fixes for the following issues:
Which issue(s) does this PR fixes?:
Fixes #555
Fixes #583
Fixes #595
Additional comments?:
Fixes will activate on EunosPaya height