diff --git a/accountmanager/accountmanager.go b/accountmanager/accountmanager.go index 4b724e15..5c1f0961 100644 --- a/accountmanager/accountmanager.go +++ b/accountmanager/accountmanager.go @@ -136,6 +136,7 @@ func SetAccountNameConfig(config *Config) bool { accountNameLength = config.AccountNameMaxLength return true } + func GetAccountNameRegExp() *regexp.Regexp { return acctRegExp } diff --git a/blockchain/genesis.go b/blockchain/genesis.go index 60bab804..7e4faa4b 100644 --- a/blockchain/genesis.go +++ b/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)) diff --git a/cmd/ft/root.go b/cmd/ft/root.go index a5ec539d..cf9e4d30 100644 --- a/cmd/ft/root.go +++ b/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) } diff --git a/ftservice/ftservice.go b/ftservice/ftservice.go index c3fa5f14..2a52d146 100644 --- a/ftservice/ftservice.go +++ b/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 != "" {