diff --git a/beacon-chain/blockchain/execution_engine.go b/beacon-chain/blockchain/execution_engine.go index e9aab3815f92..4eef5a66241d 100644 --- a/beacon-chain/blockchain/execution_engine.go +++ b/beacon-chain/blockchain/execution_engine.go @@ -278,7 +278,10 @@ func (s *Service) getPayloadAttribute(ctx context.Context, st state.BeaconState, logrus.WithFields(logrus.Fields{ "validatorIndex": proposerID, "burnAddress": fieldparams.EthBurnAddressHex, - }).Error("Fee recipient not set. Using burn address") + }).Warn("Fee recipient is currently using the burn address, " + + "you will not be rewarded transaction fees on this setting. " + + "Please set a different eth address as the fee recipient. " + + "Please refer to our documentation for instructions") } case err != nil: return false, nil, 0, errors.Wrap(err, "could not get fee recipient in db") diff --git a/beacon-chain/blockchain/execution_engine_test.go b/beacon-chain/blockchain/execution_engine_test.go index 54a8087ff8e3..31934eabfadb 100644 --- a/beacon-chain/blockchain/execution_engine_test.go +++ b/beacon-chain/blockchain/execution_engine_test.go @@ -770,7 +770,7 @@ func Test_GetPayloadAttribute(t *testing.T) { require.Equal(t, true, hasPayload) require.Equal(t, suggestedVid, vId) require.Equal(t, fieldparams.EthBurnAddressHex, common.BytesToAddress(attr.SuggestedFeeRecipient).String()) - require.LogsContain(t, hook, "Fee recipient not set. Using burn address") + require.LogsContain(t, hook, "Fee recipient is currently using the burn address") // Cache hit, advance state, has fee recipient suggestedAddr := common.HexToAddress("123") diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go index 8cf6c4c621f3..bdedd0759dac 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go @@ -5,7 +5,6 @@ import ( "context" "fmt" - "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" @@ -121,18 +120,20 @@ func (vs *Server) getExecutionPayload(ctx context.Context, slot types.Slot, vIdx feeRecipient := params.BeaconConfig().DefaultFeeRecipient recipient, err := vs.BeaconDB.FeeRecipientByValidatorID(ctx, vIdx) - burnAddr := bytesutil.PadTo([]byte{}, fieldparams.FeeRecipientLength) switch err == nil { case true: feeRecipient = recipient case errors.As(err, kv.ErrNotFoundFeeRecipient): // If fee recipient is not found in DB and not set from beacon node CLI, // use the burn address. - if bytes.Equal(feeRecipient.Bytes(), burnAddr) { + if feeRecipient.String() == fieldparams.EthBurnAddressHex { logrus.WithFields(logrus.Fields{ "validatorIndex": vIdx, - "burnAddress": common.BytesToAddress(burnAddr).Hex(), - }).Error("Fee recipient not set. Using burn address") + "burnAddress": fieldparams.EthBurnAddressHex, + }).Warn("Fee recipient is currently using the burn address, " + + "you will not be rewarded transaction fees on this setting. " + + "Please set a different eth address as the fee recipient. " + + "Please refer to our documentation for instructions") } default: return nil, errors.Wrap(err, "could not get fee recipient in db") diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go index 0df5ef109524..fac0e4d2bae5 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go @@ -2413,7 +2413,7 @@ func TestProposer_GetBeaconBlock_BellatrixEpoch(t *testing.T) { assert.DeepEqual(t, randaoReveal, bellatrixBlk.Bellatrix.Body.RandaoReveal, "Expected block to have correct randao reveal") assert.DeepEqual(t, req.Graffiti, bellatrixBlk.Bellatrix.Body.Graffiti, "Expected block to have correct Graffiti") - require.LogsContain(t, hook, "Fee recipient not set. Using burn address") + require.LogsContain(t, hook, "Fee recipient is currently using the burn address") require.DeepEqual(t, payload, bellatrixBlk.Bellatrix.Body.ExecutionPayload) // Payload should equal. // Operator sets default fee recipient to not be burned through beacon node cli. @@ -2424,7 +2424,7 @@ func TestProposer_GetBeaconBlock_BellatrixEpoch(t *testing.T) { params.OverrideBeaconConfig(cfg) _, err = proposerServer.GetBeaconBlock(ctx, req) require.NoError(t, err) - require.LogsDoNotContain(t, newHook, "Fee recipient not set. Using burn address") + require.LogsDoNotContain(t, newHook, "Fee recipient is currently using the burn address") } func TestProposer_GetBeaconBlock_Optimistic(t *testing.T) {