add pegin address for contract

[bytom/vapor.git] / node / node.go

diff --git a/node/node.go b/node/node.go
index 61c51ae..c3b2052 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -4,6 +4,7 @@ import (
        "context"
        "encoding/json"
        "errors"
+       "fmt"
        "net"
        "net/http"
        _ "net/http/pprof"
@@ -205,27 +206,30 @@ func initActiveNetParams(config *cfg.Config) {
        if !exist {
                cmn.Exit(cmn.Fmt("chain_id[%v] don't exist", config.ChainID))
        }
-       var federationRedeemXPubs []chainkd.XPub
-       if fedpegXPubs := strings.Split(config.Side.FedpegXPubs, ","); len(fedpegXPubs) > 0 {
+       if config.Side.FedpegXPubs != "" {
+               var federationRedeemXPubs []chainkd.XPub
+               fedpegXPubs := strings.Split(config.Side.FedpegXPubs, ",")
                for _, xpubStr := range fedpegXPubs {
                        var xpub chainkd.XPub
                        xpub.UnmarshalText([]byte(xpubStr))
                        federationRedeemXPubs = append(federationRedeemXPubs, xpub)
                }
+               consensus.ActiveNetParams.FedpegXPubs = federationRedeemXPubs
        }
 
-       var signBlockXPubs []chainkd.XPub
-       if xPubs := strings.Split(config.Side.SignBlockXPubs, ","); len(xPubs) > 0 {
+       if config.Side.SignBlockXPubs != "" {
+               var signBlockXPubs []chainkd.XPub
+               fmt.Println(signBlockXPubs)
+               xPubs := strings.Split(config.Side.SignBlockXPubs, ",")
                for _, xpubStr := range xPubs {
                        var xpub chainkd.XPub
                        xpub.UnmarshalText([]byte(xpubStr))
                        signBlockXPubs = append(signBlockXPubs, xpub)
                }
+               consensus.ActiveNetParams.SignBlockXPubs = signBlockXPubs
        }
 
        consensus.ActiveNetParams.Signer = config.Signer
-       consensus.ActiveNetParams.FedpegXPubs = federationRedeemXPubs
-       consensus.ActiveNetParams.SignBlockXPubs = signBlockXPubs
        consensus.ActiveNetParams.PeginMinDepth = config.Side.PeginMinDepth
        consensus.ActiveNetParams.ParentGenesisBlockHash = config.Side.ParentGenesisBlockHash
 }