Remove unnecessary genesis params and migration func

Author: thaarok

contracts/interfaces/ISFC.sol

@@ -166,16 +166,7 @@ interface ISFC {
         address _owner
     ) external;
 
-    function setGenesisValidator(
-        address auth,
-        uint256 validatorID,
-        bytes calldata pubkey,
-        uint256 status,
-        uint256 createdEpoch,
-        uint256 createdTime,
-        uint256 deactivatedEpoch,
-        uint256 deactivatedTime
-    ) external;
+    function setGenesisValidator(address auth, uint256 validatorID, bytes calldata pubkey, uint256 createdTime) external;
 
     function setGenesisDelegation(address delegator, uint256 toValidatorID, uint256 stake) external;
 

contracts/sfc/NodeDriver.sol

@@ -88,26 +88,8 @@ contract NodeDriver is Initializable {
 
     // Methods which are called only by the node
 
-    function setGenesisValidator(
-        address _auth,
-        uint256 validatorID,
-        bytes calldata pubkey,
-        uint256 status,
-        uint256 createdEpoch,
-        uint256 createdTime,
-        uint256 deactivatedEpoch,
-        uint256 deactivatedTime
-    ) external onlyNode {
-        backend.setGenesisValidator(
-            _auth,
-            validatorID,
-            pubkey,
-            status,
-            createdEpoch,
-            createdTime,
-            deactivatedEpoch,
-            deactivatedTime
-        );
+    function setGenesisValidator(address auth, uint256 validatorID, bytes calldata pubkey, uint256 createdTime) external onlyNode {
+        backend.setGenesisValidator(auth, validatorID, pubkey, createdTime);
     }
 
     function setGenesisDelegation(address delegator, uint256 toValidatorID, uint256 stake) external onlyNode {

contracts/sfc/NodeDriverAuth.sol

@@ -116,26 +116,8 @@ contract NodeDriverAuth is Initializable, Ownable {
         driver.updateValidatorPubkey(validatorID, pubkey);
     }
 
-    function setGenesisValidator(
-        address _auth,
-        uint256 validatorID,
-        bytes calldata pubkey,
-        uint256 status,
-        uint256 createdEpoch,
-        uint256 createdTime,
-        uint256 deactivatedEpoch,
-        uint256 deactivatedTime
-    ) external onlyDriver {
-        sfc.setGenesisValidator(
-            _auth,
-            validatorID,
-            pubkey,
-            status,
-            createdEpoch,
-            createdTime,
-            deactivatedEpoch,
-            deactivatedTime
-        );
+    function setGenesisValidator(address auth, uint256 validatorID, bytes calldata pubkey, uint256 createdTime) external onlyDriver {
+        sfc.setGenesisValidator(auth, validatorID, pubkey, createdTime);
     }
 
     function setGenesisDelegation(address delegator, uint256 toValidatorID, uint256 stake) external onlyDriver {

contracts/sfc/SFC.sol

@@ -238,18 +238,6 @@ contract SFC is Initializable, Ownable, Version {
         revert TransfersNotAllowed();
     }
 
-    function migrateValidatorPubkeyUniquenessFlag(uint256 start, uint256 end) external {
-        for (uint256 vid = start; vid < end; vid++) {
-            bytes memory pubkey = getValidatorPubkey[vid];
-            if (pubkey.length > 0 && pubkeyHashToValidatorID[keccak256(pubkey)] != vid) {
-                if (pubkeyHashToValidatorID[keccak256(pubkey)] != 0) {
-                    revert PubkeyUsedByOtherValidator();
-                }
-                pubkeyHashToValidatorID[keccak256(pubkey)] = vid;
-            }
-        }
-    }
-
     function updateValidatorPubkey(bytes calldata pubkey) external {
         if (pubkey.length != 66 || pubkey[0] != 0xc0) {
             revert MalformedPubkey();
@@ -351,25 +339,16 @@ contract SFC is Initializable, Ownable, Version {
         node.updateMinGasPrice(minGasPrice);
     }
 
-    function setGenesisValidator(
-        address auth,
-        uint256 validatorID,
-        bytes calldata pubkey,
-        uint256 status,
-        uint256 createdEpoch,
-        uint256 createdTime,
-        uint256 deactivatedEpoch,
-        uint256 deactivatedTime
-    ) external onlyDriver {
+    function setGenesisValidator(address auth, uint256 validatorID, bytes calldata pubkey, uint256 createdTime) external onlyDriver {
         _rawCreateValidator(
             auth,
             validatorID,
             pubkey,
-            status,
-            createdEpoch,
+            OK_STATUS,
+            0, // createdEpoch
             createdTime,
-            deactivatedEpoch,
-            deactivatedTime
+            0, // deactivatedEpoch - not deactivated
+            0 // deactivatedTime - not deactivated
         );
         if (validatorID > lastValidatorID) {
             lastValidatorID = validatorID;

test/NodeDriver.ts

@@ -123,11 +123,7 @@ describe('NodeDriver', () => {
           account,
           1,
           account.publicKey,
-          0,
-          await this.sfc.currentEpoch(),
           Date.now(),
-          0,
-          0,
         ),
       ).to.be.revertedWithCustomError(this.nodeDriver, 'NotNode');
     });
@@ -143,7 +139,7 @@ describe('NodeDriver', () => {
     it('Should revert when not node', async function () {
       const account = ethers.Wallet.createRandom();
       await expect(
-        this.nodeDriver.setGenesisDelegation(account, 1, 100, 0, 0, 0, 0, 0, 1000),
+        this.nodeDriver.setGenesisDelegation(account, 1, 100),
       ).to.be.revertedWithCustomError(this.nodeDriver, 'NotNode');
     });
   });

test/SFC.ts

@@ -60,12 +60,9 @@ describe('SFC', () => {
         validator.address,
         1,
         validator.publicKey,
-        1 << 3,
-        await this.sfc.currentEpoch(),
         Date.now(),
-        0,
-        0,
       );
+      await this.sfc.deactivateValidator(1, 1 << 3);
       await this.sfc.disableNonNodeCalls();
     });
 
@@ -319,18 +316,14 @@ describe('SFC', () => {
           validator,
           1,
           validator.publicKey,
-          0,
-          await this.sfc.currentEpoch(),
           Date.now(),
-          0,
-          0,
         ),
       ).to.be.revertedWithCustomError(this.sfc, 'NotDriverAuth');
     });
 
     it('Should revert when setGenesisDelegation is not called not node', async function () {
       const delegator = ethers.Wallet.createRandom();
-      await expect(this.sfc.setGenesisDelegation(delegator, 1, 100, 0, 0, 0, 0, 0, 1000)).to.be.revertedWithCustomError(
+      await expect(this.sfc.setGenesisDelegation(delegator, 1, 100)).to.be.revertedWithCustomError(
         this.sfc,
         'NotDriverAuth',
       );
@@ -981,18 +974,14 @@ describe('SFC', () => {
             this.delegator,
             1,
             key,
-            1 << 3,
-            await this.sfc.currentEpoch(),
             Date.now(),
-            0,
-            0,
           ),
         ).to.be.revertedWithCustomError(this.nodeDriverAuth, 'NotDriver');
       });
 
       it('Should revert when calling setGenesisDelegation if not NodeDriver', async function () {
         await expect(
-          this.nodeDriverAuth.setGenesisDelegation(this.delegator, 1, 100, 0, 0, 0, 0, 0, 1000),
+          this.nodeDriverAuth.setGenesisDelegation(this.delegator, 1, 100),
         ).to.be.revertedWithCustomError(this.nodeDriverAuth, 'NotDriver');
       });
 
@@ -1131,7 +1120,7 @@ describe('SFC', () => {
     });
 
     it('Should succeed and setGenesisDelegation Validator', async function () {
-      await this.sfc.setGenesisDelegation(this.delegator, this.validatorId, ethers.parseEther('1'), 0, 0, 0, 0, 0, 100);
+      await this.sfc.setGenesisDelegation(this.delegator, this.validatorId, ethers.parseEther('1'));
       // delegator has already delegated 0.4 in fixture
       expect(await this.sfc.getStake(this.delegator, this.validatorId)).to.equal(ethers.parseEther('1.4'));
     });