Skip to content

Commit

Permalink
chore(compiler): move interfaces and libraries to fpp (#514)
Browse files Browse the repository at this point in the history
  • Loading branch information
koloz193 authored Jun 10, 2024
1 parent 4089f20 commit f99eaf9
Show file tree
Hide file tree
Showing 74 changed files with 98 additions and 98 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol";
import {IBridgehub} from "../../bridgehub/IBridgehub.sol";
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/bridge/interfaces/IL2Bridge.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @author Matter Labs
interface IL2Bridge {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/bridge/interfaces/IWETH9.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: Apache-2.0
pragma solidity 0.8.24;
pragma solidity ^0.8.20;

interface IWETH9 {
function deposit() external payable;
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/bridgehub/IBridgehub.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {IL1SharedBridge} from "../bridge/interfaces/IL1SharedBridge.sol";
import {L2Message, L2Log, TxStatus} from "../common/Messaging.sol";
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/Config.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @dev `keccak256("")`
bytes32 constant EMPTY_STRING_KECCAK = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470;
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/Dependencies.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/* solhint-disable-next-line no-unused-import */
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol";
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/L2ContractAddresses.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @dev The formal address of the initial program of the system: the bootloader
address constant L2_BOOTLOADER_ADDRESS = address(0x8001);
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/Messaging.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @dev The enum that represents the transaction execution status
/// @param Failure The transaction execution failed
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/ReentrancyGuard.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

// solhint-disable gas-custom-errors

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/**
* @author Matter Labs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

// solhint-disable gas-custom-errors

Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/libraries/SemVer.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @dev The number of bits dedicated to the "patch" portion of the protocol version.
/// This also defines the bit starting from which the "minor" part is located.
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/libraries/UncheckedMath.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/**
* @author Matter Labs
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/common/libraries/UnsafeBytes.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/**
* @author Matter Labs
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/governance/IGovernance.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @title Governance contract interface
/// @author Matter Labs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {Diamond} from "./libraries/Diamond.sol";
import {L2CanonicalTransaction} from "../common/Messaging.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {IZkSyncHyperchainBase} from "../chain-interfaces/IZkSyncHyperchainBase.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {IVerifier, VerifierParams} from "./IVerifier.sol";
import {FeeParams} from "../chain-deps/ZkSyncHyperchainStorage.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {PriorityOperation} from "../libraries/PriorityQueue.sol";
import {VerifierParams} from "../chain-interfaces/IVerifier.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {IZkSyncHyperchainBase} from "./IZkSyncHyperchainBase.sol";
import {L2CanonicalTransaction, L2Log, L2Message, TxStatus, BridgehubL2TransactionRequest} from "../../common/Messaging.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @title The interface of the L1 -> L2 transaction filterer.
/// @author Matter Labs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @notice Part of the configuration parameters of ZKP circuits
struct VerifierParams {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

import {IAdmin} from "./IAdmin.sol";
import {IExecutor} from "./IExecutor.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: UNLICENSED
pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @title The interface of the zkSync contract, responsible for the main zkSync logic.
/// @author Matter Labs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

// solhint-disable gas-custom-errors

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.24;
pragma solidity ^0.8.20;

/// @notice Library for storage of packed unsigned integers.
/// @author Matter Labs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

// solhint-disable gas-custom-errors

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

// solhint-disable gas-custom-errors

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

// solhint-disable gas-custom-errors

Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/vendor/AddressAliasHelper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

pragma solidity 0.8.24;
pragma solidity ^0.8.20;

library AddressAliasHelper {
uint160 private constant offset = uint160(0x1111000000000000000000000000000000001111);
Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/Dependencies.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

/* solhint-disable-next-line no-unused-import */
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts-v4/proxy/transparent/TransparentUpgradeableProxy.sol";
Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/L2ContractErrors.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.20;
pragma solidity ^0.8.20;

error InvalidCaller(address);
error InvalidInput();
Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/L2ContractHelper.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

/**
* @author Matter Labs
Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/SystemContractsCaller.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// solhint-disable one-contract-per-file

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

import {MSG_VALUE_SYSTEM_CONTRACT} from "./L2ContractHelper.sol";

Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/TestnetPaymaster.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

import {IERC20} from "@openzeppelin/contracts-v4/token/ERC20/IERC20.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

/// @author Matter Labs
// note we use the IL1ERC20Bridge only to send L1<>L2 messages,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

/// @title L1 Bridge contract interface
/// @author Matter Labs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

/// @author Matter Labs
interface IL2SharedBridge {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

interface IL2StandardToken {
event BridgeInitialize(address indexed l1Token, string name, string symbol, uint8 decimals);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.20;
pragma solidity ^0.8.20;

interface IL2WrappedBaseToken {
event Initialize(string name, string symbol, uint8 decimals);
Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/interfaces/IPaymaster.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

import {Transaction} from "../L2ContractHelper.sol";

Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/interfaces/IPaymasterFlow.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

/**
* @author Matter Labs
Expand Down
2 changes: 1 addition & 1 deletion l2-contracts/contracts/vendor/AddressAliasHelper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

pragma solidity 0.8.20;
pragma solidity ^0.8.20;

library AddressAliasHelper {
uint160 internal constant offset = uint160(0x1111000000000000000000000000000000001111);
Expand Down
Loading

0 comments on commit f99eaf9

Please sign in to comment.