Refactors time verifier communication

block_test.go

@@ -58,7 +58,7 @@ func TestBlock(t *testing.T) {
 		var b big.Int
 		b.SetUint64(321)
 		var parameters dsa.Parameters
-		dsa.GenerateParameters(&parameters, rand.Reader, dsa.ParameterSizes(0))
+		dsa.GenerateParameters(&parameters, rand.Reader, dsa.ParameterSizes(3))
 		block := Block{
 			Transactions: []Transaction{
 				{

cmdline.go

@@ -52,7 +52,7 @@ func RunCmd(input string) {
 		} else if action == "keygen" {
 			var privateKey dsa.PrivateKey
 			var params dsa.Parameters
-			err := dsa.GenerateParameters(&params, rand.Reader, dsa.ParameterSizes(0))
+			err := dsa.GenerateParameters(&params, rand.Reader, dsa.ParameterSizes(3))
 			if err != nil {
 				panic(err)
 			}

create_block.go

@@ -150,14 +150,24 @@ func CreateBlock() (Block, error) {
 			fmt.Println("Time verifier believes block is invalid.")
 			continue
 		}
-		// Unmarshal the response body
-		responseBlock := Block{}
-		err = json.Unmarshal(bodyBytes, &responseBlock)
+		// Split the response body into the signature and the public key
+		split := strings.Split(string(bodyBytes), ":")
+		// Unmarshal the signature
+		var signature Signature
+		err = json.Unmarshal([]byte(split[0]), &signature)
 		if err != nil {
 			panic(err)
 		}
-		// Set the time verifiers
-		block.TimeVerifiers = responseBlock.TimeVerifiers // TODO: Verify time verifiers
+		// Unmarshal the public key
+		var publicKey dsa.PublicKey
+		err = json.Unmarshal([]byte(split[1]), &publicKey)
+		if err != nil {
+			panic(err)
+		}
+		// Add the time verifier to the block
+		block.TimeVerifiers = append(block.TimeVerifiers, publicKey)
+		// Add the time verifier signature to the block
+		block.TimeVerifierSignatures = append(block.TimeVerifierSignatures, signature)
 	}
 	if int64(len(block.TimeVerifiers)) < GetMinerCount(len(blockchain))/5 {
 		fmt.Println("Not enough time verifiers.")

server.go

@@ -224,18 +224,12 @@ func HandleVerifyTimeRequest(w http.ResponseWriter, req *http.Request) {
 		R: *r,
 		S: *s,
 	}
-	block.TimeVerifierSignatures = append(block.TimeVerifierSignatures, signature)
-	block.TimeVerifiers = append(block.TimeVerifiers, key.PublicKey)
-	// Convert the block back to JSON
-	blockBytes, err := json.Marshal(&block)
-	if err != nil {
-		panic(err)
-	}
-	// Send the block back to the requester
-	_, err = io.WriteString(w, string(blockBytes))
+	// Send the signature and public key back to the requester
+	signatureBytes, err := json.Marshal(signature)
 	if err != nil {
 		panic(err)
 	}
+	_, err = io.WriteString(w, string(signatureBytes)+":"+key.Y.String())
 }
 
 func HandlePeersRequest(w http.ResponseWriter, _ *http.Request) {