From 6ba9acb154d72d491c8c8206cd5821130d62d339 Mon Sep 17 00:00:00 2001 From: Mike-CZ Date: Fri, 25 Oct 2024 10:31:17 +0200 Subject: [PATCH] Move interfaces into separate directory --- .../interfaces/{IEVMWriter.sol => IEvmWriter.sol} | 0 .../NodeDriverI.sol => interfaces/INodeDriver.sol} | 2 +- contracts/interfaces/INodeDriverExecutable.sol | 6 ++++++ contracts/{sfc/SFCI.sol => interfaces/ISfc.sol} | 2 +- contracts/sfc/NetworkInitializer.sol | 4 ++-- contracts/sfc/NodeDriver.sol | 2 +- contracts/sfc/NodeDriverAuth.sol | 13 +++++-------- contracts/sfc/Updater.sol | 6 +++--- contracts/test/StubEvmWriter.sol | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-) rename contracts/interfaces/{IEVMWriter.sol => IEvmWriter.sol} (100%) rename contracts/{sfc/NodeDriverI.sol => interfaces/INodeDriver.sol} (97%) create mode 100644 contracts/interfaces/INodeDriverExecutable.sol rename contracts/{sfc/SFCI.sol => interfaces/ISfc.sol} (99%) diff --git a/contracts/interfaces/IEVMWriter.sol b/contracts/interfaces/IEvmWriter.sol similarity index 100% rename from contracts/interfaces/IEVMWriter.sol rename to contracts/interfaces/IEvmWriter.sol diff --git a/contracts/sfc/NodeDriverI.sol b/contracts/interfaces/INodeDriver.sol similarity index 97% rename from contracts/sfc/NodeDriverI.sol rename to contracts/interfaces/INodeDriver.sol index 4fda872..225cde4 100644 --- a/contracts/sfc/NodeDriverI.sol +++ b/contracts/interfaces/INodeDriver.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.9; -interface NodeDriverI { +interface INodeDriver { function setGenesisValidator( address _auth, uint256 validatorID, diff --git a/contracts/interfaces/INodeDriverExecutable.sol b/contracts/interfaces/INodeDriverExecutable.sol new file mode 100644 index 0000000..9bc78cc --- /dev/null +++ b/contracts/interfaces/INodeDriverExecutable.sol @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity ^0.8.9; + +interface INodeDriverExecutable { + function execute() external; +} diff --git a/contracts/sfc/SFCI.sol b/contracts/interfaces/ISfc.sol similarity index 99% rename from contracts/sfc/SFCI.sol rename to contracts/interfaces/ISfc.sol index 4574463..d7c5c15 100644 --- a/contracts/sfc/SFCI.sol +++ b/contracts/interfaces/ISfc.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.9; -interface SFCI { +interface ISfc { event CreatedValidator( uint256 indexed validatorID, address indexed auth, diff --git a/contracts/sfc/NetworkInitializer.sol b/contracts/sfc/NetworkInitializer.sol index 51d6b5a..f247036 100644 --- a/contracts/sfc/NetworkInitializer.sol +++ b/contracts/sfc/NetworkInitializer.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.9; -import {SFCI} from "./SFCI.sol"; +import {ISfc} from "../interfaces/ISfc.sol"; import {NodeDriver, NodeDriverAuth} from "./NodeDriver.sol"; import {ConstantsManager} from "./ConstantsManager.sol"; import {Decimal} from "../common/Decimal.sol"; @@ -40,6 +40,6 @@ contract NetworkInitializer { consts.updateGasPriceBalancingCounterweight(3600); consts.transferOwnership(_owner); - SFCI(_sfc).initialize(sealedEpoch, totalSupply, _auth, _lib, address(consts), _owner); + ISfc(_sfc).initialize(sealedEpoch, totalSupply, _auth, _lib, address(consts), _owner); } } diff --git a/contracts/sfc/NodeDriver.sol b/contracts/sfc/NodeDriver.sol index 58a6220..ea579bd 100644 --- a/contracts/sfc/NodeDriver.sol +++ b/contracts/sfc/NodeDriver.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.9; import {Initializable} from "../common/Initializable.sol"; import {NodeDriverAuth} from "./NodeDriverAuth.sol"; -import {IEvmWriter} from "../interfaces/IEVMWriter.sol"; +import {IEvmWriter} from "../interfaces/IEvmWriter.sol"; contract NodeDriver is Initializable { NodeDriverAuth internal backend; diff --git a/contracts/sfc/NodeDriverAuth.sol b/contracts/sfc/NodeDriverAuth.sol index 2801fff..ef5cd03 100644 --- a/contracts/sfc/NodeDriverAuth.sol +++ b/contracts/sfc/NodeDriverAuth.sol @@ -3,15 +3,12 @@ pragma solidity ^0.8.9; import {Initializable} from "../common/Initializable.sol"; import {Ownable} from "../ownership/Ownable.sol"; -import {SFCI} from "./SFCI.sol"; +import {ISfc} from "../interfaces/ISfc.sol"; import {NodeDriver} from "./NodeDriver.sol"; - -interface NodeDriverExecutable { - function execute() external; -} +import {INodeDriverExecutable} from "../interfaces/INodeDriverExecutable.sol"; contract NodeDriverAuth is Initializable, Ownable { - SFCI internal sfc; + ISfc internal sfc; NodeDriver internal driver; error NotSFC(); @@ -25,7 +22,7 @@ contract NodeDriverAuth is Initializable, Ownable { function initialize(address payable _sfc, address _driver, address _owner) external initializer { Ownable.initialize(_owner); driver = NodeDriver(_driver); - sfc = SFCI(_sfc); + sfc = ISfc(_sfc); } modifier onlySFC() { @@ -48,7 +45,7 @@ contract NodeDriverAuth is Initializable, Ownable { function _execute(address executable, address newOwner, bytes32 selfCodeHash, bytes32 driverCodeHash) internal { _transferOwnership(executable); - NodeDriverExecutable(executable).execute(); + INodeDriverExecutable(executable).execute(); _transferOwnership(newOwner); //require(driver.backend() == address(this), "ownership of driver is lost"); if (_getCodeHash(address(this)) != selfCodeHash) { diff --git a/contracts/sfc/Updater.sol b/contracts/sfc/Updater.sol index 634167a..e681f7c 100644 --- a/contracts/sfc/Updater.sol +++ b/contracts/sfc/Updater.sol @@ -6,7 +6,7 @@ import {Decimal} from "../common/Decimal.sol"; import {NodeDriverAuth} from "./NodeDriverAuth.sol"; import {ConstantsManager} from "./ConstantsManager.sol"; import {SFC} from "./SFC.sol"; -import {SFCI} from "./SFCI.sol"; +import {ISfc} from "../interfaces/ISfc.sol"; import {Version} from "../version/Version.sol"; interface GovI { @@ -104,8 +104,8 @@ contract Updater { NodeDriverAuth nodeAuth = NodeDriverAuth(0xD100ae0000000000000000000000000000000000); nodeAuth.upgradeCode(sfcTo, sfcFrom); - SFCI(sfcTo).updateConstsAddress(sfcConsts); - SFCI(sfcTo).updateVoteBookAddress(voteBook); + ISfc(sfcTo).updateConstsAddress(sfcConsts); + ISfc(sfcTo).updateVoteBookAddress(voteBook); SFC(sfcTo).updateLibAddress(sfcLib); nodeAuth.upgradeCode(govTo, govFrom); diff --git a/contracts/test/StubEvmWriter.sol b/contracts/test/StubEvmWriter.sol index 1c50617..c0e0b4b 100644 --- a/contracts/test/StubEvmWriter.sol +++ b/contracts/test/StubEvmWriter.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity ^0.8.9; -import {IEvmWriter} from "../interfaces/IEVMWriter.sol"; +import {IEvmWriter} from "../interfaces/IEvmWriter.sol"; contract StubEvmWriter is IEvmWriter { function setBalance(address acc, uint256 value) external {}