fix: export and init genesis state

checkpoint/genesis.go

@@ -44,6 +44,24 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) {
 
 	// Set initial ack count
 	keeper.UpdateACKCountWithValue(ctx, data.AckCount)
+
+	// Add finalised checkpoints to state
+	if len(data.TronCheckpoints) != 0 {
+		// check if we are provided all the headers
+		if int(data.TronAckCount) != len(data.TronCheckpoints) {
+			panic(errors.New("Incorrect state in state-dump , Please Check "))
+		}
+		// sort headers before loading to state
+		data.TronCheckpoints = hmTypes.SortHeaders(data.TronCheckpoints)
+		// load checkpoints to state
+		for i, checkpoint := range data.TronCheckpoints {
+			checkpointIndex := uint64(i) + 1
+			if err := keeper.AddOtherCheckpoint(ctx, checkpointIndex, checkpoint, hmTypes.RootChainTypeTron); err != nil {
+				keeper.Logger(ctx).Error("InitGenesis | TronAddCheckpoint", "error", err)
+			}
+		}
+	}
+	keeper.UpdateOtherACKCountWithValue(ctx, data.TronAckCount, hmTypes.RootChainTypeTron)
 }
 
 // ExportGenesis returns a GenesisState for a given context and keeper.
@@ -57,5 +75,7 @@ func ExportGenesis(ctx sdk.Context, keeper Keeper) types.GenesisState {
 		keeper.GetLastNoAck(ctx),
 		keeper.GetACKCount(ctx),
 		hmTypes.SortHeaders(keeper.GetCheckpoints(ctx)),
+		keeper.GetOtherACKCount(ctx, hmTypes.RootChainTypeTron),
+		hmTypes.SortHeaders(keeper.GetOtherCheckpoints(ctx, hmTypes.RootChainTypeTron)),
 	)
 }

checkpoint/genesis_test.go

@@ -69,6 +69,8 @@ func (suite *GenesisTestSuite) TestInitExportGenesis() {
 		uint64(lastNoACK),
 		uint64(ackCount),
 		checkpoints,
+		uint64(ackCount),
+		checkpoints,
 	)
 
 	checkpoint.InitGenesis(ctx, app.CheckpointKeeper, genesisState)

checkpoint/integration_test.go

@@ -41,6 +41,8 @@ func createTestApp(isCheckTx bool) (*app.HeimdallApp, sdk.Context, context.CLICo
 		types.DefaultGenesisState().LastNoACK,
 		types.DefaultGenesisState().AckCount,
 		types.DefaultGenesisState().Checkpoints,
+		types.DefaultGenesisState().AckCount,
+		types.DefaultGenesisState().Checkpoints,
 	)
 
 	genesisState[types.ModuleName] = app.Codec().MustMarshalJSON(checkpointGenesis)

checkpoint/keeper.go

@@ -414,6 +414,28 @@ func (k *Keeper) GetCheckpoints(ctx sdk.Context) []hmTypes.Checkpoint {
 	return headers
 }
 
+// GetOtherCheckpoints get checkpoint all checkpoints
+func (k *Keeper) GetOtherCheckpoints(ctx sdk.Context, rootChain string) []hmTypes.Checkpoint {
+	store := ctx.KVStore(k.storeKey)
+	// get checkpoint header iterator
+	var iterator sdk.Iterator
+	if hmTypes.RootChainTypeTron == rootChain {
+		iterator = sdk.KVStorePrefixIterator(store, TronCheckpointKey)
+		defer iterator.Close()
+	}
+	// create headers
+	var headers []hmTypes.Checkpoint
+
+	// loop through validators to get valid validators
+	for ; iterator.Valid(); iterator.Next() {
+		var checkpoint hmTypes.Checkpoint
+		if err := k.cdc.UnmarshalBinaryBare(iterator.Value(), &checkpoint); err == nil {
+			headers = append(headers, checkpoint)
+		}
+	}
+	return headers
+}
+
 //
 // Ack count
 //
