-
Notifications
You must be signed in to change notification settings - Fork 40
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: merge main to base #399
Merged
filippos47
merged 78 commits into
base/consumer-chain-support
from
merge-main-to-base-2025
Jan 14, 2025
Merged
fix: merge main to base #399
filippos47
merged 78 commits into
base/consumer-chain-support
from
merge-main-to-base-2025
Jan 14, 2025
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
Root cause of babylonlabs-io/finality-provider#121. If response is nil due to error, will cause panic
Closes #263. In particular, - ensure `checkpointFinalizationTimeout` can never be changed in the update params handler of the btccheckpoint module - ensure `minUnbondingTime` can not be set to a value less than or equal to `checkpointFinalizationTimeout` in the update params handler of the btcstaking module - allows `unbondingTime` of a delegation to be set to a value equals to `minUnbondingTime`
This PR introduces the `ResumeFinalityProposal` and implements the handler, which is part of [ADR-32](babylonlabs-io/pm#95). This part is quite independent and the algorithm of choosing finality providers to jail can be implemented in the future
Updates cosmos math. [Issue](GHSA-7225-m954-23v7)
(docker)resolve Dockerfile issue & fix CVEs
The bug is caused due to setting `params.MinStakingTime` to the btcstaking module's keeper method `VerifyInclusionProofAndGetHeight` other than `params.MinUnbondingTime`. In the fix, we remove `minUnbondingTime` from the parameter list of `VerifyInclusionProofAndGetHeight` as it should retrieve the parameter within the method. This PR also added comprehensive tests for `VerifyInclusionProofAndGetHeight`
Implements babylonlabs-io/pm#145 including: - Rewards are calculated with a timeout `finality_sig_timeout` - Rewards should not be assigned to finality providers that have not voted for the block when calculating rewards.
- Upgrades parameters in upgrade for testnet launch --------- Co-authored-by: Filippos Malandrakis <[email protected]>
`EventPowerDistUpdate_SlashedFp` and [`RewardBTCStaking`](https://github.com/babylonlabs-io/babylon/blob/b132d16483d2e12ac68be74a524a4b7121edac65/x/incentive/keeper/btc_staking_gauge.go#L19) are called at different blocks. The rewards are being called a few blocks behind and if the slashed fp is pruned in BTC reward tracker data, it fails to find and panics On babylond-deployments an fp is being slashed at block height 46, the call of `RewardBTCStaking` happens at Babylon block 48 but is called to distribute rewards of voting power table from block 44 (which didn't had the FP slashed yet) which then checks for fp rewards for the FP that was pruned at the slashing processed event. ``` 6:04PM INF finalizing commit of block hash=153E869F7B0056A9CD8208301F2019FFACA2BEFBBB35AEADF70DCA14C15F3972 height=47 module=consensus num_txs=2 root=62B5F025459DEEBE2EE6F5D869C5BCBE903299FF80825FB9DE62551E6B725D52 ERR CONSENSUS FAILURE!!! err="failed to add fp rewards for btc delegation bbn1wwkaq6z3kdkekm7ltwxng4ftvzux8gzp2xjx8d at height 44: finality provider current rewards not found ``` ```shell $~ babylond q btcstaking finality-providers -o json | jq ... { "description": { "moniker": "Finality Provider 0", "identity": "", "website": "", "security_contact": "", "details": "" }, "commission": "0.050000000000000000", "addr": "bbn1wwkaq6z3kdkekm7ltwxng4ftvzux8gzp2xjx8d", "btc_pk": "6ba387c315dc6105ec02b50684593505103a9f13452d3a597c16ac2f22b924dc", "pop": { "btc_sig_type": "BIP340", "btc_sig": "Q3PcfiKT0fwWOVx95rjV+mQvI/juTbYIV84Hfz2NAmQByiHRXz8OWnFbyugJgOrd/TrqR+6BOgtr10bZUFDFbA==" }, "slashed_babylon_height": "46", "slashed_btc_height": 131, "height": "46", "jailed": false, "highest_voted_height": 45 }, ``` Basically, this means we are processing the rewards a few blocks down the road after the slash and then it is not possible to prune the data for reward tracker until that fp slashed height is processed. The fix for the time being: do nothing at the btc reward tracker structures if some fp gets slashed just continue to store that data. In the future during the issue #362 we can properly handle the pruning of slashed finality provider data
#350 Introduced regression due to change from if/else to switch. `break` which earlier was jumping out of the loop, after change would only exit the `switch` statement. Fix: - add `finalizationLoop` label and use it during `break` - add proper test to check that finalization in consecutive.
Prior to this fix, if we had an unfinalized block it would stuck to it as a next block to be rewarded By using `continue` instead of `break`, if there is any finalized block in the interval (`nextBlockToBeRewarded` and `targetHeight`) it will give out rewards and update the next block to be rewarded
- fixes epoching ante handler that returned early from ante handler even in case of success validation of staking message
-backport of changelog changes for v1.0.0-rc.3
This minimizes the possibility of querying in different blocks, but actually, there was no way to do multiple queries at the same block with guarantee Runs: - https://github.com/babylonlabs-io/babylon/actions/runs/12658410867/job/35275446958?pr=391 - https://github.com/babylonlabs-io/babylon/actions/runs/12658410867/job/35279742461?pr=391 - https://github.com/babylonlabs-io/babylon/actions/runs/12658410867/job/35280945448?pr=391
SebastianElvis
force-pushed
the
merge-main-to-base-2025
branch
from
January 13, 2025 05:36
0bf90c5
to
e2651ab
Compare
SebastianElvis
requested review from
gitferry,
KonradStaniec,
maurolacy,
Lazar955,
RafilxTenfen,
gusin13 and
samricotta
January 13, 2025 05:49
RafilxTenfen
approved these changes
Jan 14, 2025
5 tasks
KonradStaniec
approved these changes
Jan 14, 2025
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.
This PR merges the latest
main
branch to the base branch, and fixes CI.