Geth migrations, rebased

.github/workflows/celo-monorepo.yml

@@ -183,8 +183,10 @@ jobs:
           name: devchain-${{ env.RELEASE_TAG }}
           path: packages/protocol/.tmp/devchain
       - name: Install Foundry
+        # foundry-toolchain v1.7.0 https://github.com/foundry-rs/foundry-toolchain/releases/tag/v1.7.0
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773
         with:
+          # TODO: Standardize Foundry version across workflows https://github.com/celo-org/celo-monorepo/issues/11714
           version: 'v1.0.0'
 
       - name: Install forge dependencies
@@ -235,8 +237,10 @@ jobs:
           rebuild-package: 'true'
           artifacts_to_cache: ${{ needs.install-dependencies.outputs.artifacts_to_cache }}
       - name: Install Foundry
+        # foundry-toolchain v1.7.0 https://github.com/foundry-rs/foundry-toolchain/releases/tag/v1.7.0
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773
         with:
+          # TODO: Standardize Foundry version across workflows https://github.com/celo-org/celo-monorepo/issues/11714
           version: 'v1.0.0'
       - name: Install forge dependencies
         working-directory: packages/protocol
@@ -252,9 +256,7 @@ jobs:
   # NOTE: This has not been fully tested as we don't have a license for certora
   certora-test:
     name: Certora test ${{ matrix.name }}
-    runs-on: ['self-hosted', 'org', '8-cpu']
-    container:
-      image: us-west1-docker.pkg.dev/devopsre/actions-runner-controller/celo-monorepo:34b1c5e90f9613964160cdf6bc292b410362ec6d
+    runs-on: ['self-hosted', 'org', 'ubuntu22-node18']
     timeout-minutes: 30
     needs: install-dependencies
     # Disable as certora license is not active

.github/workflows/protocol-devchain-anvil.yml

@@ -20,8 +20,7 @@ on:
 env:
   # Increment these to force cache rebuilding
   FOUNDRY_CACHE_KEY: 1
-  # Supported Foundry version defined at celo-org (GitHub organisation) level, for consistency across workflows.
-  SUPPORTED_FOUNDRY_VERSION: ${{ vars.SUPPORTED_FOUNDRY_VERSION }}
+  # TODO: Standardize Foundry version across workflows https://github.com/celo-org/celo-monorepo/issues/11714
 
 permissions:
   contents: read
@@ -98,9 +97,11 @@ jobs:
           echo "Pull Request Number: ${{ env.PR_NUMBER }}"
 
       - name: Install Foundry
+        # foundry-toolchain v1.7.0 https://github.com/foundry-rs/foundry-toolchain/releases/tag/v1.7.0
         uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773
         with:
-          version: 'v1.0.0'
+          # TODO: Standardize Foundry version across workflows https://github.com/celo-org/celo-monorepo/issues/11714
+          version: 'v1.5.0'
 
       - name: Install forge dependencies
         run: forge install
@@ -127,21 +128,49 @@ jobs:
           npm install --global yarn
           source ~/.bashrc
 
+
       - name: 'Install packages'
         shell: bash
         run: yarn
 
-      - name: Generate L2 migration and run migration tests
+      - name: Checkout Optimism repo
+        uses: actions/checkout@v4
+        if: success() || failure()
+        with:
+          repository: 'celo-org/optimism'
+          ref: 'celo/core-contracts-base'
+          path: celo-optimism
+          submodules: recursive
+
+      - name: Generate initial state for devchain
         if: success() || failure()
+        run: yarn devchain:generate-initial-state --contracts-dir ${{ github.workspace }}/celo-optimism/packages/contracts-bedrock
+
+      - name: Install celocli
         run: |
-          source ./scripts/foundry/constants.sh
+          sudo npm install -g @celo/celocli@latest --unsafe-perm
+          celocli --version
 
-          echo "Starting L2 from scratch to circumvent Anvil bug"
-          ./scripts/foundry/create_and_migrate_anvil_l2_devchain.sh
+      - name: Generate migrations on local devchain
+        if: success() || failure()
+        run: |
+          LOAD_STATE=${{ github.workspace }}/celo-optimism/packages/contracts-bedrock/anvil-state.json ./scripts/foundry/create_and_migrate_anvil_devchain.sh
 