@@ -465,6 +487,19 @@ func (k Keeper) UpdateACKCountWithValue(ctx sdk.Context, value uint64) {
 	store.Set(ACKCountKey, ackCount)
 }
 
+// UpdateOtherACKCountWithValue updates ACK with value
+func (k Keeper) UpdateOtherACKCountWithValue(ctx sdk.Context, value uint64, rootChain string) {
+	store := ctx.KVStore(k.storeKey)
+
+	// convert
+	ackCount := []byte(strconv.FormatUint(value, 10))
+
+	// update
+	if rootChain == hmTypes.RootChainTypeTron {
+		store.Set(TronACKCountKey, ackCount)
+	}
+}
+
 // UpdateACKCount updates ACK count by 1
 func (k Keeper) UpdateACKCount(ctx sdk.Context) {
 	store := ctx.KVStore(k.storeKey)

checkpoint/simulation/genesis.go

@@ -42,6 +42,8 @@ func RandomizedGenState(simState *module.SimulationState) {
 		uint64(lastNoACK),
 		uint64(ackCount),
 		Checkpoints,
+		uint64(ackCount),
+		Checkpoints,
 	)
 	simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(genesisState)
 

checkpoint/types/genesis.go

@@ -16,6 +16,8 @@ type GenesisState struct {
 	LastNoACK          uint64               `json:"last_no_ack" yaml:"last_no_ack"`
 	AckCount           uint64               `json:"ack_count" yaml:"ack_count"`
 	Checkpoints        []hmTypes.Checkpoint `json:"checkpoints" yaml:"checkpoints"`
+	TronAckCount       uint64               `json:"tron_ack_count" yaml:"tron_ack_count"`
+	TronCheckpoints    []hmTypes.Checkpoint `json:"tron_checkpoints" yaml:"tron_checkpoints"`
 }
 
 // NewGenesisState creates a new genesis state.
@@ -25,13 +27,17 @@ func NewGenesisState(
 	lastNoACK uint64,
 	ackCount uint64,
 	checkpoints []hmTypes.Checkpoint,
+	tronAckCount uint64,
+	tronCheckpoints []hmTypes.Checkpoint,
 ) GenesisState {
 	return GenesisState{
 		Params:             params,
 		BufferedCheckpoint: bufferedCheckpoint,
 		LastNoACK:          lastNoACK,
 		AckCount:           ackCount,
 		Checkpoints:        checkpoints,
+		TronAckCount:       tronAckCount,
+		TronCheckpoints:    tronCheckpoints,
 	}
 }
 

staking/genesis.go

@@ -49,6 +49,7 @@ func InitGenesis(ctx sdk.Context, keeper Keeper, data types.GenesisState) {
 func ExportGenesis(ctx sdk.Context, keeper Keeper) types.GenesisState {
 	// return new genesis state
 	return types.NewGenesisState(
+		keeper.GetParams(ctx),
 		keeper.GetAllValidators(ctx),
 		keeper.GetValidatorSet(ctx),
 		keeper.GetStakingSequences(ctx),

staking/genesis_test.go

@@ -61,11 +61,14 @@ func (suite *GenesisTestSuite) TestInitExportGenesis() {
 			accounts[i].Address,
 		)
 	}
+	param := types.Params{
+		StakingBufferTime: time.Duration(simulation.RandIntBetween(r1, 1, 10)) * time.Minute,
+	}
 
 	// validator set
 	validatorSet := hmTypes.NewValidatorSet(validators)
 
-	genesisState := types.NewGenesisState(validators, *validatorSet, stakingSequence)
+	genesisState := types.NewGenesisState(param, validators, *validatorSet, stakingSequence)
 	staking.InitGenesis(ctx, app.StakingKeeper, genesisState)
 
 	actualParams := staking.ExportGenesis(ctx, app.StakingKeeper)

staking/integration_test.go

@@ -18,6 +18,7 @@ import (
 func createTestApp(isCheckTx bool) (*app.HeimdallApp, sdk.Context, context.CLIContext) {
 	genesisState := app.NewDefaultGenesisState()
 	stakingGenesis := stakingTypes.NewGenesisState(
+		stakingTypes.DefaultGenesisState().Params,
 		stakingTypes.DefaultGenesisState().Validators,
 		stakingTypes.DefaultGenesisState().CurrentValSet,
 		stakingTypes.DefaultGenesisState().StakingSequences)

staking/simulation/genesis.go

@@ -39,7 +39,9 @@ func RandomizedGenState(simState *module.SimulationState) {
 
 	// validator set
 	validatorSet := hmTypes.NewValidatorSet(validators)
-
-	genesisState := types.NewGenesisState(validators, *validatorSet, stakingSequence)
+	param := types.Params{
+		StakingBufferTime: time.Duration(simulation.RandIntBetween(r1, 1, 10)) * time.Minute,
+	}
+	genesisState := types.NewGenesisState(param, validators, *validatorSet, stakingSequence)
 	simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(genesisState)
 }

staking/types/genesis.go

@@ -42,11 +42,13 @@ type GenesisState struct {
 
 // NewGenesisState creates a new genesis state.
 func NewGenesisState(
+	params Params,
 	validators []*hmTypes.Validator,
 	currentValSet hmTypes.ValidatorSet,
 	stakingSequences []string,
 ) GenesisState {
 	return GenesisState{
+		Params:           params,
 		Validators:       validators,
 		CurrentValSet:    currentValSet,
 		StakingSequences: stakingSequences,
@@ -55,7 +57,7 @@ func NewGenesisState(
 
 // DefaultGenesisState returns a default genesis state
 func DefaultGenesisState() GenesisState {
-	return NewGenesisState(nil, hmTypes.ValidatorSet{}, nil)
+	return NewGenesisState(Params{}, nil, hmTypes.ValidatorSet{}, nil)
 }
 
 // ValidateGenesis performs basic validation of bor genesis data returning an

topup/side_handler_test.go

@@ -110,7 +110,7 @@ func (suite *SideHandlerTestSuite) TestSideHandleMsgTopup() {
 			User: ethCommon.BytesToAddress(addr1.Bytes()),
 			Fee:  coins.AmountOf(authTypes.FeeToken).BigInt(),
 		}
-		suite.contractCaller.On("GetConfirmedTxReceipt", txHash.EthHash(), chainParams.MainchainTxConfirmations).Return(txReceipt, nil)
+		suite.contractCaller.On("GetTronTransactionReceipt", txHash.String()).Return(txReceipt, nil)
 		suite.contractCaller.On("DecodeValidatorTopupFeesEvent", chainParams.ChainParams.StateSenderAddress.EthAddress(), txReceipt, logIndex).Return(event, nil)
 
 		// execute handler
@@ -143,7 +143,7 @@ func (suite *SideHandlerTestSuite) TestSideHandleMsgTopup() {
 			blockNumber,
 		)
 
-		suite.contractCaller.On("GetConfirmedTxReceipt", txHash.EthHash(), chainParams.MainchainTxConfirmations).Return(nil, nil)
+		suite.contractCaller.On("GetTronTransactionReceipt", txHash.String()).Return(nil, nil)
 		suite.contractCaller.On("DecodeValidatorTopupFeesEvent", chainParams.ChainParams.StateSenderAddress.EthAddress(), nil, logIndex).Return(nil, nil)
 
 		// execute handler
@@ -176,7 +176,7 @@ func (suite *SideHandlerTestSuite) TestSideHandleMsgTopup() {
 			blockNumber,
 		)
 
-		suite.contractCaller.On("GetConfirmedTxReceipt", txHash.EthHash(), chainParams.MainchainTxConfirmations).Return(txReceipt, nil)
+		suite.contractCaller.On("GetTronTransactionReceipt", txHash.String()).Return(txReceipt, nil)
 		suite.contractCaller.On("DecodeValidatorTopupFeesEvent", chainParams.ChainParams.StateSenderAddress.EthAddress(), txReceipt, logIndex).Return(nil, nil)
 
 		// execute handler
@@ -214,7 +214,7 @@ func (suite *SideHandlerTestSuite) TestSideHandleMsgTopup() {
 			User: ethCommon.BytesToAddress(addr1.Bytes()),
 			Fee:  coins.AmountOf(authTypes.FeeToken).BigInt(),
 		}
-		suite.contractCaller.On("GetConfirmedTxReceipt", txHash.EthHash(), chainParams.MainchainTxConfirmations).Return(txReceipt, nil)
+		suite.contractCaller.On("GetTronTransactionReceipt", txHash.String()).Return(txReceipt, nil)
 		suite.contractCaller.On("DecodeValidatorTopupFeesEvent", chainParams.ChainParams.StateSenderAddress.EthAddress(), txReceipt, logIndex).Return(event, nil)
 
 		// execute handler
@@ -252,7 +252,7 @@ func (suite *SideHandlerTestSuite) TestSideHandleMsgTopup() {
 			User: ethCommon.BytesToAddress(addr2.Bytes()),
 			Fee:  coins.AmountOf(authTypes.FeeToken).BigInt(),
 		}
-		suite.contractCaller.On("GetConfirmedTxReceipt", txHash.EthHash(), chainParams.MainchainTxConfirmations).Return(txReceipt, nil)
+		suite.contractCaller.On("GetTronTransactionReceipt", txHash.String()).Return(txReceipt, nil)
 		suite.contractCaller.On("DecodeValidatorTopupFeesEvent", chainParams.ChainParams.StateSenderAddress.EthAddress(), txReceipt, logIndex).Return(event, nil)
 
 		// execute handler
@@ -290,7 +290,7 @@ func (suite *SideHandlerTestSuite) TestSideHandleMsgTopup() {
 			User: ethCommon.BytesToAddress(addr1.Bytes()),
 			Fee:  big.NewInt(1), // different fee
 		}
-		suite.contractCaller.On("GetConfirmedTxReceipt", txHash.EthHash(), chainParams.MainchainTxConfirmations).Return(txReceipt, nil)
+		suite.contractCaller.On("GetTronTransactionReceipt", txHash.String()).Return(txReceipt, nil)
 		suite.contractCaller.On("DecodeValidatorTopupFeesEvent", chainParams.ChainParams.StateSenderAddress.EthAddress(), txReceipt, logIndex).Return(event, nil)
 
 		// execute handler

tron/types.go

@@ -1,9 +1,10 @@
 package tron
 
 import (
-	"github.com/maticnetwork/bor/core/types"
 	"math/rand"
 	"strconv"
+
+	"github.com/maticnetwork/bor/core/types"
 )
 
 const (
@@ -21,39 +22,38 @@ type NewFilter struct {
 }
 type FilterEventParams struct {
 	BaseQueryParam
-	Method  string      `json:"method"`
-	Params  []NewFilter `json:"params"`
+	Method string      `json:"method"`
+	Params []NewFilter `json:"params"`
 }
 type FilterOtherParams struct {
 	BaseQueryParam
-	Method  string   `json:"method"`
-	Params  []string `json:"params"`
+	Method string   `json:"method"`
+	Params []string `json:"params"`
 }
 
 type BaseQueryParam struct {
-	Jsonrpc string      `json:"jsonrpc"`
-	Id      string      `json:"id"`
+	Jsonrpc string `json:"jsonrpc"`
+	Id      string `json:"id"`
 }
 type FilterEventResponse struct {
 	BaseQueryParam
-	Result  []types.Log `json:result`
+	Result []types.Log `json:result`
 }
 
 type FilterTxResponse struct {
 	BaseQueryParam
-	Result  types.Receipt `json:result`
+	Result types.Receipt `json:result`
 }
 
 type FilterTxNumberResponse struct {
 	BaseQueryParam
-	Result  string `json:result`
+	Result string `json:result`
 }
 
-
-func  GetDefaultBaseParm() BaseQueryParam {
+func GetDefaultBaseParm() BaseQueryParam {
 	param := BaseQueryParam{
 		Jsonrpc: JsonRpcVersion,
 		Id:      strconv.FormatInt(int64(rand.Int()%100), 10),
 	}
 	return param
-}
+}