Tracking metablocks' rounds in the Consensus contract.

.travis.yml

@@ -30,7 +30,11 @@ before_script:
   - ./tools/run_ganache_cli.sh </dev/null 1>/dev/null 2>&1 &
 script:
   - npm run compile
-  - npm run test
+  - npm run test test/axiom/*
+  - npm run test test/committee/*
+  - npm run test test/consensus/*
+  - npm run test test/core/*
+  - npm run test test/reputation/*
   - npm run test:integration
 after_script:
   - kill $(ps aux | grep 'ganache-cli' | awk '{print $2}')

contracts/axiom/Axiom.sol

@@ -275,7 +275,7 @@ contract Axiom is AxiomI, ProxyFactory, ConsensusModule {
     }
 
     /**
-     * @notice Setup a new meta chain. Only technical governance address can
+     * @notice Setup a new metachain. Only technical governance address can
      *         call this function.
      * @param _maxStateRoots The max number of state roots to store in the
      *                       circular buffer.

contracts/committee/Committee.sol

@@ -113,6 +113,9 @@ contract Committee is MasterCopyNonUpgradable, ConsensusModule, CommitteeI {
 
     /* Storage */
 
+    /** Metachain id of the meta-blockchain */
+    bytes32 public metachainId;
+
     /** Committee size */
     uint256 public committeeSize;
 
@@ -232,6 +235,7 @@ contract Committee is MasterCopyNonUpgradable, ConsensusModule, CommitteeI {
     /* External functions */
 
     function setup(
+        bytes32 _metachainId,
         ConsensusI _consensus,
         uint256 _committeeSize,
         bytes32 _dislocation,
@@ -240,10 +244,15 @@ contract Committee is MasterCopyNonUpgradable, ConsensusModule, CommitteeI {
         external
     {
         require(
-            committeeSize == 0 && proposal == bytes32(0),
+            metachainId == bytes32(0),
             "Committee is already setup."
         );
 
+        require(
+            _metachainId != bytes32(0),
+            "Metachain id is 0."
+        );
+
         require(
             _committeeSize >= 3,
             "Committee size must not be smaller than three."
@@ -261,6 +270,8 @@ contract Committee is MasterCopyNonUpgradable, ConsensusModule, CommitteeI {
 
         setupConsensus(_consensus);
 
+        metachainId = _metachainId;
+
         committeeStatus = CommitteeStatus.Open;
 
         // Initialize the members linked-list as the empty set.
@@ -572,7 +583,10 @@ contract Committee is MasterCopyNonUpgradable, ConsensusModule, CommitteeI {
 
             if (committeeDecision == bytes32(0)) {
                 committeeDecision = _position;
-                consensus.registerCommitteeDecision(committeeDecision);
+                consensus.registerCommitteeDecision(
+                    metachainId,
+                    committeeDecision
+                );
             }
         }