Skip to content

Commit

Permalink
bump solc from 0.8.15 & 0.8.19 to 0.8.25, fix errors
Browse files Browse the repository at this point in the history
  • Loading branch information
AmadiMichael committed Oct 8, 2024
1 parent c938fdf commit 8d275b7
Show file tree
Hide file tree
Showing 234 changed files with 454 additions and 454 deletions.
34 changes: 17 additions & 17 deletions packages/contracts-bedrock/.gas-snapshot
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
GasBenchMark_L1BlockInterop_DepositsComplete:test_depositsComplete_benchmark() (gas: 7567)
GasBenchMark_L1BlockInterop_DepositsComplete_Warm:test_depositsComplete_benchmark() (gas: 5567)
GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchmark() (gas: 175677)
GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_benchmark() (gas: 5099)
GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158531)
GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 369245)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2967385)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 564368)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4076583)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 467019)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3512723)
GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72618)
GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92973)
GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68357)
GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68921)
GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155610)
GasBenchMark_L1BlockInterop_DepositsComplete:test_depositsComplete_benchmark() (gas: 7560)
GasBenchMark_L1BlockInterop_DepositsComplete_Warm:test_depositsComplete_benchmark() (gas: 5560)
GasBenchMark_L1BlockInterop_SetValuesInterop:test_setL1BlockValuesInterop_benchmark() (gas: 175668)
GasBenchMark_L1BlockInterop_SetValuesInterop_Warm:test_setL1BlockValuesInterop_benchmark() (gas: 5094)
GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (gas: 158515)
GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7592)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 367377)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2965582)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 561705)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4073772)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 464792)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3510517)
GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 72339)
GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 92975)
GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68513)
GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68980)
GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 155467)
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/lib/lib-keccak
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/scripts/DeployAuthSystem.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

import { Script } from "forge-std/Script.sol";
import { CommonBase } from "forge-std/Base.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

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

Expand Down Expand Up @@ -550,7 +550,7 @@ contract DeployImplementations is Script {
vm.broadcast(msg.sender);
IProxy proxy = IProxy(
DeployUtils.create1({
_name: "Proxy",
_name: "forge-artifacts/Proxy.sol/Proxy.json",
_args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
})
);
Expand Down Expand Up @@ -588,7 +588,7 @@ contract DeployImplementations is Script {

vm.startBroadcast(msg.sender);
blueprints.addressManager = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("AddressManager")), salt);
blueprints.proxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("Proxy")), salt);
blueprints.proxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("forge-artifacts/Proxy.sol/Proxy.json")), salt);
blueprints.proxyAdmin = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ProxyAdmin")), salt);
blueprints.l1ChugSplashProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("L1ChugSplashProxy")), salt);
blueprints.resolvedDelegateProxy = deployBytecode(Blueprint.blueprintDeployerBytecode(vm.getCode("ResolvedDelegateProxy")), salt);
Expand Down Expand Up @@ -1125,7 +1125,7 @@ contract DeployImplementationsInterop is DeployImplementations {
vm.broadcast(msg.sender);
IProxy proxy = IProxy(
DeployUtils.create1({
_name: "Proxy",
_name: "forge-artifacts/Proxy.sol/Proxy.json",
_args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (msg.sender)))
})
);
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/scripts/DeployOPChain.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

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

Expand Down
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/scripts/DeploySuperchain.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

import { Script } from "forge-std/Script.sol";
import { stdToml } from "forge-std/StdToml.sol";
Expand Down Expand Up @@ -367,7 +367,7 @@ contract DeploySuperchain is Script {
vm.startBroadcast(msg.sender);
ISuperchainConfig superchainConfigProxy = ISuperchainConfig(
DeployUtils.create1({
_name: "Proxy",
_name: "forge-artifacts/Proxy.sol/Proxy.json",
_args: DeployUtils.encodeConstructor(
abi.encodeCall(IProxy.__constructor__, (address(superchainProxyAdmin)))
)
Expand Down Expand Up @@ -395,7 +395,7 @@ contract DeploySuperchain is Script {
vm.startBroadcast(msg.sender);
IProtocolVersions protocolVersionsProxy = IProtocolVersions(
DeployUtils.create1({
_name: "Proxy",
_name: "forge-artifacts/Proxy.sol/Proxy.json",
_args: DeployUtils.encodeConstructor(
abi.encodeCall(IProxy.__constructor__, (address(superchainProxyAdmin)))
)
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/scripts/L2Genesis.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

// Testing
import { console2 as console } from "forge-std/console2.sol";
Expand Down Expand Up @@ -214,7 +214,7 @@ contract L2Genesis is Deployer {
/// migrating genesis generation to Solidity.
function setPredeployProxies() public {
console.log("Setting Predeploy proxies");
bytes memory code = vm.getDeployedCode("Proxy.sol:Proxy");
bytes memory code = vm.getDeployedCode("forge-artifacts/Proxy.sol/Proxy.json");
uint160 prefix = uint160(0x420) << 148;

console.log(
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/scripts/SetPreinstalls.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

import { Script } from "forge-std/Script.sol";
import { console2 as console } from "forge-std/console2.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

import { Script } from "forge-std/Script.sol";
import { stdJson } from "forge-std/StdJson.sol";
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ contract Deploy is Deployer {
DeployUtils.create2AndSave({
_save: this,
_salt: keccak256(abi.encode(_implSalt(), _name)),
_name: "Proxy",
_name: "forge-artifacts/Proxy.sol/Proxy.json",
_nick: _name,
_args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (_proxyOwner)))
})
Expand All @@ -622,7 +622,7 @@ contract Deploy is Deployer {
DeployUtils.create2AndSave({
_save: this,
_salt: _implSalt(),
_name: "Proxy",
_name: "forge-artifacts/Proxy.sol/Proxy.json",
_nick: "DataAvailabilityChallengeProxy",
_args: DeployUtils.encodeConstructor(abi.encodeCall(IProxy.__constructor__, (proxyAdmin)))
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

import { Script } from "forge-std/Script.sol";
import { console2 as console } from "forge-std/console2.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

// Scripts
import { Vm } from "forge-std/Vm.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

import { stdJson } from "forge-std/StdJson.sol";
import { VmSafe } from "forge-std/Vm.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;
pragma solidity 0.8.25;

import { console } from "forge-std/console.sol";
import { Script } from "forge-std/Script.sol";
Expand Down
Loading

0 comments on commit 8d275b7

Please sign in to comment.