Validate ChainId

chains/ethereum/chain.go

@@ -21,6 +21,7 @@ The writer recieves the message and creates a proposals on-chain. Once a proposa
 package ethereum
 
 import (
+	"fmt"
 	"math/big"
 
 	bridge "github.com/ChainSafe/ChainBridge/bindings/Bridge"
@@ -111,7 +112,6 @@ func InitializeChain(chainCfg *core.ChainConfig, logger log15.Logger, sysErr cha
 	if err != nil {
 		return nil, err
 	}
-
 	err = conn.EnsureHasBytecode(cfg.bridgeContract)
 	if err != nil {
 		return nil, err
@@ -130,6 +130,15 @@ func InitializeChain(chainCfg *core.ChainConfig, logger log15.Logger, sysErr cha
 		return nil, err
 	}
 
+	chainId, err := bridgeContract.ChainID(conn.CallOpts())
+	if err != nil {
+		return nil, err
+	}
+
+	if chainId != uint8(chainCfg.Id) {
+		return nil, fmt.Errorf("chainId and configuration chainId do not match")
+	}
+
 	erc20HandlerContract, err := erc20Handler.NewERC20Handler(cfg.erc20HandlerContract, conn.Client())
 	if err != nil {
 		return nil, err

chains/ethereum/chain_test.go

@@ -21,7 +21,7 @@ func TestChain_ListenerShutdownOnFailure(t *testing.T) {
 	client := ethtest.NewClient(t, TestEndpoint, AliceKp)
 	contracts := deployTestContracts(t, client, msg.ChainId(1))
 	cfg := &core.ChainConfig{
-		Id:             msg.ChainId(0),
+		Id:             msg.ChainId(1),
 		Name:           "alice",
 		Endpoint:       TestEndpoint,
 		From:           keystore.AliceKey,