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

Jump to bottom

Clean imports #265

Merged
merged 13 commits into from
Mar 13, 2024
Merged

Clean imports #265

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8868b12
Clean imports
dnkolegov Mar 12, 2024
93d80b9
clean l2
dnkolegov Mar 12, 2024
1b4511a
fix l2
dnkolegov Mar 12, 2024
64c42dd
update l2
dnkolegov Mar 12, 2024
f9737c7
fix imports
dnkolegov Mar 12, 2024
eb800bf
fmt
dnkolegov Mar 12, 2024
6f567ab
fix imports
dnkolegov Mar 12, 2024
07b072a
fix test
dnkolegov Mar 12, 2024
26c3a9e
revert verifier
dnkolegov Mar 12, 2024
0a19bf5
change solhint policy
dnkolegov Mar 13, 2024
642ba35
fix conflicts
dnkolegov Mar 13, 2024
715200f
update hashes
dnkolegov Mar 13, 2024
41e824c
remove unused imports
dnkolegov Mar 13, 2024
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
2 changes: 1 addition & 1 deletion l1-contracts/contracts/bridge/interfaces/IL1ERC20Bridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

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

/// @title L1 Bridge contract legacy interface
/// @author Matter Labs
Expand Down
14 changes: 7 additions & 7 deletions l1-contracts/contracts/bridgehub/Bridgehub.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ pragma solidity 0.8.20;

import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";

import "./IBridgehub.sol";
import "../bridge/interfaces/IL1SharedBridge.sol";
import "../state-transition/IStateTransitionManager.sol";
import "../common/ReentrancyGuard.sol";
import "../state-transition/chain-interfaces/IZkSyncStateTransition.sol";
import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter, L2TransactionRequestTwoBridgesInner} from "./IBridgehub.sol";
import {IBridgehub, IL1SharedBridge} from "../bridge/interfaces/IL1SharedBridge.sol";
import {IStateTransitionManager} from "../state-transition/IStateTransitionManager.sol";
import {ReentrancyGuard} from "../common/ReentrancyGuard.sol";
import {IZkSyncStateTransition} from "../state-transition/chain-interfaces/IZkSyncStateTransition.sol";
import {ETH_TOKEN_ADDRESS, TWO_BRIDGES_MAGIC_VALUE, BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS} from "../common/Config.sol";
import {BridgehubL2TransactionRequest} from "../common/Messaging.sol";
import "../vendor/AddressAliasHelper.sol";
import {BridgehubL2TransactionRequest, L2Message, L2Log, TxStatus} from "../common/Messaging.sol";
import {AddressAliasHelper} from "../vendor/AddressAliasHelper.sol";

