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

Take anchor block deeper to avoid "Anchor too new" error #531

Merged
merged 1 commit into from
Jun 23, 2021

Conversation

Bushstar
Copy link
Member

Solves one issue reported here #524

@DeFiCh DeFiCh deleted a comment from defichain-bot Jun 14, 2021
@Bushstar Bushstar force-pushed the fix/choose-older-anchor branch from 51c5f19 to 91fbc88 Compare June 14, 2021 11:26
@Bushstar Bushstar changed the base branch from 1.8.x to master June 14, 2021 11:26
@Bushstar Bushstar force-pushed the fix/choose-older-anchor branch from 91fbc88 to 9e24365 Compare June 14, 2021 11:28
bvbfan
bvbfan previously approved these changes Jun 16, 2021
@Bushstar Bushstar changed the base branch from master to 1.8.x June 16, 2021 10:15
@Bushstar Bushstar dismissed bvbfan’s stale review June 16, 2021 10:15

The base branch was changed.

@Bushstar Bushstar force-pushed the fix/choose-older-anchor branch from 9e24365 to 86901b3 Compare June 16, 2021 10:16
@Bushstar Bushstar requested a review from bvbfan June 23, 2021 05:58
@Bushstar Bushstar merged commit 69e2779 into 1.8.x Jun 23, 2021
@Bushstar Bushstar deleted the fix/choose-older-anchor branch June 23, 2021 11:57
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]>
prasannavl pushed a commit that referenced this pull request Oct 30, 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)
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.

3 participants