Merge SFCLib and SFC contracts (#82)

Fantom-foundation · Oct 31, 2024 · 1bc06aa · 1bc06aa
1 parent 975107b
commit 1bc06aa
Show file tree

Hide file tree

Showing 11 changed files with 827 additions and 1,123 deletions.
diff --git a/contracts/interfaces/ISFC.sol b/contracts/interfaces/ISFC.sol
@@ -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);
@@ -162,7 +162,6 @@ interface ISFC {
         uint256 sealedEpoch,
         uint256 _totalSupply,
         address nodeDriver,
-        address lib,
         address consts,
         address _owner
     ) external;

diff --git a/contracts/sfc/NetworkInitializer.sol b/contracts/sfc/NetworkInitializer.sol
@@ -12,7 +12,6 @@ contract NetworkInitializer {
         uint256 sealedEpoch,
         uint256 totalSupply,
         address payable _sfc,
-        address _lib,
         address _auth,
         address _driver,
         address _evmWriter,
@@ -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);
     }
 }