Skip to content

Commit 6ba9acb

Browse files
author
Mike-CZ
committed
Move interfaces into separate directory
1 parent 45c78a3 commit 6ba9acb

9 files changed

+20
-17
lines changed
File renamed without changes.

contracts/sfc/NodeDriverI.sol contracts/interfaces/INodeDriver.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: UNLICENSED
22
pragma solidity ^0.8.9;
33

4-
interface NodeDriverI {
4+
interface INodeDriver {
55
function setGenesisValidator(
66
address _auth,
77
uint256 validatorID,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// SPDX-License-Identifier: UNLICENSED
2+
pragma solidity ^0.8.9;
3+
4+
interface INodeDriverExecutable {
5+
function execute() external;
6+
}

contracts/sfc/SFCI.sol contracts/interfaces/ISfc.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: UNLICENSED
22
pragma solidity ^0.8.9;
33

4-
interface SFCI {
4+
interface ISfc {
55
event CreatedValidator(
66
uint256 indexed validatorID,
77
address indexed auth,

contracts/sfc/NetworkInitializer.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: UNLICENSED
22
pragma solidity ^0.8.9;
33

4-
import {SFCI} from "./SFCI.sol";
4+
import {ISfc} from "../interfaces/ISfc.sol";
55
import {NodeDriver, NodeDriverAuth} from "./NodeDriver.sol";
66
import {ConstantsManager} from "./ConstantsManager.sol";
77
import {Decimal} from "../common/Decimal.sol";
@@ -40,6 +40,6 @@ contract NetworkInitializer {
4040
consts.updateGasPriceBalancingCounterweight(3600);
4141
consts.transferOwnership(_owner);
4242

43-
SFCI(_sfc).initialize(sealedEpoch, totalSupply, _auth, _lib, address(consts), _owner);
43+
ISfc(_sfc).initialize(sealedEpoch, totalSupply, _auth, _lib, address(consts), _owner);
4444
}
4545
}

contracts/sfc/NodeDriver.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.9;
33

44
import {Initializable} from "../common/Initializable.sol";
55
import {NodeDriverAuth} from "./NodeDriverAuth.sol";
6-
import {IEvmWriter} from "../interfaces/IEVMWriter.sol";
6+
import {IEvmWriter} from "../interfaces/IEvmWriter.sol";
77

88
contract NodeDriver is Initializable {
99
NodeDriverAuth internal backend;

contracts/sfc/NodeDriverAuth.sol

+5-8
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@ pragma solidity ^0.8.9;
33

44
import {Initializable} from "../common/Initializable.sol";
55
import {Ownable} from "../ownership/Ownable.sol";
6-
import {SFCI} from "./SFCI.sol";
6+
import {ISfc} from "../interfaces/ISfc.sol";
77
import {NodeDriver} from "./NodeDriver.sol";
8-
9-
interface NodeDriverExecutable {
10-
function execute() external;
11-
}
8+
import {INodeDriverExecutable} from "../interfaces/INodeDriverExecutable.sol";
129

1310
contract NodeDriverAuth is Initializable, Ownable {
14-
SFCI internal sfc;
11+
ISfc internal sfc;
1512
NodeDriver internal driver;
1613

1714
error NotSFC();
@@ -25,7 +22,7 @@ contract NodeDriverAuth is Initializable, Ownable {
2522
function initialize(address payable _sfc, address _driver, address _owner) external initializer {
2623
Ownable.initialize(_owner);
2724
driver = NodeDriver(_driver);
28-
sfc = SFCI(_sfc);
25+
sfc = ISfc(_sfc);
2926
}
3027

3128
modifier onlySFC() {
@@ -48,7 +45,7 @@ contract NodeDriverAuth is Initializable, Ownable {
4845

4946
function _execute(address executable, address newOwner, bytes32 selfCodeHash, bytes32 driverCodeHash) internal {
5047
_transferOwnership(executable);
51-
NodeDriverExecutable(executable).execute();
48+
INodeDriverExecutable(executable).execute();
5249
_transferOwnership(newOwner);
5350
//require(driver.backend() == address(this), "ownership of driver is lost");
5451
if (_getCodeHash(address(this)) != selfCodeHash) {

contracts/sfc/Updater.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {Decimal} from "../common/Decimal.sol";
66
import {NodeDriverAuth} from "./NodeDriverAuth.sol";
77
import {ConstantsManager} from "./ConstantsManager.sol";
88
import {SFC} from "./SFC.sol";
9-
import {SFCI} from "./SFCI.sol";
9+
import {ISfc} from "../interfaces/ISfc.sol";
1010
import {Version} from "../version/Version.sol";
1111

1212
interface GovI {
@@ -104,8 +104,8 @@ contract Updater {
104104

105105
NodeDriverAuth nodeAuth = NodeDriverAuth(0xD100ae0000000000000000000000000000000000);
106106
nodeAuth.upgradeCode(sfcTo, sfcFrom);
107-
SFCI(sfcTo).updateConstsAddress(sfcConsts);
108-
SFCI(sfcTo).updateVoteBookAddress(voteBook);
107+
ISfc(sfcTo).updateConstsAddress(sfcConsts);
108+
ISfc(sfcTo).updateVoteBookAddress(voteBook);
109109
SFC(sfcTo).updateLibAddress(sfcLib);
110110

111111
nodeAuth.upgradeCode(govTo, govFrom);

contracts/test/StubEvmWriter.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: UNLICENSED
22
pragma solidity ^0.8.9;
33

4-
import {IEvmWriter} from "../interfaces/IEVMWriter.sol";
4+
import {IEvmWriter} from "../interfaces/IEvmWriter.sol";
55

66
contract StubEvmWriter is IEvmWriter {
77
function setBalance(address acc, uint256 value) external {}

0 commit comments

Comments
 (0)