From 6db1d642c8f4f69dceefc3cc7a6ad651afb59874 Mon Sep 17 00:00:00 2001 From: Potuz Date: Wed, 24 Nov 2021 15:46:45 -0300 Subject: [PATCH 1/2] Add verbosity to aggregation logs --- beacon-chain/monitor/process_attestation.go | 7 +++++++ beacon-chain/monitor/process_attestation_test.go | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/beacon-chain/monitor/process_attestation.go b/beacon-chain/monitor/process_attestation.go index 77a2f9dae728..585b7ff0b03d 100644 --- a/beacon-chain/monitor/process_attestation.go +++ b/beacon-chain/monitor/process_attestation.go @@ -198,6 +198,13 @@ func (s *Service) processAggregatedAttestation(ctx context.Context, att *ethpb.A if s.trackedIndex(att.AggregatorIndex) { log.WithFields(logrus.Fields{ "ValidatorIndex": att.AggregatorIndex, + "Slot": att.Aggregate.Data.Slot, + "BeaconBlockRoot": fmt.Sprintf("%#x", bytesutil.Trunc( + att.Aggregate.Data.BeaconBlockRoot)), + "SourceRoot:": fmt.Sprintf("%#x", bytesutil.Trunc( + att.Aggregate.Data.Source.Root)), + "TargetRoot:": fmt.Sprintf("%#x", bytesutil.Trunc( + att.Aggregate.Data.Target.Root)), }).Info("Processed attestation aggregation") aggregatedPerf := s.aggregatedPerformance[att.AggregatorIndex] aggregatedPerf.totalAggregations++ diff --git a/beacon-chain/monitor/process_attestation_test.go b/beacon-chain/monitor/process_attestation_test.go index 0ff19e2ba104..d020d50ecf8e 100644 --- a/beacon-chain/monitor/process_attestation_test.go +++ b/beacon-chain/monitor/process_attestation_test.go @@ -211,7 +211,7 @@ func TestProcessAggregatedAttestationStateNotCached(t *testing.T) { }, } s.processAggregatedAttestation(ctx, att) - require.LogsContain(t, hook, "\"Processed attestation aggregation\" ValidatorIndex=2 prefix=monitor") + require.LogsContain(t, hook, "\"Processed attestation aggregation\" BeaconBlockRoot=0x000000000000 Slot=1 SourceRoot:=0x68656c6c6f2d TargetRoot:=0x68656c6c6f2d ValidatorIndex=2 prefix=monitor") require.LogsContain(t, hook, "Skipping agregated attestation due to state not found in cache") logrus.SetLevel(logrus.InfoLevel) } @@ -249,7 +249,7 @@ func TestProcessAggregatedAttestationStateCached(t *testing.T) { require.NoError(t, s.config.StateGen.SaveState(ctx, root, state)) s.processAggregatedAttestation(ctx, att) - require.LogsContain(t, hook, "\"Processed attestation aggregation\" ValidatorIndex=2 prefix=monitor") + require.LogsContain(t, hook, "\"Processed attestation aggregation\" BeaconBlockRoot=0x68656c6c6f2d Slot=1 SourceRoot:=0x68656c6c6f2d TargetRoot:=0x68656c6c6f2d ValidatorIndex=2 prefix=monitor") require.LogsContain(t, hook, "\"Processed aggregated attestation\" Head=0x68656c6c6f2d Slot=1 Source=0x68656c6c6f2d Target=0x68656c6c6f2d ValidatorIndex=2 prefix=monitor") require.LogsDoNotContain(t, hook, "\"Processed aggregated attestation\" Head=0x68656c6c6f2d Slot=1 Source=0x68656c6c6f2d Target=0x68656c6c6f2d ValidatorIndex=12 prefix=monitor") } From 62af7ff740ccd3936a632271e3ac39b8b5f6c987 Mon Sep 17 00:00:00 2001 From: Potuz Date: Wed, 24 Nov 2021 16:10:39 -0300 Subject: [PATCH 2/2] Terence's suggestion --- beacon-chain/monitor/process_attestation.go | 4 ++-- beacon-chain/monitor/process_attestation_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/beacon-chain/monitor/process_attestation.go b/beacon-chain/monitor/process_attestation.go index 585b7ff0b03d..70a1fa0e0e3d 100644 --- a/beacon-chain/monitor/process_attestation.go +++ b/beacon-chain/monitor/process_attestation.go @@ -197,8 +197,8 @@ func (s *Service) processAggregatedAttestation(ctx context.Context, att *ethpb.A defer s.Unlock() if s.trackedIndex(att.AggregatorIndex) { log.WithFields(logrus.Fields{ - "ValidatorIndex": att.AggregatorIndex, - "Slot": att.Aggregate.Data.Slot, + "AggregatorIndex": att.AggregatorIndex, + "Slot": att.Aggregate.Data.Slot, "BeaconBlockRoot": fmt.Sprintf("%#x", bytesutil.Trunc( att.Aggregate.Data.BeaconBlockRoot)), "SourceRoot:": fmt.Sprintf("%#x", bytesutil.Trunc( diff --git a/beacon-chain/monitor/process_attestation_test.go b/beacon-chain/monitor/process_attestation_test.go index d020d50ecf8e..6aca6b2896a0 100644 --- a/beacon-chain/monitor/process_attestation_test.go +++ b/beacon-chain/monitor/process_attestation_test.go @@ -211,7 +211,7 @@ func TestProcessAggregatedAttestationStateNotCached(t *testing.T) { }, } s.processAggregatedAttestation(ctx, att) - require.LogsContain(t, hook, "\"Processed attestation aggregation\" BeaconBlockRoot=0x000000000000 Slot=1 SourceRoot:=0x68656c6c6f2d TargetRoot:=0x68656c6c6f2d ValidatorIndex=2 prefix=monitor") + require.LogsContain(t, hook, "\"Processed attestation aggregation\" AggregatorIndex=2 BeaconBlockRoot=0x000000000000 Slot=1 SourceRoot:=0x68656c6c6f2d TargetRoot:=0x68656c6c6f2d prefix=monitor") require.LogsContain(t, hook, "Skipping agregated attestation due to state not found in cache") logrus.SetLevel(logrus.InfoLevel) } @@ -249,7 +249,7 @@ func TestProcessAggregatedAttestationStateCached(t *testing.T) { require.NoError(t, s.config.StateGen.SaveState(ctx, root, state)) s.processAggregatedAttestation(ctx, att) - require.LogsContain(t, hook, "\"Processed attestation aggregation\" BeaconBlockRoot=0x68656c6c6f2d Slot=1 SourceRoot:=0x68656c6c6f2d TargetRoot:=0x68656c6c6f2d ValidatorIndex=2 prefix=monitor") + require.LogsContain(t, hook, "\"Processed attestation aggregation\" AggregatorIndex=2 BeaconBlockRoot=0x68656c6c6f2d Slot=1 SourceRoot:=0x68656c6c6f2d TargetRoot:=0x68656c6c6f2d prefix=monitor") require.LogsContain(t, hook, "\"Processed aggregated attestation\" Head=0x68656c6c6f2d Slot=1 Source=0x68656c6c6f2d Target=0x68656c6c6f2d ValidatorIndex=2 prefix=monitor") require.LogsDoNotContain(t, hook, "\"Processed aggregated attestation\" Head=0x68656c6c6f2d Slot=1 Source=0x68656c6c6f2d Target=0x68656c6c6f2d ValidatorIndex=12 prefix=monitor") }