From fc12fdb2661696460a4a85a52f6ead5ee51b42e9 Mon Sep 17 00:00:00 2001
From: Fangyu Gai <greferry@gmail.com>
Date: Thu, 7 Jul 2022 14:39:35 +0800
Subject: [PATCH 1/2] add raw checkpoint creation

---
 proto/babylon/checkpointing/checkpoint.proto |  16 +--
 x/checkpointing/abci.go                      |  46 ++++++++
 x/checkpointing/keeper/ckpt_state.go         |  13 ++-
 x/checkpointing/keeper/keeper.go             |  20 +++-
 x/checkpointing/module.go                    |   4 +-
 x/checkpointing/types/checkpoint.pb.go       | 107 ++++++++++---------
 x/checkpointing/types/expected_keepers.go    |   1 +
 x/checkpointing/types/query.pb.go            |   2 +-
 x/checkpointing/types/types.go               |  12 +++
 9 files changed, 154 insertions(+), 67 deletions(-)
 create mode 100644 x/checkpointing/abci.go

diff --git a/proto/babylon/checkpointing/checkpoint.proto b/proto/babylon/checkpointing/checkpoint.proto
index 2c5888dde..0b7896d58 100644
--- a/proto/babylon/checkpointing/checkpoint.proto
+++ b/proto/babylon/checkpointing/checkpoint.proto
@@ -34,12 +34,16 @@ message RawCheckpointWithMeta {
 enum CheckpointStatus {
   option (gogoproto.goproto_enum_prefix) = false;
 
-  // UNCHECKPOINTED defines a checkpoint that is checkpointed on BTC.
-  CKPT_STATUS_UNCHECKPOINTED = 0 [(gogoproto.enumvalue_customname) = "Uncheckpointed"];
-  // UNCONFIRMED defines a validator that is checkpointed on BTC but not confirmed.
-  CKPT_STATUS_UNCONFIRMED = 1 [(gogoproto.enumvalue_customname) = "Unconfirmed"];
-  // CONFIRMED defines a validator that is confirmed on BTC.
-  CKPT_STATUS_CONFIRMED = 2 [(gogoproto.enumvalue_customname) = "Confirmed"];
+  // ACCUMULATING defines a checkpoint that is awaiting for BLS signatures.
+  CKPT_STATUS_ACCUMULATING = 0 [(gogoproto.enumvalue_customname) = "Accumulating"];
+  // SIGNED defines a checkpoint that has accumulated sufficient BLS signatures.
+  CKPT_STATUS_SIGNED = 1 [(gogoproto.enumvalue_customname) = "Unconfirmed"];
+  // SUBMITTED defines a checkpoint that is included on BTC.
+  CKPT_STATUS_SUBMITTED = 2 [(gogoproto.enumvalue_customname) = "Submitted"];
+  // CONFIRMED defines a checkpoint that is k-deep on BTC.
+  CKPT_STATUS_CONFIRMED = 3 [(gogoproto.enumvalue_customname) = "Confirmed"];
+  // FINALIZED defines a checkpoint that is w-deep on BTC.
+  CKPT_STATUS_FINALIZED = 4 [(gogoproto.enumvalue_customname) = "Finalized"];
 }
 
 // BlsSig wraps the bls sig with meta data.
diff --git a/x/checkpointing/abci.go b/x/checkpointing/abci.go
new file mode 100644
index 000000000..89fd39773
--- /dev/null
+++ b/x/checkpointing/abci.go
@@ -0,0 +1,46 @@
+package checkpointing
+
+import (
+	"github.com/babylonchain/babylon/x/checkpointing/types"
+	"time"
+
+	"github.com/babylonchain/babylon/x/checkpointing/keeper"
+
+	"github.com/cosmos/cosmos-sdk/telemetry"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	abci "github.com/tendermint/tendermint/abci/types"
+)
+
+// BeginBlocker is called at the beginning of every block.
+// Upon each BeginBlock, if reaching the second block after the epoch begins, then
+// - extract the LastCommitHash from the block
+// - create a raw checkpoint with the status of ACCUMULATING
+// - start a BLS signer which creates a BLS sig transaction and distributes it to the network
+
+func BeginBlocker(ctx sdk.Context, k keeper.Keeper, req abci.RequestBeginBlock) {
+	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyBeginBlocker)
+
+	// get the height of the last block in this epoch
+	epochBoundary := k.GetEpochBoundary(ctx)
+	// if this block is the second block of an epoch
+	if uint64(ctx.BlockHeight())-2 == epochBoundary.Uint64() {
+		// note that this epochNum is obtained before the BeginBlocker of the epoching module is executed
+		// meaning that the epochNum has not been incremented upon a new epoch
+		epochNum := k.GetEpochNumber(ctx)
+		lch := ctx.BlockHeader().LastCommitHash
+		err := k.BuildRawCheckpoint(ctx, epochNum, lch)
+		if err != nil {
+			panic("failed to generate a raw checkpoint")
+		}
+
+		// emit BeginEpoch event
+		ctx.EventManager().EmitEvents(sdk.Events{
+			sdk.NewEvent(
+				types.EventTypeRawCheckpointGenerated,
+				sdk.NewAttribute(types.AttributeKeyEpochNumber, k.GetEpochNumber(ctx).String()),
+			),
+		})
+
+		// TODO: call BLS signer to send a BLS-sig transaction
+	}
+}
diff --git a/x/checkpointing/keeper/ckpt_state.go b/x/checkpointing/keeper/ckpt_state.go
index 4aab61fb7..212eb2dbe 100644
--- a/x/checkpointing/keeper/ckpt_state.go
+++ b/x/checkpointing/keeper/ckpt_state.go
@@ -23,15 +23,14 @@ func (k Keeper) CheckpointsState(ctx sdk.Context) CheckpointsState {
 
 // CreateRawCkptWithMeta inserts the raw checkpoint with meta into the storage by its epoch number
 // a new checkpoint is created with the status of UNCEHCKPOINTED
-func (cs CheckpointsState) CreateRawCkptWithMeta(ckpt *types.RawCheckpoint) error {
-	// save concrete ckpt object
-	ckptWithMeta := types.NewCheckpointWithMeta(ckpt, types.Uncheckpointed)
-
-	if cs.checkpoints.Has(types.CkptsObjectKey(ckpt.EpochNum)) {
-		return types.ErrCkptAlreadyExist.Wrapf("a raw checkpoint already exists at epoch %v", ckpt.EpochNum)
+func (cs CheckpointsState) CreateRawCkptWithMeta(ckptWithMeta *types.RawCheckpointWithMeta) error {
+	epoch := ckptWithMeta.Ckpt.EpochNum
+	if cs.checkpoints.Has(types.CkptsObjectKey(epoch)) {
+		return types.ErrCkptAlreadyExist.Wrapf("a raw checkpoint already exists at epoch %v", epoch)
 	}
 
-	cs.checkpoints.Set(types.CkptsObjectKey(ckpt.EpochNum), types.CkptWithMetaToBytes(cs.cdc, ckptWithMeta))
+	// save concrete ckpt object
+	cs.checkpoints.Set(types.CkptsObjectKey(epoch), types.CkptWithMetaToBytes(cs.cdc, ckptWithMeta))
 	return nil
 }
 
diff --git a/x/checkpointing/keeper/keeper.go b/x/checkpointing/keeper/keeper.go
index 02d3ba250..b138f3551 100644
--- a/x/checkpointing/keeper/keeper.go
+++ b/x/checkpointing/keeper/keeper.go
@@ -68,10 +68,14 @@ func (k Keeper) AddBlsSig(ctx sdk.Context, sig *types.BlsSig) error {
 }
 
 // AddRawCheckpoint adds a raw checkpoint into the storage
-// this API may not needed since checkpoints are generated internally
-func (k Keeper) AddRawCheckpoint(ctx sdk.Context, ckpt *types.RawCheckpoint) error {
-	// NOTE: may remove this API
-	return k.CheckpointsState(ctx).CreateRawCkptWithMeta(ckpt)
+func (k Keeper) AddRawCheckpoint(ctx sdk.Context, ckptWithMeta *types.RawCheckpointWithMeta) error {
+	return k.CheckpointsState(ctx).CreateRawCkptWithMeta(ckptWithMeta)
+}
+
+func (k Keeper) BuildRawCheckpoint(ctx sdk.Context, epochNum sdk.Uint, lch types.LastCommitHash) error {
+	ckptWithMeta := types.NewCheckpointWithMeta(types.NewCheckpoint(epochNum, lch), types.Accumulating)
+
+	return k.AddRawCheckpoint(ctx, ckptWithMeta)
 }
 
 // CheckpointEpoch verifies checkpoint from BTC and returns epoch number
@@ -105,3 +109,11 @@ func (k Keeper) UpdateCkptStatus(ctx sdk.Context, rawCkptBytes []byte, status ty
 func (k Keeper) CreateRegistration(ctx sdk.Context, blsPubKey bls12381.PublicKey, valAddr types.ValidatorAddress) error {
 	return k.RegistrationState(ctx).CreateRegistration(blsPubKey, valAddr)
 }
+
+func (k Keeper) GetEpochBoundary(ctx sdk.Context) sdk.Uint {
+	return k.epochingKeeper.GetEpochBoundary(ctx)
+}
+
+func (k Keeper) GetEpochNumber(ctx sdk.Context) sdk.Uint {
+	return k.epochingKeeper.GetEpochNumber(ctx)
+}
diff --git a/x/checkpointing/module.go b/x/checkpointing/module.go
index 13c16bd78..eaa4e9dd0 100644
--- a/x/checkpointing/module.go
+++ b/x/checkpointing/module.go
@@ -168,7 +168,9 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw
 func (AppModule) ConsensusVersion() uint64 { return 2 }
 
 // BeginBlock executes all ABCI BeginBlock logic respective to the capability module.
-func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {}
+func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
+	BeginBlocker(ctx, am.keeper, req)
+}
 
 // EndBlock executes all ABCI EndBlock logic respective to the capability module. It
 // returns no validator updates.
diff --git a/x/checkpointing/types/checkpoint.pb.go b/x/checkpointing/types/checkpoint.pb.go
index c9ecb8047..11b9992af 100644
--- a/x/checkpointing/types/checkpoint.pb.go
+++ b/x/checkpointing/types/checkpoint.pb.go
@@ -31,24 +31,32 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 type CheckpointStatus int32
 
 const (
-	// UNCHECKPOINTED defines a checkpoint that is checkpointed on BTC.
-	Uncheckpointed CheckpointStatus = 0
-	// UNCONFIRMED defines a validator that is checkpointed on BTC but not confirmed.
+	// ACCUMULATING defines a checkpoint that is awaiting for BLS signatures.
+	Accumulating CheckpointStatus = 0
+	// SIGNED defines a checkpoint that has accumulated sufficient BLS signatures.
 	Unconfirmed CheckpointStatus = 1
-	// CONFIRMED defines a validator that is confirmed on BTC.
-	Confirmed CheckpointStatus = 2
+	// SUBMITTED defines a checkpoint that is included on BTC.
+	Submitted CheckpointStatus = 2
+	// CONFIRMED defines a checkpoint that is k-deep on BTC.
+	Confirmed CheckpointStatus = 3
+	// FINALIZED defines a checkpoint that is w-deep on BTC.
+	Finalized CheckpointStatus = 4
 )
 
 var CheckpointStatus_name = map[int32]string{
-	0: "CKPT_STATUS_UNCHECKPOINTED",
-	1: "CKPT_STATUS_UNCONFIRMED",
-	2: "CKPT_STATUS_CONFIRMED",
+	0: "CKPT_STATUS_ACCUMULATING",
+	1: "CKPT_STATUS_SIGNED",
+	2: "CKPT_STATUS_SUBMITTED",
+	3: "CKPT_STATUS_CONFIRMED",
+	4: "CKPT_STATUS_FINALIZED",
 }
 
 var CheckpointStatus_value = map[string]int32{
-	"CKPT_STATUS_UNCHECKPOINTED": 0,
-	"CKPT_STATUS_UNCONFIRMED":    1,
-	"CKPT_STATUS_CONFIRMED":      2,
+	"CKPT_STATUS_ACCUMULATING": 0,
+	"CKPT_STATUS_SIGNED":       1,
+	"CKPT_STATUS_SUBMITTED":    2,
+	"CKPT_STATUS_CONFIRMED":    3,
+	"CKPT_STATUS_FINALIZED":    4,
 }
 
 func (x CheckpointStatus) String() string {
@@ -176,7 +184,7 @@ func (m *RawCheckpointWithMeta) GetStatus() CheckpointStatus {
 	if m != nil {
 		return m.Status
 	}
-	return Uncheckpointed
+	return Accumulating
 }
 
 // BlsSig wraps the bls sig with meta data.
@@ -259,42 +267,45 @@ func init() {
 }
 
 var fileDescriptor_63ff05f0a47b36f7 = []byte{
-	// 558 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x5f, 0x6b, 0xd3, 0x50,
-	0x18, 0xc6, 0x73, 0xb6, 0x5a, 0xdd, 0x99, 0xad, 0x25, 0x38, 0x8d, 0x11, 0xd2, 0x50, 0x50, 0xcb,
-	0x90, 0x84, 0x76, 0x08, 0xfe, 0xc1, 0x8b, 0x35, 0xab, 0x6c, 0x8c, 0xb6, 0x23, 0x69, 0x15, 0xbc,
-	0x09, 0x27, 0x69, 0x96, 0x1c, 0x96, 0xe4, 0x84, 0x9c, 0x13, 0xb5, 0xdf, 0x40, 0x7a, 0xe5, 0xa5,
-	0x37, 0x05, 0x41, 0x3f, 0x8c, 0x97, 0xbb, 0x10, 0x14, 0x2f, 0x44, 0xda, 0x1b, 0x3f, 0x86, 0x24,
-	0xa9, 0xeb, 0x5a, 0x18, 0xde, 0xec, 0x2e, 0xef, 0x73, 0x9e, 0x5f, 0x92, 0xf7, 0x07, 0x07, 0xde,
-	0xb7, 0x90, 0x35, 0xf2, 0x49, 0xa8, 0xda, 0x9e, 0x63, 0x9f, 0x44, 0x04, 0x87, 0x0c, 0x87, 0xee,
-	0xb9, 0x49, 0x89, 0x62, 0xc2, 0x08, 0x2f, 0xcc, 0x7b, 0xca, 0x52, 0x4f, 0x79, 0xd3, 0x10, 0xef,
-	0xd8, 0x84, 0x06, 0x84, 0x9a, 0x59, 0x4f, 0xcd, 0x87, 0x1c, 0x12, 0x6f, 0xba, 0xc4, 0x25, 0x79,
-	0x9e, 0x3e, 0xcd, 0xd3, 0xaa, 0x4b, 0x88, 0xeb, 0x3b, 0x6a, 0x36, 0x59, 0xc9, 0xb1, 0xca, 0x70,
-	0xe0, 0x50, 0x86, 0x82, 0x28, 0x2f, 0xd4, 0xbe, 0x03, 0x58, 0xd2, 0xd1, 0x5b, 0xed, 0xec, 0x4b,
-	0xfc, 0x5d, 0xb8, 0xe1, 0x44, 0xc4, 0xf6, 0xcc, 0x30, 0x09, 0x04, 0x20, 0x83, 0x7a, 0x41, 0xbf,
-	0x96, 0x05, 0xdd, 0x24, 0xe0, 0xeb, 0xb0, 0xe2, 0x23, 0xca, 0x4c, 0x9b, 0x04, 0x01, 0x66, 0xa6,
-	0x87, 0xa8, 0x27, 0xac, 0xc9, 0xa0, 0x7e, 0x5d, 0x2f, 0xa7, 0xb9, 0x96, 0xc5, 0xfb, 0x88, 0x7a,
-	0xfc, 0x2d, 0x58, 0xb4, 0x30, 0x0b, 0x50, 0x24, 0xac, 0x67, 0xe7, 0xf3, 0x89, 0x47, 0xb0, 0x64,
-	0xf9, 0xd4, 0x0c, 0x12, 0x9f, 0x61, 0x93, 0x62, 0x57, 0x28, 0xa4, 0xc7, 0xad, 0xe7, 0x3f, 0x7f,
-	0x55, 0x9f, 0xb8, 0x98, 0x79, 0x89, 0xa5, 0xd8, 0x24, 0x50, 0xe7, 0x0a, 0x6c, 0x0f, 0xe1, 0x50,
-	0x3d, 0xf3, 0x16, 0x8f, 0x22, 0x46, 0x54, 0xcb, 0xa7, 0x8d, 0xe6, 0xce, 0xe3, 0x86, 0x62, 0x60,
-	0x37, 0x44, 0x2c, 0x89, 0x1d, 0x7d, 0xd3, 0xf2, 0x69, 0x27, 0x7d, 0xa5, 0x81, 0xdd, 0xa7, 0x85,
-	0x3f, 0x9f, 0xaa, 0xa0, 0xf6, 0x11, 0xc0, 0xad, 0xa5, 0xcd, 0x5e, 0x61, 0xe6, 0x75, 0x1c, 0x86,
-	0xf8, 0x67, 0xb0, 0x60, 0x9f, 0x44, 0x2c, 0x5b, 0x6e, 0xb3, 0xf9, 0x40, 0xb9, 0x48, 0xb7, 0xb2,
-	0x84, 0xeb, 0x19, 0xc4, 0xb7, 0x60, 0x91, 0x32, 0xc4, 0x12, 0x9a, 0xed, 0x5d, 0x6e, 0x6e, 0x5f,
-	0x8c, 0x2f, 0x58, 0x23, 0x23, 0xf4, 0x39, 0x59, 0xfb, 0x06, 0x60, 0xb1, 0xe5, 0x53, 0x03, 0xbb,
-	0x97, 0x65, 0xfb, 0x25, 0xbc, 0x9a, 0x5a, 0x4d, 0x7d, 0xae, 0x5f, 0x86, 0xcf, 0xa2, 0x95, 0xff,
-	0xde, 0x3d, 0x58, 0xa6, 0xd8, 0x0d, 0x9d, 0xd8, 0x44, 0xc3, 0x61, 0xec, 0x50, 0x2a, 0x5c, 0x91,
-	0x41, 0x7d, 0x43, 0x2f, 0xe5, 0xe9, 0x6e, 0x1e, 0x66, 0xc6, 0xb9, 0xed, 0x2f, 0x00, 0x56, 0x56,
-	0x77, 0xe6, 0x9b, 0x50, 0xd4, 0x0e, 0x8f, 0xfa, 0xa6, 0xd1, 0xdf, 0xed, 0x0f, 0x0c, 0x73, 0xd0,
-	0xd5, 0xf6, 0xdb, 0xda, 0xe1, 0x51, 0xef, 0xa0, 0xdb, 0x6f, 0xef, 0x55, 0x38, 0x91, 0x1f, 0x4f,
-	0xe4, 0xf2, 0x20, 0x5c, 0xc8, 0x73, 0x86, 0xfc, 0x43, 0x78, 0x7b, 0x85, 0xe9, 0x75, 0x5f, 0x1c,
-	0xe8, 0x9d, 0xf6, 0x5e, 0x05, 0x88, 0x37, 0xc6, 0x13, 0x79, 0x73, 0x10, 0xda, 0x24, 0x3c, 0xc6,
-	0x71, 0xe0, 0x0c, 0xf9, 0x3a, 0xdc, 0x3a, 0xdf, 0x5e, 0x74, 0xd7, 0xc4, 0xd2, 0x78, 0x22, 0x6f,
-	0x68, 0xff, 0x9a, 0x62, 0xe1, 0xfd, 0x67, 0x89, 0x6b, 0xf5, 0xbe, 0x4e, 0x25, 0x70, 0x3a, 0x95,
-	0xc0, 0xef, 0xa9, 0x04, 0x3e, 0xcc, 0x24, 0xee, 0x74, 0x26, 0x71, 0x3f, 0x66, 0x12, 0xf7, 0xfa,
-	0xd1, 0xff, 0x84, 0xbd, 0x5b, 0xb9, 0xba, 0x6c, 0x14, 0x39, 0xd4, 0x2a, 0x66, 0x57, 0x69, 0xe7,
-	0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xf9, 0xdf, 0x5c, 0xe0, 0x03, 0x00, 0x00,
+	// 604 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x6b, 0xd4, 0x4c,
+	0x1c, 0xc7, 0x77, 0xda, 0x7d, 0xf6, 0xb1, 0xd3, 0x6e, 0x0d, 0xc1, 0x4a, 0x5c, 0x21, 0x0d, 0x05,
+	0xed, 0xd2, 0x43, 0x42, 0x5b, 0x04, 0xff, 0xe0, 0x21, 0x9b, 0xdd, 0xd6, 0x60, 0x77, 0x2b, 0x49,
+	0x56, 0xa1, 0x97, 0x30, 0xc9, 0xa6, 0xc9, 0xd0, 0x4c, 0x26, 0x64, 0x26, 0x6a, 0x7d, 0x05, 0xd2,
+	0x93, 0x47, 0x2f, 0x05, 0xc1, 0x37, 0xe3, 0xb1, 0x07, 0x41, 0xf1, 0x20, 0xd2, 0x5e, 0xbc, 0xf9,
+	0x16, 0x24, 0xc9, 0x52, 0xbb, 0x95, 0xc5, 0x4b, 0x6f, 0xfb, 0xfb, 0xce, 0xe7, 0x3b, 0x9b, 0xdf,
+	0x07, 0x12, 0x78, 0xd7, 0x43, 0xde, 0x61, 0x4c, 0x13, 0xcd, 0x8f, 0x02, 0xff, 0x20, 0xa5, 0x38,
+	0xe1, 0x38, 0x09, 0x2f, 0x4c, 0x6a, 0x9a, 0x51, 0x4e, 0x45, 0x69, 0xcc, 0xa9, 0x13, 0x9c, 0xfa,
+	0x72, 0xbd, 0x75, 0xcb, 0xa7, 0x8c, 0x50, 0xe6, 0x96, 0x9c, 0x56, 0x0d, 0x55, 0xa9, 0x75, 0x23,
+	0xa4, 0x21, 0xad, 0xf2, 0xe2, 0xd7, 0x38, 0x5d, 0x0e, 0x29, 0x0d, 0xe3, 0x40, 0x2b, 0x27, 0x2f,
+	0xdf, 0xd7, 0x38, 0x26, 0x01, 0xe3, 0x88, 0xa4, 0x15, 0xb0, 0xf2, 0x05, 0xc0, 0xa6, 0x85, 0x5e,
+	0x19, 0xe7, 0xff, 0x24, 0xde, 0x86, 0x73, 0x41, 0x4a, 0xfd, 0xc8, 0x4d, 0x72, 0x22, 0x01, 0x05,
+	0xb4, 0xeb, 0xd6, 0xb5, 0x32, 0x18, 0xe4, 0x44, 0x6c, 0x43, 0x21, 0x46, 0x8c, 0xbb, 0x3e, 0x25,
+	0x04, 0x73, 0x37, 0x42, 0x2c, 0x92, 0x66, 0x14, 0xd0, 0x5e, 0xb0, 0x16, 0x8b, 0xdc, 0x28, 0xe3,
+	0x27, 0x88, 0x45, 0xe2, 0x4d, 0xd8, 0xf0, 0x30, 0x27, 0x28, 0x95, 0x66, 0xcb, 0xf3, 0xf1, 0x24,
+	0x22, 0xd8, 0xf4, 0x62, 0xe6, 0x92, 0x3c, 0xe6, 0xd8, 0x65, 0x38, 0x94, 0xea, 0xc5, 0x71, 0xe7,
+	0xf1, 0xb7, 0xef, 0xcb, 0x0f, 0x42, 0xcc, 0xa3, 0xdc, 0x53, 0x7d, 0x4a, 0xb4, 0xb1, 0x02, 0x3f,
+	0x42, 0x38, 0xd1, 0xce, 0xbd, 0x65, 0x87, 0x29, 0xa7, 0x9a, 0x17, 0xb3, 0xf5, 0x8d, 0xcd, 0xfb,
+	0xeb, 0xaa, 0x8d, 0xc3, 0x04, 0xf1, 0x3c, 0x0b, 0xac, 0x79, 0x2f, 0x66, 0xfd, 0xe2, 0x4a, 0x1b,
+	0x87, 0x0f, 0xeb, 0x3f, 0x3f, 0x2c, 0x83, 0x95, 0xf7, 0x00, 0x2e, 0x4d, 0x6c, 0xf6, 0x02, 0xf3,
+	0xa8, 0x1f, 0x70, 0x24, 0x3e, 0x82, 0x75, 0xff, 0x20, 0xe5, 0xe5, 0x72, 0xf3, 0x1b, 0xab, 0xea,
+	0x34, 0xdd, 0xea, 0x44, 0xdd, 0x2a, 0x4b, 0x62, 0x07, 0x36, 0x18, 0x47, 0x3c, 0x67, 0xe5, 0xde,
+	0x8b, 0x1b, 0x6b, 0xd3, 0xeb, 0x7f, 0xba, 0x76, 0xd9, 0xb0, 0xc6, 0xcd, 0x95, 0xcf, 0x00, 0x36,
+	0x3a, 0x31, 0xb3, 0x71, 0x78, 0x55, 0xb6, 0x9f, 0xc3, 0xff, 0x0b, 0xab, 0x85, 0xcf, 0xd9, 0xab,
+	0xf0, 0xd9, 0xf0, 0xaa, 0xc7, 0xbb, 0x03, 0x17, 0x19, 0x0e, 0x93, 0x20, 0x73, 0xd1, 0x68, 0x94,
+	0x05, 0x8c, 0x49, 0xff, 0x29, 0xa0, 0x3d, 0x67, 0x35, 0xab, 0x54, 0xaf, 0xc2, 0xd2, 0x78, 0x6d,
+	0xed, 0x17, 0x80, 0xc2, 0xe5, 0x9d, 0x45, 0x15, 0x4a, 0xc6, 0xd3, 0x67, 0x8e, 0x6b, 0x3b, 0xba,
+	0x33, 0xb4, 0x5d, 0xdd, 0x30, 0x86, 0xfd, 0xe1, 0x8e, 0xee, 0x98, 0x83, 0x6d, 0xa1, 0xd6, 0x12,
+	0x8e, 0x8e, 0x95, 0x05, 0xdd, 0xf7, 0x73, 0x92, 0xc7, 0xa8, 0xf0, 0x26, 0xae, 0x42, 0xf1, 0x22,
+	0x6f, 0x9b, 0xdb, 0x83, 0x5e, 0x57, 0x00, 0xad, 0xeb, 0x47, 0xc7, 0xca, 0xfc, 0x30, 0xf1, 0x69,
+	0xb2, 0x8f, 0x33, 0x12, 0x8c, 0xc4, 0x36, 0x5c, 0x9a, 0x00, 0x87, 0x9d, 0xbe, 0xe9, 0x38, 0xbd,
+	0xae, 0x30, 0xd3, 0x6a, 0x1e, 0x1d, 0x2b, 0x73, 0x76, 0xee, 0x11, 0xcc, 0xf9, 0xdf, 0xa4, 0xb1,
+	0x3b, 0xd8, 0x32, 0xad, 0x7e, 0xaf, 0x2b, 0xcc, 0x56, 0xa4, 0x31, 0xed, 0xce, 0x2d, 0x73, 0xa0,
+	0xef, 0x98, 0x7b, 0xbd, 0xae, 0x50, 0xaf, 0xc8, 0x2d, 0x9c, 0xa0, 0x18, 0xbf, 0x09, 0x46, 0xad,
+	0xfa, 0xdb, 0x8f, 0x72, 0xad, 0xb3, 0xfb, 0xe9, 0x54, 0x06, 0x27, 0xa7, 0x32, 0xf8, 0x71, 0x2a,
+	0x83, 0x77, 0x67, 0x72, 0xed, 0xe4, 0x4c, 0xae, 0x7d, 0x3d, 0x93, 0x6b, 0x7b, 0xf7, 0xfe, 0xe5,
+	0xfe, 0xf5, 0xa5, 0xaf, 0x00, 0x3f, 0x4c, 0x03, 0xe6, 0x35, 0xca, 0xb7, 0x72, 0xf3, 0x77, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xba, 0x62, 0xf9, 0x7f, 0x2b, 0x04, 0x00, 0x00,
 }
 
 func (this *RawCheckpoint) Equal(that interface{}) bool {
diff --git a/x/checkpointing/types/expected_keepers.go b/x/checkpointing/types/expected_keepers.go
index ee31a0f2e..c64450ff3 100644
--- a/x/checkpointing/types/expected_keepers.go
+++ b/x/checkpointing/types/expected_keepers.go
@@ -27,6 +27,7 @@ type StakingKeeper interface {
 type EpochingKeeper interface {
 	GetEpochNumber(ctx sdk.Context) sdk.Uint
 	EnqueueMsg(ctx sdk.Context, msg epochingtypes.QueuedMessage)
+	GetEpochBoundary(ctx sdk.Context) sdk.Uint
 }
 
 // Event Hooks
diff --git a/x/checkpointing/types/query.pb.go b/x/checkpointing/types/query.pb.go
index 449f522f9..748ab84cf 100644
--- a/x/checkpointing/types/query.pb.go
+++ b/x/checkpointing/types/query.pb.go
@@ -76,7 +76,7 @@ func (m *QueryRawCheckpointListRequest) GetStatus() CheckpointStatus {
 	if m != nil {
 		return m.Status
 	}
-	return Uncheckpointed
+	return Accumulating
 }
 
 func (m *QueryRawCheckpointListRequest) GetPagination() *query.PageRequest {
diff --git a/x/checkpointing/types/types.go b/x/checkpointing/types/types.go
index 758a8d16b..9eda94ea1 100644
--- a/x/checkpointing/types/types.go
+++ b/x/checkpointing/types/types.go
@@ -3,8 +3,11 @@ package types
 import (
 	"bytes"
 	"github.com/cosmos/cosmos-sdk/codec"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
+type LastCommitHash []byte
+
 type ValidatorAddress string
 
 type BlsSigHash []byte
@@ -19,6 +22,15 @@ func ValAddrToBytes(address ValidatorAddress) []byte {
 	return []byte(address)
 }
 
+func NewCheckpoint(epochNum sdk.Uint, lch LastCommitHash) *RawCheckpoint {
+	return &RawCheckpoint{
+		EpochNum:       epochNum.Uint64(),
+		LastCommitHash: lch,
+		Bitmap:         nil,
+		BlsMultiSig:    nil,
+	}
+}
+
 func NewCheckpointWithMeta(ckpt *RawCheckpoint, status CheckpointStatus) *RawCheckpointWithMeta {
 	return &RawCheckpointWithMeta{
 		Ckpt:   ckpt,

From 15a64f4543851d2ff4ff0841a7043bae2c20ec4c Mon Sep 17 00:00:00 2001
From: Fangyu Gai <greferry@gmail.com>
Date: Thu, 7 Jul 2022 21:21:02 +0800
Subject: [PATCH 2/2] add raw checkpoint generation

---
 proto/babylon/checkpointing/checkpoint.proto |   2 +
 x/checkpointing/abci.go                      |   1 +
 x/checkpointing/keeper/ckpt_state.go         |   2 +-
 x/checkpointing/types/blssig_set.go          |  39 -------
 x/checkpointing/types/checkpoint.pb.go       | 115 ++++++++++++-------
 x/checkpointing/types/keys.go                |  11 +-
 6 files changed, 85 insertions(+), 85 deletions(-)
 delete mode 100644 x/checkpointing/types/blssig_set.go

diff --git a/proto/babylon/checkpointing/checkpoint.proto b/proto/babylon/checkpointing/checkpoint.proto
index 0b7896d58..56ee25722 100644
--- a/proto/babylon/checkpointing/checkpoint.proto
+++ b/proto/babylon/checkpointing/checkpoint.proto
@@ -28,6 +28,8 @@ message RawCheckpointWithMeta {
   RawCheckpoint ckpt = 1;
   // status defines the status of the checkpoint
   CheckpointStatus status = 2;
+  // power_sum defines the accumulated voting power for the checkpoint
+  uint64 power_sum = 3;
 }
 
 // CkptStatus is the status of a checkpoint.
diff --git a/x/checkpointing/abci.go b/x/checkpointing/abci.go
index 89fd39773..30c876088 100644
--- a/x/checkpointing/abci.go
+++ b/x/checkpointing/abci.go
@@ -23,6 +23,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper, req abci.RequestBeginBlock)
 	// get the height of the last block in this epoch
 	epochBoundary := k.GetEpochBoundary(ctx)
 	// if this block is the second block of an epoch
+	// TODO: it's not correct, we want the epoch boundary of the previous epoch
 	if uint64(ctx.BlockHeight())-2 == epochBoundary.Uint64() {
 		// note that this epochNum is obtained before the BeginBlocker of the epoching module is executed
 		// meaning that the epochNum has not been incremented upon a new epoch
diff --git a/x/checkpointing/keeper/ckpt_state.go b/x/checkpointing/keeper/ckpt_state.go
index 212eb2dbe..9a99c1392 100644
--- a/x/checkpointing/keeper/ckpt_state.go
+++ b/x/checkpointing/keeper/ckpt_state.go
@@ -17,7 +17,7 @@ func (k Keeper) CheckpointsState(ctx sdk.Context) CheckpointsState {
 	store := ctx.KVStore(k.storeKey)
 	return CheckpointsState{
 		cdc:         k.cdc,
-		checkpoints: prefix.NewStore(store, types.CheckpointsPrefix),
+		checkpoints: prefix.NewStore(store, types.CkptsObjectPrefix),
 	}
 }
 
diff --git a/x/checkpointing/types/blssig_set.go b/x/checkpointing/types/blssig_set.go
deleted file mode 100644
index 5a0a982e7..000000000
--- a/x/checkpointing/types/blssig_set.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package types
-
-import (
-	"github.com/cosmos/cosmos-sdk/x/staking/types"
-	"github.com/tendermint/tendermint/libs/bits"
-	"github.com/tendermint/tendermint/libs/bytes"
-)
-
-type BlsSigSet struct {
-	epoch          uint16
-	lastCommitHash bytes.HexBytes
-	validators     types.Validators
-
-	sum          uint64
-	sigsBitArray *bits.BitArray
-}
-
-// NewBlsSigSet constructs a new BlsSigSet struct used to accumulate bls sigs for a given epoch
-func NewBlsSigSet(epoch uint16, lastCommitHash bytes.HexBytes, validators types.Validators) *BlsSigSet {
-	return &BlsSigSet{
-		epoch:          epoch,
-		lastCommitHash: lastCommitHash,
-		validators:     validators,
-		sum:            0,
-		sigsBitArray:   bits.NewBitArray(validators.Len()),
-	}
-}
-
-func (bs *BlsSigSet) AddBlsSig(sig *BlsSig) (bool, error) {
-	return bs.addBlsSig(sig)
-}
-
-func (bs *BlsSigSet) addBlsSig(sig *BlsSig) (bool, error) {
-	panic("implement this!")
-}
-
-func (bs *BlsSigSet) MakeRawCheckpoint() *RawCheckpoint {
-	panic("implement this!")
-}
diff --git a/x/checkpointing/types/checkpoint.pb.go b/x/checkpointing/types/checkpoint.pb.go
index 11b9992af..8d95bf2da 100644
--- a/x/checkpointing/types/checkpoint.pb.go
+++ b/x/checkpointing/types/checkpoint.pb.go
@@ -138,6 +138,8 @@ type RawCheckpointWithMeta struct {
 	Ckpt *RawCheckpoint `protobuf:"bytes,1,opt,name=ckpt,proto3" json:"ckpt,omitempty"`
 	// status defines the status of the checkpoint
 	Status CheckpointStatus `protobuf:"varint,2,opt,name=status,proto3,enum=babylon.checkpointing.v1.CheckpointStatus" json:"status,omitempty"`
+	// power_sum defines the accumulated voting power for the checkpoint
+	PowerSum uint64 `protobuf:"varint,3,opt,name=power_sum,json=powerSum,proto3" json:"power_sum,omitempty"`
 }
 
 func (m *RawCheckpointWithMeta) Reset()         { *m = RawCheckpointWithMeta{} }
@@ -187,6 +189,13 @@ func (m *RawCheckpointWithMeta) GetStatus() CheckpointStatus {
 	return Accumulating
 }
 
+func (m *RawCheckpointWithMeta) GetPowerSum() uint64 {
+	if m != nil {
+		return m.PowerSum
+	}
+	return 0
+}
+
 // BlsSig wraps the bls sig with meta data.
 type BlsSig struct {
 	// epoch_num defines the epoch number that the bls sig is signed on
@@ -267,45 +276,46 @@ func init() {
 }
 
 var fileDescriptor_63ff05f0a47b36f7 = []byte{
-	// 604 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x6b, 0xd4, 0x4c,
-	0x1c, 0xc7, 0x77, 0xda, 0x7d, 0xf6, 0xb1, 0xd3, 0x6e, 0x0d, 0xc1, 0x4a, 0x5c, 0x21, 0x0d, 0x05,
-	0xed, 0xd2, 0x43, 0x42, 0x5b, 0x04, 0xff, 0xe0, 0x21, 0x9b, 0xdd, 0xd6, 0x60, 0x77, 0x2b, 0x49,
-	0x56, 0xa1, 0x97, 0x30, 0xc9, 0xa6, 0xc9, 0xd0, 0x4c, 0x26, 0x64, 0x26, 0x6a, 0x7d, 0x05, 0xd2,
-	0x93, 0x47, 0x2f, 0x05, 0xc1, 0x37, 0xe3, 0xb1, 0x07, 0x41, 0xf1, 0x20, 0xd2, 0x5e, 0xbc, 0xf9,
-	0x16, 0x24, 0xc9, 0x52, 0xbb, 0x95, 0xc5, 0x4b, 0x6f, 0xfb, 0xfb, 0xce, 0xe7, 0x3b, 0x9b, 0xdf,
-	0x07, 0x12, 0x78, 0xd7, 0x43, 0xde, 0x61, 0x4c, 0x13, 0xcd, 0x8f, 0x02, 0xff, 0x20, 0xa5, 0x38,
-	0xe1, 0x38, 0x09, 0x2f, 0x4c, 0x6a, 0x9a, 0x51, 0x4e, 0x45, 0x69, 0xcc, 0xa9, 0x13, 0x9c, 0xfa,
-	0x72, 0xbd, 0x75, 0xcb, 0xa7, 0x8c, 0x50, 0xe6, 0x96, 0x9c, 0x56, 0x0d, 0x55, 0xa9, 0x75, 0x23,
-	0xa4, 0x21, 0xad, 0xf2, 0xe2, 0xd7, 0x38, 0x5d, 0x0e, 0x29, 0x0d, 0xe3, 0x40, 0x2b, 0x27, 0x2f,
-	0xdf, 0xd7, 0x38, 0x26, 0x01, 0xe3, 0x88, 0xa4, 0x15, 0xb0, 0xf2, 0x05, 0xc0, 0xa6, 0x85, 0x5e,
-	0x19, 0xe7, 0xff, 0x24, 0xde, 0x86, 0x73, 0x41, 0x4a, 0xfd, 0xc8, 0x4d, 0x72, 0x22, 0x01, 0x05,
-	0xb4, 0xeb, 0xd6, 0xb5, 0x32, 0x18, 0xe4, 0x44, 0x6c, 0x43, 0x21, 0x46, 0x8c, 0xbb, 0x3e, 0x25,
-	0x04, 0x73, 0x37, 0x42, 0x2c, 0x92, 0x66, 0x14, 0xd0, 0x5e, 0xb0, 0x16, 0x8b, 0xdc, 0x28, 0xe3,
-	0x27, 0x88, 0x45, 0xe2, 0x4d, 0xd8, 0xf0, 0x30, 0x27, 0x28, 0x95, 0x66, 0xcb, 0xf3, 0xf1, 0x24,
-	0x22, 0xd8, 0xf4, 0x62, 0xe6, 0x92, 0x3c, 0xe6, 0xd8, 0x65, 0x38, 0x94, 0xea, 0xc5, 0x71, 0xe7,
-	0xf1, 0xb7, 0xef, 0xcb, 0x0f, 0x42, 0xcc, 0xa3, 0xdc, 0x53, 0x7d, 0x4a, 0xb4, 0xb1, 0x02, 0x3f,
-	0x42, 0x38, 0xd1, 0xce, 0xbd, 0x65, 0x87, 0x29, 0xa7, 0x9a, 0x17, 0xb3, 0xf5, 0x8d, 0xcd, 0xfb,
-	0xeb, 0xaa, 0x8d, 0xc3, 0x04, 0xf1, 0x3c, 0x0b, 0xac, 0x79, 0x2f, 0x66, 0xfd, 0xe2, 0x4a, 0x1b,
-	0x87, 0x0f, 0xeb, 0x3f, 0x3f, 0x2c, 0x83, 0x95, 0xf7, 0x00, 0x2e, 0x4d, 0x6c, 0xf6, 0x02, 0xf3,
-	0xa8, 0x1f, 0x70, 0x24, 0x3e, 0x82, 0x75, 0xff, 0x20, 0xe5, 0xe5, 0x72, 0xf3, 0x1b, 0xab, 0xea,
-	0x34, 0xdd, 0xea, 0x44, 0xdd, 0x2a, 0x4b, 0x62, 0x07, 0x36, 0x18, 0x47, 0x3c, 0x67, 0xe5, 0xde,
-	0x8b, 0x1b, 0x6b, 0xd3, 0xeb, 0x7f, 0xba, 0x76, 0xd9, 0xb0, 0xc6, 0xcd, 0x95, 0xcf, 0x00, 0x36,
-	0x3a, 0x31, 0xb3, 0x71, 0x78, 0x55, 0xb6, 0x9f, 0xc3, 0xff, 0x0b, 0xab, 0x85, 0xcf, 0xd9, 0xab,
-	0xf0, 0xd9, 0xf0, 0xaa, 0xc7, 0xbb, 0x03, 0x17, 0x19, 0x0e, 0x93, 0x20, 0x73, 0xd1, 0x68, 0x94,
-	0x05, 0x8c, 0x49, 0xff, 0x29, 0xa0, 0x3d, 0x67, 0x35, 0xab, 0x54, 0xaf, 0xc2, 0xd2, 0x78, 0x6d,
-	0xed, 0x17, 0x80, 0xc2, 0xe5, 0x9d, 0x45, 0x15, 0x4a, 0xc6, 0xd3, 0x67, 0x8e, 0x6b, 0x3b, 0xba,
-	0x33, 0xb4, 0x5d, 0xdd, 0x30, 0x86, 0xfd, 0xe1, 0x8e, 0xee, 0x98, 0x83, 0x6d, 0xa1, 0xd6, 0x12,
-	0x8e, 0x8e, 0x95, 0x05, 0xdd, 0xf7, 0x73, 0x92, 0xc7, 0xa8, 0xf0, 0x26, 0xae, 0x42, 0xf1, 0x22,
-	0x6f, 0x9b, 0xdb, 0x83, 0x5e, 0x57, 0x00, 0xad, 0xeb, 0x47, 0xc7, 0xca, 0xfc, 0x30, 0xf1, 0x69,
-	0xb2, 0x8f, 0x33, 0x12, 0x8c, 0xc4, 0x36, 0x5c, 0x9a, 0x00, 0x87, 0x9d, 0xbe, 0xe9, 0x38, 0xbd,
-	0xae, 0x30, 0xd3, 0x6a, 0x1e, 0x1d, 0x2b, 0x73, 0x76, 0xee, 0x11, 0xcc, 0xf9, 0xdf, 0xa4, 0xb1,
-	0x3b, 0xd8, 0x32, 0xad, 0x7e, 0xaf, 0x2b, 0xcc, 0x56, 0xa4, 0x31, 0xed, 0xce, 0x2d, 0x73, 0xa0,
-	0xef, 0x98, 0x7b, 0xbd, 0xae, 0x50, 0xaf, 0xc8, 0x2d, 0x9c, 0xa0, 0x18, 0xbf, 0x09, 0x46, 0xad,
-	0xfa, 0xdb, 0x8f, 0x72, 0xad, 0xb3, 0xfb, 0xe9, 0x54, 0x06, 0x27, 0xa7, 0x32, 0xf8, 0x71, 0x2a,
-	0x83, 0x77, 0x67, 0x72, 0xed, 0xe4, 0x4c, 0xae, 0x7d, 0x3d, 0x93, 0x6b, 0x7b, 0xf7, 0xfe, 0xe5,
-	0xfe, 0xf5, 0xa5, 0xaf, 0x00, 0x3f, 0x4c, 0x03, 0xe6, 0x35, 0xca, 0xb7, 0x72, 0xf3, 0x77, 0x00,
-	0x00, 0x00, 0xff, 0xff, 0xba, 0x62, 0xf9, 0x7f, 0x2b, 0x04, 0x00, 0x00,
+	// 623 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x6b, 0xd4, 0x4e,
+	0x1c, 0xc6, 0x77, 0xda, 0xfc, 0xf6, 0xd7, 0x4e, 0xbb, 0x35, 0x04, 0x2b, 0x71, 0x85, 0x74, 0x29,
+	0x68, 0x97, 0x1e, 0x12, 0xda, 0x22, 0xf8, 0x07, 0x0f, 0xbb, 0xd9, 0x6d, 0x5d, 0xec, 0x6e, 0x25,
+	0xc9, 0x2a, 0xf4, 0x12, 0x26, 0xd9, 0x34, 0x19, 0x9a, 0xc9, 0x84, 0xcc, 0xc4, 0x5a, 0x5f, 0x81,
+	0xf4, 0xe4, 0x1b, 0x28, 0x08, 0xbe, 0x06, 0xdf, 0x83, 0xc7, 0x1e, 0x04, 0xc5, 0x83, 0x48, 0x7b,
+	0xf1, 0xe6, 0x5b, 0x90, 0x4c, 0x96, 0xda, 0xad, 0x14, 0x2f, 0xbd, 0xe5, 0x79, 0xe6, 0x79, 0x26,
+	0xf9, 0x7e, 0x86, 0x0c, 0xbc, 0xe7, 0x21, 0xef, 0x30, 0xa6, 0x89, 0xe1, 0x47, 0x81, 0xbf, 0x9f,
+	0x52, 0x9c, 0x70, 0x9c, 0x84, 0x17, 0x94, 0x9e, 0x66, 0x94, 0x53, 0x45, 0x1d, 0xe7, 0xf4, 0x89,
+	0x9c, 0xfe, 0x6a, 0xad, 0x7e, 0xdb, 0xa7, 0x8c, 0x50, 0xe6, 0x8a, 0x9c, 0x51, 0x8a, 0xb2, 0x54,
+	0xbf, 0x19, 0xd2, 0x90, 0x96, 0x7e, 0xf1, 0x34, 0x76, 0x97, 0x42, 0x4a, 0xc3, 0x38, 0x30, 0x84,
+	0xf2, 0xf2, 0x3d, 0x83, 0x63, 0x12, 0x30, 0x8e, 0x48, 0x5a, 0x06, 0x96, 0xbf, 0x00, 0x58, 0xb3,
+	0xd0, 0x81, 0x79, 0xfe, 0x26, 0xe5, 0x0e, 0x9c, 0x0d, 0x52, 0xea, 0x47, 0x6e, 0x92, 0x13, 0x15,
+	0x34, 0x40, 0x53, 0xb2, 0x66, 0x84, 0x31, 0xc8, 0x89, 0xd2, 0x84, 0x72, 0x8c, 0x18, 0x77, 0x7d,
+	0x4a, 0x08, 0xe6, 0x6e, 0x84, 0x58, 0xa4, 0x4e, 0x35, 0x40, 0x73, 0xde, 0x5a, 0x28, 0x7c, 0x53,
+	0xd8, 0x4f, 0x11, 0x8b, 0x94, 0x5b, 0xb0, 0xea, 0x61, 0x4e, 0x50, 0xaa, 0x4e, 0x8b, 0xf5, 0xb1,
+	0x52, 0x10, 0xac, 0x79, 0x31, 0x73, 0x49, 0x1e, 0x73, 0xec, 0x32, 0x1c, 0xaa, 0x52, 0xb1, 0xdc,
+	0x7e, 0xf2, 0xed, 0xfb, 0xd2, 0xc3, 0x10, 0xf3, 0x28, 0xf7, 0x74, 0x9f, 0x12, 0x63, 0x8c, 0xc0,
+	0x8f, 0x10, 0x4e, 0x8c, 0x73, 0x6e, 0xd9, 0x61, 0xca, 0xa9, 0xe1, 0xc5, 0x6c, 0x6d, 0x7d, 0xe3,
+	0xc1, 0x9a, 0x6e, 0xe3, 0x30, 0x41, 0x3c, 0xcf, 0x02, 0x6b, 0xce, 0x8b, 0x59, 0xbf, 0xd8, 0xd2,
+	0xc6, 0xe1, 0x23, 0xe9, 0xe7, 0xfb, 0x25, 0xb0, 0xfc, 0x11, 0xc0, 0xc5, 0x89, 0xc9, 0x5e, 0x62,
+	0x1e, 0xf5, 0x03, 0x8e, 0x94, 0xc7, 0x50, 0xf2, 0xf7, 0x53, 0x2e, 0x86, 0x9b, 0x5b, 0x5f, 0xd1,
+	0xaf, 0xc2, 0xad, 0x4f, 0xd4, 0x2d, 0x51, 0x52, 0xda, 0xb0, 0xca, 0x38, 0xe2, 0x39, 0x13, 0x73,
+	0x2f, 0xac, 0xaf, 0x5e, 0x5d, 0xff, 0xd3, 0xb5, 0x45, 0xc3, 0x1a, 0x37, 0x0b, 0xc4, 0x29, 0x3d,
+	0x08, 0x32, 0x97, 0xe5, 0x44, 0xe0, 0x91, 0xac, 0x19, 0x61, 0xd8, 0x39, 0x59, 0xfe, 0x0c, 0x60,
+	0xb5, 0x1d, 0x33, 0x1b, 0x87, 0xd7, 0x75, 0x14, 0x2f, 0xe0, 0xff, 0x05, 0xf2, 0x02, 0xf6, 0xf4,
+	0x75, 0xc0, 0xae, 0x7a, 0xe5, 0xe7, 0xdd, 0x85, 0x0b, 0x0c, 0x87, 0x49, 0x90, 0xb9, 0x68, 0x34,
+	0xca, 0x02, 0xc6, 0xd4, 0xff, 0x1a, 0xa0, 0x39, 0x6b, 0xd5, 0x4a, 0xb7, 0x55, 0x9a, 0xe2, 0x38,
+	0x2a, 0xab, 0xbf, 0x00, 0x94, 0x2f, 0x03, 0x51, 0x74, 0xa8, 0x9a, 0xcf, 0x9e, 0x3b, 0xae, 0xed,
+	0xb4, 0x9c, 0xa1, 0xed, 0xb6, 0x4c, 0x73, 0xd8, 0x1f, 0x6e, 0xb7, 0x9c, 0xde, 0x60, 0x4b, 0xae,
+	0xd4, 0xe5, 0xa3, 0xe3, 0xc6, 0x7c, 0xcb, 0xf7, 0x73, 0x92, 0xc7, 0xa8, 0x80, 0xaa, 0xac, 0x40,
+	0xe5, 0x62, 0xde, 0xee, 0x6d, 0x0d, 0xba, 0x1d, 0x19, 0xd4, 0x6f, 0x1c, 0x1d, 0x37, 0xe6, 0x86,
+	0x89, 0x4f, 0x93, 0x3d, 0x9c, 0x91, 0x60, 0xa4, 0x34, 0xe1, 0xe2, 0x44, 0x70, 0xd8, 0xee, 0xf7,
+	0x1c, 0xa7, 0xdb, 0x91, 0xa7, 0xea, 0xb5, 0xa3, 0xe3, 0xc6, 0xac, 0x9d, 0x7b, 0x04, 0x73, 0xfe,
+	0x77, 0xd2, 0xdc, 0x19, 0x6c, 0xf6, 0xac, 0x7e, 0xb7, 0x23, 0x4f, 0x97, 0x49, 0xf3, 0xaa, 0x3d,
+	0x37, 0x7b, 0x83, 0xd6, 0x76, 0x6f, 0xb7, 0xdb, 0x91, 0xa5, 0x32, 0xb9, 0x89, 0x13, 0x14, 0xe3,
+	0x37, 0xc1, 0xa8, 0x2e, 0xbd, 0xfd, 0xa0, 0x55, 0xda, 0x3b, 0x9f, 0x4e, 0x35, 0x70, 0x72, 0xaa,
+	0x81, 0x1f, 0xa7, 0x1a, 0x78, 0x77, 0xa6, 0x55, 0x4e, 0xce, 0xb4, 0xca, 0xd7, 0x33, 0xad, 0xb2,
+	0x7b, 0xff, 0x5f, 0xec, 0x5f, 0x5f, 0xba, 0x22, 0xf8, 0x61, 0x1a, 0x30, 0xaf, 0x2a, 0x7e, 0xd9,
+	0x8d, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x1c, 0x24, 0xdf, 0x48, 0x04, 0x00, 0x00,
 }
 
 func (this *RawCheckpoint) Equal(that interface{}) bool {
@@ -419,6 +429,11 @@ func (m *RawCheckpointWithMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
+	if m.PowerSum != 0 {
+		i = encodeVarintCheckpoint(dAtA, i, uint64(m.PowerSum))
+		i--
+		dAtA[i] = 0x18
+	}
 	if m.Status != 0 {
 		i = encodeVarintCheckpoint(dAtA, i, uint64(m.Status))
 		i--
@@ -541,6 +556,9 @@ func (m *RawCheckpointWithMeta) Size() (n int) {
 	if m.Status != 0 {
 		n += 1 + sovCheckpoint(uint64(m.Status))
 	}
+	if m.PowerSum != 0 {
+		n += 1 + sovCheckpoint(uint64(m.PowerSum))
+	}
 	return n
 }
 
@@ -830,6 +848,25 @@ func (m *RawCheckpointWithMeta) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 3:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PowerSum", wireType)
+			}
+			m.PowerSum = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowCheckpoint
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.PowerSum |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipCheckpoint(dAtA[iNdEx:])
diff --git a/x/checkpointing/types/keys.go b/x/checkpointing/types/keys.go
index 835f92aaa..5d3b7ccb8 100644
--- a/x/checkpointing/types/keys.go
+++ b/x/checkpointing/types/keys.go
@@ -39,28 +39,27 @@ var (
 // BlsSigsObjectKey defines epoch + hash
 func BlsSigsObjectKey(epoch uint64, hash BlsSigHash) []byte {
 	ee := sdk.Uint64ToBigEndian(epoch)
-	epochPrefix := append(BlsSigsObjectPrefix, ee...)
-	return append(epochPrefix, hash...)
+	return append(ee, hash...)
 }
 
 // BlsSigsEpochKey defines BLS sig hash
 func BlsSigsEpochKey(hash BlsSigHash) []byte {
-	return append(BlsSigsHashToEpochPrefix, hash...)
+	return hash
 }
 
 // CkptsObjectKey defines epoch
 func CkptsObjectKey(epoch uint64) []byte {
-	return append(CkptsObjectPrefix, sdk.Uint64ToBigEndian(epoch)...)
+	return sdk.Uint64ToBigEndian(epoch)
 }
 
 // AddrToBlsKeyKey defines validator address
 func AddrToBlsKeyKey(valAddr ValidatorAddress) []byte {
-	return append(AddrToBlsKeyPrefix, []byte(valAddr)...)
+	return []byte(valAddr)
 }
 
 // BlsKeyToAddrKey defines BLS public key
 func BlsKeyToAddrKey(pk bls12381.PublicKey) []byte {
-	return append(BlsKeyToAddrPrefix, pk...)
+	return pk
 }
 
 func KeyPrefix(p string) []byte {