Skip to content

Commit

Permalink
Merge branch 'main' into chore/injected-checkpoint-tx
Browse files Browse the repository at this point in the history
  • Loading branch information
@gitferry
gitferry committed Oct 23, 2024
2 parents bdcec2b + 9efe79b commit 950d9ab
Show file tree
Hide file tree
Showing 21 changed files with 392 additions and 175 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
* [#224](https://github.com/babylonlabs-io/babylon/pull/224) Make injected checkpoint a standard tx
* [#207](https://github.com/babylonlabs-io/babylon/pull/207) Rename total voting power
to total bonded sat
* [#204](https://github.com/babylonlabs-io/babylon/pull/204) Add babylon finality
activation block height to start processing finality messages in `x/finality` params.
* [#215](https://github.com/babylonlabs-io/babylon/pull/215) Implement ADR-29
generalized unbonding handler

Expand Down
3 changes: 2 additions & 1 deletion app/upgrades/v1/mainnet/finality_params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ const FinalityParamStr = `{
"finality_sig_timeout": 3,
"min_signed_per_window": "0.1",
"min_pub_rand": 100,
"jail_duration": "86400s"
"jail_duration": "86400s",
"finality_activation_height": 17500
}`
3 changes: 2 additions & 1 deletion app/upgrades/v1/testnet/finality_params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ const FinalityParamStr = `{
"finality_sig_timeout": 3,
"min_signed_per_window": "0.1",
"min_pub_rand": 100,
"jail_duration": "86400s"
"jail_duration": "86400s",
"finality_activation_height": 75
}`
1 change: 1 addition & 0 deletions btcstaking/staking_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ func TestCheckPreSignedTxSanity(t *testing.T) {
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
err := btcstaking.CheckPreSignedTxSanity(
Expand Down
129 changes: 64 additions & 65 deletions client/docs/swagger-ui/swagger.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ paths:
format: uint64
description: EpochNumber of this checkpoint.
best_submission_btc_block_height:
type: string
format: uint64
type: integer
format: int64
title: btc height of the best submission of the epoch
best_submission_btc_block_hash:
type: string
Expand Down Expand Up @@ -229,8 +229,8 @@ paths:
type: object
properties:
btc_confirmation_depth:
type: string
format: uint64
type: integer
format: int64
title: >-
btc_confirmation_depth is the confirmation depth in BTC.
Expand All @@ -239,8 +239,8 @@ paths:
(k in research paper)
checkpoint_finalization_timeout:
type: string
format: uint64
type: integer
format: int64
title: >-
checkpoint_finalization_timeout is the maximum time window
(measured in BTC
Expand Down Expand Up @@ -308,8 +308,8 @@ paths:
format: uint64
description: EpochNumber of this checkpoint.
best_submission_btc_block_height:
type: string
format: uint64
type: integer
format: int64
title: btc height of the best submission of the epoch
best_submission_btc_block_hash:
type: string
Expand Down Expand Up @@ -520,8 +520,8 @@ paths:
hash_hex:
type: string
height:
type: string
format: uint64
type: integer
format: int64
work:
type: string
description: Work is the sdkmath.Uint as string.
Expand Down Expand Up @@ -676,8 +676,8 @@ paths:
type: object
properties:
depth:
type: string
format: uint64
type: integer
format: int64
title: >-
QueryMainChainDepthResponse is the response type for the
Query/MainChainDepth RPC
Expand Down Expand Up @@ -859,8 +859,8 @@ paths:
hash_hex:
type: string
height:
type: string
format: uint64
type: integer
format: int64
work:
type: string
description: Work is the sdkmath.Uint as string.
Expand Down Expand Up @@ -1055,8 +1055,8 @@ paths:
hash_hex:
type: string
height:
type: string
format: uint64
type: integer
format: int64
work:
type: string
description: Work is the sdkmath.Uint as string.
Expand Down Expand Up @@ -3726,9 +3726,8 @@ paths:
validator_address:
type: string
title: validator_address is the address of the validator
bls_pub_key:
bls_pub_key_hex:
type: string
format: byte
title: bls_pub_key is the BLS public key of the validator
voting_power:
type: string
Expand All @@ -3737,8 +3736,8 @@ paths:
voting_power is the voting power of the validator at the
given epoch
title: >-
ValidatorWithBlsKey couples validator address, voting power,
and its bls
BlsPublicKeyListResponse couples validator address, voting
power, and its bls
public key
pagination:
Expand Down Expand Up @@ -4747,8 +4746,8 @@ definitions:
format: uint64
description: EpochNumber of this checkpoint.
best_submission_btc_block_height:
type: string
format: uint64
type: integer
format: int64
title: btc height of the best submission of the epoch
best_submission_btc_block_hash:
type: string
Expand Down Expand Up @@ -4839,8 +4838,8 @@ definitions:
type: object
properties:
btc_confirmation_depth:
type: string
format: uint64
type: integer
format: int64
title: >-
btc_confirmation_depth is the confirmation depth in BTC.
Expand All @@ -4849,8 +4848,8 @@ definitions:
(k in research paper)
checkpoint_finalization_timeout:
type: string
format: uint64
type: integer
format: int64
title: >-
checkpoint_finalization_timeout is the maximum time window (measured
in BTC
Expand Down Expand Up @@ -4885,8 +4884,8 @@ definitions:
format: uint64
description: EpochNumber of this checkpoint.
best_submission_btc_block_height:
type: string
format: uint64
type: integer
format: int64
title: btc height of the best submission of the epoch
best_submission_btc_block_hash:
type: string
Expand Down Expand Up @@ -4970,8 +4969,8 @@ definitions:
format: uint64
description: EpochNumber of this checkpoint.
best_submission_btc_block_height:
type: string
format: uint64
type: integer
format: int64
title: btc height of the best submission of the epoch
best_submission_btc_block_hash:
type: string
Expand Down Expand Up @@ -5119,8 +5118,8 @@ definitions:
type: object
properties:
btc_confirmation_depth:
type: string
format: uint64
type: integer
format: int64
title: >-
btc_confirmation_depth is the confirmation depth in BTC.
Expand All @@ -5129,8 +5128,8 @@ definitions:
(k in research paper)
checkpoint_finalization_timeout:
type: string
format: uint64
type: integer
format: int64
title: >-
checkpoint_finalization_timeout is the maximum time window
(measured in BTC
Expand Down Expand Up @@ -5635,8 +5634,8 @@ definitions:
hash_hex:
type: string
height:
type: string
format: uint64
type: integer
format: int64
work:
type: string
description: Work is the sdkmath.Uint as string.
Expand Down Expand Up @@ -5675,8 +5674,8 @@ definitions:
hash_hex:
type: string
height:
type: string
format: uint64
type: integer
format: int64
work:
type: string
description: Work is the sdkmath.Uint as string.
Expand Down Expand Up @@ -5749,8 +5748,8 @@ definitions:
type: object
properties:
depth:
type: string
format: uint64
type: integer
format: int64
title: >-
QueryMainChainDepthResponse is the response type for the
Query/MainChainDepth RPC
Expand All @@ -5769,8 +5768,8 @@ definitions:
hash_hex:
type: string
height:
type: string
format: uint64
type: integer
format: int64
work:
type: string
description: Work is the sdkmath.Uint as string.
Expand Down Expand Up @@ -5842,8 +5841,8 @@ definitions:
hash_hex:
type: string
height:
type: string
format: uint64
type: integer
format: int64
work:
type: string
description: Work is the sdkmath.Uint as string.
Expand Down Expand Up @@ -6598,6 +6597,24 @@ definitions:
NOTE: The amount field is an Int which implements the custom method
signatures required by gogoproto.
babylon.checkpointing.v1.BlsPublicKeyListResponse:
type: object
properties:
validator_address:
type: string
title: validator_address is the address of the validator
bls_pub_key_hex:
type: string
title: bls_pub_key is the BLS public key of the validator
voting_power:
type: string
format: uint64
title: voting_power is the voting power of the validator at the given epoch
title: >-
BlsPublicKeyListResponse couples validator address, voting power, and its
bls
public key
babylon.checkpointing.v1.CheckpointStateUpdateResponse:
type: object
properties:
Expand Down Expand Up @@ -6669,9 +6686,8 @@ definitions:
validator_address:
type: string
title: validator_address is the address of the validator
bls_pub_key:
bls_pub_key_hex:
type: string
format: byte
title: bls_pub_key is the BLS public key of the validator
voting_power:
type: string
Expand All @@ -6680,8 +6696,8 @@ definitions:
voting_power is the voting power of the validator at the given
epoch
title: >-
ValidatorWithBlsKey couples validator address, voting power, and its
bls
BlsPublicKeyListResponse couples validator address, voting power,
and its bls
public key
pagination:
Expand Down Expand Up @@ -7342,20 +7358,3 @@ definitions:
transition and the time (in both timestamp and block height) of this
transition.
description: RawCheckpointWithMetaResponse wraps the raw checkpoint with metadata.
babylon.checkpointing.v1.ValidatorWithBlsKey:
type: object
properties:
validator_address:
type: string
title: validator_address is the address of the validator
bls_pub_key:
type: string
format: byte
title: bls_pub_key is the BLS public key of the validator
voting_power:
type: string
format: uint64
title: voting_power is the voting power of the validator at the given epoch
title: |-
ValidatorWithBlsKey couples validator address, voting power, and its bls
public key
Loading

0 comments on commit 950d9ab

Please sign in to comment.