From 7ccfdae7762598ffc19f94b01f808ea0c759cc7d Mon Sep 17 00:00:00 2001
From: Alberto Sala <albertosala@horizenlabs.io>
Date: Tue, 28 May 2024 18:00:39 +0200
Subject: [PATCH 1/2] Fix for issue EON-1857

---
 node/src/main/java/io/horizen/eon/forks/F6Fork.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/node/src/main/java/io/horizen/eon/forks/F6Fork.java b/node/src/main/java/io/horizen/eon/forks/F6Fork.java
index 997d8c0..3108f82 100644
--- a/node/src/main/java/io/horizen/eon/forks/F6Fork.java
+++ b/node/src/main/java/io/horizen/eon/forks/F6Fork.java
@@ -45,7 +45,10 @@ public List<Pair<SidechainForkConsensusEpoch, OptionalSidechainFork>> getPairs()
                                 getActivationRegtest(),
                                 getActivationTestnet(sidechainId),
                                 getActivationMainnet()),
-                        new Version1_4_0Fork(true)
+                        new Version1_4_0Fork(true,
+                                getActivationRegtest(),
+                                getActivationTestnet(sidechainId),
+                                getActivationMainnet())
                 )
         );
     }

From 792211dce40c05cbf8cc53e9e0dd4db8e4ed1436 Mon Sep 17 00:00:00 2001
From: Alberto Sala <albertosala@horizenlabs.io>
Date: Wed, 29 May 2024 12:41:26 +0200
Subject: [PATCH 2/2] Modifications after code review

---
 doc/api/transaction/updateForger.md                 | 2 +-
 doc/nativesc/contracts/ForgerStakesV2.md            | 3 ++-
 doc/nativesc/contracts/ForgerStakesV2.sol           | 1 +
 node/src/main/java/io/horizen/eon/forks/F6Fork.java | 7 ++-----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/api/transaction/updateForger.md b/doc/api/transaction/updateForger.md
index 21c7ce2..c7c64d0 100644
--- a/doc/api/transaction/updateForger.md
+++ b/doc/api/transaction/updateForger.md
@@ -4,7 +4,7 @@
 Updates an existing forger.<br>
 Available from: EON 1.4.0<br>
 
-Note: this action can be performed only for forgers with rewardShare = 0 and rewardAddress not set, and only to assign them a value.<br>
+Note: this action can be performed only for forgers with rewardShare = 0 and rewardAddress not set, and only to assign them a value. This operation can be called only if at least 2 epochs are passed by since the 1.4 fork activation.<br>
 
 **Parameters**
 
diff --git a/doc/nativesc/contracts/ForgerStakesV2.md b/doc/nativesc/contracts/ForgerStakesV2.md
index cd4f183..e43ecc9 100644
--- a/doc/nativesc/contracts/ForgerStakesV2.md
+++ b/doc/nativesc/contracts/ForgerStakesV2.md
@@ -35,7 +35,8 @@ This native smart contract manages the forger stakes from EON 1.4.0 version.
 
      Updates an existing forger.<br>
      A forger can be updated just once and only if rewardAddress == 0x000..00 and rewardShare == 0.<br>
-     Vrf key is split in two separate parameters, being longer than 32 bytes.
+     Vrf key is split in two separate parameters, being longer than 32 bytes.<br>
+     This operation should be called only if at least 2 epochs are passed by since the 1.4 fork activation.
 
 - delegate
 
diff --git a/doc/nativesc/contracts/ForgerStakesV2.sol b/doc/nativesc/contracts/ForgerStakesV2.sol
index 1b89a70..9b55bad 100644
--- a/doc/nativesc/contracts/ForgerStakesV2.sol
+++ b/doc/nativesc/contracts/ForgerStakesV2.sol
@@ -59,6 +59,7 @@ interface ForgerStakesV2 {
       Updates an existing forger.
       A forger can be updated just once and only if rewardAddress == 0x000..00 and rewardShare == 0.
       See above the registerForger command for the parameters meaning.
+      This operation should be called only if at least 2 epochs are passed by since the 1.4 fork activation.
     */
     function updateForger(bytes32 signPubKey, bytes32 vrf1, bytes1 vrf2, uint32 rewardShare,
         address rewardAddress, bytes32 sign1_1, bytes32 sign1_2,
diff --git a/node/src/main/java/io/horizen/eon/forks/F6Fork.java b/node/src/main/java/io/horizen/eon/forks/F6Fork.java
index 3108f82..65cd9d4 100644
--- a/node/src/main/java/io/horizen/eon/forks/F6Fork.java
+++ b/node/src/main/java/io/horizen/eon/forks/F6Fork.java
@@ -45,11 +45,8 @@ public List<Pair<SidechainForkConsensusEpoch, OptionalSidechainFork>> getPairs()
                                 getActivationRegtest(),
                                 getActivationTestnet(sidechainId),
                                 getActivationMainnet()),
-                        new Version1_4_0Fork(true,
-                                getActivationRegtest(),
-                                getActivationTestnet(sidechainId),
-                                getActivationMainnet())
+                        new Version1_4_0Fork(true)
                 )
         );
     }
-}
\ No newline at end of file
+}