contract Bridgehub is IBridgehub, ReentrancyGuard, Ownable2Step {
/// @notice all the ether is held by the weth bridge
Expand Down
4 changes: 1 addition & 3 deletions l1-contracts/contracts/bridgehub/IBridgehub.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
pragma solidity 0.8.20;

import {IL1SharedBridge} from "../bridge/interfaces/IL1SharedBridge.sol";
import "../common/Messaging.sol";
import "../state-transition/IStateTransitionManager.sol";
import "../state-transition/libraries/Diamond.sol";
import {L2Message, L2Log, TxStatus} from "../common/Messaging.sol";

struct L2TransactionRequestDirect {
uint256 chainId;
Expand Down
4 changes: 2 additions & 2 deletions l1-contracts/contracts/common/Dependencies.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

pragma solidity 0.8.20;

import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/RevertTransferERC20.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

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

/// @title RevertTransferERC20Token - A ERC20 token contract which can revert transfers depending on a flag
/// @dev Used for testing failed ERC-20 withdrawals from the zkSync smart contract
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/TestnetERC20Token.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

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

contract TestnetERC20Token is ERC20 {
// add this to be excluded from coverage report
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/AddressAliasHelperTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../vendor/AddressAliasHelper.sol";
import {AddressAliasHelper} from "../../vendor/AddressAliasHelper.sol";

contract AddressAliasHelperTest {
function applyL1ToL2Alias(address _l1Address) external pure returns (address) {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/AdminFacetTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/chain-deps/facets/Admin.sol";
import {AdminFacet} from "../../state-transition/chain-deps/facets/Admin.sol";

contract AdminFacetTest is AdminFacet {
// add this to be excluded from coverage report
Expand Down
4 changes: 2 additions & 2 deletions l1-contracts/contracts/dev-contracts/test/CustomUpgradeTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

pragma solidity 0.8.20;

import "../../state-transition/libraries/Diamond.sol";
import "../../upgrades/BaseZkSyncUpgrade.sol";
import {Diamond} from "../../state-transition/libraries/Diamond.sol";
import {BaseZkSyncUpgrade, ProposedUpgrade} from "../../upgrades/BaseZkSyncUpgrade.sol";

contract CustomUpgradeTest is BaseZkSyncUpgrade {
// add this to be excluded from coverage report
Expand Down
4 changes: 2 additions & 2 deletions l1-contracts/contracts/dev-contracts/test/DiamondCutTestContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

pragma solidity 0.8.20;

import "../../state-transition/libraries/Diamond.sol";
import "../../state-transition/chain-deps/facets/Getters.sol";
import {Diamond} from "../../state-transition/libraries/Diamond.sol";
import {GettersFacet} from "../../state-transition/chain-deps/facets/Getters.sol";

contract DiamondCutTestContract is GettersFacet {
function diamondCut(Diamond.DiamondCutData memory _diamondCut) external {
Expand Down
4 changes: 2 additions & 2 deletions l1-contracts/contracts/dev-contracts/test/DiamondProxyTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

pragma solidity 0.8.20;

import "../../state-transition/libraries/Diamond.sol";
import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
import {Diamond} from "../../state-transition/libraries/Diamond.sol";
import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";

contract DiamondProxyTest is ZkSyncStateTransitionBase {
// add this to be excluded from coverage report
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/DummyAdminFacet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity 0.8.20;

import {Diamond} from "../../state-transition/libraries/Diamond.sol";
import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";

contract DummyAdminFacet is ZkSyncStateTransitionBase {
// add this to be excluded from coverage report
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/DummyAdminFacet2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity 0.8.20;

import {Diamond} from "../../state-transition/libraries/Diamond.sol";
import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";

contract DummyAdminFacet2 is ZkSyncStateTransitionBase {
// add this to be excluded from coverage report
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/DummyExecutor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/chain-interfaces/IExecutor.sol";
import {IExecutor} from "../../state-transition/chain-interfaces/IExecutor.sol";

/// @title DummyExecutor
/// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes.
Expand Down
4 changes: 2 additions & 2 deletions l1-contracts/contracts/dev-contracts/test/DummySharedBridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pragma solidity 0.8.20;

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

import {L2TransactionRequestTwoBridgesInner, L2TransactionRequestDirect} from "../../bridgehub/IBridgehub.sol";
import {ETH_TOKEN_ADDRESS, TWO_BRIDGES_MAGIC_VALUE, BRIDGEHUB_MIN_SECOND_BRIDGE_ADDRESS} from "../../common/Config.sol";
import {L2TransactionRequestTwoBridgesInner} from "../../bridgehub/IBridgehub.sol";
import {TWO_BRIDGES_MAGIC_VALUE} from "../../common/Config.sol";

contract DummySharedBridge {
event BridgehubDepositBaseTokenInitiated(
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/DummyStateTransitionManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/StateTransitionManager.sol";
import {StateTransitionManager} from "../../state-transition/StateTransitionManager.sol";

/// @title DummyExecutor
/// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes.
Expand Down
2 changes: 1 addition & 1 deletion ...ontracts/contracts/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/StateTransitionManager.sol";
import {StateTransitionManager} from "../../state-transition/StateTransitionManager.sol";

/// @title DummyExecutor
/// @notice A test smart contract implementing the IExecutor interface to simulate Executor behavior for testing purposes.
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/ExecutorProvingTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pragma solidity 0.8.20;
import {ExecutorFacet} from "../../state-transition/chain-deps/facets/Executor.sol";
import {VerifierParams, PubdataPricingMode} from "../../state-transition/chain-deps/ZkSyncStateTransitionStorage.sol";
import {LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol";
import {PubdataSource, LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol";
import {LogProcessingOutput} from "../../state-transition/chain-interfaces/IExecutor.sol";

contract ExecutorProvingTest is ExecutorFacet {
function getBatchProofPublicInput(
Expand Down
5 changes: 2 additions & 3 deletions l1-contracts/contracts/dev-contracts/test/L1ERC20BridgeTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

pragma solidity 0.8.20;

import "../../bridge/L1ERC20Bridge.sol";
import {IMailbox} from "../../state-transition/chain-interfaces/IMailbox.sol";
import "../../bridge/interfaces/IL1SharedBridge.sol";
import {L1ERC20Bridge} from "../../bridge/L1ERC20Bridge.sol";
import {IBridgehub, IL1SharedBridge} from "../../bridge/interfaces/IL1SharedBridge.sol";

/// @author Matter Labs
contract L1ERC20BridgeTest is L1ERC20Bridge {
Expand Down
8 changes: 5 additions & 3 deletions l1-contracts/contracts/dev-contracts/test/L1SharedBridgeTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

pragma solidity 0.8.20;

import "../../bridge/L1SharedBridge.sol";
import {IMailbox} from "../../state-transition/chain-interfaces/IMailbox.sol";
import "../../bridge/interfaces/IL1SharedBridge.sol";
import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

import {L1SharedBridge} from "../../bridge/L1SharedBridge.sol";
import {IL1ERC20Bridge, IBridgehub} from "../../bridge/interfaces/IL1SharedBridge.sol";
import {ETH_TOKEN_ADDRESS, ERA_CHAIN_ID} from "../../common/Config.sol";

/// @author Matter Labs
contract L1SharedBridgeTest is L1SharedBridge {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/MerkleTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/libraries/Merkle.sol";
import {Merkle} from "../../state-transition/libraries/Merkle.sol";

contract MerkleTest {
function calculateRoot(
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/MockExecutor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
import {ZkSyncStateTransitionBase} from "../../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";

contract MockExecutorFacet is ZkSyncStateTransitionBase {
// add this to be excluded from coverage report
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/PriorityQueueTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/libraries/PriorityQueue.sol";
import {PriorityQueue, PriorityOperation} from "../../state-transition/libraries/PriorityQueue.sol";

contract PriorityQueueTest {
PriorityQueue.Queue priorityQueue;
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/UncheckedMathTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../common/libraries/UncheckedMath.sol";
import {UncheckedMath} from "../../common/libraries/UncheckedMath.sol";

contract UncheckedMathTest {
function uncheckedInc(uint256 _number) external pure returns (uint256) {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/UnsafeBytesTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../common/libraries/UnsafeBytes.sol";
import {UnsafeBytes} from "../../common/libraries/UnsafeBytes.sol";

contract UnsafeBytesTest {
// add this to be excluded from coverage report
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/VerifierRecursiveTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/Verifier.sol";
import {Verifier} from "../../state-transition/Verifier.sol";

/// @author Matter Labs
contract VerifierRecursiveTest is Verifier {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/dev-contracts/test/VerifierTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity 0.8.20;

import "../../state-transition/Verifier.sol";
import {Verifier} from "../../state-transition/Verifier.sol";

/// @author Matter Labs
contract VerifierTest is Verifier {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/contracts/state-transition/StateTransitionManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {L2CanonicalTransaction} from "../common/Messaging.sol";
import {Ownable2Step} from "@openzeppelin/contracts/access/Ownable2Step.sol";
import {ProposedUpgrade} from "../upgrades/BaseZkSyncUpgrade.sol";
import {ReentrancyGuard} from "../common/ReentrancyGuard.sol";
import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L2_TO_L1_LOG_SERIALIZE_SIZE, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK, SYSTEM_UPGRADE_L2_TX_TYPE, ERA_DIAMOND_PROXY, ERA_CHAIN_ID} from "../common/Config.sol";
import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L2_TO_L1_LOG_SERIALIZE_SIZE, DEFAULT_L2_LOGS_TREE_ROOT_HASH, EMPTY_STRING_KECCAK, SYSTEM_UPGRADE_L2_TX_TYPE} from "../common/Config.sol";
import {VerifierParams} from "./chain-interfaces/IVerifier.sol";

/// @title StateTransition contract
Expand Down
4 changes: 0 additions & 4 deletions l1-contracts/contracts/state-transition/chain-deps/DiamondInit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ pragma solidity 0.8.20;

import {Diamond} from "../libraries/Diamond.sol";
import {ZkSyncStateTransitionBase} from "./facets/ZkSyncStateTransitionBase.sol";
import {FeeParams} from "./ZkSyncStateTransitionStorage.sol";
import {L2_TO_L1_LOG_SERIALIZE_SIZE, MAX_GAS_PER_TRANSACTION} from "../../common/Config.sol";
import {InitializeData, IDiamondInit} from "../chain-interfaces/IDiamondInit.sol";
import {VerifierParams} from "../chain-interfaces/IVerifier.sol";

import "../l2-deps/ISystemContext.sol";

/// @author Matter Labs
/// @dev The contract is used only once to initialize the diamond proxy.
Expand Down
4 changes: 1 addition & 3 deletions l1-contracts/contracts/state-transition/chain-deps/facets/Mailbox.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ import {TransactionValidator} from "../../libraries/TransactionValidator.sol";
import {WritePriorityOpParams, L2CanonicalTransaction, L2Message, L2Log, TxStatus, BridgehubL2TransactionRequest} from "../../../common/Messaging.sol";
import {FeeParams, PubdataPricingMode} from "../ZkSyncStateTransitionStorage.sol";
import {UncheckedMath} from "../../../common/libraries/UncheckedMath.sol";
import {UnsafeBytes} from "../../../common/libraries/UnsafeBytes.sol";
import {L2ContractHelper} from "../../../common/libraries/L2ContractHelper.sol";
import {AddressAliasHelper} from "../../../vendor/AddressAliasHelper.sol";
import {ZkSyncStateTransitionBase} from "./ZkSyncStateTransitionBase.sol";
import {REQUIRED_L2_GAS_PRICE_PER_PUBDATA, L1_GAS_PER_PUBDATA_BYTE, L2_L1_LOGS_TREE_DEFAULT_LEAF_HASH, PRIORITY_OPERATION_L2_TX_TYPE, PRIORITY_EXPIRATION, MAX_NEW_FACTORY_DEPS, ETH_TOKEN_ADDRESS, ERA_CHAIN_ID} from "../../../common/Config.sol";
import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR, L2_BASE_TOKEN_SYSTEM_CONTRACT_ADDR} from "../../../common/L2ContractAddresses.sol";
import {L2_BOOTLOADER_ADDRESS, L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR} from "../../../common/L2ContractAddresses.sol";

import {IBridgehub} from "../../../bridgehub/IBridgehub.sol";
import {IL1SharedBridge} from "../../../bridge/interfaces/IL1SharedBridge.sol";

// While formally the following import is not used, it is needed to inherit documentation from it
Expand Down
1 change: 0 additions & 1 deletion l1-contracts/contracts/state-transition/chain-interfaces/IDiamondInit.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

pragma solidity 0.8.20;

import {L2CanonicalTransaction} from "../../common/Messaging.sol";
import {IVerifier, VerifierParams} from "./IVerifier.sol";
import {FeeParams} from "../chain-deps/ZkSyncStateTransitionStorage.sol";

Expand Down
4 changes: 1 addition & 3 deletions l1-contracts/contracts/state-transition/chain-interfaces/IZkSyncStateTransition.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ import {IAdmin} from "./IAdmin.sol";
import {IExecutor} from "./IExecutor.sol";
import {IGetters} from "./IGetters.sol";
import {IMailbox} from "./IMailbox.sol";
import {Verifier} from "../Verifier.sol";
import {VerifierParams} from "./IVerifier.sol";

// kl to do remove this, needed for the server for now
import "../libraries/Diamond.sol";
import {Diamond} from "../libraries/Diamond.sol";

interface IZkSyncStateTransition is IAdmin, IExecutor, IGetters, IMailbox {
// KL todo: need this in the server for now
Expand Down
1 change: 0 additions & 1 deletion l1-contracts/contracts/upgrades/BaseZkSyncUpgrade.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
pragma solidity 0.8.20;

import {ZkSyncStateTransitionBase} from "../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
import {IMailbox} from "../state-transition/chain-interfaces/IMailbox.sol";
import {VerifierParams} from "../state-transition/chain-interfaces/IVerifier.sol";
import {IVerifier} from "../state-transition/chain-interfaces/IVerifier.sol";
import {L2ContractHelper} from "../common/libraries/L2ContractHelper.sol";
Expand Down
8 changes: 1 addition & 7 deletions l1-contracts/contracts/upgrades/BaseZkSyncUpgradeGenesis.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@

pragma solidity 0.8.20;

import "../state-transition/chain-deps/facets/ZkSyncStateTransitionBase.sol";
import "../state-transition/chain-interfaces/IMailbox.sol";
import "../state-transition/chain-interfaces/IVerifier.sol";
import "../common/libraries/L2ContractHelper.sol";
import "../common/Messaging.sol";
import "../state-transition/libraries/TransactionValidator.sol";
import {MAX_NEW_FACTORY_DEPS, SYSTEM_UPGRADE_L2_TX_TYPE, MAX_ALLOWED_PROTOCOL_VERSION_DELTA} from "../common/Config.sol";
import {MAX_ALLOWED_PROTOCOL_VERSION_DELTA} from "../common/Config.sol";
import {ProposedUpgrade, BaseZkSyncUpgrade} from "./BaseZkSyncUpgrade.sol";

/// @author Matter Labs
Expand Down
6 changes: 3 additions & 3 deletions l1-contracts/contracts/upgrades/GenesisUpgrade.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

pragma solidity 0.8.20;

import "../state-transition/libraries/Diamond.sol";
import "./BaseZkSyncUpgradeGenesis.sol";
import "./IDefaultUpgrade.sol";
import {Diamond} from "../state-transition/libraries/Diamond.sol";
import {BaseZkSyncUpgradeGenesis} from "./BaseZkSyncUpgradeGenesis.sol";
import {ProposedUpgrade} from "./IDefaultUpgrade.sol";

/// @author Matter Labs
/// @custom:security-contact security@matterlabs.dev
Expand Down
3 changes: 1 addition & 2 deletions l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ import {stdStorage, StdStorage, Test} from "forge-std/Test.sol";

import {Diamond} from "solpp/state-transition/libraries/Diamond.sol";
import {TestnetERC20Token} from "solpp/dev-contracts/TestnetERC20Token.sol";
import {IBridgehub, Bridgehub} from "solpp/bridgehub/Bridgehub.sol";
import {Bridgehub} from "solpp/bridgehub/Bridgehub.sol";
import {L2TransactionRequestDirect, L2TransactionRequestTwoBridgesOuter} from "solpp/bridgehub/IBridgehub.sol";
import {DummyStateTransitionManagerWBH} from "solpp/dev-contracts/test/DummyStateTransitionManagerWithBridgeHubAddress.sol";
import {DummyStateTransition} from "solpp/dev-contracts/test/DummyStateTransition.sol";
import {DummySharedBridge} from "solpp/dev-contracts/test/DummySharedBridge.sol";
import {IL1SharedBridge} from "solpp/bridge/interfaces/IL1SharedBridge.sol";
import {TransactionValidator} from "solpp/state-transition/libraries/TransactionValidator.sol";

import {L2Message, L2Log, TxStatus, BridgehubL2TransactionRequest} from "solpp/common/Messaging.sol";
import {ETH_TOKEN_ADDRESS, REQUIRED_L2_GAS_PRICE_PER_PUBDATA, MAX_NEW_FACTORY_DEPS} from "solpp/common/Config.sol";
Expand Down
1 change: 0 additions & 1 deletion l1-contracts/test/foundry/unit/concrete/Bridges/L1Erc20Bridge/_L1Erc20Bridge_Shared.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {TestnetERC20Token} from "solpp/dev-contracts/TestnetERC20Token.sol";
import {FeeOnTransferToken} from "solpp/dev-contracts/FeeOnTransferToken.sol";
import {DummySharedBridge} from "solpp/dev-contracts/test/DummySharedBridge.sol";
import {ReenterL1ERC20Bridge} from "solpp/dev-contracts/test/ReenterL1ERC20Bridge.sol";
import {Forwarder} from "solpp/dev-contracts/Forwarder.sol";
import {Utils} from "../../Utils/Utils.sol";

contract L1Erc20BridgeTest is Test {
Expand Down
Loading
Loading