Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make full migrations work #301

Open
wants to merge 6 commits into
base: celo10
Choose a base branch
from
Open

Make full migrations work #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
422d097
WIP
martinvol Jan 28, 2025
ac1da6e
deleted submodule ???
martinvol Jan 28, 2025
3f91c4d
Swapped proxies
martinvol Jan 30, 2025
3c1a8bf
Added Unreleased Treasury address
martinvol Jan 30, 2025
aff1167
wip
martinvol Jan 30, 2025
3089256
no implementations added to the proxy
martinvol Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 73 additions & 31 deletions packages/contracts-bedrock/scripts/L2Genesis.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import { CeloRegistry } from "src/celo/CeloRegistry.sol";
import { FeeHandler } from "src/celo/FeeHandler.sol";
import { MentoFeeHandlerSeller } from "src/celo/MentoFeeHandlerSeller.sol";
import { UniswapFeeHandlerSeller } from "src/celo/UniswapFeeHandlerSeller.sol";
import { ICeloProxy } from "src/celo/ICeloProxy.sol";
import { SortedOracles } from "src/celo/stability/SortedOracles.sol";
import { FeeCurrencyDirectory } from "src/celo/FeeCurrencyDirectory.sol";
import { FeeCurrency } from "src/celo/testing/FeeCurrency.sol";
Expand All @@ -54,6 +55,8 @@ interface IInitializable {
function initialize(address _addr) external;
}



