Add ePBS to db #13971
Add ePBS to db #13971
Conversation
terencechain
requested review from
saolyn,
potuz and
rkapka
and removed request for
a team
terencechain
force-pushed
the
db-epbs
branch
2 times, most recently
from
00a399c
to
a73b914
Compare
beacon-chain/db/iface/interface.go
Outdated
| @@ -87,6 +88,7 @@ type NoHeadAccessDatabase interface { | |||
| SaveDepositContractAddress(ctx context.Context, addr common.Address) error | |||
| // SaveExecutionChainData operations. | |||
| SaveExecutionChainData(ctx context.Context, data *ethpb.ETH1ChainData) error | |||
| SaveSignedExecutionPayloadEnvelopeBlind(ctx context.Context, envelope *ethpb.SignedExecutionPayloadEnvelopeBlind) error | |||
There was a problem hiding this comment.
Do we really need the Blind here? and even such a long name? any problem in calling this SavePayloadEnvelope?
beacon-chain/db/kv/blocks.go
Outdated
| @@ -303,7 +303,7 @@ func prepareBlockBatch(blks []blocks.ROBlock, shouldBlind bool) ([]blockBatchEnt | |||
| if !errors.Is(err, blocks.ErrUnsupportedVersion) { | |||
| return nil, errors.Wrapf(err, "could not convert block to blinded format for root %#x", batch[i].root) | |||
| } | |||
| // Pre-deneb blocks give ErrUnsupportedVersion; use the full block already in the batch entry. | |||
| // Pre-bellatrix and ePBS blocks give ErrUnsupportedVersion; use the full block already in the batch entry. | |||
There was a problem hiding this comment.
This comment change is confusing
There was a problem hiding this comment.
I'll revert this change. There's nothing we have to do here anyway
| @@ -857,7 +869,7 @@ func TestStore_BlocksBySlot_BlockRootsBySlot(t *testing.T) { | |||
| require.NoError(t, err) | |||
| assert.Equal(t, true, proto.Equal(wantedPb, retrieved0Pb), "Wanted: %v, received: %v", retrievedBlocks[0], wanted) | |||
| wanted = b3 | |||
| if b3.Version() >= version.Bellatrix { | |||
| if b3.Version() >= version.Bellatrix && b3.Version() < version.EPBS { | |||
There was a problem hiding this comment.
Don't we need to add then a test for epbs?
There was a problem hiding this comment.
I'm unclear what you meant. We have an EPBS test in blockTests. These changes fix the previous behavior where the test always assumes the saved block is blinded for b3.
proto/eth/v1/generated.ssz.go
Outdated
| @@ -1,5 +1,5 @@ | |||
| // Code generated by fastssz. DO NOT EDIT. | |||
| // Hash: d06a72227c2f5e350916cce3e89f4e855135a2a22f6ea263dedc68fa506c1ba7 | |||
There was a problem hiding this comment.
This file is better not to add the change
proto/eth/v2/generated.ssz.go
Outdated
| @@ -1,5 +1,5 @@ | |||
| // Code generated by fastssz. DO NOT EDIT. | |||
| // Hash: 6f33097dd41d3dd49d35b7cfceef5a1afca20f05d65b18215748b459db16f99b | |||
| // Hash: 6b214399116c0ca31026da23db2b85fccd78e16d7b9113c83b4a9ee4e60977f6 | |||
There was a problem hiding this comment.
This file is better not to add the change
| bytes signature = 2 [(ethereum.eth.ext.ssz_size) = "96"]; | ||
| } | ||
|
|
||
| message ExecutionPayloadEnvelopeBlind { |
There was a problem hiding this comment.
I think we probably can start naming these PayloadEnvelopeBlind or BlindPayloadEnvelope
| option java_package = "org.ethereum.eth.v1alpha1"; | ||
| option php_namespace = "Ethereum\\Eth\\v1alpha1"; | ||
|
|
||
| message SignedExecutionPayloadEnvelopeBlind { |
There was a problem hiding this comment.
Same with this, probably can be simply named SignedPayloadEnvelopeBlind or SignedBlindPayloadEnvelope
| return ðpb.Deposit{ | ||
| Proof: [][]byte{randomBytes(32, t), randomBytes(32, t), randomBytes(32, t)}, |
There was a problem hiding this comment.
why before it was 33 and now 32 the length of the slice?
There was a problem hiding this comment.
Before we didn't use the correct length. Now we are using correct length 33 or else HTR fails
This PR updates DB pkg to be ePBS compatible. Mainly these three things
1.) Block
2.) Beacon state
3.) Exuection Payload Envelope (blind version)
SignedExecutionPayloadEnvelopeBlindwas defined. The payload itself is replaced bypayload_rootSignedExecutionPayloadEnvelopeBlind(ctx context.Context, blockRoot []byte)which uses beacon block root to retrieveSaveSignedExecutionPayloadEnvelopeBlind(ctx context.Context, envelope *ethpb.SignedExecutionPayloadEnvelopeBlind)