mirror of
https://github.com/0glabs/0g-chain.git
synced 2024-12-26 00:05:18 +00:00
fix: missing designers (#62)
* fix: add dasigners back * test: remove manually initialize genesis * feat: generate all missing epochs on begin block; only panic on smaller block height * chore: add logs, fix EpochBlocks
This commit is contained in:
parent
8bd14a6c00
commit
1355bd6ab1
@ -670,6 +670,7 @@ func NewApp(
|
|||||||
// nil InflationCalculationFn, use SDK's default inflation function
|
// nil InflationCalculationFn, use SDK's default inflation function
|
||||||
mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace),
|
mint.NewAppModule(appCodec, app.mintKeeper, app.accountKeeper, nil, mintSubspace),
|
||||||
ibcwasm.NewAppModule(app.ibcWasmClientKeeper),
|
ibcwasm.NewAppModule(app.ibcWasmClientKeeper),
|
||||||
|
dasigners.NewAppModule(app.dasignersKeeper, *app.stakingKeeper),
|
||||||
)
|
)
|
||||||
|
|
||||||
// Warning: Some begin blockers must run before others. Ensure the dependencies are understood before modifying this list.
|
// Warning: Some begin blockers must run before others. Ensure the dependencies are understood before modifying this list.
|
||||||
@ -714,6 +715,7 @@ func NewApp(
|
|||||||
consensusparamtypes.ModuleName,
|
consensusparamtypes.ModuleName,
|
||||||
packetforwardtypes.ModuleName,
|
packetforwardtypes.ModuleName,
|
||||||
ibcwasmtypes.ModuleName,
|
ibcwasmtypes.ModuleName,
|
||||||
|
dasignerstypes.ModuleName,
|
||||||
)
|
)
|
||||||
|
|
||||||
// Warning: Some end blockers must run before others. Ensure the dependencies are understood before modifying this list.
|
// Warning: Some end blockers must run before others. Ensure the dependencies are understood before modifying this list.
|
||||||
@ -748,6 +750,7 @@ func NewApp(
|
|||||||
consensusparamtypes.ModuleName,
|
consensusparamtypes.ModuleName,
|
||||||
packetforwardtypes.ModuleName,
|
packetforwardtypes.ModuleName,
|
||||||
ibcwasmtypes.ModuleName,
|
ibcwasmtypes.ModuleName,
|
||||||
|
dasignerstypes.ModuleName,
|
||||||
)
|
)
|
||||||
|
|
||||||
// Warning: Some init genesis methods must run before others. Ensure the dependencies are understood before modifying this list
|
// Warning: Some init genesis methods must run before others. Ensure the dependencies are understood before modifying this list
|
||||||
@ -781,6 +784,7 @@ func NewApp(
|
|||||||
packetforwardtypes.ModuleName,
|
packetforwardtypes.ModuleName,
|
||||||
crisistypes.ModuleName, // runs the invariants at genesis, should run after other modules
|
crisistypes.ModuleName, // runs the invariants at genesis, should run after other modules
|
||||||
ibcwasmtypes.ModuleName,
|
ibcwasmtypes.ModuleName,
|
||||||
|
dasignerstypes.ModuleName,
|
||||||
)
|
)
|
||||||
|
|
||||||
app.mm.RegisterInvariants(&app.crisisKeeper)
|
app.mm.RegisterInvariants(&app.crisisKeeper)
|
||||||
|
@ -2,6 +2,7 @@ package keeper
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"fmt"
|
||||||
"math/big"
|
"math/big"
|
||||||
"sort"
|
"sort"
|
||||||
|
|
||||||
@ -16,7 +17,8 @@ type Ballot struct {
|
|||||||
content []byte
|
content []byte
|
||||||
}
|
}
|
||||||
|
|
||||||
func (k Keeper) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
|
// generateOneEpoch generate one epoch and returns true if there is a new epoch generated
|
||||||
|
func (k Keeper) generateOneEpoch(ctx sdk.Context) bool {
|
||||||
epochNumber, err := k.GetEpochNumber(ctx)
|
epochNumber, err := k.GetEpochNumber(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
k.Logger(ctx).Error("[BeginBlock] cannot get epoch number")
|
k.Logger(ctx).Error("[BeginBlock] cannot get epoch number")
|
||||||
@ -25,12 +27,14 @@ func (k Keeper) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
|
|||||||
params := k.GetParams(ctx)
|
params := k.GetParams(ctx)
|
||||||
expectedEpoch := uint64(ctx.BlockHeight()) / params.EpochBlocks
|
expectedEpoch := uint64(ctx.BlockHeight()) / params.EpochBlocks
|
||||||
if expectedEpoch == epochNumber {
|
if expectedEpoch == epochNumber {
|
||||||
return
|
return false
|
||||||
}
|
}
|
||||||
if expectedEpoch > epochNumber+1 || expectedEpoch < epochNumber {
|
if expectedEpoch < epochNumber {
|
||||||
panic("block height is not continuous")
|
panic("block height is not continuous")
|
||||||
}
|
}
|
||||||
|
expectedEpoch = epochNumber + 1
|
||||||
// new epoch
|
// new epoch
|
||||||
|
k.Logger(ctx).Info(fmt.Sprintf("[BeginBlock] generating epoch %v", expectedEpoch))
|
||||||
registrations := []Ballot{}
|
registrations := []Ballot{}
|
||||||
k.IterateRegistrations(ctx, expectedEpoch, func(account string, signature []byte) (stop bool) {
|
k.IterateRegistrations(ctx, expectedEpoch, func(account string, signature []byte) (stop bool) {
|
||||||
registrations = append(registrations, Ballot{
|
registrations = append(registrations, Ballot{
|
||||||
@ -106,4 +110,11 @@ func (k Keeper) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
|
|||||||
// save to store
|
// save to store
|
||||||
k.SetEpochQuorums(ctx, expectedEpoch, quorums)
|
k.SetEpochQuorums(ctx, expectedEpoch, quorums)
|
||||||
k.SetEpochNumber(ctx, expectedEpoch)
|
k.SetEpochNumber(ctx, expectedEpoch)
|
||||||
|
k.Logger(ctx).Info(fmt.Sprintf("[BeginBlock] epoch %v generated, with %v quorums", expectedEpoch, len(quorums.Quorums)))
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
func (k Keeper) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
|
||||||
|
for k.generateOneEpoch(ctx) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,6 @@ package keeper_test
|
|||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1"
|
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1/keeper"
|
"github.com/0glabs/0g-chain/x/dasigners/v1/keeper"
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1/testutil"
|
"github.com/0glabs/0g-chain/x/dasigners/v1/testutil"
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1/types"
|
"github.com/0glabs/0g-chain/x/dasigners/v1/types"
|
||||||
@ -19,16 +18,29 @@ type AbciTestSuite struct {
|
|||||||
|
|
||||||
func (suite *AbciTestSuite) TestBeginBlock_NotContinuous() {
|
func (suite *AbciTestSuite) TestBeginBlock_NotContinuous() {
|
||||||
// suite.App.InitializeFromGenesisStates()
|
// suite.App.InitializeFromGenesisStates()
|
||||||
dasigners.InitGenesis(suite.Ctx, suite.Keeper, *types.DefaultGenesisState())
|
// dasigners.InitGenesis(suite.Ctx, suite.Keeper, *types.DefaultGenesisState())
|
||||||
params := suite.Keeper.GetParams(suite.Ctx)
|
params := suite.Keeper.GetParams(suite.Ctx)
|
||||||
suite.Require().Panics(func() {
|
suite.Assert().EqualValues(params, types.DefaultGenesisState().Params)
|
||||||
suite.Keeper.BeginBlock(suite.Ctx.WithBlockHeight(int64(params.EpochBlocks*2)), abci.RequestBeginBlock{})
|
|
||||||
|
epoch, err := suite.Keeper.GetEpochNumber(suite.Ctx)
|
||||||
|
suite.Require().NoError(err)
|
||||||
|
suite.Assert().EqualValues(epoch, 0)
|
||||||
|
|
||||||
|
suite.Assert().NotPanics(func() {
|
||||||
|
suite.Keeper.BeginBlock(suite.Ctx.WithBlockHeight(int64(params.EpochBlocks*10)), abci.RequestBeginBlock{})
|
||||||
|
})
|
||||||
|
epoch, err = suite.Keeper.GetEpochNumber(suite.Ctx)
|
||||||
|
suite.Require().NoError(err)
|
||||||
|
suite.Assert().EqualValues(epoch, 10)
|
||||||
|
|
||||||
|
suite.Assert().Panics(func() {
|
||||||
|
suite.Keeper.BeginBlock(suite.Ctx.WithBlockHeight(int64(params.EpochBlocks*9)), abci.RequestBeginBlock{})
|
||||||
}, "block height is not continuous")
|
}, "block height is not continuous")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (suite *AbciTestSuite) TestBeginBlock_Success() {
|
func (suite *AbciTestSuite) TestBeginBlock_Success() {
|
||||||
// suite.App.InitializeFromGenesisStates()
|
// suite.App.InitializeFromGenesisStates()
|
||||||
dasigners.InitGenesis(suite.Ctx, suite.Keeper, *types.DefaultGenesisState())
|
// dasigners.InitGenesis(suite.Ctx, suite.Keeper, *types.DefaultGenesisState())
|
||||||
suite.Keeper.SetParams(suite.Ctx, types.Params{
|
suite.Keeper.SetParams(suite.Ctx, types.Params{
|
||||||
TokensPerVote: 10,
|
TokensPerVote: 10,
|
||||||
MaxVotesPerSigner: 200,
|
MaxVotesPerSigner: 200,
|
||||||
|
@ -7,7 +7,6 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/0glabs/0g-chain/crypto/bn254util"
|
"github.com/0glabs/0g-chain/crypto/bn254util"
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1"
|
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1/keeper"
|
"github.com/0glabs/0g-chain/x/dasigners/v1/keeper"
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1/testutil"
|
"github.com/0glabs/0g-chain/x/dasigners/v1/testutil"
|
||||||
"github.com/0glabs/0g-chain/x/dasigners/v1/types"
|
"github.com/0glabs/0g-chain/x/dasigners/v1/types"
|
||||||
@ -312,7 +311,7 @@ func (suite *KeeperTestSuite) queryAggregatePubkeyG1(params types.Params) {
|
|||||||
|
|
||||||
func (suite *KeeperTestSuite) Test_Keeper() {
|
func (suite *KeeperTestSuite) Test_Keeper() {
|
||||||
// suite.App.InitializeFromGenesisStates()
|
// suite.App.InitializeFromGenesisStates()
|
||||||
dasigners.InitGenesis(suite.Ctx, suite.Keeper, *types.DefaultGenesisState())
|
// dasigners.InitGenesis(suite.Ctx, suite.Keeper, *types.DefaultGenesisState())
|
||||||
// add delegation
|
// add delegation
|
||||||
params := suite.Keeper.GetParams(suite.Ctx)
|
params := suite.Keeper.GetParams(suite.Ctx)
|
||||||
suite.AddDelegation(signer1, signer1, keeper.BondedConversionRate.Mul(sdk.NewIntFromUint64(params.TokensPerVote)))
|
suite.AddDelegation(signer1, signer1, keeper.BondedConversionRate.Mul(sdk.NewIntFromUint64(params.TokensPerVote)))
|
||||||
|
Loading…
Reference in New Issue
Block a user