-          FOUNDRY_PROFILE=devchain forge test \
+      - name: Run migration tests against local op-geth devchain
+        run: |
+          source ./scripts/foundry/constants.sh
+
+          FOUNDRY_PROFILE=devchain forge test -vvv \
           --match-path "test-sol/devchain/migration/*" \
           --fork-url $ANVIL_RPC_URL
+
+      - name: Run e2e tests against local devchain
+        run: |
+          source ./scripts/foundry/constants.sh
+
+          FOUNDRY_PROFILE=devchain forge test -vvv \
+          --match-path "test-sol/devchain/e2e/*" \
+          --fork-url $ANVIL_RPC_URL
 
       - name: Sanitize ref name
         id: sanitize-ref-name
@@ -176,6 +205,7 @@ jobs:
         id: artifact-name
         run: echo "name=devchain-${{ env.PR_NUMBER }}-${{ steps.date.outputs.date }}" >> $GITHUB_OUTPUT
 
+
       - name: Upload devchain as artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/protocol_tests.yml

@@ -21,8 +21,8 @@ jobs:
     defaults:
       run:
         working-directory: packages/protocol
-    name: Lint checks
-    runs-on: ubuntu-latest
+    name: Run tests
+    runs-on: ['self-hosted', 'org', 'ubuntu22-node18']
     steps:
       - uses: actions/checkout@v4
         with:
@@ -55,7 +55,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-
       - name: Fail if there are test with wrong extension
         if: success() || failure()
         run: |
@@ -77,9 +76,12 @@ jobs:
           path: packages/protocol/out
           key: ${{ runner.os }}-foundry-out-${{ env.FOUNDRY_CACHE_KEY }}
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        # foundry-toolchain v1.7.0 https://github.com/foundry-rs/foundry-toolchain/releases/tag/v1.7.0
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773
         with:
-          version: 'v1.0.0' # TODO: revert back to env var
+          # TODO: Standardize Foundry version across workflows https://github.com/celo-org/celo-monorepo/issues/11714
+          version: 'v1.5.0'
+
       - name: Install forge dependencies
         run: forge install
       - name: Compile Contracts
@@ -184,7 +186,7 @@ jobs:
       - name: Restore script permissions
         run: chmod +x scripts/foundry/*.sh
       - name: Generate migrations and run devchain
-        run: ./scripts/foundry/create_and_migrate_anvil_l2_devchain.sh
+        run: ./scripts/foundry/create_and_migrate_anvil_devchain.sh
       - name: Run migration tests against local anvil devchain
         run: |
           source ./scripts/foundry/constants.sh

packages/protocol/.gitignore

@@ -56,4 +56,4 @@ broadcast/
 out-truffle-compat-0.8
 out-truffle-compat
 
-opencode.json
+opencode.json

packages/protocol/contracts-0.8/common/EpochManager.sol

@@ -168,24 +168,29 @@ contract EpochManager is
    * @notice Used in place of the constructor to allow the contract to be upgradable via proxy.
    * @param registryAddress The address of the registry core smart contract.
    * @param newEpochDuration The duration of an epoch in seconds.
+   * @param sortedOraclesAddress The address of the sorted oracles core smart contract.
    */
