Implements pre-mining time verification verification

Ashy5000 · Apr 9, 2024 · 60ed130 · 60ed130
1 parent 9b47c7f
commit 60ed130
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 11 deletions.
diff --git a/builds/node/node_darwin-amd64 b/builds/node/node_darwin-amd64
diff --git a/builds/node/node_darwin-arm64 b/builds/node/node_darwin-arm64
diff --git a/builds/node/node_linux-386 b/builds/node/node_linux-386
diff --git a/builds/node/node_linux-amd64 b/builds/node/node_linux-amd64
diff --git a/builds/node/node_linux-arm b/builds/node/node_linux-arm
diff --git a/builds/node/node_linux-arm64 b/builds/node/node_linux-arm64
diff --git a/builds/node/node_windows-386 b/builds/node/node_windows-386
diff --git a/builds/node/node_windows-amd64 b/builds/node/node_windows-amd64
diff --git a/builds/node/node_windows-arm b/builds/node/node_windows-arm
diff --git a/builds/node/node_windows-arm64 b/builds/node/node_windows-arm64
diff --git a/create_block.go b/create_block.go
@@ -36,7 +36,7 @@ func RequestTimeVerification(block Block) ([]Signature, []dsa.PublicKey) {
 		panic(err)
 	}
 	for _, peer := range GetPeers() {
-    if int64(len(block.TimeVerifiers)) >= GetMinerCount(len(blockchain))/5 && VerifyTimeVerifiers(block, block.TimeVerifiers, block.TimeVerifierSignatures) {
+    if int64(len(block.TimeVerifiers)) >= GetMinerCount(len(blockchain))/5 {
 			break
 		}
 		// Verify that the peer has mined a block (only miners can be time verifiers)

diff --git a/peers.txt b/peers.txt
@@ -1,2 +1 @@
-http://192.168.4.87:8080
-http://192.168.4.23:8080
+http://127.0.0.1:8080
diff --git a/verify.go b/verify.go
@@ -120,24 +120,37 @@ func VerifyBlock(block Block) bool {
 		fmt.Println("Timestamp is in the future.")
 		return false
 	}
-	if !VerifyTimeVerifiers(block, block.TimeVerifiers, block.TimeVerifierSignatures) {
+	if !VerifyTimeVerifiers(block, block.TimeVerifiers, block.TimeVerifierSignatures, false) {
 		fmt.Println("Block has invalid time verifiers. Ignoring block request.")
 		return false
 	}
+  if !VerifyTimeVerifiers(block, block.PreMiningTimeVerifiers, block.PreMiningTimeVerifierSignatures, true) {
+    fmt.Println("Block has invalid time verifiers. Ignoring block request.")
+    return false
+  }
 	return true
 }
 
-func VerifyTimeVerifiers(block Block, verifiers []dsa.PublicKey, signatures []Signature) bool {
+func VerifyTimeVerifiers(block Block, verifiers []dsa.PublicKey, signatures []Signature, premining bool) bool {
 	if len(verifiers) != len(signatures) {
 		fmt.Println("Signature count does not match verifier count.")
 		return false
 	}
-	for i, verifier := range verifiers {
-		if !dsa.Verify(&verifier, []byte(fmt.Sprintf("%d", block.Timestamp.Add(block.MiningTime).UnixNano())), &signatures[i].R, &signatures[i].S) {
-			fmt.Println("Time verifier signature is not valid.")
-			return false
-		}
-	}
+  if premining {
+    for i, verifier := range verifiers {
+      if !dsa.Verify(&verifier, []byte(fmt.Sprintf("%d", block.Timestamp.UnixNano())), &signatures[i].R, &signatures[i].S) {
+        fmt.Println("Time verifier signature is not valid.")
+        return false
+      }
+    }
+  } else {
+    for i, verifier := range verifiers {
+      if !dsa.Verify(&verifier, []byte(fmt.Sprintf("%d", block.Timestamp.Add(block.MiningTime).UnixNano())), &signatures[i].R, &signatures[i].S) {
+        fmt.Println("Time verifier signature is not valid.")
+        return false
+      }
+    }
+  }
 	// Ensure all verifiers are unique
 	verifierMap := make(map[string]bool)
 	for _, verifier := range verifiers {