Skip to content

Commit

Permalink
Fix script error on Deploy.s.sol Config.sol Deployconfig.s.sol Types.sol
Browse files Browse the repository at this point in the history
  • Loading branch information
@AaronLee22
AaronLee22 committed Oct 8, 2024
1 parent 34dce0f commit 3ab38b0
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 11 deletions.
110 changes: 101 additions & 9 deletions packages/tokamak/contracts-bedrock/scripts/Deploy.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
import { GnosisSafeProxyFactory as SafeProxyFactory } from "safe-contracts/proxies/GnosisSafeProxyFactory.sol";
import { Enum as SafeOps } from "safe-contracts/common/Enum.sol";

import { Deployer } from "scripts/deploy/Deployer.sol";
import { Deployer } from "scripts/Deployer.sol";

import { ProxyAdmin } from "src/universal/ProxyAdmin.sol";
import { AddressManager } from "src/legacy/AddressManager.sol";
Expand Down Expand Up @@ -44,20 +44,24 @@ import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
import { ProtocolVersions, ProtocolVersion } from "src/L1/ProtocolVersions.sol";
import { StorageSetter } from "src/universal/StorageSetter.sol";
import { Predeploys } from "src/libraries/Predeploys.sol";
import { Chains } from "scripts/libraries/Chains.sol";
import { Config } from "scripts/libraries/Config.sol";
import { Chains } from "scripts/Chains.sol";
import { Config } from "scripts/Config.sol";

import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol";
import { IPreimageOracle } from "src/cannon/interfaces/IPreimageOracle.sol";
import { AlphabetVM } from "test/mocks/AlphabetVM.sol";
import "src/dispute/lib/Types.sol";
import { ChainAssertions } from "scripts/deploy/ChainAssertions.sol";
import { Types } from "scripts/libraries/Types.sol";
import { ChainAssertions } from "scripts/ChainAssertions.sol";
import { Types } from "scripts/Types.sol";
import { LibStateDiff } from "scripts/libraries/LibStateDiff.sol";
import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
import { ForgeArtifacts } from "scripts/libraries/ForgeArtifacts.sol";
import { ForgeArtifacts } from "scripts/ForgeArtifacts.sol";
import { Process } from "scripts/libraries/Process.sol";

import { L2NativeToken } from "src/L1/L2NativeToken.sol";
import { L1UsdcBridge } from "src/tokamak-contracts/USDC/L1//tokamak-UsdcBridge/L1UsdcBridge.sol";
import { L1UsdcBridgeProxy } from "src/tokamak-contracts/USDC/L1/tokamak-UsdcBridge/L1UsdcBridgeProxy.sol";

/// @title Deploy
/// @notice Script used to deploy a bedrock system. The entire system is deployed within the `run` function.
/// To add a new contract to the system, add a public function that deploys that individual contract.
Expand Down Expand Up @@ -279,7 +283,7 @@ contract Deploy is Deployer {
vm.dumpState(Config.stateDumpPath(""));
}