struct L1Dependencies {
address payable l1CrossDomainMessengerProxy;
address payable l1StandardBridgeProxy;
Expand All @@ -71,9 +74,10 @@ contract L2Genesis is Deployer {
using ForkUtils for Fork;
using OutputModeUtils for OutputMode;

address constant defaultOwner = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266; // TODO this is DEV_ACCOUNT_FUND_AMT
uint256 public constant PRECOMPILE_COUNT = 256;

uint80 internal constant DEV_ACCOUNT_FUND_AMT = 10_000 ether;
uint80 internal constant DEV_ACCOUNT_FUND_AMT = 70_000 ether;

/// @notice Default Anvil dev accounts. Only funded if `cfg.fundDevAccounts == true`.
/// Also known as "test test test test test test test test test test test junk" mnemonic accounts,
Expand Down Expand Up @@ -675,6 +679,8 @@ contract L2Genesis is Deployer {
console.log("Funding dev account %s with %s ETH", devAccounts[i], DEV_ACCOUNT_FUND_AMT / 1e18);
vm.deal(devAccounts[i], DEV_ACCOUNT_FUND_AMT);
}
// fund an address that'd then be used to fund the celoUnreleasedTreasury
vm.deal(devAccounts[1], 400_000_000 ether);
}

///@notice Sets all proxies and implementations for Celo contracts
Expand All @@ -683,78 +689,114 @@ contract L2Genesis is Deployer {

setCeloRegistry();
setCeloGoldToken();
setCeloTreasury();
setCeloFeeHandler();
setCeloMentoFeeHandlerSeller();
setCeloUniswapFeeHandlerSeller();
setCeloFeeCurrency();
setFeeCurrencyDirectory();
}


/// @notice Sets up a proxy for the given impl address
function _setupProxy(address addr, address impl) internal returns (address) {
bytes memory code = vm.getDeployedCode("Proxy.sol:Proxy");
// bytes memory code = vm.getDeployedCode("Proxy.sol:Proxy");
bytes memory code = vm.getDeployedCode("CeloProxy.sol:CeloProxy");
vm.etch(addr, code);
EIP1967Helper.setAdmin(addr, Predeploys.PROXY_ADMIN);

console.log("Owner of Celo proxy is:", ICeloProxy(addr)._getOwner());
vm.startPrank(ICeloProxy(addr)._getOwner());
ICeloProxy(addr)._transferOwnership(defaultOwner);

vm.stopPrank();
// EIP1967Helper.setAdmin(addr, Predeploys.PROXY_ADMIN);

console.log("Setting proxy %s with implementation: %s", addr, impl);
EIP1967Helper.setImplementation(addr, impl);

return addr;
}

function setCeloRegistry() internal {
CeloRegistry kontract = new CeloRegistry({ test: false });
// deployCodeTo("CeloRegistry.sol", abi.encode(false), REGISTRY_ADDRESS);

// address REGISTRY_ADDRESS = address(0x000000000000000000000000000000000000CE11);
// bytes memory code = vm.getDeployedCode("CeloRegistry.sol:CeloRegistry");
// vm.etch(REGISTRY_ADDRESS, code);

// CeloRegistry contract_ = new CeloRegistry({ test: false });

address precompile = CeloPredeploys.CELO_REGISTRY;

string memory cname = CeloPredeploys.getName(precompile);
console.log("Deploying %s implementation at: %s", cname, address(kontract));
// console.log("Deploying %s implementation at: %s", cname, address(contract_));

// vm.resetNonce(address(contract_));
_setupProxy(precompile, address(0));

// CeloRegistry registry = CeloRegistry(precompile);
// address celoOwner = registry.owner();
// vm.startPrank(address(celoOwner));
// registry._transferOwnership(defaultOwner);
// vm.stopPrank();

// console.log("CeloRegistry owner: %s", celoOwner);
// revert("vert on puporse");

vm.resetNonce(address(kontract));
_setupProxy(precompile, address(kontract));
}

function setCeloGoldToken() internal {
GoldToken kontract = new GoldToken({ test: false });
GoldToken contract_ = new GoldToken({ test: false });

address precompile = CeloPredeploys.GOLD_TOKEN;
string memory cname = CeloPredeploys.getName(precompile);
console.log("Deploying %s implementation at: %s", cname, address(kontract));
console.log("Deploying %s implementation at: %s", cname, address(contract_));

vm.resetNonce(address(kontract));
_setupProxy(precompile, address(kontract));
vm.resetNonce(address(contract_));
_setupProxy(precompile, address(contract_));
}

function setCeloTreasury() internal {
// GoldToken contract_ = new GoldToken({ test: false });

address precompile = CeloPredeploys.TREASURY;
string memory cname = CeloPredeploys.getName(precompile);
console.log("Deploying %s implementation at: %s", cname, address(0));

// vm.resetNonce(address(contract_));
_setupProxy(precompile, address(0));
}

function setCeloFeeHandler() internal {
FeeHandler kontract = new FeeHandler({ test: false });
FeeHandler contract_ = new FeeHandler({ test: false });

address precompile = CeloPredeploys.FEE_HANDLER;
string memory cname = CeloPredeploys.getName(precompile);
console.log("Deploying %s implementation at: %s", cname, address(kontract));
console.log("Deploying %s implementation at: %s", cname, address(contract_));

vm.resetNonce(address(kontract));
_setupProxy(precompile, address(kontract));
vm.resetNonce(address(contract_));
_setupProxy(precompile, address(contract_));
}

function setCeloMentoFeeHandlerSeller() internal {
MentoFeeHandlerSeller kontract = new MentoFeeHandlerSeller({ test: false });
MentoFeeHandlerSeller contract_ = new MentoFeeHandlerSeller({ test: false });

address precompile = CeloPredeploys.MENTO_FEE_HANDLER_SELLER;
string memory cname = CeloPredeploys.getName(precompile);
console.log("Deploying %s implementation at: %s", cname, address(kontract));
console.log("Deploying %s implementation at: %s", cname, address(contract_));

vm.resetNonce(address(kontract));
_setupProxy(precompile, address(kontract));
vm.resetNonce(address(contract_));
_setupProxy(precompile, address(contract_));
}

function setCeloUniswapFeeHandlerSeller() internal {
UniswapFeeHandlerSeller kontract = new UniswapFeeHandlerSeller({ test: false });
UniswapFeeHandlerSeller contract_ = new UniswapFeeHandlerSeller({ test: false });

address precompile = CeloPredeploys.UNISWAP_FEE_HANDLER_SELLER;
string memory cname = CeloPredeploys.getName(precompile);
console.log("Deploying %s implementation at: %s", cname, address(kontract));
console.log("Deploying %s implementation at: %s", cname, address(contract_));

vm.resetNonce(address(kontract));
_setupProxy(precompile, address(kontract));
vm.resetNonce(address(contract_));
_setupProxy(precompile, address(contract_));
}

function setFeeCurrencyDirectory() internal {
Expand All @@ -767,17 +809,17 @@ contract L2Genesis is Deployer {
vm.resetNonce(address(feeCurrencyDirectory));
_setupProxy(precompile, address(feeCurrencyDirectory));

vm.startPrank(devAccounts[0]);
FeeCurrencyDirectory(precompile).initialize();
vm.stopPrank();
// vm.startPrank(devAccounts[0]);
// FeeCurrencyDirectory(precompile).initialize();
// vm.stopPrank();
}

function setCeloFeeCurrency() internal {
FeeCurrency kontract = new FeeCurrency({ name_: "Test", symbol_: "TST" });
FeeCurrency contract_ = new FeeCurrency({ name_: "Test", symbol_: "TST" });
address precompile = CeloPredeploys.FEE_CURRENCY;
string memory cname = CeloPredeploys.getName(precompile);
console.log("Deploying %s implementation at: %s", cname, address(kontract));
vm.resetNonce(address(kontract));
_setupProxy(precompile, address(kontract));
console.log("Deploying %s implementation at: %s", cname, address(contract_));
vm.resetNonce(address(contract_));
_setupProxy(precompile, address(contract_));
}
}
72 changes: 72 additions & 0 deletions packages/contracts-bedrock/src/celo/Address.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
pragma solidity ^0.5.5;

// copy of import "@openzeppelin/contracts/utils/Address.sol";

/**
* @dev Collection of functions related to the address type
*/
library Address {
/**
* @dev Returns true if `account` is a contract.
*
* [IMPORTANT]
* ====
* It is unsafe to assume that an address for which this function returns
* false is an externally-owned account (EOA) and not a contract.
*
* Among others, `isContract` will return false for the following
* types of addresses:
*
* - an externally-owned account
* - a contract in construction
* - an address where a contract will be created
* - an address where a contract lived, but was destroyed
* ====
*/
function isContract(address account) internal view returns (bool) {
// According to EIP-1052, 0x0 is the value returned for not-yet created accounts
// and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned
// for accounts without code, i.e. `keccak256('')`
bytes32 codehash;
bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470;
// solhint-disable-next-line no-inline-assembly
assembly { codehash := extcodehash(account) }
return (codehash != accountHash && codehash != 0x0);
}

/**
* @dev Converts an `address` into `address payable`. Note that this is
* simply a type cast: the actual underlying value is not changed.
*
* _Available since v2.4.0._
*/
function toPayable(address account) internal pure returns (address payable) {
return address(uint160(account));
}

/**
* @dev Replacement for Solidity's `transfer`: sends `amount` wei to
* `recipient`, forwarding all available gas and reverting on errors.
*
* https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost
* of certain opcodes, possibly making contracts go over the 2300 gas limit
* imposed by `transfer`, making them unable to receive funds via
* `transfer`. {sendValue} removes this limitation.
*
* https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more].
*
* IMPORTANT: because control is transferred to `recipient`, care must be
* taken to not create reentrancy vulnerabilities. Consider using
* {ReentrancyGuard} or the
* https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern].
*
* _Available since v2.4.0._
*/
function sendValue(address payable recipient, uint256 amount) internal {
require(address(this).balance >= amount, "Address: insufficient balance");

// solhint-disable-next-line avoid-call-value
(bool success, ) = recipient.call.value(amount)("");
require(success, "Address: unable to send value, recipient may have reverted");
}
}
2 changes: 2 additions & 0 deletions packages/contracts-bedrock/src/celo/CeloPredeploys.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ library CeloPredeploys {
address internal constant FEE_CURRENCY = 0x4200000000000000000000000000000000001022;
address internal constant FEE_CURRENCY_DIRECTORY = 0x9212Fb72ae65367A7c887eC4Ad9bE310BAC611BF;
address internal constant cUSD = 0x765DE816845861e75A25fCA122bb6898B8B1282a;
address internal constant TREASURY = 0xB76D502Ad168F9D545661ea628179878DcA92FD5;

/// @notice Returns the name of the predeploy at the given address.
function getName(address _addr) internal pure returns (string memory out_) {
Expand All @@ -31,6 +32,7 @@ library CeloPredeploys {
if (_addr == FEE_CURRENCY) return "FeeCurrency";
if (_addr == FEE_CURRENCY_DIRECTORY) return "FeeCurrencyDirectory";
if (_addr == cUSD) return "cUSD";
if (_addr == TREASURY) return "TREASURY";

revert("Predeploys: unnamed predeploy");
}
Expand Down
Loading
Loading