[DO NOT MERGE] Epoch manager WIP (#11189)

celo-org · Sep 25, 2024 · 736fbc2 · 736fbc2
1 parent c5eff1c
commit 736fbc2
Show file tree

Hide file tree

Showing 143 changed files with 6,276 additions and 1,902 deletions.
diff --git a/.github/workflows/celo-monorepo.yml b/.github/workflows/celo-monorepo.yml
@@ -9,10 +9,18 @@ on:
     branches:
       - master
       - 'release/**'
+      - 'feat/l2-epoch-system'
+      - 'martinvol/**'
+      - 'pahor167/**'
+      - 'soloseng/**'
   pull_request:
     branches:
       - master
       - 'release/**'
+      - 'feat/l2-epoch-system'
+      - 'martinvol/**'
+      - 'pahor167/**'
+      - 'soloseng/**'
 
 concurrency:
   group: celo-monorepo-${{ github.ref }}
@@ -24,7 +32,7 @@ defaults:
 
 env:
   # Increment these to force cache rebuilding
-  NODE_MODULE_CACHE_VERSION: 7
+  NODE_MODULE_CACHE_VERSION: 8
   NODE_OPTIONS: '--max-old-space-size=4096'
   TERM: dumb
   GRADLE_OPTS: '-Dorg.gradle.daemon=false -Dorg.gradle.parallel=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs="-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError"'

diff --git a/.github/workflows/protocol-devchain-anvil.yml b/.github/workflows/protocol-devchain-anvil.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: ${{ env.SUPPORTED_FOUNDRY_VERSION }}
+          version: 'nightly-fa0e0c2ca3ae75895dd19173a02faf88509c0608'
 
       - name: Install forge dependencies
         run: forge install

diff --git a/.github/workflows/protocol_tests.yml b/.github/workflows/protocol_tests.yml
@@ -4,15 +4,23 @@ on:
     branches:
       - master
       - 'release/**'
+      - 'feat/l2-epoch-system'
+      - 'martinvol/**'
+      - 'pahor167/**'
+      - 'soloseng/**'
   pull_request:
     branches:
       - master
       - 'release/**'
+      - 'feat/l2-epoch-system'
+      - 'martinvol/**'
+      - 'pahor167/**'
+      - 'soloseng/**'
 
 env:
   # Increment these to force cache rebuilding
   FOUNDRY_CACHE_KEY: 2
-  # Supported Foundry version defined at celo-org (GitHub organisation) level, for consistency across workflows.
+  # Supported Foundry version defined at celo-org (GitHub organisation) level, for consistency across workflows. Please contact DevOps to update value.
   SUPPORTED_FOUNDRY_VERSION: ${{ vars.SUPPORTED_FOUNDRY_VERSION }}
 
 jobs:
@@ -54,7 +62,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: ${{ env.SUPPORTED_FOUNDRY_VERSION }}
+          version: 'nightly-fa0e0c2ca3ae75895dd19173a02faf88509c0608' # TODO: revert back to env var
 
       - name: Install forge dependencies
         run: forge install
@@ -132,7 +140,6 @@ jobs:
         run: ./scripts/foundry/create_and_migrate_anvil_devchain.sh
 
       - name: Run migration tests against local anvil devchain
-        if: success() || failure()
         run: |
           source ./scripts/foundry/constants.sh
 
@@ -141,10 +148,9 @@ jobs:
           --fork-url $ANVIL_RPC_URL
       
       - name: Run e2e tests against local anvil devchain
-        if: success() || failure()
         run: |
           source ./scripts/foundry/constants.sh
 
           FOUNDRY_PROFILE=devchain forge test -vvv \
           --match-path "test-sol/devchain/e2e/*" \
-          --fork-url $ANVIL_RPC_URL
+          --fork-url $ANVIL_RPC_URL
diff --git a/.gitmodules b/.gitmodules
@@ -20,3 +20,7 @@
 	path = packages/protocol/lib/celo-foundry
 	url = https://github.com/celo-org/celo-foundry
 	branch = celo-foundry-v0.5.13
+[submodule "packages/protocol/lib/solidity-bytes-utils-8"]
+	path = packages/protocol/lib/solidity-bytes-utils-8
+	url = https://github.com/GNSPS/solidity-bytes-utils
+	branch = master
diff --git a/packages/protocol/contractPackages.ts b/packages/protocol/contractPackages.ts
@@ -48,12 +48,24 @@ export const SOLIDITY_08_PACKAGE = {
   proxiesPath: '/', // Proxies are still with 0.5 contracts
   // Proxies shouldn't have to be added to a list manually
   // https://github.com/celo-org/celo-monorepo/issues/10555
-  contracts: ['GasPriceMinimum', 'FeeCurrencyDirectory', 'CeloDistributionSchedule'],
+  contracts: [
+    'GasPriceMinimum',
+    'FeeCurrencyDirectory',
+    'CeloUnreleasedTreasury',
+    'Validators',
+    'EpochManager',
+    'EpochManagerEnabler',
+    'ScoreManager',
+  ],
   proxyContracts: [
     'GasPriceMinimumProxy',
     'FeeCurrencyDirectoryProxy',
     'MentoFeeCurrencyAdapterV1',
-    'CeloDistributionScheduleProxy',
+    'CeloUnreleasedTreasuryProxy',
+    'ValidatorsProxy',
+    'EpochManagerProxy',
+    'EpochManagerEnablerProxy',
+    'ScoreManagerProxy',
   ],
   truffleConfig: 'truffle-config0.8.js',
 } satisfies ContractPackage