Merge pull request #61 from bttcprotocol/release_1.0.6

Release 1.0.6

Author: kuny0707

.golangci.yaml

@@ -11,6 +11,11 @@ linters:
     - wrapcheck
     - gochecknoglobals
     - goerr113
+    - gochecknoinits
+    - exhaustivestruct
+    - cyclop
+    - nestif
+    - gocognit
 
 service:
   golangci-lint-version: 1.41

app/app.go

@@ -26,6 +26,9 @@ import (
 	"github.com/maticnetwork/heimdall/clerk"
 	clerkTypes "github.com/maticnetwork/heimdall/clerk/types"
 	"github.com/maticnetwork/heimdall/common"
+	"github.com/maticnetwork/heimdall/featuremanager"
+	featuremanagerTypes "github.com/maticnetwork/heimdall/featuremanager/types"
+	featuremanagerUtil "github.com/maticnetwork/heimdall/featuremanager/util"
 	gov "github.com/maticnetwork/heimdall/gov"
 	govTypes "github.com/maticnetwork/heimdall/gov/types"
 	"github.com/maticnetwork/heimdall/helper"
@@ -72,6 +75,7 @@ var (
 		bank.AppModuleBasic{},
 		supply.AppModuleBasic{},
 		chainmanager.AppModuleBasic{},
+		featuremanager.AppModuleBasic{},
 		staking.AppModuleBasic{},
 		checkpoint.AppModuleBasic{},
 		bor.AppModuleBasic{},
@@ -110,6 +114,7 @@ type HeimdallApp struct {
 	SupplyKeeper      supply.Keeper
 	GovKeeper         gov.Keeper
 	ChainKeeper       chainmanager.Keeper
+	FeatureKeeper     featuremanager.Keeper
 	CheckpointKeeper  checkpoint.Keeper
 	StakingKeeper     staking.Keeper
 	BorKeeper         bor.Keeper
@@ -239,12 +244,15 @@ func NewHeimdallApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 	app.subspaces[supplyTypes.ModuleName] = app.ParamsKeeper.Subspace(supplyTypes.DefaultParamspace)
 	app.subspaces[govTypes.ModuleName] = app.ParamsKeeper.Subspace(govTypes.DefaultParamspace).WithKeyTable(govTypes.ParamKeyTable())
 	app.subspaces[chainmanagerTypes.ModuleName] = app.ParamsKeeper.Subspace(chainmanagerTypes.DefaultParamspace)
+	app.subspaces[featuremanagerTypes.ModuleName] = app.ParamsKeeper.Subspace(featuremanagerTypes.DefaultParamspace)
 	app.subspaces[stakingTypes.ModuleName] = app.ParamsKeeper.Subspace(stakingTypes.DefaultParamspace)
 	app.subspaces[slashingTypes.ModuleName] = app.ParamsKeeper.Subspace(slashingTypes.DefaultParamspace)
 	app.subspaces[checkpointTypes.ModuleName] = app.ParamsKeeper.Subspace(checkpointTypes.DefaultParamspace)
 	app.subspaces[borTypes.ModuleName] = app.ParamsKeeper.Subspace(borTypes.DefaultParamspace)
 	app.subspaces[clerkTypes.ModuleName] = app.ParamsKeeper.Subspace(clerkTypes.DefaultParamspace)
 	app.subspaces[topupTypes.ModuleName] = app.ParamsKeeper.Subspace(topupTypes.DefaultParamspace)
+
+	featuremanagerUtil.InitFeatureConfig(app.subspaces[featuremanagerTypes.ModuleName])
 	//
 	// Contract caller
 	//
@@ -333,7 +341,8 @@ func NewHeimdallApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 	govRouter := gov.NewRouter()
 	govRouter.
 		AddRoute(govTypes.RouterKey, govTypes.ProposalHandler).
-		AddRoute(paramsTypes.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper))
+		AddRoute(paramsTypes.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)).
+		AddRoute(featuremanagerTypes.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper))
 
 	app.GovKeeper = gov.NewKeeper(
 		app.cdc,
@@ -345,6 +354,14 @@ func NewHeimdallApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 		govRouter,
 	)
 
