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

Merge SFCLib and SFC contracts #82

Merged
merged 12 commits into from
Oct 31, 2024
Merged

Merge SFCLib and SFC contracts #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
883717f
Move interfaces into separate directory
Oct 25, 2024
5815adb
Rename interfaces
Oct 27, 2024
97aef3d
Merge `SFCLib` and `SFC` contracts
Oct 27, 2024
892017d
Fix lint errors
Oct 27, 2024
998e2ad
Fix solhint warning
Oct 27, 2024
3314c46
Merge branch 'sonic_sfc' into mike/sfc_merge
Oct 31, 2024
0715895
Merge removed lock
Oct 31, 2024
b4c6585
Merge branch 'sonic_sfc' into mike/iface_refactor
Oct 31, 2024
d7c12b1
Merge branch 'mike/iface_refactor' into mike/sfc_merge
Oct 31, 2024
f2cf506
Merge branch 'sonic_sfc' into mike/sfc_merge
Oct 31, 2024
5e22990
Reorganize `Validator` struct fields
Oct 31, 2024
c236915
Reorganize `Validator` struct fields
Oct 31, 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
7 changes: 3 additions & 4 deletions contracts/interfaces/ISFC.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ interface ISFC {
view
returns (
uint256 status,
uint256 deactivatedTime,
uint256 deactivatedEpoch,
uint256 receivedStake,
address auth,
uint256 createdEpoch,
uint256 createdTime,
address auth
uint256 deactivatedTime,
uint256 deactivatedEpoch
);

function getValidatorID(address) external view returns (uint256);
Expand Down Expand Up @@ -162,7 +162,6 @@ interface ISFC {
uint256 sealedEpoch,
uint256 _totalSupply,
address nodeDriver,
address lib,
address consts,
address _owner
) external;
Expand Down
3 changes: 1 addition & 2 deletions contracts/sfc/NetworkInitializer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ contract NetworkInitializer {
uint256 sealedEpoch,
uint256 totalSupply,
address payable _sfc,
address _lib,
address _auth,
address _driver,
address _evmWriter,
Expand All @@ -37,6 +36,6 @@ contract NetworkInitializer {
consts.updateGasPriceBalancingCounterweight(3600);
consts.transferOwnership(_owner);

ISFC(_sfc).initialize(sealedEpoch, totalSupply, _auth, _lib, address(consts), _owner);
ISFC(_sfc).initialize(sealedEpoch, totalSupply, _auth, address(consts), _owner);
}
}
Loading
Loading