proxy: refactor and add header pragma (#3543)

chirag-parmar · web-flow · commit 0a481026bd92 · 2025-08-12T17:22:36.000+05:30
* add header pragma

* refactor

* trigger CI

* rearrange
diff --git a/execution_chain/version.nim b/execution_chain/version.nim
@@ -27,7 +27,8 @@ proc gitFolderExists(path: string): bool {.compileTime.} =
     if dirExists(currPath & "/.git"):
       return true
     let parts = splitPath(currPath)
-    if parts.tail.len == 0: break
+    if parts.tail.len == 0:
+      break
     currPath = parts.head
   false
 
diff --git a/nimbus_verified_proxy/header_store.nim b/nimbus_verified_proxy/header_store.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   eth/common/[hashes, headers],
diff --git a/nimbus_verified_proxy/nimbus_verified_proxy.nim b/nimbus_verified_proxy/nimbus_verified_proxy.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   std/[os, strutils],
diff --git a/nimbus_verified_proxy/nimbus_verified_proxy_conf.nim b/nimbus_verified_proxy/nimbus_verified_proxy_conf.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   std/os,
diff --git a/nimbus_verified_proxy/rpc/accounts.nim b/nimbus_verified_proxy/rpc/accounts.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   std/sequtils,
diff --git a/nimbus_verified_proxy/rpc/blocks.nim b/nimbus_verified_proxy/rpc/blocks.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   std/strutils,
diff --git a/nimbus_verified_proxy/rpc/evm.nim b/nimbus_verified_proxy/rpc/evm.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   chronicles,
diff --git a/nimbus_verified_proxy/rpc/receipts.nim b/nimbus_verified_proxy/rpc/receipts.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push gcsafe, raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   std/sequtils,
diff --git a/nimbus_verified_proxy/rpc/rpc_eth_api.nim b/nimbus_verified_proxy/rpc/rpc_eth_api.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   results,
diff --git a/nimbus_verified_proxy/rpc/transactions.nim b/nimbus_verified_proxy/rpc/transactions.nim
@@ -5,6 +5,8 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+{.push raises: [], gcsafe.}
+
 import
   stint,
   results,
diff --git a/nimbus_verified_proxy/rpc_api_backend.nim b/nimbus_verified_proxy/rpc_api_backend.nim
@@ -5,6 +5,8 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+{.push raises: [], gcsafe.}
+
 import json_rpc/[rpcproxy, rpcclient], web3/[eth_api, eth_api_types], stint, ./types
 
 proc initNetworkApiBackend*(vp: VerifiedRpcProxy): EthApiBackend =
diff --git a/nimbus_verified_proxy/tests/test_api_backend.nim b/nimbus_verified_proxy/tests/test_api_backend.nim
@@ -5,6 +5,8 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+{.push raises: [], gcsafe.}
+
 import
   std/tables,
   web3/[eth_api, eth_api_types],
diff --git a/nimbus_verified_proxy/tests/test_blocks.nim b/nimbus_verified_proxy/tests/test_blocks.nim
@@ -6,29 +6,18 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 {.used.}
+{.push raises: [].}
 
 import
   unittest2,
-  stew/io2,
-  json_rpc/[rpcclient, rpcserver, rpcproxy, jsonmarshal],
+  json_rpc/[rpcclient, rpcserver, rpcproxy],
   web3/[eth_api_types, eth_api],
   ../header_store,
   ../rpc/blocks,
   ../types,
-  ./test_setup,
+  ./test_utils,
   ./test_api_backend
 
-proc getBlockFromJson(filepath: string): BlockObject =
-  var blkBytes = readAllBytes(filepath)
-  let blk = JrpcConv.decode(blkBytes.get, BlockObject)
-  return blk
-
-template checkEqual(blk1: BlockObject, blk2: BlockObject): bool =
-  JrpcConv.encode(blk1).JsonString == JrpcConv.encode(blk2).JsonString
-
-template checkEqual(tx1: TransactionObject, tx2: TransactionObject): bool =
-  JrpcConv.encode(tx1).JsonString == JrpcConv.encode(tx2).JsonString
-
 suite "test verified blocks":
   let
     ts = TestApiState.init(1.u256)
@@ -51,7 +40,7 @@ suite "test verified blocks":
       # reuse verified proxy's internal client. Conveniently it is looped back to the proxy server
       let verifiedBlk = waitFor vp.proxy.getClient().eth_getBlockByHash(blk.hash, true)
 
-      check checkEqual(blk, verifiedBlk)
+      check blk == verifiedBlk
 
       ts.clear()
       vp.headerStore.clear()
@@ -73,16 +62,16 @@ suite "test verified blocks":
     discard vp.headerStore.updateFinalized(convHeader(blk), blk.hash)
 
     var verifiedBlk = waitFor vp.proxy.getClient().eth_getBlockByNumber(numberTag, true)
-    check checkEqual(blk, verifiedBlk)
+    check blk == verifiedBlk
 
     verifiedBlk = waitFor vp.proxy.getClient().eth_getBlockByNumber(finalTag, true)
-    check checkEqual(blk, verifiedBlk)
+    check blk == verifiedBlk
 
     verifiedBlk = waitFor vp.proxy.getClient().eth_getBlockByNumber(earliestTag, true)
-    check checkEqual(blk, verifiedBlk)
+    check blk == verifiedBlk
 
     verifiedBlk = waitFor vp.proxy.getClient().eth_getBlockByNumber(latestTag, true)
-    check checkEqual(blk, verifiedBlk)
+    check blk == verifiedBlk
 
   test "check block walk":
     ts.clear()
@@ -158,7 +147,7 @@ suite "test verified blocks":
 
     doAssert blk.transactions[0].kind == tohTx
 
-    check checkEqual(txByHash, blk.transactions[0].tx)
-    check checkEqual(txByHash, txByNum)
+    check txByHash == blk.transactions[0].tx
+    check txByHash == txByNum
 
     vp.stopTestSetup()
diff --git a/nimbus_verified_proxy/tests/test_header_store.nim b/nimbus_verified_proxy/tests/test_header_store.nim
@@ -6,6 +6,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 {.used.}
+{.push raises: [], gcsafe.}
 
 import
   unittest2,
diff --git a/nimbus_verified_proxy/tests/test_proof_validation.nim b/nimbus_verified_proxy/tests/test_proof_validation.nim
@@ -7,7 +7,7 @@
 
 {.used.}
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import unittest2, stint, stew/byteutils, web3, ../rpc/accounts
 
diff --git a/nimbus_verified_proxy/tests/test_receipts.nim b/nimbus_verified_proxy/tests/test_receipts.nim
@@ -6,43 +6,19 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 {.used.}
+{.push raises: [].}
 
 import
   unittest2,
   web3/[eth_api, eth_api_types],
-  stew/io2,
-  json_rpc/[rpcclient, rpcserver, rpcproxy, jsonmarshal],
+  json_rpc/[rpcclient, rpcserver, rpcproxy],
   eth/common/eth_types_rlp,
   ../rpc/blocks,
   ../types,
   ../header_store,
-  ./test_setup,
+  ./test_utils,
   ./test_api_backend
 
-proc getBlockFromJson(filepath: string): BlockObject =
-  var blkBytes = readAllBytes(filepath)
-  let blk = JrpcConv.decode(blkBytes.get, BlockObject)
-  return blk
-
-proc getReceiptsFromJson(filepath: string): seq[ReceiptObject] =
-  var rxBytes = readAllBytes(filepath)
-  let rxs = JrpcConv.decode(rxBytes.get, seq[ReceiptObject])
-  return rxs
-
-proc getLogsFromJson(filepath: string): seq[LogObject] =
-  var logBytes = readAllBytes(filepath)
-  let logs = JrpcConv.decode(logBytes.get, seq[LogObject])
-  return logs
-
-template checkEqual(rx1: ReceiptObject, rx2: ReceiptObject): bool =
-  JrpcConv.encode(rx1).JsonString == JrpcConv.encode(rx2).JsonString
-
-template checkEqual(rxs1: seq[ReceiptObject], rxs2: seq[ReceiptObject]): bool =
-  JrpcConv.encode(rxs1).JsonString == JrpcConv.encode(rxs2).JsonString
-
-template checkEqual(logs1: seq[LogObject], logs2: seq[LogObject]): bool =
-  JrpcConv.encode(logs1).JsonString == JrpcConv.encode(logs2).JsonString
-
 suite "test receipts verification":
   let
     ts = TestApiState.init(1.u256)
@@ -63,20 +39,20 @@ suite "test receipts verification":
     discard vp.headerStore.updateFinalized(convHeader(blk), blk.hash)
 
     var verified = waitFor vp.proxy.getClient().eth_getBlockReceipts(numberTag)
-    check checkEqual(rxs, verified.get())
+    check rxs == verified.get()
 
     verified = waitFor vp.proxy.getClient().eth_getBlockReceipts(finalTag)
-    check checkEqual(rxs, verified.get())
+    check rxs == verified.get()
 
     verified = waitFor vp.proxy.getClient().eth_getBlockReceipts(earliestTag)
-    check checkEqual(rxs, verified.get())
+    check rxs == verified.get()
 
     verified = waitFor vp.proxy.getClient().eth_getBlockReceipts(latestTag)
-    check checkEqual(rxs, verified.get())
+    check rxs == verified.get()
 
     let verifiedReceipt =
       waitFor vp.proxy.getClient().eth_getTransactionReceipt(rxs[0].transactionHash)
-    check checkEqual(rxs[0], verifiedReceipt)
+    check rxs[0] == verifiedReceipt
 
     ts.clear()
     vp.headerStore.clear()
diff --git a/nimbus_verified_proxy/tests/test_setup.nim b/nimbus_verified_proxy/tests/test_setup.nim
diff --git a/nimbus_verified_proxy/tests/test_transactions.nim b/nimbus_verified_proxy/tests/test_transactions.nim
@@ -6,25 +6,17 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 {.used.}
+{.push raises: [], gcsafe.}
 
 import
   unittest2,
   web3/[eth_api, eth_api_types],
-  stew/io2,
-  json_rpc/[rpcclient, rpcserver, rpcproxy, jsonmarshal],
+  json_rpc/[rpcclient, rpcserver, rpcproxy],
   eth/common/eth_types_rlp,
   ../rpc/transactions,
-  ./test_setup,
+  ./test_utils,
   ./test_api_backend
 
-proc getBlockFromJson(filepath: string): BlockObject =
-  var blkBytes = readAllBytes(filepath)
-  let blk = JrpcConv.decode(blkBytes.get, BlockObject)
-  return blk
-
-template checkEqual(tx1: TransactionObject, tx2: TransactionObject): bool =
-  JrpcConv.encode(tx1).JsonString == JrpcConv.encode(tx2).JsonString
-
 suite "test transaction verification":
   test "check tx hash":
     let blk = getBlockFromJson("nimbus_verified_proxy/tests/data/Istanbul.json")
@@ -51,7 +43,7 @@ suite "test transaction verification":
         ts.loadTransaction(tx.tx.hash, tx.tx)
         let verifiedTx =
           waitFor vp.proxy.getClient().eth_getTransactionByHash(tx.tx.hash)
-        check checkEqual(verifiedTx, tx.tx)
+        check verifiedTx == tx.tx
         ts.clear()
 
     vp.stopTestSetup()
diff --git a/nimbus_verified_proxy/tests/test_utils.nim b/nimbus_verified_proxy/tests/test_utils.nim
diff --git a/nimbus_verified_proxy/types.nim b/nimbus_verified_proxy/types.nim
