wip

Author: nitely

research/fakeee.nim

@@ -17,10 +17,10 @@ import
   chronicles
 
 proc setupEngineAPI*(server: RpcServer) =
-  server.rpcContext(EthJson):
+  server.rpc(EthJson):
     # https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/paris.md#engine_newpayloadv1
     # cannot use `params` as param name. see https:#github.com/status-im/nim-json-rpc/issues/128
-    rpc("engine_newPayloadV1") do(payload: ExecutionPayloadV1) -> PayloadStatusV1:
+    proc engine_newPayloadV1(payload: ExecutionPayloadV1): PayloadStatusV1 =
       info "engine_newPayloadV1",
         number = $(distinctBase payload.blockNumber), hash = payload.blockHash
 
@@ -29,15 +29,15 @@ proc setupEngineAPI*(server: RpcServer) =
       )
 
     # https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#engine_newpayloadv2
-    rpc("engine_newPayloadV2") do(payload: ExecutionPayloadV2) -> PayloadStatusV1:
+    proc engine_newPayloadV2(payload: ExecutionPayloadV2): PayloadStatusV1 =
       info "engine_newPayloadV2", payload
 
       return PayloadStatusV1(
         status: PayloadExecutionStatus.syncing,
       )
 
     # https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/paris.md#engine_getpayloadv1
-    rpc("engine_getPayloadV1") do(payloadId: Bytes8) -> ExecutionPayloadV1:
+    proc engine_getPayloadV1(payloadId: Bytes8): ExecutionPayloadV1 =
       info "engine_getPayloadV1",
         id = payloadId.toHex
 
@@ -47,9 +47,9 @@ proc setupEngineAPI*(server: RpcServer) =
       )
 
     # https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/paris.md#engine_forkchoiceupdatedv1
-    rpc("engine_forkchoiceUpdatedV1") do(
+    proc engine_forkchoiceUpdatedV1(
         update: ForkchoiceStateV1,
-        payloadAttributes: Opt[PayloadAttributesV1]) -> ForkchoiceUpdatedResponse:
+        payloadAttributes: Opt[PayloadAttributesV1]): ForkchoiceUpdatedResponse =
       info "engine_forkchoiceUpdatedV1",
         update,
         payloadAttributes
@@ -59,31 +59,31 @@ proc setupEngineAPI*(server: RpcServer) =
         status: PayloadExecutionStatus.syncing))
 
     # https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#engine_forkchoiceupdatedv2
-    rpc("engine_forkchoiceUpdatedV2") do(
-        forkchoiceState: ForkchoiceStateV1, payloadAttributes: Opt[PayloadAttributesV2]) -> ForkchoiceUpdatedResponse:
+    proc engine_forkchoiceUpdatedV2(
+        forkchoiceState: ForkchoiceStateV1, payloadAttributes: Opt[PayloadAttributesV2]): ForkchoiceUpdatedResponse =
       info "engine_forkchoiceUpdatedV2",
         forkchoiceState, payloadAttributes
 
       return ForkchoiceUpdatedResponse(
         payloadStatus: PayloadStatusV1(
         status: PayloadExecutionStatus.syncing))
 
-    rpc("eth_getBlockByNumber") do(
-        quantityTag: string, fullTransactions: bool) -> JsonString:
+    proc eth_getBlockByNumber(
+        quantityTag: string, fullTransactions: bool): JsonString =
       info "eth_getBlockByNumber", quantityTag, fullTransactions
 
       return if quantityTag == "latest":
         EthJson.encode(BlockObject(number: 1000.Quantity)).JsonString
       else:
         "{}".JsonString
 
-    rpc("eth_getBlockByHash") do(
-        data: string, fullTransactions: bool) -> BlockObject:
+    proc eth_getBlockByHash(
+        data: string, fullTransactions: bool): BlockObject =
       info "eth_getBlockByHash", data = toHex(data), fullTransactions
 
       return BlockObject(number: 1000.Quantity)
 
-    rpc("eth_chainId") do() -> UInt256:
+    proc eth_chainId(): UInt256 =
       info "eth_chainId"
 
       return 1.u256