Add satellites NFT distribution

protocol/governance/contracts/interfaces/IElectionModule.sol

@@ -6,7 +6,6 @@ import {Epoch} from "../storage/Epoch.sol";
 
 /// @title Module for electing a council, represented by a set of NFT holders
 interface IElectionModule {
-    error NotMothership();
     error AlreadyNominated();
     error ElectionAlreadyEvaluated();
     error ElectionNotEvaluated();

protocol/governance/contracts/modules/core/BaseElectionModule.sol

@@ -31,16 +31,6 @@
 
     uint256 private constant _CROSSCHAIN_GAS_LIMIT = 100000;
 
-    /// @dev Used to allow certain functions to only be executed on the "mothership" chain.
-    /// The mothership is considered to be the first chain id in the supported networks list.
-    modifier onlyMothership() {
-        if (CrossChain.load().getSupportedNetworks()[0] != block.chainid.to64()) {
-            revert NotMothership();
-        }
-
-        _;
-    }
-
     function initOrUpdateElectionSettings(
         address[] memory initialCouncil,
         uint8 minimumActiveMembers,
@@ -49,6 +39,7 @@
         uint64 nominationPeriodDuration,
         uint64 votingPeriodDuration
     ) external override {
+        // TODO: initialization should be called only on mothership and broadcasted?
         OwnableStorage.onlyOwner();
 
         _initOrUpdateElectionSettings(
@@ -153,6 +144,8 @@
         uint64 newVotingPeriodStartDate,
         uint64 newEpochEndDate
     ) external override {
+        // TODO: onlyOnMothership?
+
         OwnableStorage.onlyOwner();
         Council.onlyInPeriod(Council.ElectionPeriod.Administration);
         Council.Data storage council = Council.load();
@@ -180,6 +173,8 @@
         uint64 votingPeriodDuration,
         uint64 maxDateAdjustmentTolerance
     ) external override {
+        // TODO: onlyOnMothership?
+
         OwnableStorage.onlyOwner();
         Council.onlyInPeriod(Council.ElectionPeriod.Administration);
 
@@ -194,6 +189,8 @@
     }
 
     function dismissMembers(address[] calldata membersToDismiss) external override {
+        // TODO: onlyOnMothership?
+
         OwnableStorage.onlyOwner();
 
         Council.Data storage store = Council.load();
@@ -219,9 +216,12 @@
     }
 
     function nominate() public virtual override {
-        SetUtil.AddressSet storage nominees = Council.load().getCurrentElection().nominees;
+        // TODO: onlyOnMothership?
+
         Council.onlyInPeriod(Council.ElectionPeriod.Nomination);
 
+        SetUtil.AddressSet storage nominees = Council.load().getCurrentElection().nominees;
+
         if (nominees.contains(msg.sender)) revert AlreadyNominated();
 
         nominees.add(msg.sender);
@@ -232,6 +232,8 @@
     }
 
     function withdrawNomination() external override {
+        // TODO: onlyOnMothership?
+
         SetUtil.AddressSet storage nominees = Council.load().getCurrentElection().nominees;
         Council.onlyInPeriod(Council.ElectionPeriod.Nomination);
 
@@ -276,17 +278,15 @@
 
         CrossChain.Data storage cc = CrossChain.load();
         cc.transmit(
-            cc.getSupportedNetworks()[0],
+            cc.getChainIdAt(0),
             abi.encodeWithSelector(this._recvCast.selector, msg.sender, block.chainid, ballot),
             _CROSSCHAIN_GAS_LIMIT
         );
     }
 
-    function _recvCast(
-        address voter,
-        uint256 precinct,
-        Ballot.Data calldata ballot
-    ) external onlyMothership {
+    function _recvCast(address voter, uint256 precinct, Ballot.Data calldata ballot) external {
+        CrossChain.onlyOnChainAt(0);
+        CrossChain.onlyCrossChain();
         Council.onlyInPeriod(Council.ElectionPeriod.Vote);
 
         _validateCandidates(ballot.votedCandidates);
@@ -307,11 +307,12 @@
 
         election.ballotPtrs.push(ballotPtr);
 
-        emit VoteRecorded(msg.sender, precinct, currentElectionId, ballot.votingPower);
+        emit VoteRecorded(voter, precinct, currentElectionId, ballot.votingPower);
     }
 
     /// @dev ElectionTally needs to be extended to specify how votes are counted
-    function evaluate(uint numBallots) external override onlyMothership {
+    function evaluate(uint numBallots) external override {
+        CrossChain.onlyOnChainAt(0);
         Council.onlyInPeriod(Council.ElectionPeriod.Evaluation);
 
         Election.Data storage election = Council.load().getCurrentElection();
@@ -336,7 +337,8 @@
     }
 
     /// @dev Burns previous NFTs and mints new ones
-    function resolve() public virtual override onlyMothership {
+    function resolve() public virtual override {
+        CrossChain.onlyOnChainAt(0);
         Council.onlyInPeriod(Council.ElectionPeriod.Evaluation);
 
         Council.Data storage store = Council.load();
@@ -358,6 +360,14 @@
         // TODO: Broadcast message to distribute the new NFTs on all chains
     }
 
+    function _recvResolve(address voter, uint256 precinct, Ballot.Data calldata ballot) external {
+        CrossChain.onlyOnChainAt(0);
+        CrossChain.onlyCrossChain();
+        Council.onlyInPeriod(Council.ElectionPeriod.Vote);
+
+        // TODO: update voting store, distribute nfts
+    }
+
     function getEpochSchedule() external view override returns (Epoch.Data memory epoch) {
         return Council.load().getCurrentElection().epoch;
     }

protocol/governance/contracts/storage/Council.sol

@@ -27,7 +27,7 @@ library Council {
         // Council token id's by council member address
         mapping(address => uint) councilTokenIds;
         // id of the current epoch
-        uint currentElectionId;
+        uint256 currentElectionId;
     }
 
     enum ElectionPeriod {

protocol/governance/contracts/storage/Election.sol

@@ -19,6 +19,7 @@ library Election {
         SetUtil.AddressSet winners;
         // List of all ballot ids in this election
         bytes32[] ballotPtrs;
+        // Total votes count for a given candidate
         mapping(address => uint256) candidateVoteTotals;
     }
 

utils/core-modules/contracts/storage/CrossChain.sol

@@ -19,6 +19,7 @@ library CrossChain {
 
     error NotCcipRouter(address);
     error UnsupportedNetwork(uint64);
+    error InvalidNetwork(uint64);
     error InsufficientCcipFee(uint256 requiredAmount, uint256 availableAmount);
     error InvalidMessage();
 
@@ -91,12 +92,22 @@ library CrossChain {
         }
     }
 
+    function onlyOnChainAt(uint64 chainIndex) internal view {
+        if (getChainIdAt(load(), chainIndex) != block.chainid.to64()) {
+            revert InvalidNetwork(block.chainid.to64());
+        }
+    }
+
+    function getChainIdAt(Data storage self, uint64 index) internal view returns (uint64) {
+        return self.supportedNetworks.valueAt(index + 1).to64();
+    }
+
     function getSupportedNetworks(Data storage self) internal view returns (uint64[] memory) {
         SetUtil.UintSet storage supportedNetworks = self.supportedNetworks;
-        uint256 supportedNetworksLength = supportedNetworks.length();
-        uint64[] memory chains = new uint64[](supportedNetworksLength);
-        for (uint i = 0; i < supportedNetworksLength; i++) {
-            uint64 chainId = supportedNetworks.values()[i].to64();
+        uint256[] memory supportedChains = supportedNetworks.values();
+        uint64[] memory chains = new uint64[](supportedChains.length);
+        for (uint i = 0; i < supportedChains.length; i++) {
+            uint64 chainId = supportedChains[i].to64();
             chains[i] = chainId;
         }
         return chains;