export error (#498)

* fix export error

accountmanager/accountmanager.go

@@ -136,6 +136,7 @@ func SetAccountNameConfig(config *Config) bool {
 	accountNameLength = config.AccountNameMaxLength
 	return true
 }
+
 func GetAccountNameRegExp() *regexp.Regexp {
 	return acctRegExp
 }

blockchain/genesis.go

@@ -202,6 +202,7 @@ func (g *Genesis) ToBlock(db fdb.Database) (*types.Block, []*types.Receipt, erro
 		SubAssetNameMinLength:  1,
 		SubAssetNameMaxLength:  8,
 	})
+
 	am.SetAcctMangerName(common.StrToName(g.Config.AccountName))
 	at.SetAssetMangerName(common.StrToName(g.Config.AssetName))
 	fm.SetFeeManagerName(common.StrToName(g.Config.FeeName))

cmd/ft/root.go

@@ -94,6 +94,7 @@ var RootCmd = &cobra.Command{
 }
 
 func makeNode() (*node.Node, error) {
+	genesis := blockchain.DefaultGenesis()
 	// set miner config
 	SetupMetrics()
 	// Make sure we have a valid genesis JSON
@@ -105,13 +106,18 @@ func makeNode() (*node.Node, error) {
 		}
 		defer file.Close()
 
-		genesis := blockchain.DefaultGenesis()
 		if err := json.NewDecoder(file).Decode(genesis); err != nil {
 			return nil, fmt.Errorf("invalid genesis file: %v(%v)", ftCfgInstance.GenesisFile, err)
 		}
 		ftCfgInstance.FtServiceCfg.Genesis = genesis
-	}
 
+	}
+	block, _, err := genesis.ToBlock(nil)
+	if err != nil {
+		return nil, err
+	}
+	// p2p used to generate MagicNetID
+	ftCfgInstance.NodeCfg.P2PConfig.GenesisHash = block.Hash()
 	return node.New(ftCfgInstance.NodeCfg)
 }
 

ftservice/ftservice.go

@@ -82,8 +82,6 @@ func New(ctx *node.ServiceContext, config *Config) (*FtService, error) {
 	if err != nil {
 		return nil, err
 	}
-	// used to generate MagicNetID
-	ftservice.p2pServer.GenesisHash = ftservice.blockchain.Genesis().Hash()
 
 	// txpool
 	if config.TxPool.Journal != "" {