modify hash logic

Author: zhangbin

chainbridge-core/chainbridge.go

@@ -266,7 +266,12 @@ func handleFeedBackArbitersSig(engine *pbft.Pbft, e *events.Event) {
 		bridgelog.Warn("handleFeedBackArbitersSig failed , is not producer", common.Bytes2Hex(producer))
 		return
 	}
-	hash, err := arbiterManager.HashArbiterList()
+	salt, err := MsgReleayer.GetHashSalt(escChainID)
+	if err != nil {
+		bridgelog.Warn("GetHashSalt failed", "error")
+		return
+	}
+	hash, err := arbiterManager.HashArbiterList(salt)
 	if err != nil {
 		bridgelog.Warn("HashArbiterList failed", "error", err)
 		return
@@ -307,7 +312,14 @@ func receivedReqArbiterSignature(engine *pbft.Pbft, e *events.Event) {
 
 	kp := engine.GetBridgeArbiters().(*secp256k1.Keypair)
 	privateKey := kp.PrivateKey()
-	hash, err := arbiterManager.HashArbiterList()
+
+	salt, err := MsgReleayer.GetHashSalt(escChainID)
+	if err != nil {
+		bridgelog.Warn("GetHashSalt failed", "error")
+		return
+	}
+
+	hash, err := arbiterManager.HashArbiterList(salt)
 	if err != nil {
 		bridgelog.Error("receivedReqArbiterSignature HashArbiterList failed", "error", err)
 	}

chainbridge-core/chains/evm/aribiters/arbitermanager.go

@@ -140,7 +140,7 @@ func (a *ArbiterManager) Clear() {
 	a.consensusArbiters.List = make([][]byte, 0)
 }
 
-func (a *ArbiterManager) HashArbiterList() (common.Hash, error) {
+func (a *ArbiterManager) HashArbiterList(hashSalt *big.Int) (common.Hash, error) {
 	arbiters := a.GetArbiterList()
 	data := make([]byte, 0)
 	for _, arbiter := range arbiters {
@@ -154,6 +154,9 @@ func (a *ArbiterManager) HashArbiterList() (common.Hash, error) {
 	total := new(big.Int).SetUint64(uint64(a.nextTotalCount))
 	totalBytes := common.LeftPadBytes(total.Bytes(), 32)
 	data = append(data, totalBytes...)
+
+	saltBytes := common.LeftPadBytes(hashSalt.Bytes(), 32)
+	data = append(data, saltBytes...)
 	return crypto.Keccak256Hash(data), nil
 }
 

chainbridge-core/chains/evm/chain.go

@@ -33,6 +33,7 @@ type ProposalVoter interface {
 	GetSignatures(bridgeAddress string) ([][crypto.SignatureLength]byte, error)
 	GetTotalCount(bridgeAddress string) (uint64, error)
 	GetESCState(bridgeAddress string) (uint8, error)
+	GetHashSalt(bridgeAddress string) (*big.Int, error)
 	IsDeployedBridgeContract(bridgeAddress string) bool
 	SetESCState(bridgeAddress string, state uint8) error
 	SetManualArbiter(bridgeAddress string, arbiter []common.Address, totalSigner int) error
@@ -121,6 +122,10 @@ func (c *EVMChain) GetESCState() (uint8, error) {
 	return state, nil
 }
 
+func (c *EVMChain) GetHashSalt() (*big.Int, error) {
+	return c.writer.GetHashSalt(c.bridgeContractAddress)
+}
+
 func (c *EVMChain) SetESCState(state uint8) error {
 	err := c.writer.SetESCState(c.bridgeContractAddress, state)
 	if err != nil {

chainbridge-core/chains/evm/voter/voter.go

@@ -298,6 +298,24 @@ func (w *EVMVoter) GetESCState(bridgeAddress string) (uint8, error) {
 	return uint8(out0.Uint64()), err
 }
 
+func (w *EVMVoter) GetHashSalt(bridgeAddress string) (*big.Int, error) {
+	a, err := chainbridge_abi.GetHashSaltABI()
+	if err != nil {
+		return big.NewInt(0), err
+	}
+	input, err := a.Pack("GetHashSalt")
+	if err != nil {
+		return big.NewInt(0), err
+	}
+	bridge := common.HexToAddress(bridgeAddress)
+	msg := ethereum.CallMsg{From: common.Address{}, To: &bridge, Data: input}
+	out, err := w.client.CallContract(context.TODO(), toCallArg(msg), nil)
+	log.Info("GetHashSalt", "error", err, "out", out)
+
+	out0 := big.NewInt(0).SetBytes(out)
+	return out0, err
+}
+
 func (w *EVMVoter) IsDeployedBridgeContract(bridgeAddress string) bool {
 	return w.client.IsContractAddress(bridgeAddress)
 }

chainbridge-core/relayer/relayer.go

@@ -6,6 +6,7 @@ package relayer
 import (
 	"errors"
 	"fmt"
+	"math/big"
 
 	"github.com/elastos/Elastos.ELA.SideChain.ESC/chainbridge-core/bridgelog"
 	"github.com/elastos/Elastos.ELA.SideChain.ESC/common"
@@ -21,6 +22,7 @@ type RelayedChain interface {
 	GetTotalCount() (uint64, error)
 	GetESCState() (uint8, error)
 	SetESCState(state uint8) error
+	GetHashSalt() (*big.Int, error)
 	SetManualArbiters(arbiter []common.Address, totalSigner int) error
 	GetBridgeContract() string
 	PollEvents(sysErr chan<- error, stop <-chan struct{}, eventsChan chan *SetArbiterListMsg)
@@ -155,6 +157,16 @@ func (r *Relayer) SetESCState(state uint8) error {
 	return nil
 }
 
+func (r *Relayer) GetHashSalt(chainID uint64) (*big.Int, error) {
+	for _, c := range r.relayedChains {
+		if c.ChainID() != chainID {
+			continue
+		}
+		return c.GetHashSalt()
+	}
+	return big.NewInt(0), errors.New("GetHashSalt error chainId")
+}
+
 func (r *Relayer) SetManualArbiters(arbiters []common.Address, totalCount int) error {
 	for _, c := range r.relayedChains {
 		if c.ChainID() != r.escChainID {

chainbridge_abi/utils.go

@@ -53,3 +53,9 @@ func SetManualArbiterABI() (abi.ABI, error) {
 	a, err := abi.JSON(strings.NewReader(definition))
 	return a, err
 }
+
+func GetHashSaltABI() (abi.ABI, error) {
+	definition := "[{\"inputs\": [],\"name\": \"GetHashSalt\",\"outputs\": [{\"internalType\": \"uint256\",\"name\": \"\",\"type\": \"uint256\"}],\"stateMutability\": \"view\",\"type\": \"function\"}]"
+	a, err := abi.JSON(strings.NewReader(definition))
+	return a, err
+}