Get migrations, rebased by martinvol · Pull Request #11593 · celo-org/celo-monorepo

martinvol · 2026-01-05T11:13:29Z

Forked from mc01/cr14/geth-migrations-fix-tests

Commit 6ea49d059846e2c96b2b4d375f0c319fbf1fdf08

* WIP. * Consitution test that fail with anvil. * Identify part of migration script that causes tests to fail. * Wip: fixing migration script. * Do not rely on ffi mode. * Fix constitution values in anvil migration. * Port old governance tests from Truffle. * Finish porting old governance integration tests to Foundry. * Fix unit tests. * Fix CI. * Fix remappings for CI. * Fix TS deps. * Update comment. Co-authored-by: pahor167 <47992132+pahor167@users.noreply.github.com> * CR. * Combine proxy selectors with contract selectors. * CR. * Isolate common part. * Enabled detailed anvil logging in CI by default. * Fix tests. * CR fixes. * Cleanup merging. --------- Co-authored-by: pahor167 <47992132+pahor167@users.noreply.github.com>

…ns on top of CR14 (#11485) * Update caching version and add Foundry release scripts * prettify * Refactor argument names in make-release scripts for consistency * Refactor getDefaultValueForSolidityType to handle fixed arrays and improve readability * prettify

…1488) * Update README and Foundry configuration for contract verification - Added Foundry verification instructions alongside Truffle in README.md - Updated foundry.toml to include a profile for Truffle compatibility with Solidity 0.5.13 - Clarified parameter descriptions in SortedOracles contract * revert of foundry.toml * API key * Update .gitignore and foundry.toml for improved build configuration and compatibility * Update openzeppelin-contracts8 submodule to v4.9.0 * Refactor foundry.toml: reorganize profiles and update no_match_path and fs_permissions for clarity

…lution

…onorepo into martinvol/gethMigrations

Mc01

Please take a look on unresolved comments from previous review also 🙏
Resolve conflicts & fix up CI 😌

Except those -> ton of really good work 🙌

Mc01 · 2026-02-02T13:55:24Z

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

+      - 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


Maybe to be consistent also replace with:

Suggested change

LOAD_STATE=${GITHUB_WORKSPACE}/celo-optimism/packages/contracts-bedrock/anvil-state.json ./scripts/foundry/create_and_migrate_anvil_devchain.sh

LOAD_STATE=${{ github.workspace }}/celo-optimism/packages/contracts-bedrock/anvil-state.json ./scripts/foundry/create_and_migrate_anvil_devchain.sh

?

packages/protocol/migrations_sol/constants.sol

Mc01 · 2026-02-03T12:12:50Z

packages/protocol/migrations_sol/Migration.s.sol

+        // TODO: ForceTx only exists to retrieve Address from PrivateKey -> explore alternatives
+        address accountAddress = (new ForceTx()).identity();


Maybe attach than following to this TODO: https://github.com/witnet/elliptic-curve-solidity ?
It is probably the only potential direction if we don't want to use cheatcodes.

Mc01 · 2026-02-03T12:36:29Z

packages/protocol/scripts/foundry/activate_votes.sh