/// @notice Deploy all L1 contracts and write the state diff to a file.
/// @notice Deploy all L1 contracts and write the state diff to a file.DeployConfig
function runWithStateDiff() public stateDiff {
_run();
}
Expand Down Expand Up @@ -341,8 +345,11 @@ contract Deploy is Deployer {
mustGetAddress("AddressManager");
mustGetAddress("ProxyAdmin");

deployL2NativeToken();
deployProxies();
deployImplementations();
deployL1UsdcBridgeProxy();
setL1UsdcBridge();
initializeImplementations();

setAlphabetFaultGameImplementation({ _allowUpgrade: false });
Expand Down Expand Up @@ -394,6 +401,8 @@ contract Deploy is Deployer {
deployPreimageOracle();
deployMips();
deployAnchorStateRegistry();

deployL1UsdcBridge();
}

/// @notice Initialize all of the implementations
Expand Down Expand Up @@ -790,6 +799,80 @@ contract Deploy is Deployer {
addr_ = address(versions);
}

function getL2NativeToken() public returns (address) {
bool isForkPublicNetwork = vm.envOr("FORK_PUBLIC_NETWORK", false);
if (isForkPublicNetwork) {
address addr_ = vm.envAddress("L2_NATIVE_TOKEN");
return addr_;
} else {
L2NativeToken token = new L2NativeToken{ salt: _implSalt() }();
address addr_ = address(token);
return addr_;
}
}

/// @notice Deploy the Safe
function deployL2NativeToken() public broadcast {
string memory path = Config.deployConfigPath();
address setupAddr_ = vm.envOr("L2_NATIVE_TOKEN", address(0));
// If L2NativeToken is already existing on the network, we don't deploy the new contract.
if (setupAddr_ != address(0)) {
cfg.setNativeTokenAddress(setupAddr_, path);
console.log("Native token deployed at", setupAddr_);
return;
}
address addr_ = getL2NativeToken();
cfg.setNativeTokenAddress(addr_, path);
console.log("Native token deployed at", addr_);
save("L2NativeToken", addr_);
}

/// @notice Deploy the L1UsdcBridge
function deployL1UsdcBridge() public broadcast returns (address addr_) {
L1UsdcBridge bridge = new L1UsdcBridge{ salt: _implSalt() }();

require(address(bridge.messenger()) == address(0));
require(address(bridge.otherBridge()) == address(0));
require(address(bridge.l1Usdc()) == address(0));
require(address(bridge.l2Usdc()) == address(0));

save("L1UsdcBridge", address(bridge));
console.log("L1UsdcBridge deployed at %s", address(bridge));

addr_ = address(bridge);
}

/// @notice Deploy the L1UsdcBridgeProxy
function deployL1UsdcBridgeProxy() public broadcast returns (address addr_) {
address l1UsdcBridge = mustGetAddress("L1UsdcBridge");
address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy");
L1UsdcBridgeProxy proxy =
new L1UsdcBridgeProxy({ _logic: l1UsdcBridge, initialOwner: msg.sender, _data: abi.encode() });

require(EIP1967Helper.getAdmin(address(proxy)) == address(msg.sender));

proxy.setAddress(
l1CrossDomainMessengerProxy, Predeploys.L2_USDC_BRIDGE, cfg.l1UsdcAddr(), Predeploys.FIATTOKENV2_2
);
proxy.upgradeTo(l1UsdcBridge);

save("L1UsdcBridgeProxy", address(proxy));
console.log("L1UsdcBridgeProxy deployed at %s", address(proxy));
addr_ = address(proxy);
}

function setL1UsdcBridge() public broadcast {
address l1UsdcBridgeProxy = mustGetAddress("L1UsdcBridgeProxy");
address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy");

L1UsdcBridge bridge = L1UsdcBridge(l1UsdcBridgeProxy);

require(address(bridge.messenger()) == l1CrossDomainMessengerProxy);
require(address(bridge.otherBridge()) == Predeploys.L2_USDC_BRIDGE);
require(address(bridge.l1Usdc()) == cfg.l1UsdcAddr());
require(address(bridge.l2Usdc()) == Predeploys.FIATTOKENV2_2);
}

/// @notice Deploy the PreimageOracle
function deployPreimageOracle() public broadcast returns (address addr_) {
console.log("Deploying PreimageOracle implementation");
Expand Down Expand Up @@ -1052,6 +1135,14 @@ contract Deploy is Deployer {
customGasTokenAddress = cfg.customGasTokenAddress();
}

// deployL2NativeToken();
address l2NativeTokenAddress = cfg.nativeTokenAddress();
if (l2NativeTokenAddress == address(0)) {
L2NativeToken token = new L2NativeToken{ salt: _implSalt() }();
l2NativeTokenAddress = address(token);
}
console.log(" [Check ]l2NativeTokenAddress", l2NativeTokenAddress);

_upgradeAndCallViaSafe({
_proxy: payable(systemConfigProxy),
_implementation: systemConfig,
Expand All @@ -1073,7 +1164,8 @@ contract Deploy is Deployer {
disputeGameFactory: mustGetAddress("DisputeGameFactoryProxy"),
optimismPortal: mustGetAddress("OptimismPortalProxy"),
optimismMintableERC20Factory: mustGetAddress("OptimismMintableERC20FactoryProxy"),
gasPayingToken: customGasTokenAddress
gasPayingToken: customGasTokenAddress,
nativeTokenAddress: l2NativeTokenAddress
})
)
)
Expand Down Expand Up @@ -1400,7 +1492,7 @@ contract Deploy is Deployer {
function loadMipsAbsolutePrestate() internal returns (Claim mipsAbsolutePrestate_) {
if (block.chainid == Chains.LocalDevnet || block.chainid == Chains.GethDevnet) {
// Fetch the absolute prestate dump
string memory filePath = string.concat(vm.projectRoot(), "/../../op-program/bin/prestate-proof.json");
string memory filePath = string.concat(vm.projectRoot(), "/../../../op-program/bin/prestate-proof.json");
string[] memory commands = new string[](3);
commands[0] = "bash";
commands[1] = "-c";
Expand Down
11 changes: 9 additions & 2 deletions packages/tokamak/contracts-bedrock/scripts/DeployConfig.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ pragma solidity 0.8.15;
import { Script } from "forge-std/Script.sol";
import { console2 as console } from "forge-std/console2.sol";
import { stdJson } from "forge-std/StdJson.sol";
import { Executables } from "scripts/libraries/Executables.sol";
import { Executables } from "scripts/Executables.sol";
import { Process } from "scripts/libraries/Process.sol";
import { Chains } from "scripts/libraries/Chains.sol";
import { Chains } from "scripts/Chains.sol";
import { Config, Fork, ForkUtils } from "scripts/libraries/Config.sol";

/// @title DeployConfig
Expand All @@ -24,6 +24,7 @@ contract DeployConfig is Script {

address public finalSystemOwner;
address public superchainConfigGuardian;
address public nativeTokenAddress;
uint256 public l1ChainID;
uint256 public l2ChainID;
uint256 public l2BlockTime;
Expand Down Expand Up @@ -76,6 +77,7 @@ contract DeployConfig is Script {
uint256 public systemConfigStartBlock;
uint256 public requiredProtocolVersion;
uint256 public recommendedProtocolVersion;
address public l1UsdcAddr;
uint256 public proofMaturityDelaySeconds;
uint256 public disputeGameFinalityDelaySeconds;
uint256 public respectedGameType;
Expand All @@ -102,6 +104,7 @@ contract DeployConfig is Script {

finalSystemOwner = stdJson.readAddress(_json, "$.finalSystemOwner");
superchainConfigGuardian = stdJson.readAddress(_json, "$.superchainConfigGuardian");
nativeTokenAddress = stdJson.readAddress(_json, "$.nativeTokenAddress");
l1ChainID = stdJson.readUint(_json, "$.l1ChainID");
l2ChainID = stdJson.readUint(_json, "$.l2ChainID");
l2BlockTime = stdJson.readUint(_json, "$.l2BlockTime");
Expand Down Expand Up @@ -178,6 +181,10 @@ contract DeployConfig is Script {
useInterop = _readOr(_json, "$.useInterop", false);
}

function setNativeTokenAddress(address _nativeTokenAddress, string memory _path) public {
nativeTokenAddress = _nativeTokenAddress;
stdJson.write(vm.toString(_nativeTokenAddress), _path, "$.nativeTokenAddress");

function fork() public view returns (Fork fork_) {
// let env var take precedence
fork_ = Config.fork();
Expand Down

0 comments on commit 3ab38b0

Please sign in to comment.