-  function initialize(address registryAddress, uint256 newEpochDuration) external initializer {
+  function initialize(
+    address registryAddress,
+    uint256 newEpochDuration,
+    address sortedOraclesAddress
+  ) external initializer {
     _transferOwnership(msg.sender);
     setRegistry(registryAddress);
     setEpochDuration(newEpochDuration);
-    setOracleAddress(registry.getAddressForOrDie(SORTED_ORACLES_REGISTRY_ID));
+    setOracleAddress(sortedOraclesAddress);
   }
 
   /**
    * @notice Initializes the EpochManager system, allowing it to start processing epoch
    * and distributing the epoch rewards.
-   * @dev Can only be called by the EpochManagerEnabler contract.
+   * @dev Can only be called by Owner. This function is only meant to be called during deployment of a new network.
    */
   function initializeSystem(
     uint256 firstEpochNumber,
     uint256 firstEpochBlock,
     address[] memory firstElected
-  ) external onlyEpochManagerEnabler {
+  ) external onlyOwner {
     require(
       getCeloToken().balanceOf(registry.getAddressForOrDie(CELO_UNRELEASED_TREASURY_REGISTRY_ID)) >
         0,
@@ -604,7 +609,7 @@ contract EpochManager is
    * @return Patch version of the contract.
    */
   function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 1, 0, 3);
+    return (1, 2, 0, 0);
   }
 
   /**

packages/protocol/contracts-0.8/common/EpochManagerEnabler.sol

@@ -12,6 +12,7 @@ import "./interfaces/IEpochManagerEnablerInitializer.sol";
 
 /**
  * @title Contract Used to initialize the EpochManager system after L2 transition.
+ * @dev this contract is now deprecated.
  */
 contract EpochManagerEnabler is
   Initializable,

packages/protocol/contracts-0.8/common/UsingRegistryV2NoMento.sol

@@ -26,11 +26,9 @@ import { ILockedCelo } from "../../contracts/governance/interfaces/ILockedCelo.s
 import { IValidators } from "../../contracts/governance/interfaces/IValidators.sol";
 
 // Identity imports
-import { IAttestations } from "../../contracts/identity/interfaces/IAttestations.sol";
 import { IEscrow } from "../../contracts/identity/interfaces/IEscrow.sol";
 import { IFederatedAttestations } from "../../contracts/identity/interfaces/IFederatedAttestations.sol";
 import { IOdisPayments } from "../../contracts/identity/interfaces/IOdisPayments.sol";
-import { IRandom } from "../../contracts/identity/interfaces/IRandom.sol";
 
 // Stability imports
 import { ISortedOracles } from "../../contracts/stability/interfaces/ISortedOracles.sol";
@@ -47,10 +45,6 @@ contract UsingRegistryV2NoMento {
     keccak256(abi.encodePacked("CeloUnreleasedTreasury"));
   bytes32 internal constant GOLD_TOKEN_REGISTRY_ID = keccak256(abi.encodePacked("GoldToken"));
   bytes32 internal constant CELO_TOKEN_REGISTRY_ID = keccak256(abi.encodePacked("CeloToken"));
-  bytes32 internal constant DOUBLE_SIGNING_SLASHER_REGISTRY_ID =
-    keccak256(abi.encodePacked("DoubleSigningSlasher"));
-  bytes32 internal constant DOWNTIME_SLASHER_REGISTRY_ID =
-    keccak256(abi.encodePacked("DowntimeSlasher"));
   bytes32 internal constant ELECTION_REGISTRY_ID = keccak256(abi.encodePacked("Election"));
   bytes32 internal constant EPOCH_REWARDS_REGISTRY_ID = keccak256(abi.encodePacked("EpochRewards"));
   bytes32 internal constant EPOCH_MANAGER_ENABLER_REGISTRY_ID =
@@ -63,15 +57,12 @@ contract UsingRegistryV2NoMento {
     keccak256(abi.encodePacked("FeeCurrencyDirectory"));
   bytes32 internal constant FEE_HANDLER_REGISTRY_ID = keccak256(abi.encodePacked("FeeHandler"));
   bytes32 internal constant FREEZER_REGISTRY_ID = keccak256(abi.encodePacked("Freezer"));
-  bytes32 internal constant GAS_PRICE_MINIMUM_REGISTRY_ID =
-    keccak256(abi.encodePacked("GasPriceMinimum"));
   bytes32 internal constant GOVERNANCE_REGISTRY_ID = keccak256(abi.encodePacked("Governance"));
   bytes32 internal constant GOVERNANCE_SLASHER_REGISTRY_ID =
     keccak256(abi.encodePacked("GovernanceSlasher"));
   bytes32 internal constant LOCKED_GOLD_REGISTRY_ID = keccak256(abi.encodePacked("LockedGold"));
   bytes32 internal constant LOCKED_CELO_REGISTRY_ID = keccak256(abi.encodePacked("LockedCelo"));
   bytes32 internal constant ODIS_PAYMENT_REGISTRY_ID = keccak256(abi.encodePacked("OdisPayments"));
-  bytes32 internal constant RANDOM_REGISTRY_ID = keccak256(abi.encodePacked("Random"));
   bytes32 internal constant SCORE_MANAGER_REGISTRY_ID = keccak256(abi.encodePacked("ScoreManager"));
   bytes32 internal constant SORTED_ORACLES_REGISTRY_ID =
     keccak256(abi.encodePacked("SortedOracles"));
@@ -161,10 +152,6 @@ contract UsingRegistryV2NoMento {
     return IOdisPayments(registryContract.getAddressForOrDie(ODIS_PAYMENT_REGISTRY_ID));
   }
 
-  function getRandom() internal view returns (IRandom) {
-    return IRandom(registryContract.getAddressForOrDie(RANDOM_REGISTRY_ID));
-  }
-
   function getScoreReader() internal view returns (IScoreReader) {
     return IScoreReader(registryContract.getAddressForOrDie(SCORE_MANAGER_REGISTRY_ID));
   }

packages/protocol/contracts-0.8/common/interfaces/IEpochManagerInitializer.sol

@@ -2,5 +2,9 @@
 pragma solidity >=0.5.13 <0.9.0;
 
 interface IEpochManagerInitializer {
-  function initialize(address registryAddress, uint256 newEpochDuration) external;
+  function initialize(
+    address registryAddress,
+    uint256 newEpochDuration,
+    address sortedOraclesAddress
+  ) external;
 }

packages/protocol/contracts/governance/EpochRewards.sol

@@ -489,8 +489,10 @@ contract EpochRewards is
   ) internal view returns (FixidityLib.Fraction memory) {
     uint256 targetSupply = getTargetGoldTotalSupply();
     uint256 allocatedSupply = ICeloToken(address(getCeloToken())).allocatedSupply();
+
     uint256 remainingSupply = GOLD_SUPPLY_CAP.sub(allocatedSupply.add(targetGoldSupplyIncrease));
     uint256 targetRemainingSupply = GOLD_SUPPLY_CAP.sub(targetSupply);
+
     FixidityLib.Fraction memory remainingToTargetRatio = FixidityLib
       .newFixed(remainingSupply)
       .divide(FixidityLib.newFixed(targetRemainingSupply));

packages/protocol/foundry.toml

@@ -1,4 +1,8 @@
 # docs: https://getfoundry.sh/config/reference/default-config
+
+[lint]
+lint_on_build = false
+
 [profile.default]
 src = 'contracts-0.8'
 out = 'out'

packages/protocol/governanceConstitution.json

@@ -2,20 +2,6 @@
   "Accounts": {
     "default": 600000000000000000000000
   },
-  "BlockchainParameters": {
-    "default": 900000000000000000000000,
-    "setBlockGasLimit": 800000000000000000000000,
-    "setIntrinsicGasForAlternativeFeeCurrency": 800000000000000000000000
-  },
-  "DoubleSigningSlasher": {
-    "default": 700000000000000000000000,
-    "setSlashingIncentives": 700000000000000000000000
-  },
-  "DowntimeSlasher": {
-    "default": 700000000000000000000000,
-    "setSlashingIncentives": 700000000000000000000000,
-    "setSlashableDowntime": 700000000000000000000000
-  },
   "Election": {
     "default": 800000000000000000000000,
     "setRegistry": 900000000000000000000000,
@@ -45,13 +31,6 @@
     "freeze": 600000000000000000000000,
     "unfreeze": 600000000000000000000000
   },
-  "GasPriceMinimum": {
-    "default": 700000000000000000000000,
-    "setRegistry": 900000000000000000000000,
-    "setAdjustmentSpeed": 700000000000000000000000,
-    "setTargetDensity": 700000000000000000000000,
-    "setGasPriceMinimumFloor": 700000000000000000000000
-  },
   "GoldToken": {
     "default": 900000000000000000000000,
     "transfer": 600000000000000000000000,
@@ -93,10 +72,6 @@
     "_setAndInitializeImplementation": 900000000000000000000000,
     "_setImplementation": 900000000000000000000000
   },
-  "Random": {
-    "default": 700000000000000000000000,
-    "setRandomnessBlockRetentionWindow": 700000000000000000000000
-  },
   "Registry": {
     "default": 900000000000000000000000,
     "setAddressFor": 900000000000000000000000