The l1-deployer-cli.sh enables production deployment of L1 contracts, with publishing of source code to etherscan (see source code verification). This deployment workflow is decoupled from the core mev-commit chain contracts. This cli accepts keystore (not suggested), ledger, or trezor wallets. Any contract must be deployed from a tagged mev-commit release, unless the --skip-release-verification flag is set.
If contract deployment succeeds but etherscan verification fails, try running forge verify-contract directly with the deployment address. Ex:
forge verify-contract --watch --rpc-url $RPC_URL 0x4c31ad10617bb36e7749c686eedf6fef0fd2502e ValidatorOptInRouterTo avoid issues with etherscan verification, use a non-public RPC that can support rapid requests.
Contract upgrades are not always possible, as there are strict limitations as enforced by Solidity. When a contract feat/fix cannot be implemented as a contract upgrade, simply PR the changes into main, and release/deploy a new contract instance as needed.
See #360 for a reference example of a complete contract upgrade.
The following instructions assist in upgrading an existing deployment of any of the contracts within this directory. Contracts committed to this repo should utilize UUPS proxies.
First, implement and merge an appropriate feat/fix to the implementation contract using the main branch. This ensures any future (new) deployments of the contract will include the feat/fix along with changes to the contract's ABI.
Next, create a branch off the appropriate release branch (e.g. release/v0.5.x) that the currently deployed contract was initially built/deployed from, we'll refer to this as the "upgrade branch". Copy/paste the currently deployed contract implementation to a new file (currently deployed implementation and new file should both reside within the upgrade branch). Name the new file with an incremented version number as a postfix of the original contract's filename. E.g. if the original contract's filename is MevCommitAVS.sol, then the new contract's filename should be MevCommitAVSV2.sol.
Now update the new implementation contract with the feat/fix that was merged to main. You can try to utilize cherry-picking here, but may have to re-implement the feat/fix manually.
Make sure to update and run tests on the upgrade branch. The setUp() function for relevant test contract(s) should include an upgrade from the previous to the new implementation contract. Also any regression tests merged to main should be ported to the upgrade branch.
If the feat/fix required changes to the storage contract (see limitations above), you must also create a new storage contract with an incremented version number as a postfix of the original storage contract's filename. E.g. if the original storage contract's filename is MevCommitAVSStorage.sol, then the new storage contract's filename should be MevCommitAVSStorageV2.sol.
If applicable, make sure the incremented implementation contract inherits from the incremented storage contract. This is necessary to ensure accurate upgrade safety validation.
Example: MevCommitAVSV2.sol would inherit MevCommitAVSV2Storage.sol.
Now define the reference contract for the upgrade right above the new contract implementation. E.g /// @custom:oz-upgrades-from MevCommitAVS.
Finally, build the contracts and use openzeppelin's cli to validate the upgrade, similar to npx @openzeppelin/upgrades-core validate --contract MevCommitAVSV2. If this command fails, you'll need to address whether a contract upgrade is still possible/appropriate.
If the feat/fix to the implementation contract results in a change to the contract's ABI, you'll need to generate new ABI file and go binding within the upgrade branch. This can be handled on a case-by-case basis, as generating (for example) a MevCommitAVSV2.abi in the upgrade branch, that is equivalent to the MevCommitAVS.abi in the main branch, could be difficult to maintain.
If possible it's recommended to avoid changing a contract's ABI for an upgrade.
Invoking the upgrade involves creating a script in which a new implementation contract is deployed, then calling upgradeToAndCall on the proxy contract, passing in the address of the new implementation contract.
See example below
pragma solidity 0.8.26;
import {Script} from "forge-std/Script.sol";
import {console} from "forge-std/console.sol";
import {MevCommitAVS} from "../../../contracts/validator-registry/avs/MevCommitAVS.sol";
import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
contract UpgradeAVS is Script {
function _runTests(MevCommitAVS avs) internal {
// Define expected state and/or function behavior to execute before and after upgrade
}
}
contract UpgradeAnvil is UpgradeAVS {
function run() external {
require(block.chainid == 31337, "must deploy on anvil");
MevCommitAVS existingMevCommitAVSProxy = MevCommitAVS(payable(0x5FC8d32690cc91D4c39d9d3abcBD16989F875707));
console.log("Pre-upgrade tests:");
_runTests(existingMevCommitAVSProxy);
vm.startBroadcast();
Upgrades.upgradeProxy(
address(existingMevCommitAVSProxy),
"MevCommitAVSV2.sol",
""
);
console.log("Upgraded to MevCommitAVSV2");
vm.stopBroadcast();
console.log("Post-upgrade tests:");
_runTests(existingMevCommitAVSProxy);
}
}In this example, no function call is made during the upgrade. However these examples demonstrate how to make a function call during the upgrade.
It's encouraged to test your upgrade process using anvil, then use identical code to invoke the upgrade on Holesky/mainnet.
The aforementioned process can be followed exactly for contracts that are owned by a single EOA, where the forge script can be run directly using a keystore.
For contracts that are owned by a multisig, simply deploy an uninitialized new implementation contract from any account using a forge script etc.,
import {MevCommitAVSV2} from "../../../contracts/validator-registry/avs/MevCommitAVSV2.sol";
import {Script} from "forge-std/Script.sol";
import {console} from "forge-std/console.sol";
contract DeployNewImpl is Script {
function run() external {
vm.startBroadcast();
MevCommitAVSV2 newImplementation = new MevCommitAVSV2();
console.log("Deployed new implementation contract at address: ", address(newImplementation));
vm.stopBroadcast();
}
}Then call the upgradeToAndCall(newImplAddr, callData) function directly on the proxy contract using your multisig UI (e.g Safe wallet).
Ownership of the implementation contract itself would be irrelevant in this scenario, as the implementation is deployed without calling its initializer, or setting any state. Ie. the implementation contract serves only as a blueprint for state transition functionality.
The multisig option bypasses safety checks that would otherwise happen by using a forge script in tandem with OpenZeppelin Foundry Upgrades. Therefore it's very important to use the validate command from above to ensure the upgrade is safe to proceed with.