Merge pull request #103 from pgev/metablock-round

Tracking metablocks' rounds in the Consensus contract.
mosaicdao · Dec 19, 2019 · 86908bf · 86908bf
2 parents 4dbc544 + 2c1c70b
commit 86908bf
Show file tree

Hide file tree

Showing 37 changed files with 731 additions and 535 deletions.
diff --git a/contracts/axiom/Axiom.sol b/contracts/axiom/Axiom.sol
@@ -278,7 +278,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.
      */
     function newMetaChain()

diff --git a/contracts/committee/Committee.sol b/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.
@@ -272,9 +283,8 @@ contract Committee is MasterCopyNonUpgradable, ConsensusModule, CommitteeI {
 
         proposal = _proposal;
 
-        // @qn (pro): In case of 7 quorum should be 4 or 5.
         quorum = _committeeSize * COMMITTEE_SUPER_MAJORITY_NUMERATOR /
-        COMMITTEE_SUPER_MAJORITY_DENOMINATOR;
+            COMMITTEE_SUPER_MAJORITY_DENOMINATOR;
     }
 
     /**
@@ -572,7 +582,10 @@ contract Committee is MasterCopyNonUpgradable, ConsensusModule, CommitteeI {
 
             if (committeeDecision == bytes32(0)) {
                 committeeDecision = _position;
-                consensus.registerCommitteeDecision(committeeDecision);
+                consensus.registerCommitteeDecision(
+                    metachainId,
+                    committeeDecision
+                );
             }
         }