Uncomment & rework debug json-rpc endpoints (#3929)

kdeme · web-flow · commit c9fed3ba0102 · 2026-01-22T09:20:46.000+01:00
diff --git a/execution_chain/rpc/debug.nim b/execution_chain/rpc/debug.nim
@@ -57,22 +57,6 @@ ExecutionWitness.useDefaultSerializationIn JrpcConv
 #     if opts.disableState.isTrue  : result.incl TracerFlags.DisableState
 #     if opts.disableStateDiff.isTrue: result.incl TracerFlags.DisableStateDiff
 
-proc headerFromTag(chain: ForkedChainRef, blockTag: BlockTag): Result[Header, string] =
-  if blockTag.kind == bidAlias:
-    let tag = blockTag.alias.toLowerAscii
-    case tag
-    of "latest":
-      return ok(chain.latestHeader)
-    of "finalized":
-      return ok(chain.finalizedHeader)
-    of "safe":
-      return ok(chain.safeHeader)
-    else:
-      return err("Unsupported block tag " & tag)
-  else:
-    let blockNum = base.BlockNumber blockTag.number
-    return chain.headerByNumber(blockNum)
-
 proc getExecutionWitness*(chain: ForkedChainRef, blockHash: Hash32): Result[ExecutionWitness, string] =
   let txFrame = chain.txFrame(blockHash).txFrameBegin()
   defer:
@@ -183,43 +167,45 @@ proc setupDebugRpc*(com: CommonRef, txPool: TxPoolRef, server: RpcServer) =
   #     header = chainDB.headerFromTag(quantityTag)
   #   chainDB.setHead(header)
 
-  # server.rpc("debug_getRawBlock") do(quantityTag: BlockTag) -> seq[byte]:
-  #   ## Returns an RLP-encoded block.
-  #   var
-  #     header = chainDB.headerFromTag(quantityTag)
-  #     blockHash = chainDB.getBlockHash(header.number)
-  #     body = chainDB.getBlockBody(blockHash)
+  server.rpc("debug_getRawBlock") do(blockTag: BlockTag) -> seq[byte]:
+    ## Returns an RLP-encoded block.
+    let blockFromTag = chain.blockFromTag(blockTag).valueOr:
+      raise newException(ValueError, error)
 
-  #   rlp.encode(EthBlock.init(move(header), move(body)))
+    rlp.encode(blockFromTag)
 
-  # server.rpc("debug_getRawHeader") do(quantityTag: BlockTag) -> seq[byte]:
-  #   ## Returns an RLP-encoded header.
-  #   let header = chainDB.headerFromTag(quantityTag)
-  #   rlp.encode(header)
+  server.rpc("debug_getRawHeader") do(blockTag: BlockTag) -> seq[byte]:
+    ## Returns an RLP-encoded header.
+    let header = chain.headerFromTag(blockTag).valueOr:
+      raise newException(ValueError, error)
+    rlp.encode(header)
+
+  server.rpc("debug_getRawReceipts") do(blockTag: BlockTag) -> seq[seq[byte]]:
+    ## Returns an array of EIP-2718 binary-encoded receipts.
+    let header = chain.headerFromTag(blockTag).valueOr:
+      raise newException(ValueError, error)
+    var res: seq[seq[byte]]
+    for receipt in chain.baseTxFrame.getReceipts(header.receiptsRoot):
+      res.add rlp.encode(receipt)
 
-  # server.rpc("debug_getRawReceipts") do(quantityTag: BlockTag) -> seq[seq[byte]]:
-  #   ## Returns an array of EIP-2718 binary-encoded receipts.
-  #   let header = chainDB.headerFromTag(quantityTag)
-  #   for receipt in chainDB.getReceipts(header.receiptsRoot):
-  #     result.add rlp.encode(receipt)
+    res
 
-  # server.rpc("debug_getRawTransaction") do(data: Hash32) -> seq[byte]:
-  #   ## Returns an EIP-2718 binary-encoded transaction.
-  #   let txHash = data
-  #   let res = txPool.getItem(txHash)
-  #   if res.isOk:
-  #     return rlp.encode(res.get().tx)
+  server.rpc("debug_getRawTransaction") do(txHash: Hash32) -> seq[byte]:
+    ## Returns an EIP-2718 binary-encoded transaction.
+    let res = txPool.getItem(txHash)
+    if res.isOk:
+      return rlp.encode(res.get().tx)
 
-  #   let txDetails = chainDB.getTransactionKey(txHash)
-  #   if txDetails.index < 0:
-  #     raise newException(ValueError, "Transaction not found " & data.toHex)
+    let
+      (blockHash, txId) = chain.txDetailsByTxHash(txHash).valueOr:
+        raise newException(ValueError, "Transaction not found")
+      blk = chain.blockByHash(blockHash).valueOr:
+        raise newException(ValueError, "Block not found")
 
-  #   let header = chainDB.getBlockHeader(txDetails.blockNumber)
-  #   var tx: Transaction
-  #   if chainDB.getTransaction(header.txRoot, txDetails.index, tx):
-  #     return rlp.encode(tx)
+    if blk.transactions.len <= int(txId):
+      raise newException(ValueError, "Transaction not found")
 
-  #   raise newException(ValueError, "Transaction not found " & data.toHex)
+    rlp.encode(blk.transactions[txId])
 
   server.rpc("debug_executionWitness") do(quantityTag: BlockTag) -> ExecutionWitness:
     ## Returns an execution witness for the given block number.
diff --git a/execution_chain/rpc/rpc_utils.nim b/execution_chain/rpc/rpc_utils.nim
@@ -10,7 +10,7 @@
 {.push raises: [].}
 
 import
-  std/[sequtils, algorithm],
+  std/[sequtils, algorithm, strutils],
   ./rpc_types,
   ./params,
   ../db/ledger,
@@ -399,3 +399,35 @@ proc getTotalDifficulty*(chain: ForkedChainRef, blockHash: Hash32, header: Heade
   else:
     # Note: It's ok to use baseTxFrame for TD as this is for historical blocks
     chain.baseTxFrame().getScore(blockHash)
+
+proc headerFromTag*(chain: ForkedChainRef, blockTag: BlockTag): Result[Header, string] =
+  if blockTag.kind == bidAlias:
+    let tag = blockTag.alias.toLowerAscii
+    case tag
+    of "latest":
+      ok(chain.latestHeader)
+    of "finalized":
+      ok(chain.finalizedHeader)
+    of "safe":
+      ok(chain.safeHeader)
+    else:
+      err("Unsupported block tag " & tag)
+  else:
+    let blockNum = base.BlockNumber blockTag.number
+    chain.headerByNumber(blockNum)
+
+proc blockFromTag*(chain: ForkedChainRef, blockTag: BlockTag): Result[Block, string] =
+  if blockTag.kind == bidAlias:
+    let tag = blockTag.alias.toLowerAscii
+    case tag
+    of "latest":
+      ok(chain.latestBlock)
+    of "finalized":
+      ok(chain.finalizedBlock)
+    of "safe":
+      ok(chain.safeBlock)
+    else:
+      err("Unsupported block tag " & tag)
+  else:
+    let blockNum = base.BlockNumber blockTag.number
+    chain.blockByNumber(blockNum)
diff --git a/execution_chain/rpc/server_api.nim b/execution_chain/rpc/server_api.nim
@@ -11,7 +11,7 @@
 
 import
   chronicles,
-  std/[sequtils, strutils],
+  std/sequtils,
   stint,
   web3/[conversions, eth_api_types],
   eth/common/[base, transaction_utils],
@@ -88,20 +88,7 @@ proc getProof*(
     )
 
 proc headerFromTag(api: ServerAPIRef, blockTag: BlockTag): Result[Header, string] =
-  if blockTag.kind == bidAlias:
-    let tag = blockTag.alias.toLowerAscii
-    case tag
-    of "latest":
-      return ok(api.chain.latestHeader)
-    of "finalized":
-      return ok(api.chain.finalizedHeader)
-    of "safe":
-      return ok(api.chain.safeHeader)
-    else:
-      return err("Unsupported block tag " & tag)
-  else:
-    let blockNum = base.BlockNumber blockTag.number
-    return api.chain.headerByNumber(blockNum)
+  api.chain.headerFromTag(blockTag)
 
 proc headerFromTag(api: ServerAPIRef, blockTag: Opt[BlockTag]): Result[Header, string] =
   let blockId = blockTag.get(defaultTag)
@@ -117,20 +104,7 @@ proc ledgerFromTag(api: ServerAPIRef, blockTag: BlockTag): Result[LedgerRef, str
   ok(LedgerRef.init(txFrame))
 
 proc blockFromTag(api: ServerAPIRef, blockTag: BlockTag): Result[Block, string] =
-  if blockTag.kind == bidAlias:
-    let tag = blockTag.alias.toLowerAscii
-    case tag
-    of "latest":
-      return ok(api.chain.latestBlock)
-    of "finalized":
-      return ok(api.chain.finalizedBlock)
-    of "safe":
-      return ok(api.chain.safeBlock)
-    else:
-      return err("Unsupported block tag " & tag)
-  else:
-    let blockNum = base.BlockNumber blockTag.number
-    return api.chain.blockByNumber(blockNum)
+  api.chain.blockFromTag(blockTag)
 
 proc setupServerAPI*(api: ServerAPIRef, server: RpcServer, am: ref AccountsManager) =
   server.rpc("eth_getBalance") do(data: Address, blockTag: BlockTag) -> UInt256:
