Revise the getNextSeed for supporting the signature scheme swap fork

aionnetwork · Apr 29, 2020 · 5064a8c · 5064a8c
1 parent 44cbcc9
commit 5064a8c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/org/aion/staker/BlockSigner.java b/src/org/aion/staker/BlockSigner.java
@@ -8,6 +8,7 @@
 import org.aion.staker.chain.Transaction;
 import org.aion.staker.utils.Logger;
 import org.aion.staker.utils.PrivateKey;
+import org.aion.staker.vrf.VRF_Ed25519;
 import org.aion.util.bytes.ByteUtil;
 import org.aion.util.conversions.Hex;
 
@@ -120,8 +121,21 @@ public static void main(String[] args) throws InvalidKeySpecException, Interrupt
 
     private static byte[] getNextSeed(byte[] oldSeed) throws NoSuchAlgorithmException, InvalidKeySpecException, InvalidKeyException, SignatureException {
         byte[] seed;
+        int seedLength = 64;
+        int proofLength = 80;
         if (oldSeed != null) {
-            seed = MessageSigner.signMessageFromKeyBytes(stakerPrivateKey.getPrivateKeyBytes(), oldSeed);
+            if (oldSeed.length == seedLength) {
+                seed = MessageSigner.signMessageFromKeyBytes(stakerPrivateKey.getPrivateKeyBytes(), oldSeed);
+            } else if (oldSeed.length == (seedLength + 1) && oldSeed[seedLength] == 0) {
+                byte[] oldSeedHash = new byte[seedLength];
+                System.arraycopy(oldSeed, 0, oldSeedHash, 0, seedLength);
+                seed = VRF_Ed25519.generateProof(oldSeedHash, stakerPrivateKey.getKeyPairBytes());
+            } else if (oldSeed.length == proofLength) {
+                byte[] oldSeedHash = VRF_Ed25519.generateProofHash(oldSeed);
+                seed = VRF_Ed25519.generateProof(oldSeedHash, stakerPrivateKey.getKeyPairBytes());
+            } else {
+                return null;
+            }
         } else {
             seed = null;
         }

diff --git a/src/org/aion/staker/utils/PrivateKey.java b/src/org/aion/staker/utils/PrivateKey.java
@@ -1,5 +1,6 @@
 package org.aion.staker.utils;
 
+import org.aion.util.bytes.ByteUtil;
 import org.apache.commons.codec.binary.Hex;
 
 import java.security.spec.InvalidKeySpecException;
@@ -57,6 +58,10 @@ public byte[] getPublicKeyBytes() {
         return copyByteArray(this.publicKeyBytes);
     }
 
+    public byte[] getKeyPairBytes() {
+        return ByteUtil.merge(privateKeyBytes, publicKeyBytes);
+    }
+
     private static byte[] copyByteArray(byte[] byteArray) {
         return Arrays.copyOf(byteArray, byteArray.length);
     }