Skip to content

Commit

Permalink
chore: bump solidity across repo (#379)
Browse files Browse the repository at this point in the history
* chore: bump solidity to 0.8.25 across repo

* bump to 0.8.26
  • Loading branch information
shaspitz authored Aug 30, 2024
1 parent d866562 commit e0c7a7c
Show file tree
Hide file tree
Showing 58 changed files with 63 additions and 63 deletions.
4 changes: 2 additions & 2 deletions bridge/standard/bridge-v1/deploy_contracts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ RELAYER_ADDR="$RELAYER_ADDR" $FORGE_BIN_PATH script \
--broadcast \
--chain-id "$SETTLEMENT_CHAIN_ID" \
-vvvv \
--use 0.8.20 | tee deploy_sg_output.txt
--use 0.8.26 | tee deploy_sg_output.txt

awk -F"JSON_DEPLOY_ARTIFACT: " '/JSON_DEPLOY_ARTIFACT:/ {print $2}' deploy_sg_output.txt | sed '/^$/d' > SettlementGatewayArtifact.json
mv SettlementGatewayArtifact.json "$ARTIFACT_OUT_PATH"
Expand All @@ -131,7 +131,7 @@ RELAYER_ADDR="$RELAYER_ADDR" $FORGE_BIN_PATH script \
--broadcast \
--chain-id "$L1_CHAIN_ID" \
-vvvv \
--use 0.8.20 | tee deploy_l1g_output.txt
--use 0.8.26 | tee deploy_l1g_output.txt

awk -F"JSON_DEPLOY_ARTIFACT: " '/JSON_DEPLOY_ARTIFACT:/ {print $2}' deploy_l1g_output.txt | sed '/^$/d' > L1GatewayArtifact.json
mv L1GatewayArtifact.json "$ARTIFACT_OUT_PATH"
Expand Down
4 changes: 2 additions & 2 deletions contracts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ deploy-val-reg:
--broadcast \
--chain-id 31337 \
-vvvv \
--use 0.8.20 \
--use 0.8.26 \
--via-ir \

deploy-opt-in-router-holesky:
Expand All @@ -25,7 +25,7 @@ deploy-opt-in-router-holesky:
--sender "${SENDER}" \
--via-ir \
--chain-id 17000 \
--use 0.8.20 \
--use 0.8.26 \
--broadcast

deploy-core:
Expand Down
2 changes: 1 addition & 1 deletion contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Invoking the upgrade involves creating a script in which a new implementation co
See example below

```solidity
pragma solidity 0.8.20;
pragma solidity 0.8.26;
import {Script} from "forge-std/Script.sol";
import {console} from "forge-std/console.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/BidderRegistry.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/BidderRegistryStorage.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {FeePayout} from "../utils/FeePayout.sol";
import {IBlockTracker} from "../interfaces/IBlockTracker.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/BlockTracker.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IBlockTracker} from "../interfaces/IBlockTracker.sol";
import {BlockTrackerStorage} from "./BlockTrackerStorage.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/BlockTrackerStorage.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

abstract contract BlockTrackerStorage {
/// @dev Permissioned address of the oracle account.
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/Oracle.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/OracleStorage.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IPreconfManager} from "../interfaces/IPreconfManager.sol";
import {IBlockTracker} from "../interfaces/IBlockTracker.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/PreconfManager.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {ECDSA} from "@openzeppelin-contracts/contracts/utils/cryptography/ECDSA.sol";
import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/PreconfManagerStorage.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IProviderRegistry} from "../interfaces/IProviderRegistry.sol";
import {IBidderRegistry} from "../interfaces/IBidderRegistry.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/ProviderRegistry.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/core/ProviderRegistryStorage.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {FeePayout} from "../utils/FeePayout.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IBidderRegistry.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

interface IBidderRegistry {
struct OpenedCommitment {
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IBlockTracker.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

/// @title IBlockTracker interface for BlockTracker contract
interface IBlockTracker {
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IMevCommitAVS.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {ISignatureUtils} from "eigenlayer-contracts/src/contracts/interfaces/ISignatureUtils.sol";
import {EventHeightLib} from "../utils/EventHeight.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IOracle.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

interface IOracle {

Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IPreconfManager.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

/**
* @title IPreconfManager
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IProviderRegistry.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

interface IProviderRegistry {

Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IValidatorOptInRouter.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IVanillaRegistry} from "./IVanillaRegistry.sol";
import {IMevCommitAVS} from "./IMevCommitAVS.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IVanillaRegistry.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import { EventHeightLib } from "../utils/EventHeight.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/interfaces/IWhitelist.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

interface IWhitelist {
function mint(address _mintTo, uint256 _amount) external;
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/standard-bridge/Gateway.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/standard-bridge/L1Gateway.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Gateway} from "./Gateway.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/standard-bridge/SettlementGateway.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Gateway} from "./Gateway.sol";
import {IWhitelist} from "../interfaces/IWhitelist.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/standard-bridge/Whitelist.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/utils/Errors.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

library Errors {
/// @dev Custom error for invalid fallback calls.
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/utils/EventHeight.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

library EventHeightLib {
/// @title EventHeight
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/utils/FeePayout.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

library FeePayout {

Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/utils/WindowFromBlockNumber.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

/**
* @title WindowFromBlockNumber
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {ValidatorOptInRouterStorage} from "./ValidatorOptInRouterStorage.sol";
import {IValidatorOptInRouter} from "../interfaces/IValidatorOptInRouter.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IVanillaRegistry} from "../interfaces/IVanillaRegistry.sol";
import {IMevCommitAVS} from "../interfaces/IMevCommitAVS.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/contracts/validator-registry/VanillaRegistry.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IVanillaRegistry} from "../interfaces/IVanillaRegistry.sol";
import {VanillaRegistryStorage} from "./VanillaRegistryStorage.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IVanillaRegistry} from "../interfaces/IVanillaRegistry.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {IMevCommitAVS} from "../../interfaces/IMevCommitAVS.sol";
import {MevCommitAVSStorage} from "./MevCommitAVSStorage.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;


import {IMevCommitAVS} from "../../interfaces/IMevCommitAVS.sol";
Expand Down
8 changes: 4 additions & 4 deletions contracts/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if [ "${DEPLOY_TYPE}" = "core" ]; then
--password "${KEYSTORE_PASSWORD}" \
--sender "${SENDER}" \
--skip-simulation \
--use 0.8.20 \
--use 0.8.26 \
--broadcast \
--force \
--json \
Expand All @@ -53,7 +53,7 @@ elif [ "${DEPLOY_TYPE}" = "settlement-gateway" ]; then
--broadcast \
--chain-id "${CHAIN_ID}" \
-vvvv \
--use 0.8.20 \
--use 0.8.26 \
--root "${CONTRACT_REPO_ROOT_PATH}" \
--via-ir

Expand All @@ -72,7 +72,7 @@ elif [ "${DEPLOY_TYPE}" = "l1-gateway" ]; then
--broadcast \
--chain-id "${CHAIN_ID}" \
-vvvv \
--use 0.8.20 \
--use 0.8.26 \
--root "${CONTRACT_REPO_ROOT_PATH}" \
--via-ir

Expand All @@ -87,7 +87,7 @@ elif [ "${DEPLOY_TYPE}" = "vanilla-registry" ]; then
--broadcast \
--chain-id "${CHAIN_ID}" \
-vvvv \
--use 0.8.20 \
--use 0.8.26 \
--root "${CONTRACT_REPO_ROOT_PATH}" \
--via-ir \
--skip-simulation \
Expand Down
2 changes: 1 addition & 1 deletion contracts/foundry.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[profile.default]
src = 'contracts'
solc-version = '0.8.20'
solc-version = '0.8.26'
script = 'scripts'
out = 'out'
libs = ['node_modules', 'lib']
Expand Down
2 changes: 1 addition & 1 deletion contracts/scripts/core/DeployCore.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// solhint-disable no-console
// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Script} from "forge-std/Script.sol";
import {BidderRegistry} from "../../contracts/core/BidderRegistry.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// solhint-disable no-console
// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Script} from "forge-std/Script.sol";
import {SettlementGateway} from "../../contracts/standard-bridge/SettlementGateway.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// solhint-disable no-console
// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Script} from "forge-std/Script.sol";
import {console} from "forge-std/console.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// solhint-disable no-console
// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Script} from "forge-std/Script.sol";
import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// solhint-disable no-console
// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Script} from "forge-std/Script.sol";
import {console} from "forge-std/console.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/scripts/validator-registry/avs/DeployAVS.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// solhint-disable no-console
// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Script} from "forge-std/Script.sol";
import {console} from "forge-std/console.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity ^0.8.20;
pragma solidity 0.8.26;

// solhint-disable no-console
// solhint-disable one-contract-per-file
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// solhint-disable no-console
// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity 0.8.26;

/// @notice Constants from https://github.com/Layr-Labs/eigenlayer-contracts?tab=readme-ov-file#deployments,
/// @notice Last updated 07-26-2024
Expand Down
2 changes: 1 addition & 1 deletion contracts/test/core/BidderRegistryTest.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: BSL 1.1
pragma solidity 0.8.20;
pragma solidity 0.8.26;

import {Test} from "forge-std/Test.sol";
import {BidderRegistry} from "../../contracts/core/BidderRegistry.sol";
Expand Down
Loading

0 comments on commit e0c7a7c

Please sign in to comment.