From 5885068c6317d5688344750fc3d66445731912af Mon Sep 17 00:00:00 2001 From: cheatfate Date: Sat, 3 Apr 2021 04:50:47 +0300 Subject: [PATCH] Rebase and fixes. --- beacon_chain/conf.nim | 2 +- beacon_chain/gossip_processing/eth2_processor.nim | 2 +- beacon_chain/rpc/beacon_rest_api.nim | 5 +++-- beacon_chain/rpc/validator_rest_api.nim | 4 +++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/beacon_chain/conf.nim b/beacon_chain/conf.nim index b47c609c7..31c42003a 100644 --- a/beacon_chain/conf.nim +++ b/beacon_chain/conf.nim @@ -292,7 +292,7 @@ type name: "rest-port" }: Port restAddress* {. - defaultValue: defaultAdminListenAddress(config) + defaultValue: defaultAdminListenAddress desc: "Listening address of the REST server" name: "rest-address" }: ValidIpAddress diff --git a/beacon_chain/gossip_processing/eth2_processor.nim b/beacon_chain/gossip_processing/eth2_processor.nim index f6060df14..a7b908958 100644 --- a/beacon_chain/gossip_processing/eth2_processor.nim +++ b/beacon_chain/gossip_processing/eth2_processor.nim @@ -73,7 +73,7 @@ type # Almost validated, pending cryptographic signature check # ---------------------------------------------------------------- - batchCrypto: ref BatchCrypto + batchCrypto*: ref BatchCrypto # Missing information # ---------------------------------------------------------------- diff --git a/beacon_chain/rpc/beacon_rest_api.nim b/beacon_chain/rpc/beacon_rest_api.nim index f49ab07d1..7dc2d281e 100644 --- a/beacon_chain/rpc/beacon_rest_api.nim +++ b/beacon_chain/rpc/beacon_rest_api.nim @@ -752,8 +752,9 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) = var failures: seq[RestAttestationsFailureTuple] for atindex, attestation in attestations.pairs(): let wallTime = node.processor.getWallTime() - let res = node.attestationPool[].validateAttestation( - attestation, wallTime, attestation.data.index, true + let res = await node.attestationPool.validateAttestation( + node.processor.batchCrypto, attestation, wallTime, + attestation.data.index, true ) if res.isErr(): failures.add((index: uint64(atindex), message: $res.error())) diff --git a/beacon_chain/rpc/validator_rest_api.nim b/beacon_chain/rpc/validator_rest_api.nim index 48c46e18c..317f9e36c 100644 --- a/beacon_chain/rpc/validator_rest_api.nim +++ b/beacon_chain/rpc/validator_rest_api.nim @@ -323,7 +323,9 @@ proc installValidatorApiHandlers*(router: var RestRouter, node: BeaconNode) = dres.get() let wallTime = node.processor.getWallTime() - let res = node.attestationPool[].validateAggregate(payload, wallTime) + let res = await node.attestationPool.validateAggregate( + node.processor.batchCrypto, payload, wallTime + ) if res.isErr(): return RestApiResponse.jsonError(Http400, "Aggregate and proofs " & "verification failed", $res.error())