+	// create feature keeper
+	app.FeatureKeeper = featuremanager.NewKeeper(
+		app.cdc,
+		app.subspaces[featuremanagerTypes.ModuleName],
+		app.GovKeeper,
+		common.DefaultCodespace,
+	)
+
 	app.CheckpointKeeper = checkpoint.NewKeeper(
 		app.cdc,
 		keys[checkpointTypes.StoreKey], // target store
@@ -395,6 +412,7 @@ func NewHeimdallApp(logger log.Logger, db dbm.DB, baseAppOptions ...func(*bam.Ba
 		supply.NewAppModule(app.SupplyKeeper, &app.caller),
 		gov.NewAppModule(app.GovKeeper, app.SupplyKeeper),
 		chainmanager.NewAppModule(app.ChainKeeper, &app.caller),
+		featuremanager.NewAppModule(app.FeatureKeeper),
 		staking.NewAppModule(app.StakingKeeper, &app.caller),
 		slashing.NewAppModule(app.SlashingKeeper, app.StakingKeeper, &app.caller),
 		checkpoint.NewAppModule(app.CheckpointKeeper, app.StakingKeeper, app.TopupKeeper, &app.caller),

bridge/cmd/statesynced.go

@@ -0,0 +1,242 @@
+package cmd
+
+import (
+	"encoding/hex"
+	"encoding/json"
+	"fmt"
+	"strconv"
+
+	"github.com/cosmos/cosmos-sdk/client/context"
+	"github.com/maticnetwork/heimdall/bridge/setu/util"
+	"github.com/maticnetwork/heimdall/helper"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	hmtypes "github.com/maticnetwork/heimdall/types"
+)
+
+func tokenMapShowAll(eventProcessor *util.TokenMapProcessor) error {
+	mmap, err := eventProcessor.GetTokenMap()
+	if err != nil {
+		return err
+	}
+
+	for k, v := range mmap {
+		helper.Logger.Info(
+			fmt.Sprintf("----------- %s chain [%d items] -----------", k, len(v)))
+
+		for _, item := range v {
+			msg, err := json.Marshal(item)
+			if err != nil {
+				return err
+			}
+
+			helper.Logger.Info(string(msg))
+		}
+
+		helper.Logger.Info("----------- ------------------- -----------")
+	}
+
+	return nil
+}
+
+func tokenMapShowOne(eventProcessor *util.TokenMapProcessor, chainType string) error {
+	mlist, err := eventProcessor.GetTokenMapByRootType(chainType)
+	if err != nil {
+		return err
+	}
+
+	helper.Logger.Info(
+		fmt.Sprintf("----------- %s chain [%d items] -----------",
+			chainType, len(mlist)))
+
+	for _, item := range mlist {
+		msg, err := json.Marshal(item)
+		if err != nil {
+			return err
+		}
+
+		helper.Logger.Info(string(msg))
+	}
+
+	helper.Logger.Info("----------- ------------------- -----------")
+
+	return nil
+}
+
+func tokenMapShowHash(eventProcessor *util.TokenMapProcessor) error {
+	hashBytes, err := eventProcessor.GetHash()
+	if err != nil {
+		return err
+	}
+
+	if hashBytes == nil {
+		helper.Logger.Info("Hash value not found")
+
+		return nil
+	}
+
+	helper.Logger.Info(fmt.Sprintf("Hash Value: %s", hex.EncodeToString(hashBytes)))
+
+	return nil
+}
+
+func queryTokenMapCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "tokenmap-query [root-chain-type|all|hash|end-block|last-event-id]",
+		Short: "query token items for one chain or all",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			chainType := args[0]
+
+			bridgeDB := util.GetBridgeDBInstance(viper.GetString(util.BridgeDBFlag))
+			if bridgeDB == nil {
+				return fmt.Errorf("query parameter error, open db failed")
+			}
+
+			eventProcessor := util.NewTokenMapProcessor(context.NewCLIContext(), bridgeDB)
+
+			switch chainType {
+			case "all":
+				return tokenMapShowAll(eventProcessor)
+
+			case hmtypes.RootChainTypeEth, hmtypes.RootChainTypeTron, hmtypes.RootChainTypeBsc:
+				return tokenMapShowOne(eventProcessor, chainType)
+
+			case "hash":
+				return tokenMapShowHash(eventProcessor)
+
+			case "end-block":
+				helper.Logger.Info(fmt.Sprintf("End Block: %d",
+					eventProcessor.TokenMapCheckedEndBlock))
+
+			case "last-event-id":
+				helper.Logger.Info(fmt.Sprintf("Last Event ID: %d",
+					eventProcessor.TokenMapLastEventID))
+
+			default:
+				return fmt.Errorf("query parameter error, should be [root-chain-type|all|hash|end-block|last-event-id]")
+			}
+
+			return nil
+		},
+	}
+
+	return cmd
+}
+
+func setTokenMapEventIDCmd() *cobra.Command {
+	logger := helper.Logger
+
+	cmd := &cobra.Command{
+		Use:   "tokenmap-set-event-id [event-id]",
+		Short: "set event id for token map processor",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			eventIDStr := args[0]
+
+			eventID, err := strconv.ParseUint(eventIDStr, util.DigitBase, util.DigitBitSize)
+			if err != nil {
+				return err
+			}
+
+			bridgeDB := util.GetBridgeDBInstance(viper.GetString(util.BridgeDBFlag))
+			if bridgeDB == nil {
+				return fmt.Errorf("query parameter error, open db failed")
+			}
+
+			eventProcessor := util.NewTokenMapProcessor(context.NewCLIContext(), bridgeDB)
+			eventIDNow := eventProcessor.TokenMapLastEventID
+
+			if err := eventProcessor.UpdateTokenMapLastEventID(eventID); err != nil {
+				return err
+			}
+			logger.Info(
+				fmt.Sprintf("Modify last event ID from %d to %d", eventIDNow, eventID))
+
+			return nil
+		},
+	}
+
+	return cmd
+}
+
+func setTokenMapEndBlockCmd() *cobra.Command {
+	logger := helper.Logger
+	cmd := &cobra.Command{
+		Use:   "tokenmap-set-end-block [block-id]",
+		Short: "set end block for token map processor",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			blockID, err := strconv.ParseInt(args[0], util.DigitBase, util.DigitBitSize)
+			if err != nil {
+				return err
+			}
+
+			bridgeDB := util.GetBridgeDBInstance(viper.GetString(util.BridgeDBFlag))
+			if bridgeDB == nil {
+				return fmt.Errorf("query parameter error, open db failed")
+			}
+
+			eventProcessor := util.NewTokenMapProcessor(context.NewCLIContext(), bridgeDB)
+			blockIDNow := eventProcessor.TokenMapCheckedEndBlock
+
+			if err := eventProcessor.UpdateTokenMapCheckedEndBlock(blockID); err != nil {
+				return err
+			}
+
+			logger.Info(fmt.Sprintf("Modify end block from %d to %d", blockIDNow, blockID))
+
+			return nil
+		},
+	}
+
+	return cmd
+}
+
+func removeTokenMapCmd() *cobra.Command {
+	logger := helper.Logger
+	cmd := &cobra.Command{
+		Use:   "tokenmap-remove",
+		Short: "remove token map to regenerate it",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			bridgeDB := util.GetBridgeDBInstance(viper.GetString(util.BridgeDBFlag))
+			if bridgeDB == nil {
+				return fmt.Errorf("query parameter error, open db failed")
+			}
+
+			eventProcessor := util.NewTokenMapProcessor(context.NewCLIContext(), bridgeDB)
+			eventIDNow := eventProcessor.TokenMapLastEventID
+			endBlockNow := eventProcessor.TokenMapCheckedEndBlock
+			hashNow := ""
+
+			hashBytes, err := eventProcessor.GetHash()
+			if err != nil {
+				return err
+			}
+			if hashBytes != nil {
+				hashNow = hex.EncodeToString(hashBytes)
+			}
+
+			if err := eventProcessor.ResetParameters(); err != nil {
+				return err
+			}
+
+			logger.Info(
+				fmt.Sprintf("\nRemove map, lastest status:\nLastEventID:\t%d\nEndBlock:\t%d\nHash:\t%s",
+					eventIDNow, endBlockNow, hashNow))
+
+			return nil
+		},
+	}
+
+	return cmd
+}
+
+func init() {
+	rootCmd.AddCommand(queryTokenMapCmd())
+	rootCmd.AddCommand(setTokenMapEventIDCmd())
+	rootCmd.AddCommand(setTokenMapEndBlockCmd())
+	rootCmd.AddCommand(removeTokenMapCmd())
+}