fix conflict

diff --cc config/genesis.go
index 5f7b22d,e27e733..d1cfeb0
--- 1/config/genesis.go
--- 2/config/genesis.go
+++ b/config/genesis.go
@@@ -14,18 -13,14 +14,18 @@@ import 
        "github.com/vapor/protocol/vm/vmutil"
  )
  
 -func FederationProgrom(c *Config) []byte {
 -      pubKeys := chainkd.XPubKeys(c.Federation.Xpubs)
 -      fedpegScript, err := vmutil.P2SPMultiSigProgram(pubKeys, c.Federation.Quorum)
 +func GenesisArguments(c *Config) []byte {
 +      pubKeys := edchainkd.XPubKeys(c.Federation.Xpubs)
 +      cryptoPub := make([]crypto.PublicKey, 0)
 +      for _, pub := range pubKeys {
 +              cryptoPub = append(cryptoPub, pub)
 +      }
 +      fedpegScript, err := vmutil.P2SPMultiSigProgram(cryptoPub, c.Federation.Quorum)
        if err != nil {
-               log.Panicf("fail on decode genesis arguments for federation")
+               log.Panicf("Failed generate federation scirpt  for federation")
        }
  
 -      scriptHash := crypto.Sha256(fedpegScript)
 +      scriptHash := vcrypto.Sha256(fedpegScript)
  
        control, err := vmutil.P2WSHProgram(scriptHash)
        if err != nil {

diff --cc protocol/bbft.go
index b062f58,3a59e47..44b1009
--- 1/protocol/bbft.go
--- 2/protocol/bbft.go
+++ b/protocol/bbft.go
@@@ -9,10 -8,9 +8,9 @@@ import 
        log "github.com/sirupsen/logrus"
  
        "github.com/vapor/crypto/ed25519"
 -      "github.com/vapor/crypto/ed25519/chainkd"
 +      edchainkd "github.com/vapor/crypto/ed25519/chainkd"
        "github.com/vapor/errors"
        "github.com/vapor/event"
-       "github.com/vapor/math/checked"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
        "github.com/vapor/protocol/state"
@@@ -310,9 -212,10 +212,10 @@@ func (b *bbft) checkDoubleSign(nodeOrde
  
  // SignBlock signing the block if current node is consensus node
  func (b *bbft) SignBlock(block *types.Block) ([]byte, error) {
 -      var xprv chainkd.XPrv
 +      var xprv edchainkd.XPrv
        xpub := [64]byte(xprv.XPub())
-       node, err := b.consensusNodeManager.getConsensusNode(block.Height, hex.EncodeToString(xpub[:]))
+       blockHash := block.Hash()
+       node, err := b.consensusNodeManager.getConsensusNode(&blockHash, hex.EncodeToString(xpub[:]))
        if err != nil && err != errNotFoundConsensusNode {
                return nil, err
        }

diff --cc protocol/bc/types/map.go
Simple merge

diff --cc test/bench_blockchain_test.go
Simple merge