Addressed review comments.

contracts/src/management/ManagementContract.sol

@@ -102,7 +102,7 @@ contract ManagementContract is Initializable, OwnableUpgradeable {
         }
     }
 
-    function addCrossChainMessagesRoot(bytes32 _lastBatchHash, bytes32 blockHash, uint256 blockNum, bytes[] memory crossChainHashes, bytes calldata signature) external {
+    function addCrossChainMessagesRoot(bytes32 _lastBatchHash, bytes32 blockHash, uint256 blockNum, bytes[] memory crossChainHashes, bytes calldata signature, uint256 rollupNumber, bytes32 forkID) external {
         if (block.number > blockNum + 255) {
             revert("Block binding too old");
         }
@@ -111,6 +111,10 @@ contract ManagementContract is Initializable, OwnableUpgradeable {
             revert(string(abi.encodePacked("Invalid block binding:", Strings.toString(block.number),":", Strings.toString(uint256(blockHash)), ":", Strings.toString(uint256(blockhash(blockNum))))));
         }
 
+        if (rollups.toUniqueForkID[rollupNumber] != forkID) {
+            revert("Invalid forkID");
+        }
+
         address enclaveID = ECDSA.recover(keccak256(abi.encode(_lastBatchHash, blockHash, blockNum, crossChainHashes)), signature);
         require(attested[enclaveID], "enclaveID not attested"); //todo: only sequencer, rather than everyone who has attested.
 

go/common/host/services.go

@@ -110,7 +110,7 @@ type L1Publisher interface {
 	PublishSecretResponse(secretResponse *common.ProducedSecretResponse) error
 
 	// PublishCrossChainBundle will create and publish a cross-chain bundle tx to the management contract
-	PublishCrossChainBundle(bundle *common.ExtCrossChainBundle) error
+	PublishCrossChainBundle(*common.ExtCrossChainBundle, *big.Int, gethcommon.Hash) error
 
 	FetchLatestSeqNo() (*big.Int, error)
 

go/host/l1/publisher.go

@@ -284,7 +284,7 @@ func (p *Publisher) PublishRollup(producedRollup *common.ExtRollup) {
 	}
 }
 
-func (p *Publisher) PublishCrossChainBundle(bundle *common.ExtCrossChainBundle) error {
+func (p *Publisher) PublishCrossChainBundle(bundle *common.ExtCrossChainBundle, rollupNum *big.Int, forkID gethcommon.Hash) error {
 	if p.mgmtContractLib.IsMock() {
 		return nil
 	}
@@ -313,7 +313,7 @@ func (p *Publisher) PublishCrossChainBundle(bundle *common.ExtCrossChainBundle)
 
 	transactor.Nonce = big.NewInt(0).SetUint64(nonce)
 
-	tx, err := managementCtr.AddCrossChainMessagesRoot(transactor, [32]byte(bundle.LastBatchHash.Bytes()), bundle.L1BlockHash, bundle.L1BlockNum, bundle.CrossChainRootHashes, bundle.Signature)
+	tx, err := managementCtr.AddCrossChainMessagesRoot(transactor, [32]byte(bundle.LastBatchHash.Bytes()), bundle.L1BlockHash, bundle.L1BlockNum, bundle.CrossChainRootHashes, bundle.Signature, rollupNum, forkID)
 	if err != nil {
 		if !errors.Is(err, errutil.ErrCrossChainBundleRepublished) {
 			p.logger.Error("Error with submitting cross chain bundle transaction.", log.ErrKey, err, log.BundleHashKey, bundle.LastBatchHash)

go/host/l1/statemachine.go

@@ -27,6 +27,9 @@ type CrossChainStateMachine interface {
 	host.Service
 }
 
+// crossChainStateMachine - responsible for maintaining a view of the submitted cross chain bundles for the rollups on the L1.
+// Whenever a reorg happens, the state machine will revert to the latest known common ancestor rollup.
+// Bundles are only submitted after a rollup is pushed on the L1. The state machine will keep track of the latest rollup and the bundles that have been submitted.
 type crossChainStateMachine struct {
 	latestRollup  RollupInfo
 	rollupHistory map[RollupNumber]RollupInfo
@@ -41,7 +44,6 @@ type crossChainStateMachine struct {
 }
 
 type RollupInfo struct {
-	Hash    gethcommon.Hash
 	ForkUID ForkUniqueID
 	Number  RollupNumber
 }
@@ -56,7 +58,6 @@ func NewCrossChainStateMachine(
 ) CrossChainStateMachine {
 	return &crossChainStateMachine{
 		latestRollup: RollupInfo{
-			Hash:    gethcommon.Hash{},
 			ForkUID: gethcommon.Hash{},
 			Number:  0,
 		},
@@ -120,7 +121,7 @@ func (c *crossChainStateMachine) PublishNextBundle() error {
 		return err
 	}
 
-	err = c.publisher.PublishCrossChainBundle(bundle)
+	err = c.publisher.PublishCrossChainBundle(bundle, big.NewInt(0).SetUint64(data.Number), data.ForkUID)
 	if err != nil {
 		return err
 	}
@@ -141,7 +142,7 @@ func (c *crossChainStateMachine) Synchronize() error {
 		}
 
 		if errors.Is(err, errutil.ErrRollupForkMismatch) {
-			return c.RevertToLatestKnownCommonAncestorRollup()
+			return c.revertToLatestKnownCommonAncestorRollup()
 		}
 
 		c.logger.Error("Failed to get bundle range from management contract", "error", err)
@@ -150,15 +151,14 @@ func (c *crossChainStateMachine) Synchronize() error {
 
 	c.rollupHistory[c.latestRollup.Number] = c.latestRollup
 	c.latestRollup = RollupInfo{
-		Hash:    gethcommon.Hash{},
 		ForkUID: *forkUID,
 		Number:  c.latestRollup.Number + 1,
 	}
 
 	return nil
 }
 
-func (c *crossChainStateMachine) RevertToLatestKnownCommonAncestorRollup() error {
+func (c *crossChainStateMachine) revertToLatestKnownCommonAncestorRollup() error {
 	managementContract, err := ManagementContract.NewManagementContract(*c.mgmtContractLib.GetContractAddr(), c.ethClient.EthClient())
 	if err != nil {
 		return err

integration/networktest/tests/helpful/spin_up_local_network_test.go

@@ -30,7 +30,7 @@ const (
 )
 
 func TestRunLocalNetwork(t *testing.T) {
-	networktest.TestOnlyRunsInIDE(t)
+	//	networktest.TestOnlyRunsInIDE(t)
 	networktest.EnsureTestLogsSetUp("local-geth-network")
 	networkConnector, cleanUp, err := env.LocalDevNetwork(devnetwork.WithGateway()).Prepare()
 	if err != nil {