fix genesis err

Author: aquarius-kuchain

x/asset/genesis.go

@@ -21,6 +21,42 @@ func InitGenesis(ctx sdk.Context, ak Keeper, bz json.RawMessage) {
 	for _, a := range data.GenesisCoins {
 		logger.Info("init genesis asset coin", "accountID", a.GetCreator(), "coins", a.GetSymbol(), "maxsupply:", a.GetMaxSupply())
 
+		if a.GetCreator().Empty() {
+			continue
+		}
+
+		initSupply := types.NewCoin(a.GetMaxSupply().Denom, sdk.ZeroInt())
+
+		err := ak.Create(ctx, a.GetCreator(), a.GetSymbol(), a.GetMaxSupply(), true, true, true, 0, initSupply, []byte{}) // TODO: genesis coins support opt
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	// for genesis old version
+	logger.Info("init genesis", "bz", string(bz))
+
+	var oldVersion struct {
+		Value struct {
+			GenesisCoins []struct {
+				Value assetTypes.SimpleGensisAssetCoin `json:"value"`
+			} `json:"genesisCoins"`
+		} `json:"value"`
+	}
+	err := json.Unmarshal(bz, &oldVersion)
+
+	if err != nil {
+		panic(err)
+	}
+
+	for _, av := range oldVersion.Value.GenesisCoins {
+		a := av.Value
+		logger.Info("init genesis asset coin", "accountID", a.GetCreator(), "coins", a.GetSymbol(), "maxsupply:", a.GetMaxSupply())
+
+		if a.GetCreator().Empty() {
+			continue
+		}
+
 		initSupply := types.NewCoin(a.GetMaxSupply().Denom, sdk.ZeroInt())
 
 		err := ak.Create(ctx, a.GetCreator(), a.GetSymbol(), a.GetMaxSupply(), true, true, true, 0, initSupply, []byte{}) // TODO: genesis coins support opt

x/asset/types/codec.go

@@ -15,6 +15,7 @@ func RegisterCodec(cdc *codec.Codec) {
 
 	cdc.RegisterConcrete(&GenesisState{}, "asset/genesisState", nil)
 	cdc.RegisterConcrete(&BaseGensisAssetCoin{}, "asset/genesisCoin", nil)
+	cdc.RegisterConcrete(&SimpleGensisAssetCoin{}, "asset/simpleGenesisCoin", nil)
 	cdc.RegisterConcrete(&BaseGenesisAsset{}, "asset/genesisAsset", nil)
 	cdc.RegisterConcrete(&BaseGenesisLocks{}, "asset/genesisLock", nil)
 

x/asset/types/genesis.go

@@ -153,3 +153,41 @@ func (g BaseGensisAssetCoin) GetMaxSupply() Coin { return g.Stat.MaxSupply }
 
 // GetDescription imp GenesisCoin
 func (g BaseGensisAssetCoin) GetDescription() string { return g.Description }
+
+type SimpleGensisAssetCoin struct {
+	Symbol      Name   `json:"symbol" yaml:"symbol"`       // Symbol coin symbol name
+	Creator     Name   `json:"creator" yaml:"creator"`     // Creator coin creator account name
+	MaxSupply   Coin   `json:"maxSupply" yaml:"maxSupply"` // MaxSupply coin max supply limit
+	Description string `json:"description" yaml:"description"`
+}
+
+// Validate imp GenesisCoin
+func (s SimpleGensisAssetCoin) Validate() error {
+	if len(s.Description) >= MaxDescriptionLength {
+		return fmt.Errorf("genesis coin description too length")
+	}
+
+	denom := CoinDenom(s.Creator, s.Symbol)
+
+	if denom != s.MaxSupply.Denom {
+		return fmt.Errorf("genesis max supply coin denom error")
+	}
+
+	if err := coin.ValidateDenom(denom); err != nil {
+		return sdkerrors.Wrapf(ErrAssetDenom, "denom %s", denom)
+	}
+
+	return nil
+}
+
+// GetCreator imp GenesisCoin
+func (s SimpleGensisAssetCoin) GetCreator() Name { return s.Creator }
+
+// GetSymbol imp GenesisCoin
+func (s SimpleGensisAssetCoin) GetSymbol() Name { return s.Symbol }
+
+// GetMaxSupply imp GenesisCoin
+func (s SimpleGensisAssetCoin) GetMaxSupply() Coin { return s.MaxSupply }
+
+// GetDescription imp GenesisCoin
+func (s SimpleGensisAssetCoin) GetDescription() string { return s.Description }

x/slashing/types/signing_info.go

@@ -21,8 +21,6 @@ type ValidatorSigningInfo struct {
 	Tombstoned bool `json:"tombstoned,omitempty"`
 	// missed blocks counter (to avoid scanning the array every time)
 	MissedBlocksCounter int64 `json:"missed_blocks_counter,omitempty" yaml:"missed_blocks_counter"`
-	// AccountID
-	AccountID AccountID `json:"account_id,omitempty"`
 }
 
 // NewValidatorSigningInfo creates a new ValidatorSigningInfo instance
@@ -32,7 +30,6 @@ func NewValidatorSigningInfo(
 ) ValidatorSigningInfo {
 	return ValidatorSigningInfo{
 		Address:             condAddr,
-		AccountID:           accountID,
 		StartHeight:         startHeight,
 		IndexOffset:         indexOffset,
 		JailedUntil:         jailedUntil,