Fix negative reward values.

status-im · Sep 17, 2024 · f4d1bd5 · f4d1bd5
1 parent ac8f5bf
commit f4d1bd5
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 3 deletions.
diff --git a/beacon_chain/rpc/rest_constants.nim b/beacon_chain/rpc/rest_constants.nim
@@ -267,3 +267,5 @@ const
     "Error reading file"
   ParentBlockMissingStateError* =
     "Unable to load state for parent block, database corrupt?"
+  RewardOverflowError* =
+    "Reward value overflow"
diff --git a/beacon_chain/rpc/rest_rewards_api.nim b/beacon_chain/rpc/rest_rewards_api.nim
@@ -201,12 +201,22 @@ proc installRewardsApiHandlers*(router: var RestRouter, node: BeaconNode) =
             let
               pubkey = forkyState.data.current_sync_committee.pubkeys.data[i]
               vindex = pubkeyIndices.getOrDefault(pubkey)
+              reward =
+                block:
+                  let res = uint64(get_participant_reward(total_active_balance))
+                  if res > uint64(high(int64)):
+                    return RestApiResponse.jsonError(
+                      Http500, RewardOverflowError)
+                  if sync_aggregate.sync_committee_bits[i]:
+                    cast[int64](res)
+                  else:
+                    -cast[int64](res)
 
             if (len(idents) == 0) or (pubkey in keys):
               resp.add(RestSyncCommitteeReward(
                 validator_index: RestValidatorIndex(vindex),
-                reward: uint64(get_participant_reward(total_active_balance))
-              ))
+                reward: RestReward(reward)))
+
         resp
 
     RestApiResponse.jsonResponseFinalized(

diff --git a/beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim b/beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim
@@ -979,6 +979,29 @@ proc readValue*(reader: var JsonReader[RestJson], value: var uint64) {.
   else:
     reader.raiseUnexpectedValue($res.error() & ": " & svalue)
 
+## RestReward
+proc writeValue*(
+    w: var JsonWriter[RestJson], value: RestReward) {.raises: [IOError].} =
+  writeValue(w, $int64(value))
+
+proc readValue*(reader: var JsonReader[RestJson], value: var RestReward) {.
+     raises: [IOError, SerializationError].} =
+  let svalue = reader.readValue(string)
+  if svalue.startsWith("-"):
+    let res =
+      Base10.decode(uint64, svalue.toOpenArray(1, len(svalue) - 1)).valueOr:
+        reader.raiseUnexpectedValue($error & ": " & svalue)
+    if res > uint64(high(int64)):
+      reader.raiseUnexpectedValue("Integer value overflow " & svalue)
+    value = RestReward(-int64(res))
+  else:
+    let res =
+      Base10.decode(uint64, svalue).valueOr:
+        reader.raiseUnexpectedValue($error & ": " & svalue)
+    if res > uint64(high(int64)):
+      reader.raiseUnexpectedValue("Integer value overflow " & svalue)
+    value = RestReward(int64(res))
+
 ## uint8
 proc writeValue*(
     w: var JsonWriter[RestJson], value: uint8) {.raises: [IOError].} =

diff --git a/beacon_chain/spec/eth2_apis/rest_types.nim b/beacon_chain/spec/eth2_apis/rest_types.nim
@@ -527,9 +527,11 @@ type
     subcommittee_index*: uint64
     selection_proof*: ValidatorSig
 
+  RestReward* = distinct int64
+
   RestSyncCommitteeReward* = object
     validator_index*: RestValidatorIndex
-    reward*: uint64
+    reward*: RestReward
 
   # Types based on the OAPI yaml file - used in responses to requests
   GetBeaconHeadResponse* = DataEnclosedObject[Slot]