+
+CONFIG_FILE=$PWD/migrations_sol/migrationsConfig.json
+
+ELECTIONS_ADDRESS=$(


Suggested change

ELECTIONS_ADDRESS=$(

ELECTION_ADDRESS=$(

Mc01 · 2026-02-03T12:37:35Z

packages/protocol/scripts/foundry/activate_votes.sh

+# Activate votes:
+# Activate Validators
+echo "Activating Validators..."
+registered_validators=$(cast call \
+  $VALIDATORS_ADDRESS \
+  "getRegisteredValidators()(address[])" \
+  --rpc-url $ANVIL_RPC_URL)


Suggested change

# Activate votes:

# Activate Validators

echo "Activating Validators..."

registered_validators=$(cast call \

$VALIDATORS_ADDRESS \

"getRegisteredValidators()(address[])" \

--rpc-url $ANVIL_RPC_URL)

# Activate Validators

echo "Activating Validators..."

registered_validators=$(cast call \

$VALIDATORS_ADDRESS \

"getRegisteredValidators()(address[])" \

--rpc-url $ANVIL_RPC_URL)

Mc01 · 2026-02-03T12:42:12Z

packages/protocol/scripts/foundry/activate_votes.sh

+  $ELECTIONS_ADDRESS \
+  "getActiveVotes()(uint256)" \
+  --rpc-url $ANVIL_RPC_URL)
+echo "### active votes: $active_votes"


💅:

Suggested change

echo "### active votes: $active_votes"

echo "### active votes: $active_votes"

Mc01 · 2026-02-03T12:57:10Z

packages/protocol/scripts/foundry/create_and_migrate_anvil_devchain.sh

 # Run migrations
-echo "Running migration script... "
-forge script \
+# Not using the --slow flag causes the migrations to randomly hang


Is it still true in newest foundry version?

Mc01 · 2026-02-03T13:03:29Z

packages/protocol/test-sol/devchain/e2e/common/Governance.t.sol

+  // not responding un Foundry 1.5
+  // function beforeTestSetup(
+  //   bytes4 _testSelector
+  // ) public pure virtual returns (bytes[] memory beforeCalldata_) {
+  //   // ensure tests inherit state
+  //   if (_testSelector == this.test_shouldUpvoteProposal.selector) {
+  //   revert("before Test setup called");
+  //     beforeCalldata_ = new bytes[](1);
+  //     beforeCalldata_[0] = abi.encodePacked(this.test_shouldIncrementProposalCount.selector);
+  //   } else if (_testSelector == this.test_shouldApproveProposal.selector) {
+  //     beforeCalldata_ = new bytes[](2);
+  //     beforeCalldata_[0] = abi.encodePacked(this.test_shouldIncrementProposalCount.selector);
+  //     beforeCalldata_[1] = abi.encodePacked(this.test_shouldUpvoteProposal.selector);
+  //   } else if (_testSelector == this.test_shouldIncrementVoteTotals.selector) {
+  //     beforeCalldata_ = new bytes[](3);
+  //     beforeCalldata_[0] = abi.encodePacked(this.test_shouldIncrementProposalCount.selector);
+  //     beforeCalldata_[1] = abi.encodePacked(this.test_shouldUpvoteProposal.selector);
+  //     beforeCalldata_[2] = abi.encodePacked(this.test_shouldApproveProposal.selector);
+  //   } else if (_testSelector == this.test_shouldExecuteProposal.selector) {
+  //     beforeCalldata_ = new bytes[](4);
+  //     beforeCalldata_[0] = abi.encodePacked(this.test_shouldIncrementProposalCount.selector);
+  //     beforeCalldata_[1] = abi.encodePacked(this.test_shouldUpvoteProposal.selector);
+  //     beforeCalldata_[2] = abi.encodePacked(this.test_shouldApproveProposal.selector);
+  //     beforeCalldata_[3] = abi.encodePacked(this.test_shouldIncrementVoteTotals.selector);
+  //   }
+  // }


That's likely a bug 🤔
For sure this should work: https://getfoundry.sh/forge/tests/writing-tests#before-test-setups
Maybe report it as an issue on upstream?

Mc01 · 2026-02-03T13:04:12Z

packages/protocol/test-sol/devchain/e2e/common/Governance.t.sol

  }

-  function test_shouldExecuteProposal() public virtual override {
+  function _passProposal() public {


Looks a bit dirty 🥲

Maybe leave TODO to fix those up?

Mc01 · 2026-02-03T13:05:25Z

packages/protocol/test-sol/utils/SECP256K1.sol

 * @author cyphered.eth
 */
-library SECP256K1 {
+contract SECP256K1 {


Can you comment a bit why such change?

Mc01 · 2026-02-03T14:36:01Z

packages/protocol/migrations_sol/Migration.s.sol

-      json.parseRaw(".epochManager.newEpochDuration"),
-      (address)
-    );
+    address newEpochDuration = json.readAddress(".epochManager.newEpochDuration");


I'm wondering how this worked before 😶

Suggested change

address newEpochDuration = json.readAddress(".epochManager.newEpochDuration");

uint256 newEpochDuration = json.readUint(".epochManager.newEpochDuration");

Mc01 · 2026-02-03T14:36:22Z

packages/protocol/migrations_sol/Migration.s.sol

+    // doing a native transfer is not allowed by the unreleased treasury
+    IERC20(registry.getAddressForStringOrDie("GoldToken")).transfer(
+      registry.getAddressForStringOrDie("CeloUnreleasedTreasury"),
+      390_000_000e18


Maybe move to constant? Or migrationsConfig.json?

m-chrzan · 2026-02-03T18:44:42Z

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

  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 }}
+  # Celo Foundry (celo-org/foundry) binaries version used for devchain anvil generation


Not sure what this comment is referring to at this point?

m-chrzan · 2026-02-03T18:47:42Z

.github/workflows/protocol_tests.yml

+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773
        with:
-          version: 'v1.0.0' # TODO: revert back to env var
+          version: 'v1.5.0'


Do we no longer want to use an env variable going forward?

m-chrzan · 2026-02-03T18:48:17Z

.github/workflows/protocol_tests.yml


      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773


Should there be a comment detailing where this hash is from and how/when to update it?

m-chrzan · 2026-02-03T18:50:43Z

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

    uint256 firstEpochBlock,
    address[] memory firstElected
-  ) external onlyEpochManagerEnabler {
+  ) external onlyOwner {


This contradicts the comment above. Why is the permissioned actor changed?

Need to update the comment, onlyOwner will pretty much remain useful for deploying, in production this wont ever be used and the EpochManagerEnabler will be deprecated.

m-chrzan · 2026-02-03T18:53:18Z

packages/protocol/migrations_sol/Migration.s.sol

 import { console } from "forge-std/console.sol";
+import { console2 } from "forge-std/console2.sol";


Why are two different logging functions necessary?

m-chrzan · 2026-02-03T18:53:58Z

packages/protocol/migrations_sol/Migration.s.sol

-  IProxyFactory proxyFactory;
-
-  uint256 proxyNonce = 0;
+  string json; // configuration file content


Maybe more descriptive variable name, that won't require a comment?

m-chrzan · 2026-02-03T18:56:06Z

packages/protocol/migrations_sol/Migration.s.sol

+  address DEPLOYER_ACCOUNT;
+  address SECP256K1Address;


Any reason not to use conventional camelCase for these variable names?

m-chrzan · 2026-02-03T19:18:14Z

packages/protocol/scripts/foundry/activate_votes.sh

+cast rpc evm_increaseTime $MS_TO_ADVANCE --rpc-url $ANVIL_RPC_URL --rpc-timeout 30000
+cast rpc anvil_mine $BLOCKS_TO_ADVANCE --rpc-url $ANVIL_RPC_URL --rpc-timeout 30000
+
+# advance 101 seconds


Incorrect comment?

m-chrzan · 2026-02-03T19:19:17Z

packages/protocol/scripts/foundry/activate_votes.sh

+cast rpc anvil_mine $BLOCKS_TO_ADVANCE --rpc-url $ANVIL_RPC_URL --rpc-timeout 30000
+
+# advance 101 seconds
+echo `cast block --rpc-url $ANVIL_RPC_URL`


Why do we print the latest block?

m-chrzan · 2026-02-03T19:23:08Z

packages/protocol/scripts/foundry/constants.sh

+# CUSTOM_FOUNDRY_PATH="$HOME/celo/celo-foundry/"
+export FORGE=${CUSTOM_FOUNDRY_PATH:-}"forge"
+export CAST=${CUSTOM_FOUNDRY_PATH:-}"cast"
+export ANVIL=${CUSTOM_FOUNDRY_PATH:-}"anvil"


Can the CUTOM_FOUNDRY_PATH stuff be removed?

Node 18 causes node-gyp build failures for the sleep native module.

The merge from release/core-contracts/16 changed the runner from npm-publish to ubuntu22-node18, which lacks the native build tools needed for the sleep module.

The l2 variant was deleted in 656d425 but three files still referenced it. Updated to point to create_and_migrate_anvil_devchain.sh.

Mc01 and others added 30 commits August 28, 2025 15:56

Cherry pick apply migrations.

b8ba230

Quick & dirty migration fix for op-geth.

3a9f12a

Update governance multi-sig settings and adjust proposal stage durations

aed6f6e

Add epoch manager parameter + cleanup.

c2f2dcd

Further cleanup.

257ab0a

broadcast fix

9f7e5ce

disable governance multisig

bf5eb60

remove GovernanceMultisig

a67b701

Improve ownership transfer logging in migration script

69002a3

Refactor ownership transfer to use registry for contract address reso…

dc439bb

…lution

Cleanup + TODOs after sync with Volpe.

f14527e

Only owner for epoch manager.

8359a52

Correct loading json vars.

534731b

Add lockGold function call in migration script

60d047b

Update epoch duration to 60 seconds in migrations configuration

623c56a

Removal of locked gold

a719701

Update migrationsConfig.json

fd374e6

Fix protocol tests in CI.

c4b7d39

Fix integration tests.

880a001

Fix e2e epoch manager initialize.

e399ab5

Use precompiled celo-foundry binaries for CI.

6337b3c

Change base container image for CI.

251d622

Fix e2e.

553b14d

Bump version.

4ad9001

Fix common tests.

2b02011

Adapt start anvil script for Op state.

e9005b0

Don't remove tmp dir.

42b28ca

martinvol added 15 commits January 26, 2026 16:32

Merge branch 'martinvol/gethMigrations' of github.com:celo-org/celo-m…

683a1dd

…onorepo into martinvol/gethMigrations

Adding deleted unused code

c47a739

simplify script a lot

01df42e

fixed tests

67cbf10

fixed tests

4456f4a

fixed all tests

a6a3584

Merge branch 'martinvol/gethMigrations' of github.com:celo-org/celo-m…

397eda6

…onorepo into martinvol/gethMigrations

nits

1d18cde

simplify EpochManager tests

d189fc6

Clean up more migrations file

62283fe

more cleanning

5e3fb0f

removed duplicated entry package.json

78f9695

typo

ea7b5db

moved to a better repo

ce3f0e2

nits

0221619

Mc01 mentioned this pull request Jan 27, 2026

Geth migrations - fix tests. #11539

Closed

This was linked to issues Jan 27, 2026

Initialize function of EpochManager should not query the oracle address from the registry #11452

Open

Make anvil migrations compatible with op-geth #11448

Open

Mc01 reviewed Feb 3, 2026

View reviewed changes

m-chrzan reviewed Feb 3, 2026

View reviewed changes

martinvol changed the base branch from release/core-contracts/15 to release/core-contracts/16 February 9, 2026 11:14

martinvol and others added 8 commits March 9, 2026 17:25

Merge release/core-contracts/16 into martinvol/gethMigrations

ae6c263

Update publish-contracts-abi-release workflow to Node 20

e030bb5

Node 18 causes node-gyp build failures for the sleep native module.

Restore npm-publish runner for publish-contracts-abi-release workflow

9875630

The merge from release/core-contracts/16 changed the runner from npm-publish to ubuntu22-node18, which lacks the native build tools needed for the sleep module.

Replace ForceTx with msg.sender and move mockIntrinsicGas to constants

84121d2

Fix contractSuffixes spelling mismatch between JSON config and code

036ef0f

Merge branch 'release/core-contracts/16' into martinvol/gethMigrations

cf0f41d

Replace ForceTx with msg.sender and move mockIntrinsicGas to constants

dcbe303

Fix references to deleted create_and_migrate_anvil_l2_devchain.sh

9d9284b

The l2 variant was deleted in 656d425 but three files still referenced it. Updated to point to create_and_migrate_anvil_devchain.sh.

	LOAD_STATE=${GITHUB_WORKSPACE}/celo-optimism/packages/contracts-bedrock/anvil-state.json ./scripts/foundry/create_and_migrate_anvil_devchain.sh
	LOAD_STATE=${{ github.workspace }}/celo-optimism/packages/contracts-bedrock/anvil-state.json ./scripts/foundry/create_and_migrate_anvil_devchain.sh

		// TODO: ForceTx only exists to retrieve Address from PrivateKey -> explore alternatives
		address accountAddress = (new ForceTx()).identity();


		CONFIG_FILE=$PWD/migrations_sol/migrationsConfig.json

		ELECTIONS_ADDRESS=$(

	echo "### active votes: $active_votes"
	echo "### active votes: $active_votes"

	address newEpochDuration = json.readAddress(".epochManager.newEpochDuration");
	uint256 newEpochDuration = json.readUint(".epochManager.newEpochDuration");

		import { console } from "forge-std/console.sol";
		import { console2 } from "forge-std/console2.sol";

Conversation

martinvol commented Jan 5, 2026

Uh oh!

Mc01 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants