Release adjustments.

signum-network · Jan 5, 2023 · c01f860 · c01f860
1 parent 1dd1a30
commit c01f860
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/brs/Appendix.java b/src/brs/Appendix.java
@@ -2,6 +2,7 @@
 
 import brs.crypto.EncryptedData;
 import brs.fluxcapacitor.FluxValues;
+import brs.props.Props;
 import brs.util.Convert;
 import brs.util.JSON;
 import com.google.gson.JsonObject;
@@ -399,6 +400,10 @@ public void validate(Transaction transaction) throws BurstException.ValidationEx
       if (recipientAccount != null && recipientAccount.getPublicKey() != null && ! Arrays.equals(publicKey, recipientAccount.getPublicKey())) {
         throw new BurstException.NotCurrentlyValidException("A different public key for this account has already been announced");
       }
+      if(Burst.getFluxCapacitor().getValue(FluxValues.PK_FREEZE)
+        && Burst.getBlockchain().getHeight() - recipientAccount.getCreationHeight() > Burst.getPropertyService().getInt(Props.PK_BLOCKS_PAST)) {
+          throw new BurstException.NotCurrentlyValidException("Setting a new key for and old inactivated account");
+      }
     }
 
     @Override

diff --git a/src/brs/Burst.java b/src/brs/Burst.java
@@ -47,7 +47,7 @@
 
 public final class Burst {
 
-  public static final Version VERSION = Version.parse("v3.6.0-beta1");
+  public static final Version VERSION = Version.parse("v3.6.0");
   public static final String APPLICATION = "BRS";
 
   public static final String CONF_FOLDER = "./conf";

diff --git a/src/brs/db/sql/SqlAccountStore.java b/src/brs/db/sql/SqlAccountStore.java
@@ -328,7 +328,7 @@ public boolean setOrVerify(Account acc, byte[] key, int height) {
     if (acc.getPublicKey() == null) {
       if(Burst.getFluxCapacitor().getValue(FluxValues.PK_FREEZE)
         && Burst.getBlockchain().getHeight() - acc.getCreationHeight() > Burst.getPropertyService().getInt(Props.PK_BLOCKS_PAST)) {
-          logger.info("Setting a new key for and old account {} is not allowed, created at height {}", Convert.toUnsignedLong(acc.id), Burst.getBlockchain().getHeight(), acc.getCreationHeight());
+          logger.info("Setting a new key for and old account {} is not allowed, created at height {}", Convert.toUnsignedLong(acc.id), acc.getCreationHeight());
           return false;
       }
 

diff --git a/src/brs/fluxcapacitor/HistoricalMoments.java b/src/brs/fluxcapacitor/HistoricalMoments.java
@@ -22,7 +22,7 @@ public class HistoricalMoments {
     public static HistoricalMoments SMART_ATS = new HistoricalMoments(1_029_000, Props.SMART_ATS_HEIGHT);
     public static HistoricalMoments AT_FIX_BLOCK_5 = new HistoricalMoments(1_051_900, Props.AT_FIX_BLOCK_5_BLOCK_HEIGHT);
     public static HistoricalMoments DISTRIBUTION_FIX = new HistoricalMoments(1_051_900, Props.DISTRIBUTION_FIX_BLOCK_HEIGHT);
-    public static HistoricalMoments PK_FREEZE = new HistoricalMoments(Integer.MAX_VALUE, Props.PK_BLOCK_HEIGHT);
+    public static HistoricalMoments PK_FREEZE = new HistoricalMoments(1_099_400, Props.PK_BLOCK_HEIGHT);
     public static HistoricalMoments NEXT_FORK = new HistoricalMoments(Integer.MAX_VALUE, Props.DEV_NEXT_FORK_BLOCK_HEIGHT);
 
     private final int mainnetHeight;

diff --git a/src/brs/props/Props.java b/src/brs/props/Props.java
@@ -83,7 +83,7 @@ public class Props {
   // Checkpoint block for faster sync from empty database
   public static final Prop<Integer> BRS_CHECKPOINT_HEIGHT = new Prop<>("node.checkPointHeight", 970_000);
   public static final Prop<String> BRS_CHECKPOINT_HASH = new Prop<>("node.checkPointPrevHash", "c0bb65a25e6fb5f6c4672b5ced900bdf9eb8247187467fd504f42e050fe2ad36");
-  public static final Prop<String> BRS_PK_CHECKS = new Prop<>("node.pkChecks", "169b3b99ce28a350;a83c47e772a35586;6db77a51a7def19d;c4823aa7028f6735;fb0e32a5bc032257;15a35aa0515e3584;27fcf52c3bc40fba;c4823aa7028f6735;981454e22b5ac976;0cb15471ad76fcd1;");
+  public static final Prop<String> BRS_PK_CHECKS = new Prop<>("node.pkChecks", "dba639ec3450e0b1;169b3b99ce28a350;a83c47e772a35586;6db77a51a7def19d;c4823aa7028f6735;fb0e32a5bc032257;15a35aa0515e3584;27fcf52c3bc40fba;c4823aa7028f6735;981454e22b5ac976;0cb15471ad76fcd1;");
 
   // GPU options
   public static final Prop<Boolean> GPU_ACCELERATION     = new Prop<>("GPU.Acceleration", false);