From 48df7cdfc18b58d1ffe3b3676ddf045ed760bac4 Mon Sep 17 00:00:00 2001
From: mtgnoah <noahpravecek@gmail.com>
Date: Wed, 25 Oct 2023 07:14:48 -0500
Subject: [PATCH] Fixes for JSON Server

---
 rpc/jsonrpc_server.go | 82 ++++++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 36 deletions(-)

diff --git a/rpc/jsonrpc_server.go b/rpc/jsonrpc_server.go
index 8c67818..6bc1675 100644
--- a/rpc/jsonrpc_server.go
+++ b/rpc/jsonrpc_server.go
@@ -378,9 +378,10 @@ func (j *JSONRPCServer) GetBlockHeadersByHeight(req *http.Request, args *GetBloc
 		return true
 	})
 
-	res := BlockHeadersResponse{From: args.Height, Blocks: blocks, Prev: Prev, Next: Next}
-
-	reply = &res
+	reply.From = args.Height
+	reply.Blocks = blocks
+	reply.Prev = Prev
+	reply.Next = Next
 
 	return nil
 }
@@ -406,7 +407,7 @@ func (j *JSONRPCServer) GetBlockHeadersID(req *http.Request, args *GetBlockHeade
 		// Handle hash parameter
 		// ...
 	} else {
-		firstBlock = 0
+		firstBlock = 1
 		// Handle error or default case
 		// TODO add error potentially
 		// http.Error(writer, "Invalid parameters", http.StatusBadRequest)
@@ -479,9 +480,13 @@ func (j *JSONRPCServer) GetBlockHeadersID(req *http.Request, args *GetBlockHeade
 		return true
 	})
 
-	res := BlockHeadersResponse{From: firstBlock, Blocks: blocks, Prev: Prev, Next: Next}
+	// res := BlockHeadersResponse{From: firstBlock, Blocks: blocks, Prev: Prev, Next: Next}
 
-	reply = &res
+	// reply = &res
+	reply.From = firstBlock
+	reply.Blocks = blocks
+	reply.Prev = Prev
+	reply.Next = Next
 	// TODO add blocks to the list of blocks contained in this time window
 	// Marshal res to JSON and send the response
 
@@ -534,9 +539,10 @@ func (j *JSONRPCServer) GetBlockHeadersByStart(req *http.Request, args *GetBlock
 			if err != nil {
 				return err
 			}
+			tmp := blk.Tmstmp / 1000
 			Prev = BlockInfo{
 				BlockId:   prevBlkId.String(),
-				Timestamp: blk.Tmstmp,
+				Timestamp: tmp,
 				L1Head:    l1Head.Uint64(),
 			}
 		} else {
@@ -566,10 +572,26 @@ func (j *JSONRPCServer) GetBlockHeadersByStart(req *http.Request, args *GetBlock
 			return false
 		}
 
+		if blk.Tmstmp >= args.End {
+			fmt.Println("Next Found")
+			fmt.Println("Blocks Length After Next:", len(blocks))
+
+			tmp := blk.Tmstmp / 1000
+
+			Next = BlockInfo{
+				BlockId:   id.String(),
+				Timestamp: tmp,
+				L1Head:    l1Head.Uint64(),
+			}
+			return false
+		}
+
 		if blk.Hght == heightKey {
+			tmp := blk.Tmstmp / 1000
+
 			blocks = append(blocks, BlockInfo{
 				BlockId:   id.String(),
-				Timestamp: blk.Tmstmp,
+				Timestamp: tmp,
 				L1Head:    l1Head.Uint64(),
 			})
 			fmt.Println("Match Found")
@@ -577,17 +599,6 @@ func (j *JSONRPCServer) GetBlockHeadersByStart(req *http.Request, args *GetBlock
 
 		}
 
-		if blk.Tmstmp > args.End {
-			fmt.Println("Next Found")
-			fmt.Println("Blocks Length After Next:", len(blocks))
-
-			Next = BlockInfo{
-				BlockId:   id.String(),
-				Timestamp: blk.Tmstmp,
-				L1Head:    l1Head.Uint64(),
-			}
-			return false
-		}
 		return true
 	})
 
@@ -621,34 +632,33 @@ func (j *JSONRPCServer) GetBlockTransactions(req *http.Request, args *GetBlockTr
 
 	block, success := j.headers.Get(args.ID)
 
-	if success {
-
-		res := TransactionResponse{Txs: block.Txs, BlockId: args.ID}
-
-		reply = &res
-
+	if !success {
+		return errors.New("Txs Not Found")
 	}
 
+	reply.Txs = block.Txs
+	reply.BlockId = args.ID
+
 	return nil
 }
 
 func (j *JSONRPCServer) GetBlockTransactionsByNamespace(req *http.Request, args *GetBlockTransactionsByNamespaceArgs, reply *SEQTransactionResponse) error {
 	BlkId, success := j.idsByHeight.Get(args.Height)
 
-	if success {
-		block, found := j.blocksWithValidTxs.Get(BlkId.String())
-		if !found {
-			return fmt.Errorf("Could not find Block: %s ", BlkId.String())
-		}
-
-		txs := block.Txs[args.Namespace]
-		res := SEQTransactionResponse{Txs: txs, BlockId: BlkId.String()}
+	if !success {
+		return errors.New("Txs Not Found For Namespace")
+	}
 
-		reply = &res
-	} else {
-		reply = &SEQTransactionResponse{}
+	block, found := j.blocksWithValidTxs.Get(BlkId.String())
+	if !found {
+		return fmt.Errorf("Could not find Block: %s ", BlkId.String())
 	}
 
+	txs := block.Txs[args.Namespace]
+
+	reply.Txs = txs
+	reply.BlockId = BlkId.String()
+
 	return nil
 }