diff --git a/go.mod b/go.mod index ee2e425..036cc24 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/attestantio/go-eth2-client go 1.20 require ( - github.com/ferranbt/fastssz v0.1.3 + github.com/ferranbt/fastssz v0.1.4 github.com/goccy/go-yaml v1.9.2 github.com/golang/snappy v0.0.4 github.com/holiman/uint256 v1.2.4 @@ -26,6 +26,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/emicklei/dot v1.6.2 // indirect github.com/fatih/color v1.16.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/go.sum b/go.sum index 956ac0b..17102a3 100644 --- a/go.sum +++ b/go.sum @@ -7,11 +7,13 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emicklei/dot v1.6.2 h1:08GN+DD79cy/tzN6uLCT84+2Wk9u+wvqP+Hkx/dIR8A= +github.com/emicklei/dot v1.6.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16Mo= -github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE= +github.com/ferranbt/fastssz v0.1.4 h1:OCDB+dYDEQDvAgtAGnTSidK1Pe2tW3nFV40XyMkTeDY= +github.com/ferranbt/fastssz v0.1.4/go.mod h1:Ea3+oeoRGGLGm5shYAeDgu6PGUlcvQhE2fILyD9+tGg= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -81,6 +83,7 @@ github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+Pymzi github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e h1:ATgOe+abbzfx9kCPeXIW4fiWyDdxlwHw07j8UGhdTd4= github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e/go.mod h1:wmuf/mdK4VMD+jA9ThwcUKjg3a2XWM9cVfFYjDyY4j4= +github.com/prysmaticlabs/gohashtree v0.0.4-beta h1:H/EbCuXPeTV3lpKeXGPpEV9gsUpkqOOVnWapUyeWro4= github.com/r3labs/sse/v2 v2.10.0 h1:hFEkLLFY4LDifoHdiCN/LlGBAdVJYsANaLqNYa1l/v0= github.com/r3labs/sse/v2 v2.10.0/go.mod h1:Igau6Whc+F17QUgML1fYe1VPZzTV6EMCnYktEmkNJ7I= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= @@ -93,7 +96,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/umbracle/gohashtree v0.0.2-alpha.0.20230207094856-5b775a815c10 h1:CQh33pStIp/E30b7TxDlXfM0145bn2e8boI30IxAhTg= go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= diff --git a/spec/altair/bailout_ssz.go b/spec/altair/bailout_ssz.go index d283c34..f31c159 100644 --- a/spec/altair/bailout_ssz.go +++ b/spec/altair/bailout_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/altair/beaconblock_ssz.go b/spec/altair/beaconblock_ssz.go index c6f7ef8..e52a448 100644 --- a/spec/altair/beaconblock_ssz.go +++ b/spec/altair/beaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( @@ -69,7 +69,7 @@ func (b *BeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o4 < 84 { + if o4 != 84 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/altair/beaconblockbody_ssz.go b/spec/altair/beaconblockbody_ssz.go index 78d6b09..02114ca 100644 --- a/spec/altair/beaconblockbody_ssz.go +++ b/spec/altair/beaconblockbody_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( @@ -182,7 +182,7 @@ func (b *BeaconBlockBody) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o3 < 384 { + if o3 != 384 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/altair/beaconstate_ssz.go b/spec/altair/beaconstate_ssz.go index efeab35..b2f3010 100644 --- a/spec/altair/beaconstate_ssz.go +++ b/spec/altair/beaconstate_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( @@ -309,7 +309,7 @@ func (b *BeaconState) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o7 < 2736657 { + if o7 != 2736657 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/altair/contributionandproof_ssz.go b/spec/altair/contributionandproof_ssz.go index 70bd5ce..19cd764 100644 --- a/spec/altair/contributionandproof_ssz.go +++ b/spec/altair/contributionandproof_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/altair/signedbeaconblock_ssz.go b/spec/altair/signedbeaconblock_ssz.go index bd223bd..e866c58 100644 --- a/spec/altair/signedbeaconblock_ssz.go +++ b/spec/altair/signedbeaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( @@ -47,7 +47,7 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 100 { + if o0 != 100 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/altair/signedcontributionandproof_ssz.go b/spec/altair/signedcontributionandproof_ssz.go index 62567bb..016fb07 100644 --- a/spec/altair/signedcontributionandproof_ssz.go +++ b/spec/altair/signedcontributionandproof_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/altair/syncaggregate_ssz.go b/spec/altair/syncaggregate_ssz.go index 167fc0a..3cb9417 100644 --- a/spec/altair/syncaggregate_ssz.go +++ b/spec/altair/syncaggregate_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/altair/syncaggregatorselectiondata_ssz.go b/spec/altair/syncaggregatorselectiondata_ssz.go index d27ca21..c9a0193 100644 --- a/spec/altair/syncaggregatorselectiondata_ssz.go +++ b/spec/altair/syncaggregatorselectiondata_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/altair/synccommittee_ssz.go b/spec/altair/synccommittee_ssz.go index 5a0dbbe..ceca82a 100644 --- a/spec/altair/synccommittee_ssz.go +++ b/spec/altair/synccommittee_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/altair/synccommitteecontribution_ssz.go b/spec/altair/synccommitteecontribution_ssz.go index 57dc39a..cc9f6d6 100644 --- a/spec/altair/synccommitteecontribution_ssz.go +++ b/spec/altair/synccommitteecontribution_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/altair/synccommitteemessage_ssz.go b/spec/altair/synccommitteemessage_ssz.go index 77089f6..b85a952 100644 --- a/spec/altair/synccommitteemessage_ssz.go +++ b/spec/altair/synccommitteemessage_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: 5bbe5e413b27a35b0c21ec3f78232dadc20a3211addf146a1f2643b09f44bff6 -// Version: 0.1.3 +// Version: 0.1.4 package altair import ( diff --git a/spec/bellatrix/beaconblock_ssz.go b/spec/bellatrix/beaconblock_ssz.go index 79b89e4..4bfbd89 100644 --- a/spec/bellatrix/beaconblock_ssz.go +++ b/spec/bellatrix/beaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 476c2f52fce22b86105c3bb493ad288f196cb561852abc6adf85bc92d5dbcd4c -// Version: 0.1.3 +// Hash: 1923ce42c016bc5e4d9dd227101f535e97e9435fca1b6dec7385b2e2ff5b9b65 +// Version: 0.1.4 package bellatrix import ( @@ -69,7 +69,7 @@ func (b *BeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o4 < 84 { + if o4 != 84 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/bellatrix/beaconblockbody_ssz.go b/spec/bellatrix/beaconblockbody_ssz.go index fe1d20f..cb6c52a 100644 --- a/spec/bellatrix/beaconblockbody_ssz.go +++ b/spec/bellatrix/beaconblockbody_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 476c2f52fce22b86105c3bb493ad288f196cb561852abc6adf85bc92d5dbcd4c -// Version: 0.1.3 +// Hash: 1923ce42c016bc5e4d9dd227101f535e97e9435fca1b6dec7385b2e2ff5b9b65 +// Version: 0.1.4 package bellatrix import ( @@ -192,7 +192,7 @@ func (b *BeaconBlockBody) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o3 < 388 { + if o3 != 388 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/bellatrix/beaconstate_ssz.go b/spec/bellatrix/beaconstate_ssz.go index 9559121..be0dc44 100644 --- a/spec/bellatrix/beaconstate_ssz.go +++ b/spec/bellatrix/beaconstate_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 476c2f52fce22b86105c3bb493ad288f196cb561852abc6adf85bc92d5dbcd4c -// Version: 0.1.3 +// Hash: 1923ce42c016bc5e4d9dd227101f535e97e9435fca1b6dec7385b2e2ff5b9b65 +// Version: 0.1.4 package bellatrix import ( @@ -319,7 +319,7 @@ func (b *BeaconState) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o7 < 2736661 { + if o7 != 2736661 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/bellatrix/executionpayload.go b/spec/bellatrix/executionpayload.go index c072d1b..21407d8 100644 --- a/spec/bellatrix/executionpayload.go +++ b/spec/bellatrix/executionpayload.go @@ -32,7 +32,6 @@ type ExecutionPayload struct { ParentHash phase0.Hash32 `ssz-size:"32"` FeeRecipient ExecutionAddress `ssz-size:"20"` StateRoot [32]byte `ssz-size:"32"` - CheckpointRoot [32]byte `ssz-size:"32"` ReceiptsRoot [32]byte `ssz-size:"32"` LogsBloom [256]byte `ssz-size:"256"` PrevRandao [32]byte `ssz-size:"32"` @@ -51,7 +50,6 @@ type executionPayloadJSON struct { ParentHash string `json:"parent_hash"` FeeRecipient string `json:"fee_recipient"` StateRoot string `json:"state_root"` - CheckpointRoot string `json:"checkpoint_root"` ReceiptsRoot string `json:"receipts_root"` LogsBloom string `json:"logs_bloom"` PrevRandao string `json:"prev_randao"` @@ -70,7 +68,6 @@ type executionPayloadYAML struct { ParentHash string `yaml:"parent_hash"` FeeRecipient string `yaml:"fee_recipient"` StateRoot string `yaml:"state_root"` - CheckpointRoot string `yaml:"checkpoint_root"` ReceiptsRoot string `yaml:"receipts_root"` LogsBloom string `yaml:"logs_bloom"` PrevRandao string `yaml:"prev_randao"` @@ -108,7 +105,6 @@ func (e *ExecutionPayload) MarshalJSON() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), @@ -171,15 +167,6 @@ func (e *ExecutionPayload) unpack(data *executionPayloadJSON) error { } copy(e.StateRoot[:], stateRoot) - if data.CheckpointRoot == "" { - return errors.New("checkpoint root missing") - } - checkpointRoot, err := hex.DecodeString(strings.TrimPrefix(data.CheckpointRoot, "0x")) - if err != nil { - return errors.Wrap(err, "invalid value for checkpoint root") - } - copy(e.CheckpointRoot[:], checkpointRoot) - if data.ReceiptsRoot == "" { return errors.New("receipts root missing") } @@ -366,7 +353,6 @@ func (e *ExecutionPayload) MarshalYAML() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), diff --git a/spec/bellatrix/executionpayload_ssz.go b/spec/bellatrix/executionpayload_ssz.go index 65e0bc1..d829bb7 100644 --- a/spec/bellatrix/executionpayload_ssz.go +++ b/spec/bellatrix/executionpayload_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 476c2f52fce22b86105c3bb493ad288f196cb561852abc6adf85bc92d5dbcd4c -// Version: 0.1.3 +// Hash: 1923ce42c016bc5e4d9dd227101f535e97e9435fca1b6dec7385b2e2ff5b9b65 +// Version: 0.1.4 package bellatrix import ( @@ -15,7 +15,7 @@ func (e *ExecutionPayload) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the ExecutionPayload object to a target array func (e *ExecutionPayload) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf - offset := int(540) + offset := int(508) // Field (0) 'ParentHash' dst = append(dst, e.ParentHash[:]...) @@ -26,51 +26,48 @@ func (e *ExecutionPayload) MarshalSSZTo(buf []byte) (dst []byte, err error) { // Field (2) 'StateRoot' dst = append(dst, e.StateRoot[:]...) - // Field (3) 'CheckpointRoot' - dst = append(dst, e.CheckpointRoot[:]...) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' dst = append(dst, e.ReceiptsRoot[:]...) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' dst = append(dst, e.LogsBloom[:]...) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' dst = append(dst, e.PrevRandao[:]...) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' dst = ssz.MarshalUint64(dst, e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' dst = ssz.MarshalUint64(dst, e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' dst = ssz.MarshalUint64(dst, e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' dst = ssz.MarshalUint64(dst, e.Timestamp) - // Offset (11) 'ExtraData' + // Offset (10) 'ExtraData' dst = ssz.WriteOffset(dst, offset) offset += len(e.ExtraData) - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' dst = append(dst, e.BaseFeePerGas[:]...) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' dst = append(dst, e.BlockHash[:]...) - // Offset (14) 'Transactions' + // Offset (13) 'Transactions' dst = ssz.WriteOffset(dst, offset) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' if size := len(e.ExtraData); size > 32 { err = ssz.ErrBytesLengthFn("ExecutionPayload.ExtraData", size, 32) return } dst = append(dst, e.ExtraData...) - // Field (14) 'Transactions' + // Field (13) 'Transactions' if size := len(e.Transactions); size > 1048576 { err = ssz.ErrListTooBigFn("ExecutionPayload.Transactions", size, 1048576) return @@ -97,12 +94,12 @@ func (e *ExecutionPayload) MarshalSSZTo(buf []byte) (dst []byte, err error) { func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size < 540 { + if size < 508 { return ssz.ErrSize } tail := buf - var o11, o14 uint64 + var o10, o13 uint64 // Field (0) 'ParentHash' copy(e.ParentHash[:], buf[0:32]) @@ -113,53 +110,50 @@ func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { // Field (2) 'StateRoot' copy(e.StateRoot[:], buf[52:84]) - // Field (3) 'CheckpointRoot' - copy(e.CheckpointRoot[:], buf[84:116]) - - // Field (4) 'ReceiptsRoot' - copy(e.ReceiptsRoot[:], buf[116:148]) + // Field (3) 'ReceiptsRoot' + copy(e.ReceiptsRoot[:], buf[84:116]) - // Field (5) 'LogsBloom' - copy(e.LogsBloom[:], buf[148:404]) + // Field (4) 'LogsBloom' + copy(e.LogsBloom[:], buf[116:372]) - // Field (6) 'PrevRandao' - copy(e.PrevRandao[:], buf[404:436]) + // Field (5) 'PrevRandao' + copy(e.PrevRandao[:], buf[372:404]) - // Field (7) 'BlockNumber' - e.BlockNumber = ssz.UnmarshallUint64(buf[436:444]) + // Field (6) 'BlockNumber' + e.BlockNumber = ssz.UnmarshallUint64(buf[404:412]) - // Field (8) 'GasLimit' - e.GasLimit = ssz.UnmarshallUint64(buf[444:452]) + // Field (7) 'GasLimit' + e.GasLimit = ssz.UnmarshallUint64(buf[412:420]) - // Field (9) 'GasUsed' - e.GasUsed = ssz.UnmarshallUint64(buf[452:460]) + // Field (8) 'GasUsed' + e.GasUsed = ssz.UnmarshallUint64(buf[420:428]) - // Field (10) 'Timestamp' - e.Timestamp = ssz.UnmarshallUint64(buf[460:468]) + // Field (9) 'Timestamp' + e.Timestamp = ssz.UnmarshallUint64(buf[428:436]) - // Offset (11) 'ExtraData' - if o11 = ssz.ReadOffset(buf[468:472]); o11 > size { + // Offset (10) 'ExtraData' + if o10 = ssz.ReadOffset(buf[436:440]); o10 > size { return ssz.ErrOffset } - if o11 < 540 { + if o10 != 508 { return ssz.ErrInvalidVariableOffset } - // Field (12) 'BaseFeePerGas' - copy(e.BaseFeePerGas[:], buf[472:504]) + // Field (11) 'BaseFeePerGas' + copy(e.BaseFeePerGas[:], buf[440:472]) - // Field (13) 'BlockHash' - copy(e.BlockHash[:], buf[504:536]) + // Field (12) 'BlockHash' + copy(e.BlockHash[:], buf[472:504]) - // Offset (14) 'Transactions' - if o14 = ssz.ReadOffset(buf[536:540]); o14 > size || o11 > o14 { + // Offset (13) 'Transactions' + if o13 = ssz.ReadOffset(buf[504:508]); o13 > size || o10 > o13 { return ssz.ErrOffset } - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { - buf = tail[o11:o14] + buf = tail[o10:o13] if len(buf) > 32 { return ssz.ErrBytesLength } @@ -169,9 +163,9 @@ func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { e.ExtraData = append(e.ExtraData, buf...) } - // Field (14) 'Transactions' + // Field (13) 'Transactions' { - buf = tail[o14:] + buf = tail[o13:] num, err := ssz.DecodeDynamicLength(buf, 1048576) if err != nil { return err @@ -196,12 +190,12 @@ func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { // SizeSSZ returns the ssz encoded size in bytes for the ExecutionPayload object func (e *ExecutionPayload) SizeSSZ() (size int) { - size = 540 + size = 508 - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' size += len(e.ExtraData) - // Field (14) 'Transactions' + // Field (13) 'Transactions' for ii := 0; ii < len(e.Transactions); ii++ { size += 4 size += len(e.Transactions[ii]) @@ -228,31 +222,28 @@ func (e *ExecutionPayload) HashTreeRootWith(hh ssz.HashWalker) (err error) { // Field (2) 'StateRoot' hh.PutBytes(e.StateRoot[:]) - // Field (3) 'CheckpointRoot' - hh.PutBytes(e.CheckpointRoot[:]) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' hh.PutBytes(e.ReceiptsRoot[:]) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' hh.PutBytes(e.LogsBloom[:]) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' hh.PutBytes(e.PrevRandao[:]) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' hh.PutUint64(e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' hh.PutUint64(e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' hh.PutUint64(e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' hh.PutUint64(e.Timestamp) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { elemIndx := hh.Index() byteLen := uint64(len(e.ExtraData)) @@ -264,13 +255,13 @@ func (e *ExecutionPayload) HashTreeRootWith(hh ssz.HashWalker) (err error) { hh.MerkleizeWithMixin(elemIndx, byteLen, (32+31)/32) } - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' hh.PutBytes(e.BaseFeePerGas[:]) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' hh.PutBytes(e.BlockHash[:]) - // Field (14) 'Transactions' + // Field (13) 'Transactions' { subIndx := hh.Index() num := uint64(len(e.Transactions)) diff --git a/spec/bellatrix/executionpayloadheader.go b/spec/bellatrix/executionpayloadheader.go index 2e3424d..dd107c9 100644 --- a/spec/bellatrix/executionpayloadheader.go +++ b/spec/bellatrix/executionpayloadheader.go @@ -32,7 +32,6 @@ type ExecutionPayloadHeader struct { ParentHash phase0.Hash32 `ssz-size:"32"` FeeRecipient ExecutionAddress `ssz-size:"20"` StateRoot [32]byte `ssz-size:"32"` - CheckpointRoot [32]byte `ssz-size:"32"` ReceiptsRoot [32]byte `ssz-size:"32"` LogsBloom [256]byte `ssz-size:"256"` PrevRandao [32]byte `ssz-size:"32"` @@ -51,7 +50,6 @@ type executionPayloadHeaderJSON struct { ParentHash string `json:"parent_hash"` FeeRecipient string `json:"fee_recipient"` StateRoot string `json:"state_root"` - CheckpointRoot string `json:"checkpoint_root"` ReceiptsRoot string `json:"receipts_root"` LogsBloom string `json:"logs_bloom"` PrevRandao string `json:"prev_randao"` @@ -70,7 +68,6 @@ type executionPayloadHeaderYAML struct { ParentHash string `yaml:"parent_hash"` FeeRecipient string `yaml:"fee_recipient"` StateRoot string `yaml:"state_root"` - CheckpointRoot string `yaml:"checkpoint_root"` ReceiptsRoot string `yaml:"receipts_root"` LogsBloom string `yaml:"logs_bloom"` PrevRandao string `yaml:"prev_randao"` @@ -103,7 +100,6 @@ func (e *ExecutionPayloadHeader) MarshalJSON() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), @@ -166,15 +162,6 @@ func (e *ExecutionPayloadHeader) unpack(data *executionPayloadHeaderJSON) error } copy(e.StateRoot[:], stateRoot) - if data.CheckpointRoot == "" { - return errors.New("checkpoint root missing") - } - checkpointRoot, err := hex.DecodeString(strings.TrimPrefix(data.CheckpointRoot, "0x")) - if err != nil { - return errors.Wrap(err, "invalid value for checkpoint root") - } - copy(e.CheckpointRoot[:], checkpointRoot) - if data.ReceiptsRoot == "" { return errors.New("receipts root missing") } @@ -347,7 +334,6 @@ func (e *ExecutionPayloadHeader) MarshalYAML() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), diff --git a/spec/bellatrix/executionpayloadheader_ssz.go b/spec/bellatrix/executionpayloadheader_ssz.go index 646f296..ccdccd0 100644 --- a/spec/bellatrix/executionpayloadheader_ssz.go +++ b/spec/bellatrix/executionpayloadheader_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 476c2f52fce22b86105c3bb493ad288f196cb561852abc6adf85bc92d5dbcd4c -// Version: 0.1.3 +// Hash: 1923ce42c016bc5e4d9dd227101f535e97e9435fca1b6dec7385b2e2ff5b9b65 +// Version: 0.1.4 package bellatrix import ( @@ -15,7 +15,7 @@ func (e *ExecutionPayloadHeader) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the ExecutionPayloadHeader object to a target array func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf - offset := int(568) + offset := int(536) // Field (0) 'ParentHash' dst = append(dst, e.ParentHash[:]...) @@ -26,43 +26,40 @@ func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error // Field (2) 'StateRoot' dst = append(dst, e.StateRoot[:]...) - // Field (3) 'CheckpointRoot' - dst = append(dst, e.CheckpointRoot[:]...) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' dst = append(dst, e.ReceiptsRoot[:]...) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' dst = append(dst, e.LogsBloom[:]...) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' dst = append(dst, e.PrevRandao[:]...) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' dst = ssz.MarshalUint64(dst, e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' dst = ssz.MarshalUint64(dst, e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' dst = ssz.MarshalUint64(dst, e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' dst = ssz.MarshalUint64(dst, e.Timestamp) - // Offset (11) 'ExtraData' + // Offset (10) 'ExtraData' dst = ssz.WriteOffset(dst, offset) - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' dst = append(dst, e.BaseFeePerGas[:]...) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' dst = append(dst, e.BlockHash[:]...) - // Field (14) 'TransactionsRoot' + // Field (13) 'TransactionsRoot' dst = append(dst, e.TransactionsRoot[:]...) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' if size := len(e.ExtraData); size > 32 { err = ssz.ErrBytesLengthFn("ExecutionPayloadHeader.ExtraData", size, 32) return @@ -76,12 +73,12 @@ func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size < 568 { + if size < 536 { return ssz.ErrSize } tail := buf - var o11 uint64 + var o10 uint64 // Field (0) 'ParentHash' copy(e.ParentHash[:], buf[0:32]) @@ -92,51 +89,48 @@ func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { // Field (2) 'StateRoot' copy(e.StateRoot[:], buf[52:84]) - // Field (3) 'CheckpointRoot' - copy(e.CheckpointRoot[:], buf[84:116]) - - // Field (4) 'ReceiptsRoot' - copy(e.ReceiptsRoot[:], buf[116:148]) + // Field (3) 'ReceiptsRoot' + copy(e.ReceiptsRoot[:], buf[84:116]) - // Field (5) 'LogsBloom' - copy(e.LogsBloom[:], buf[148:404]) + // Field (4) 'LogsBloom' + copy(e.LogsBloom[:], buf[116:372]) - // Field (6) 'PrevRandao' - copy(e.PrevRandao[:], buf[404:436]) + // Field (5) 'PrevRandao' + copy(e.PrevRandao[:], buf[372:404]) - // Field (7) 'BlockNumber' - e.BlockNumber = ssz.UnmarshallUint64(buf[436:444]) + // Field (6) 'BlockNumber' + e.BlockNumber = ssz.UnmarshallUint64(buf[404:412]) - // Field (8) 'GasLimit' - e.GasLimit = ssz.UnmarshallUint64(buf[444:452]) + // Field (7) 'GasLimit' + e.GasLimit = ssz.UnmarshallUint64(buf[412:420]) - // Field (9) 'GasUsed' - e.GasUsed = ssz.UnmarshallUint64(buf[452:460]) + // Field (8) 'GasUsed' + e.GasUsed = ssz.UnmarshallUint64(buf[420:428]) - // Field (10) 'Timestamp' - e.Timestamp = ssz.UnmarshallUint64(buf[460:468]) + // Field (9) 'Timestamp' + e.Timestamp = ssz.UnmarshallUint64(buf[428:436]) - // Offset (11) 'ExtraData' - if o11 = ssz.ReadOffset(buf[468:472]); o11 > size { + // Offset (10) 'ExtraData' + if o10 = ssz.ReadOffset(buf[436:440]); o10 > size { return ssz.ErrOffset } - if o11 < 568 { + if o10 != 536 { return ssz.ErrInvalidVariableOffset } - // Field (12) 'BaseFeePerGas' - copy(e.BaseFeePerGas[:], buf[472:504]) + // Field (11) 'BaseFeePerGas' + copy(e.BaseFeePerGas[:], buf[440:472]) - // Field (13) 'BlockHash' - copy(e.BlockHash[:], buf[504:536]) + // Field (12) 'BlockHash' + copy(e.BlockHash[:], buf[472:504]) - // Field (14) 'TransactionsRoot' - copy(e.TransactionsRoot[:], buf[536:568]) + // Field (13) 'TransactionsRoot' + copy(e.TransactionsRoot[:], buf[504:536]) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { - buf = tail[o11:] + buf = tail[o10:] if len(buf) > 32 { return ssz.ErrBytesLength } @@ -150,9 +144,9 @@ func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { // SizeSSZ returns the ssz encoded size in bytes for the ExecutionPayloadHeader object func (e *ExecutionPayloadHeader) SizeSSZ() (size int) { - size = 568 + size = 536 - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' size += len(e.ExtraData) return @@ -176,31 +170,28 @@ func (e *ExecutionPayloadHeader) HashTreeRootWith(hh ssz.HashWalker) (err error) // Field (2) 'StateRoot' hh.PutBytes(e.StateRoot[:]) - // Field (3) 'CheckpointRoot' - hh.PutBytes(e.CheckpointRoot[:]) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' hh.PutBytes(e.ReceiptsRoot[:]) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' hh.PutBytes(e.LogsBloom[:]) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' hh.PutBytes(e.PrevRandao[:]) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' hh.PutUint64(e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' hh.PutUint64(e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' hh.PutUint64(e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' hh.PutUint64(e.Timestamp) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { elemIndx := hh.Index() byteLen := uint64(len(e.ExtraData)) @@ -212,13 +203,13 @@ func (e *ExecutionPayloadHeader) HashTreeRootWith(hh ssz.HashWalker) (err error) hh.MerkleizeWithMixin(elemIndx, byteLen, (32+31)/32) } - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' hh.PutBytes(e.BaseFeePerGas[:]) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' hh.PutBytes(e.BlockHash[:]) - // Field (14) 'TransactionsRoot' + // Field (13) 'TransactionsRoot' hh.PutBytes(e.TransactionsRoot[:]) hh.Merkleize(indx) diff --git a/spec/bellatrix/signedbeaconblock_ssz.go b/spec/bellatrix/signedbeaconblock_ssz.go index fd0217e..b7390da 100644 --- a/spec/bellatrix/signedbeaconblock_ssz.go +++ b/spec/bellatrix/signedbeaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 476c2f52fce22b86105c3bb493ad288f196cb561852abc6adf85bc92d5dbcd4c -// Version: 0.1.3 +// Hash: 1923ce42c016bc5e4d9dd227101f535e97e9435fca1b6dec7385b2e2ff5b9b65 +// Version: 0.1.4 package bellatrix import ( @@ -47,7 +47,7 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 100 { + if o0 != 100 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/capella/beaconblock_ssz.go b/spec/capella/beaconblock_ssz.go index 8ad88f8..40cc7c0 100644 --- a/spec/capella/beaconblock_ssz.go +++ b/spec/capella/beaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( @@ -69,7 +69,7 @@ func (b *BeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o4 < 84 { + if o4 != 84 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/capella/beaconblockbody_ssz.go b/spec/capella/beaconblockbody_ssz.go index 2403286..06f95da 100644 --- a/spec/capella/beaconblockbody_ssz.go +++ b/spec/capella/beaconblockbody_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( @@ -210,7 +210,7 @@ func (b *BeaconBlockBody) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o3 < 392 { + if o3 != 392 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/capella/beaconstate_ssz.go b/spec/capella/beaconstate_ssz.go index a46f95f..a67764a 100644 --- a/spec/capella/beaconstate_ssz.go +++ b/spec/capella/beaconstate_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( @@ -343,7 +343,7 @@ func (b *BeaconState) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o7 < 2736681 { + if o7 != 2736681 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/capella/blstoexecutionchange_ssz.go b/spec/capella/blstoexecutionchange_ssz.go index 6682811..d9b1140 100644 --- a/spec/capella/blstoexecutionchange_ssz.go +++ b/spec/capella/blstoexecutionchange_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( diff --git a/spec/capella/executionpayload.go b/spec/capella/executionpayload.go index 213f06c..b0245b2 100644 --- a/spec/capella/executionpayload.go +++ b/spec/capella/executionpayload.go @@ -33,7 +33,6 @@ type ExecutionPayload struct { ParentHash phase0.Hash32 `ssz-size:"32"` FeeRecipient bellatrix.ExecutionAddress `ssz-size:"20"` StateRoot [32]byte `ssz-size:"32"` - CheckpointRoot [32]byte `ssz-size:"32"` ReceiptsRoot [32]byte `ssz-size:"32"` LogsBloom [256]byte `ssz-size:"256"` PrevRandao [32]byte `ssz-size:"32"` @@ -53,7 +52,6 @@ type executionPayloadJSON struct { ParentHash string `json:"parent_hash"` FeeRecipient string `json:"fee_recipient"` StateRoot string `json:"state_root"` - CheckpointRoot string `json:"checkpoint_root"` ReceiptsRoot string `json:"receipts_root"` LogsBloom string `json:"logs_bloom"` PrevRandao string `json:"prev_randao"` @@ -73,7 +71,6 @@ type executionPayloadYAML struct { ParentHash string `yaml:"parent_hash"` FeeRecipient string `yaml:"fee_recipient"` StateRoot string `yaml:"state_root"` - CheckpointRoot string `yaml:"checkpoint_root"` ReceiptsRoot string `yaml:"receipts_root"` LogsBloom string `yaml:"logs_bloom"` PrevRandao string `yaml:"prev_randao"` @@ -112,7 +109,6 @@ func (e *ExecutionPayload) MarshalJSON() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), @@ -176,18 +172,6 @@ func (e *ExecutionPayload) unpack(data *executionPayloadJSON) error { } copy(e.StateRoot[:], stateRoot) - if data.CheckpointRoot == "" { - return errors.New("checkpoint root missing") - } - checkpointRoot, err := hex.DecodeString(strings.TrimPrefix(data.CheckpointRoot, "0x")) - if err != nil { - return errors.Wrap(err, "invalid value for checkpoint root") - } - if len(checkpointRoot) != 32 { - return errors.New("incorrect length for checkpoint root") - } - copy(e.CheckpointRoot[:], checkpointRoot) - if data.ReceiptsRoot == "" { return errors.New("receipts root missing") } @@ -384,7 +368,6 @@ func (e *ExecutionPayload) MarshalYAML() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), diff --git a/spec/capella/executionpayload_ssz.go b/spec/capella/executionpayload_ssz.go index 577c59e..840158e 100644 --- a/spec/capella/executionpayload_ssz.go +++ b/spec/capella/executionpayload_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( @@ -16,7 +16,7 @@ func (e *ExecutionPayload) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the ExecutionPayload object to a target array func (e *ExecutionPayload) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf - offset := int(544) + offset := int(512) // Field (0) 'ParentHash' dst = append(dst, e.ParentHash[:]...) @@ -27,58 +27,55 @@ func (e *ExecutionPayload) MarshalSSZTo(buf []byte) (dst []byte, err error) { // Field (2) 'StateRoot' dst = append(dst, e.StateRoot[:]...) - // Field (3) 'CheckpointRoot' - dst = append(dst, e.CheckpointRoot[:]...) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' dst = append(dst, e.ReceiptsRoot[:]...) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' dst = append(dst, e.LogsBloom[:]...) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' dst = append(dst, e.PrevRandao[:]...) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' dst = ssz.MarshalUint64(dst, e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' dst = ssz.MarshalUint64(dst, e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' dst = ssz.MarshalUint64(dst, e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' dst = ssz.MarshalUint64(dst, e.Timestamp) - // Offset (11) 'ExtraData' + // Offset (10) 'ExtraData' dst = ssz.WriteOffset(dst, offset) offset += len(e.ExtraData) - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' dst = append(dst, e.BaseFeePerGas[:]...) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' dst = append(dst, e.BlockHash[:]...) - // Offset (14) 'Transactions' + // Offset (13) 'Transactions' dst = ssz.WriteOffset(dst, offset) for ii := 0; ii < len(e.Transactions); ii++ { offset += 4 offset += len(e.Transactions[ii]) } - // Offset (15) 'Withdrawals' + // Offset (14) 'Withdrawals' dst = ssz.WriteOffset(dst, offset) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' if size := len(e.ExtraData); size > 32 { err = ssz.ErrBytesLengthFn("ExecutionPayload.ExtraData", size, 32) return } dst = append(dst, e.ExtraData...) - // Field (14) 'Transactions' + // Field (13) 'Transactions' if size := len(e.Transactions); size > 1048576 { err = ssz.ErrListTooBigFn("ExecutionPayload.Transactions", size, 1048576) return @@ -98,7 +95,7 @@ func (e *ExecutionPayload) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = append(dst, e.Transactions[ii]...) } - // Field (15) 'Withdrawals' + // Field (14) 'Withdrawals' if size := len(e.Withdrawals); size > 16 { err = ssz.ErrListTooBigFn("ExecutionPayload.Withdrawals", size, 16) return @@ -116,12 +113,12 @@ func (e *ExecutionPayload) MarshalSSZTo(buf []byte) (dst []byte, err error) { func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size < 544 { + if size < 512 { return ssz.ErrSize } tail := buf - var o11, o14, o15 uint64 + var o10, o13, o14 uint64 // Field (0) 'ParentHash' copy(e.ParentHash[:], buf[0:32]) @@ -132,58 +129,55 @@ func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { // Field (2) 'StateRoot' copy(e.StateRoot[:], buf[52:84]) - // Field (3) 'CheckpointRoot' - copy(e.CheckpointRoot[:], buf[84:116]) - - // Field (4) 'ReceiptsRoot' - copy(e.ReceiptsRoot[:], buf[116:148]) + // Field (3) 'ReceiptsRoot' + copy(e.ReceiptsRoot[:], buf[84:116]) - // Field (5) 'LogsBloom' - copy(e.LogsBloom[:], buf[148:404]) + // Field (4) 'LogsBloom' + copy(e.LogsBloom[:], buf[116:372]) - // Field (6) 'PrevRandao' - copy(e.PrevRandao[:], buf[404:436]) + // Field (5) 'PrevRandao' + copy(e.PrevRandao[:], buf[372:404]) - // Field (7) 'BlockNumber' - e.BlockNumber = ssz.UnmarshallUint64(buf[436:444]) + // Field (6) 'BlockNumber' + e.BlockNumber = ssz.UnmarshallUint64(buf[404:412]) - // Field (8) 'GasLimit' - e.GasLimit = ssz.UnmarshallUint64(buf[444:452]) + // Field (7) 'GasLimit' + e.GasLimit = ssz.UnmarshallUint64(buf[412:420]) - // Field (9) 'GasUsed' - e.GasUsed = ssz.UnmarshallUint64(buf[452:460]) + // Field (8) 'GasUsed' + e.GasUsed = ssz.UnmarshallUint64(buf[420:428]) - // Field (10) 'Timestamp' - e.Timestamp = ssz.UnmarshallUint64(buf[460:468]) + // Field (9) 'Timestamp' + e.Timestamp = ssz.UnmarshallUint64(buf[428:436]) - // Offset (11) 'ExtraData' - if o11 = ssz.ReadOffset(buf[468:472]); o11 > size { + // Offset (10) 'ExtraData' + if o10 = ssz.ReadOffset(buf[436:440]); o10 > size { return ssz.ErrOffset } - if o11 < 544 { + if o10 != 512 { return ssz.ErrInvalidVariableOffset } - // Field (12) 'BaseFeePerGas' - copy(e.BaseFeePerGas[:], buf[472:504]) + // Field (11) 'BaseFeePerGas' + copy(e.BaseFeePerGas[:], buf[440:472]) - // Field (13) 'BlockHash' - copy(e.BlockHash[:], buf[504:536]) + // Field (12) 'BlockHash' + copy(e.BlockHash[:], buf[472:504]) - // Offset (14) 'Transactions' - if o14 = ssz.ReadOffset(buf[536:540]); o14 > size || o11 > o14 { + // Offset (13) 'Transactions' + if o13 = ssz.ReadOffset(buf[504:508]); o13 > size || o10 > o13 { return ssz.ErrOffset } - // Offset (15) 'Withdrawals' - if o15 = ssz.ReadOffset(buf[540:544]); o15 > size || o14 > o15 { + // Offset (14) 'Withdrawals' + if o14 = ssz.ReadOffset(buf[508:512]); o14 > size || o13 > o14 { return ssz.ErrOffset } - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { - buf = tail[o11:o14] + buf = tail[o10:o13] if len(buf) > 32 { return ssz.ErrBytesLength } @@ -193,9 +187,9 @@ func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { e.ExtraData = append(e.ExtraData, buf...) } - // Field (14) 'Transactions' + // Field (13) 'Transactions' { - buf = tail[o14:o15] + buf = tail[o13:o14] num, err := ssz.DecodeDynamicLength(buf, 1048576) if err != nil { return err @@ -216,9 +210,9 @@ func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { } } - // Field (15) 'Withdrawals' + // Field (14) 'Withdrawals' { - buf = tail[o15:] + buf = tail[o14:] num, err := ssz.DivideInt2(len(buf), 44, 16) if err != nil { return err @@ -238,18 +232,18 @@ func (e *ExecutionPayload) UnmarshalSSZ(buf []byte) error { // SizeSSZ returns the ssz encoded size in bytes for the ExecutionPayload object func (e *ExecutionPayload) SizeSSZ() (size int) { - size = 544 + size = 512 - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' size += len(e.ExtraData) - // Field (14) 'Transactions' + // Field (13) 'Transactions' for ii := 0; ii < len(e.Transactions); ii++ { size += 4 size += len(e.Transactions[ii]) } - // Field (15) 'Withdrawals' + // Field (14) 'Withdrawals' size += len(e.Withdrawals) * 44 return @@ -273,31 +267,28 @@ func (e *ExecutionPayload) HashTreeRootWith(hh ssz.HashWalker) (err error) { // Field (2) 'StateRoot' hh.PutBytes(e.StateRoot[:]) - // Field (3) 'CheckpointRoot' - hh.PutBytes(e.CheckpointRoot[:]) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' hh.PutBytes(e.ReceiptsRoot[:]) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' hh.PutBytes(e.LogsBloom[:]) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' hh.PutBytes(e.PrevRandao[:]) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' hh.PutUint64(e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' hh.PutUint64(e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' hh.PutUint64(e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' hh.PutUint64(e.Timestamp) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { elemIndx := hh.Index() byteLen := uint64(len(e.ExtraData)) @@ -309,13 +300,13 @@ func (e *ExecutionPayload) HashTreeRootWith(hh ssz.HashWalker) (err error) { hh.MerkleizeWithMixin(elemIndx, byteLen, (32+31)/32) } - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' hh.PutBytes(e.BaseFeePerGas[:]) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' hh.PutBytes(e.BlockHash[:]) - // Field (14) 'Transactions' + // Field (13) 'Transactions' { subIndx := hh.Index() num := uint64(len(e.Transactions)) @@ -338,7 +329,7 @@ func (e *ExecutionPayload) HashTreeRootWith(hh ssz.HashWalker) (err error) { hh.MerkleizeWithMixin(subIndx, num, 1048576) } - // Field (15) 'Withdrawals' + // Field (14) 'Withdrawals' { subIndx := hh.Index() num := uint64(len(e.Withdrawals)) diff --git a/spec/capella/executionpayloadheader.go b/spec/capella/executionpayloadheader.go index 53d1f1d..e76805c 100644 --- a/spec/capella/executionpayloadheader.go +++ b/spec/capella/executionpayloadheader.go @@ -33,7 +33,6 @@ type ExecutionPayloadHeader struct { ParentHash phase0.Hash32 `ssz-size:"32"` FeeRecipient bellatrix.ExecutionAddress `ssz-size:"20"` StateRoot [32]byte `ssz-size:"32"` - CheckpointRoot [32]byte `ssz-size:"32"` ReceiptsRoot [32]byte `ssz-size:"32"` LogsBloom [256]byte `ssz-size:"256"` PrevRandao [32]byte `ssz-size:"32"` @@ -53,7 +52,6 @@ type executionPayloadHeaderJSON struct { ParentHash string `json:"parent_hash"` FeeRecipient string `json:"fee_recipient"` StateRoot string `json:"state_root"` - CheckpointRoot string `json:"checkpoint_root"` ReceiptsRoot string `json:"receipts_root"` LogsBloom string `json:"logs_bloom"` PrevRandao string `json:"prev_randao"` @@ -73,7 +71,6 @@ type executionPayloadHeaderYAML struct { ParentHash string `yaml:"parent_hash"` FeeRecipient string `yaml:"fee_recipient"` StateRoot string `yaml:"state_root"` - CheckpointRoot string `yaml:"checkpoint_root"` ReceiptsRoot string `yaml:"receipts_root"` LogsBloom string `yaml:"logs_bloom"` PrevRandao string `yaml:"prev_randao"` @@ -107,7 +104,6 @@ func (e *ExecutionPayloadHeader) MarshalJSON() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), @@ -171,18 +167,6 @@ func (e *ExecutionPayloadHeader) unpack(data *executionPayloadHeaderJSON) error } copy(e.StateRoot[:], stateRoot) - if data.CheckpointRoot == "" { - return errors.New("checkpoint root missing") - } - checkpointRoot, err := hex.DecodeString(strings.TrimPrefix(data.CheckpointRoot, "0x")) - if err != nil { - return errors.Wrap(err, "invalid value for checkpoint root") - } - if len(checkpointRoot) != 32 { - return errors.New("incorrect length for checkpoint root") - } - copy(e.CheckpointRoot[:], checkpointRoot) - if data.ReceiptsRoot == "" { return errors.New("receipts root missing") } @@ -367,7 +351,6 @@ func (e *ExecutionPayloadHeader) MarshalYAML() ([]byte, error) { ParentHash: fmt.Sprintf("%#x", e.ParentHash), FeeRecipient: e.FeeRecipient.String(), StateRoot: fmt.Sprintf("%#x", e.StateRoot), - CheckpointRoot: fmt.Sprintf("%#x", e.CheckpointRoot), ReceiptsRoot: fmt.Sprintf("%#x", e.ReceiptsRoot), LogsBloom: fmt.Sprintf("%#x", e.LogsBloom), PrevRandao: fmt.Sprintf("%#x", e.PrevRandao), diff --git a/spec/capella/executionpayloadheader_ssz.go b/spec/capella/executionpayloadheader_ssz.go index e2764a1..9783c08 100644 --- a/spec/capella/executionpayloadheader_ssz.go +++ b/spec/capella/executionpayloadheader_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( @@ -15,7 +15,7 @@ func (e *ExecutionPayloadHeader) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the ExecutionPayloadHeader object to a target array func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf - offset := int(600) + offset := int(568) // Field (0) 'ParentHash' dst = append(dst, e.ParentHash[:]...) @@ -26,46 +26,43 @@ func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error // Field (2) 'StateRoot' dst = append(dst, e.StateRoot[:]...) - // Field (3) 'CheckpointRoot' - dst = append(dst, e.CheckpointRoot[:]...) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' dst = append(dst, e.ReceiptsRoot[:]...) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' dst = append(dst, e.LogsBloom[:]...) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' dst = append(dst, e.PrevRandao[:]...) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' dst = ssz.MarshalUint64(dst, e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' dst = ssz.MarshalUint64(dst, e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' dst = ssz.MarshalUint64(dst, e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' dst = ssz.MarshalUint64(dst, e.Timestamp) - // Offset (11) 'ExtraData' + // Offset (10) 'ExtraData' dst = ssz.WriteOffset(dst, offset) - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' dst = append(dst, e.BaseFeePerGas[:]...) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' dst = append(dst, e.BlockHash[:]...) - // Field (14) 'TransactionsRoot' + // Field (13) 'TransactionsRoot' dst = append(dst, e.TransactionsRoot[:]...) - // Field (15) 'WithdrawalsRoot' + // Field (14) 'WithdrawalsRoot' dst = append(dst, e.WithdrawalsRoot[:]...) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' if size := len(e.ExtraData); size > 32 { err = ssz.ErrBytesLengthFn("ExecutionPayloadHeader.ExtraData", size, 32) return @@ -79,12 +76,12 @@ func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size < 600 { + if size < 568 { return ssz.ErrSize } tail := buf - var o11 uint64 + var o10 uint64 // Field (0) 'ParentHash' copy(e.ParentHash[:], buf[0:32]) @@ -95,54 +92,51 @@ func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { // Field (2) 'StateRoot' copy(e.StateRoot[:], buf[52:84]) - // Field (3) 'CheckpointRoot' - copy(e.CheckpointRoot[:], buf[84:116]) - - // Field (4) 'ReceiptsRoot' - copy(e.ReceiptsRoot[:], buf[116:148]) + // Field (3) 'ReceiptsRoot' + copy(e.ReceiptsRoot[:], buf[84:116]) - // Field (5) 'LogsBloom' - copy(e.LogsBloom[:], buf[148:404]) + // Field (4) 'LogsBloom' + copy(e.LogsBloom[:], buf[116:372]) - // Field (6) 'PrevRandao' - copy(e.PrevRandao[:], buf[404:436]) + // Field (5) 'PrevRandao' + copy(e.PrevRandao[:], buf[372:404]) - // Field (7) 'BlockNumber' - e.BlockNumber = ssz.UnmarshallUint64(buf[436:444]) + // Field (6) 'BlockNumber' + e.BlockNumber = ssz.UnmarshallUint64(buf[404:412]) - // Field (8) 'GasLimit' - e.GasLimit = ssz.UnmarshallUint64(buf[444:452]) + // Field (7) 'GasLimit' + e.GasLimit = ssz.UnmarshallUint64(buf[412:420]) - // Field (9) 'GasUsed' - e.GasUsed = ssz.UnmarshallUint64(buf[452:460]) + // Field (8) 'GasUsed' + e.GasUsed = ssz.UnmarshallUint64(buf[420:428]) - // Field (10) 'Timestamp' - e.Timestamp = ssz.UnmarshallUint64(buf[460:468]) + // Field (9) 'Timestamp' + e.Timestamp = ssz.UnmarshallUint64(buf[428:436]) - // Offset (11) 'ExtraData' - if o11 = ssz.ReadOffset(buf[468:472]); o11 > size { + // Offset (10) 'ExtraData' + if o10 = ssz.ReadOffset(buf[436:440]); o10 > size { return ssz.ErrOffset } - if o11 < 600 { + if o10 != 568 { return ssz.ErrInvalidVariableOffset } - // Field (12) 'BaseFeePerGas' - copy(e.BaseFeePerGas[:], buf[472:504]) + // Field (11) 'BaseFeePerGas' + copy(e.BaseFeePerGas[:], buf[440:472]) - // Field (13) 'BlockHash' - copy(e.BlockHash[:], buf[504:536]) + // Field (12) 'BlockHash' + copy(e.BlockHash[:], buf[472:504]) - // Field (14) 'TransactionsRoot' - copy(e.TransactionsRoot[:], buf[536:568]) + // Field (13) 'TransactionsRoot' + copy(e.TransactionsRoot[:], buf[504:536]) - // Field (15) 'WithdrawalsRoot' - copy(e.WithdrawalsRoot[:], buf[568:600]) + // Field (14) 'WithdrawalsRoot' + copy(e.WithdrawalsRoot[:], buf[536:568]) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { - buf = tail[o11:] + buf = tail[o10:] if len(buf) > 32 { return ssz.ErrBytesLength } @@ -156,9 +150,9 @@ func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { // SizeSSZ returns the ssz encoded size in bytes for the ExecutionPayloadHeader object func (e *ExecutionPayloadHeader) SizeSSZ() (size int) { - size = 600 + size = 568 - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' size += len(e.ExtraData) return @@ -182,31 +176,28 @@ func (e *ExecutionPayloadHeader) HashTreeRootWith(hh ssz.HashWalker) (err error) // Field (2) 'StateRoot' hh.PutBytes(e.StateRoot[:]) - // Field (3) 'CheckpointRoot' - hh.PutBytes(e.CheckpointRoot[:]) - - // Field (4) 'ReceiptsRoot' + // Field (3) 'ReceiptsRoot' hh.PutBytes(e.ReceiptsRoot[:]) - // Field (5) 'LogsBloom' + // Field (4) 'LogsBloom' hh.PutBytes(e.LogsBloom[:]) - // Field (6) 'PrevRandao' + // Field (5) 'PrevRandao' hh.PutBytes(e.PrevRandao[:]) - // Field (7) 'BlockNumber' + // Field (6) 'BlockNumber' hh.PutUint64(e.BlockNumber) - // Field (8) 'GasLimit' + // Field (7) 'GasLimit' hh.PutUint64(e.GasLimit) - // Field (9) 'GasUsed' + // Field (8) 'GasUsed' hh.PutUint64(e.GasUsed) - // Field (10) 'Timestamp' + // Field (9) 'Timestamp' hh.PutUint64(e.Timestamp) - // Field (11) 'ExtraData' + // Field (10) 'ExtraData' { elemIndx := hh.Index() byteLen := uint64(len(e.ExtraData)) @@ -218,16 +209,16 @@ func (e *ExecutionPayloadHeader) HashTreeRootWith(hh ssz.HashWalker) (err error) hh.MerkleizeWithMixin(elemIndx, byteLen, (32+31)/32) } - // Field (12) 'BaseFeePerGas' + // Field (11) 'BaseFeePerGas' hh.PutBytes(e.BaseFeePerGas[:]) - // Field (13) 'BlockHash' + // Field (12) 'BlockHash' hh.PutBytes(e.BlockHash[:]) - // Field (14) 'TransactionsRoot' + // Field (13) 'TransactionsRoot' hh.PutBytes(e.TransactionsRoot[:]) - // Field (15) 'WithdrawalsRoot' + // Field (14) 'WithdrawalsRoot' hh.PutBytes(e.WithdrawalsRoot[:]) hh.Merkleize(indx) diff --git a/spec/capella/historicalsummary_ssz.go b/spec/capella/historicalsummary_ssz.go index 77cd5ba..85a5c5a 100644 --- a/spec/capella/historicalsummary_ssz.go +++ b/spec/capella/historicalsummary_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( diff --git a/spec/capella/signedbeaconblock_ssz.go b/spec/capella/signedbeaconblock_ssz.go index e594596..939c4bd 100644 --- a/spec/capella/signedbeaconblock_ssz.go +++ b/spec/capella/signedbeaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( @@ -47,7 +47,7 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 100 { + if o0 != 100 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/capella/signedblstoexecutionchange_ssz.go b/spec/capella/signedblstoexecutionchange_ssz.go index 3b16cd8..1e0c854 100644 --- a/spec/capella/signedblstoexecutionchange_ssz.go +++ b/spec/capella/signedblstoexecutionchange_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( diff --git a/spec/capella/withdrawal_ssz.go b/spec/capella/withdrawal_ssz.go index 997a29a..d6be197 100644 --- a/spec/capella/withdrawal_ssz.go +++ b/spec/capella/withdrawal_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 72c979f58a303b5216381c508ec66a17848f1a054dc9ee842d1087874800b424 -// Version: 0.1.3 +// Hash: af13ed3a91f123f029bb4ee94359c9065687b3339ee79d094add586a9ec3e849 +// Version: 0.1.4 package capella import ( diff --git a/spec/phase0/aggregateandproof_ssz.go b/spec/phase0/aggregateandproof_ssz.go index 4cab0ba..a0dd1c9 100644 --- a/spec/phase0/aggregateandproof_ssz.go +++ b/spec/phase0/aggregateandproof_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -53,7 +53,7 @@ func (a *AggregateAndProof) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o1 < 108 { + if o1 != 108 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/attestation_ssz.go b/spec/phase0/attestation_ssz.go index 45ed2f9..52254f4 100644 --- a/spec/phase0/attestation_ssz.go +++ b/spec/phase0/attestation_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -57,7 +57,7 @@ func (a *Attestation) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 228 { + if o0 != 228 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/attestationdata_ssz.go b/spec/phase0/attestationdata_ssz.go index c2a36b4..d545a67 100644 --- a/spec/phase0/attestationdata_ssz.go +++ b/spec/phase0/attestationdata_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/attesterslashing_ssz.go b/spec/phase0/attesterslashing_ssz.go index 4857f35..d37aec3 100644 --- a/spec/phase0/attesterslashing_ssz.go +++ b/spec/phase0/attesterslashing_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -56,7 +56,7 @@ func (a *AttesterSlashing) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 8 { + if o0 != 8 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/beaconblock_ssz.go b/spec/phase0/beaconblock_ssz.go index 3594edb..4f61c9a 100644 --- a/spec/phase0/beaconblock_ssz.go +++ b/spec/phase0/beaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -68,7 +68,7 @@ func (b *BeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o4 < 84 { + if o4 != 84 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/beaconblockbody_ssz.go b/spec/phase0/beaconblockbody_ssz.go index bb0940f..2ffc7e2 100644 --- a/spec/phase0/beaconblockbody_ssz.go +++ b/spec/phase0/beaconblockbody_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -158,7 +158,7 @@ func (b *BeaconBlockBody) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o3 < 220 { + if o3 != 220 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/beaconblockheader_ssz.go b/spec/phase0/beaconblockheader_ssz.go index 5aaf875..9a05a94 100644 --- a/spec/phase0/beaconblockheader_ssz.go +++ b/spec/phase0/beaconblockheader_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/beaconstate_ssz.go b/spec/phase0/beaconstate_ssz.go index a7b7578..b46fce0 100644 --- a/spec/phase0/beaconstate_ssz.go +++ b/spec/phase0/beaconstate_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -287,7 +287,7 @@ func (b *BeaconState) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o7 < 2687401 { + if o7 != 2687401 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/checkpoint_ssz.go b/spec/phase0/checkpoint_ssz.go index 06e54b7..458d58f 100644 --- a/spec/phase0/checkpoint_ssz.go +++ b/spec/phase0/checkpoint_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/deposit_ssz.go b/spec/phase0/deposit_ssz.go index 626c366..815a963 100644 --- a/spec/phase0/deposit_ssz.go +++ b/spec/phase0/deposit_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/depositdata_ssz.go b/spec/phase0/depositdata_ssz.go index b37a790..d40d98d 100644 --- a/spec/phase0/depositdata_ssz.go +++ b/spec/phase0/depositdata_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/depositmessage_ssz.go b/spec/phase0/depositmessage_ssz.go index e344fbc..fcdf243 100644 --- a/spec/phase0/depositmessage_ssz.go +++ b/spec/phase0/depositmessage_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/eth1data_ssz.go b/spec/phase0/eth1data_ssz.go index 60670fe..f90cb2e 100644 --- a/spec/phase0/eth1data_ssz.go +++ b/spec/phase0/eth1data_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/fork_ssz.go b/spec/phase0/fork_ssz.go index 5289f2f..ddee96c 100644 --- a/spec/phase0/fork_ssz.go +++ b/spec/phase0/fork_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/forkdata_ssz.go b/spec/phase0/forkdata_ssz.go index 699842b..aacadec 100644 --- a/spec/phase0/forkdata_ssz.go +++ b/spec/phase0/forkdata_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/indexedattestation_ssz.go b/spec/phase0/indexedattestation_ssz.go index fa74fba..738b1d2 100644 --- a/spec/phase0/indexedattestation_ssz.go +++ b/spec/phase0/indexedattestation_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -59,7 +59,7 @@ func (i *IndexedAttestation) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 228 { + if o0 != 228 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/pendingattestation_ssz.go b/spec/phase0/pendingattestation_ssz.go index f743149..ee7946b 100644 --- a/spec/phase0/pendingattestation_ssz.go +++ b/spec/phase0/pendingattestation_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -60,7 +60,7 @@ func (p *PendingAttestation) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 148 { + if o0 != 148 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/proposerslashing_ssz.go b/spec/phase0/proposerslashing_ssz.go index 1dd0c14..6713589 100644 --- a/spec/phase0/proposerslashing_ssz.go +++ b/spec/phase0/proposerslashing_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/signedaggregateandproof_ssz.go b/spec/phase0/signedaggregateandproof_ssz.go index 23a05a3..e39ac4f 100644 --- a/spec/phase0/signedaggregateandproof_ssz.go +++ b/spec/phase0/signedaggregateandproof_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -47,7 +47,7 @@ func (s *SignedAggregateAndProof) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 100 { + if o0 != 100 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/signedbeaconblock_ssz.go b/spec/phase0/signedbeaconblock_ssz.go index a18d91f..acea5ce 100644 --- a/spec/phase0/signedbeaconblock_ssz.go +++ b/spec/phase0/signedbeaconblock_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( @@ -47,7 +47,7 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o0 < 100 { + if o0 != 100 { return ssz.ErrInvalidVariableOffset } diff --git a/spec/phase0/signedbeaconblockheader_ssz.go b/spec/phase0/signedbeaconblockheader_ssz.go index 7ecbdf0..8c036ba 100644 --- a/spec/phase0/signedbeaconblockheader_ssz.go +++ b/spec/phase0/signedbeaconblockheader_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/signedvoluntaryexit_ssz.go b/spec/phase0/signedvoluntaryexit_ssz.go index 5bee7b4..a66060c 100644 --- a/spec/phase0/signedvoluntaryexit_ssz.go +++ b/spec/phase0/signedvoluntaryexit_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/signingdata_ssz.go b/spec/phase0/signingdata_ssz.go index de4da1b..1c54de0 100644 --- a/spec/phase0/signingdata_ssz.go +++ b/spec/phase0/signingdata_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/validator_ssz.go b/spec/phase0/validator_ssz.go index 866194b..c597d24 100644 --- a/spec/phase0/validator_ssz.go +++ b/spec/phase0/validator_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import ( diff --git a/spec/phase0/voluntaryexit_ssz.go b/spec/phase0/voluntaryexit_ssz.go index 047b85c..2b2cdf7 100644 --- a/spec/phase0/voluntaryexit_ssz.go +++ b/spec/phase0/voluntaryexit_ssz.go @@ -1,6 +1,6 @@ // Code generated by fastssz. DO NOT EDIT. // Hash: e8a2a80bee05ee036fad4084067d132112368727edbdc99be7b562387085c8c1 -// Version: 0.1.3 +// Version: 0.1.4 package phase0 import (