cerc-io/ipld-eth-beacon-indexer
19
0
Fork 0
Code Issues 4 Pull Requests 2 Actions Packages Projects Releases 9 Wiki Activity

Minor refactor

Browse Source
This commit is contained in:
Thomas E Lackey 2022-09-08 10:59:47 -05:00
parent dceb81866f
commit 765480b12c
1 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
pkg/beaconclient/consensus.go
View File

@ -19,12 +19,14 @@ type Root common.Root
type Eth1Data common.Eth1Data type Eth1Data common.Eth1Data
type SignedBeaconBlock struct { type SignedBeaconBlock struct {
spec *common.Spec
bellatrix *bellatrix.SignedBeaconBlock bellatrix *bellatrix.SignedBeaconBlock
altair *altair.SignedBeaconBlock altair *altair.SignedBeaconBlock
phase0 *phase0.SignedBeaconBlock phase0 *phase0.SignedBeaconBlock
} }
type BeaconBlock struct { type BeaconBlock struct {
spec *common.Spec
bellatrix *bellatrix.BeaconBlock bellatrix *bellatrix.BeaconBlock
altair *altair.BeaconBlock altair *altair.BeaconBlock
phase0 *phase0.BeaconBlock phase0 *phase0.BeaconBlock
@ -37,15 +39,17 @@ type BeaconBlockBody struct {
} }
type BeaconState struct { type BeaconState struct {
spec *common.Spec
bellatrix *bellatrix.BeaconState bellatrix *bellatrix.BeaconState
altair *altair.BeaconState altair *altair.BeaconState
phase0 *phase0.BeaconState phase0 *phase0.BeaconState
} }
func (s *SignedBeaconBlock) UnmarshalSSZ(ssz []byte) error { func (s *SignedBeaconBlock) UnmarshalSSZ(ssz []byte) error {
spec := chooseSpec(s.spec)
var bellatrix bellatrix.SignedBeaconBlock var bellatrix bellatrix.SignedBeaconBlock
decodingReader := codec.NewDecodingReader(bytes.NewReader(ssz), uint64(len(ssz))) err := bellatrix.Deserialize(spec, makeDecodingReader(ssz))
err := bellatrix.Deserialize(configs.Mainnet, decodingReader)
if nil == err { if nil == err {
s.bellatrix = &bellatrix s.bellatrix = &bellatrix
s.altair = nil s.altair = nil
@ -55,8 +59,7 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(ssz []byte) error {
} }
var altair altair.SignedBeaconBlock var altair altair.SignedBeaconBlock
decodingReader = codec.NewDecodingReader(bytes.NewReader(ssz), uint64(len(ssz))) err = altair.Deserialize(spec, makeDecodingReader(ssz))
err = altair.Deserialize(configs.Mainnet, decodingReader)
if nil == err { if nil == err {
s.bellatrix = nil s.bellatrix = nil
s.altair = &altair s.altair = &altair
@ -66,8 +69,7 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(ssz []byte) error {
} }
var phase0 phase0.SignedBeaconBlock var phase0 phase0.SignedBeaconBlock
decodingReader = codec.NewDecodingReader(bytes.NewReader(ssz), uint64(len(ssz))) err = phase0.Deserialize(spec, makeDecodingReader(ssz))
err = phase0.Deserialize(configs.Mainnet, decodingReader)
if nil == err { if nil == err {
s.bellatrix = nil s.bellatrix = nil
s.altair = nil s.altair = nil
@ -85,18 +87,19 @@ func (s *SignedBeaconBlock) UnmarshalSSZ(ssz []byte) error {
} }
func (s *SignedBeaconBlock) MarshalSSZ() ([]byte, error) { func (s *SignedBeaconBlock) MarshalSSZ() ([]byte, error) {
spec := chooseSpec(s.spec)
var err error var err error
var buf bytes.Buffer var buf bytes.Buffer
encodingWriter := codec.NewEncodingWriter(&buf) encodingWriter := codec.NewEncodingWriter(&buf)
if s.IsBellatrix() { if s.IsBellatrix() {
err = s.bellatrix.Serialize(configs.Mainnet, encodingWriter) err = s.bellatrix.Serialize(spec, encodingWriter)
} }
if s.IsAltair() { if s.IsAltair() {
err = s.altair.Serialize(configs.Mainnet, encodingWriter) err = s.altair.Serialize(spec, encodingWriter)
} }
if s.IsPhase0() { if s.IsPhase0() {
err = s.phase0.Serialize(configs.Mainnet, encodingWriter) err = s.phase0.Serialize(spec, encodingWriter)
} }
if err != nil { if err != nil {
@ -148,15 +151,15 @@ func (s *SignedBeaconBlock) Signature() [96]byte {
func (s *SignedBeaconBlock) Block() *BeaconBlock { func (s *SignedBeaconBlock) Block() *BeaconBlock {
if s.IsBellatrix() { if s.IsBellatrix() {
return &BeaconBlock{bellatrix: &s.bellatrix.Message} return &BeaconBlock{bellatrix: &s.bellatrix.Message, spec: s.spec}
} }
if s.IsAltair() { if s.IsAltair() {
return &BeaconBlock{altair: &s.altair.Message} return &BeaconBlock{altair: &s.altair.Message, spec: s.spec}
} }
if s.IsPhase0() { if s.IsPhase0() {
return &BeaconBlock{phase0: &s.phase0.Message} return &BeaconBlock{phase0: &s.phase0.Message, spec: s.spec}
} }
return nil return nil
@ -263,25 +266,28 @@ func (b *BeaconBlockBody) Eth1Data() Eth1Data {
} }
func (b *BeaconBlock) HashTreeRoot() Root { func (b *BeaconBlock) HashTreeRoot() Root {
spec := chooseSpec(b.spec)
if b.IsBellatrix() { if b.IsBellatrix() {
return Root(b.bellatrix.HashTreeRoot(configs.Mainnet, tree.Hash)) return Root(b.bellatrix.HashTreeRoot(spec, tree.Hash))
} }
if b.IsAltair() { if b.IsAltair() {
return Root(b.altair.HashTreeRoot(configs.Mainnet, tree.Hash)) return Root(b.altair.HashTreeRoot(spec, tree.Hash))
} }
if b.IsPhase0() { if b.IsPhase0() {
return Root(b.phase0.HashTreeRoot(configs.Mainnet, tree.Hash)) return Root(b.phase0.HashTreeRoot(spec, tree.Hash))
} }
return Root{} return Root{}
} }
func (s *BeaconState) UnmarshalSSZ(ssz []byte) error { func (s *BeaconState) UnmarshalSSZ(ssz []byte) error {
spec := chooseSpec(s.spec)
var bellatrix bellatrix.BeaconState var bellatrix bellatrix.BeaconState
decodingReader := codec.NewDecodingReader(bytes.NewReader(ssz), uint64(len(ssz))) err := bellatrix.Deserialize(spec, makeDecodingReader(ssz))
err := bellatrix.Deserialize(configs.Mainnet, decodingReader)
if nil == err { if nil == err {
s.bellatrix = &bellatrix s.bellatrix = &bellatrix
s.altair = nil s.altair = nil
@ -291,8 +297,7 @@ func (s *BeaconState) UnmarshalSSZ(ssz []byte) error {
} }
var altair altair.BeaconState var altair altair.BeaconState
decodingReader = codec.NewDecodingReader(bytes.NewReader(ssz), uint64(len(ssz))) err = altair.Deserialize(spec, makeDecodingReader(ssz))
err = altair.Deserialize(configs.Mainnet, decodingReader)
if nil == err { if nil == err {
s.bellatrix = nil s.bellatrix = nil
s.altair = &altair s.altair = &altair
@ -302,8 +307,7 @@ func (s *BeaconState) UnmarshalSSZ(ssz []byte) error {
} }
var phase0 phase0.BeaconState var phase0 phase0.BeaconState
decodingReader = codec.NewDecodingReader(bytes.NewReader(ssz), uint64(len(ssz))) err = phase0.Deserialize(spec, makeDecodingReader(ssz))
err = phase0.Deserialize(configs.Mainnet, decodingReader)
if nil == err { if nil == err {
s.bellatrix = nil s.bellatrix = nil
s.altair = nil s.altair = nil
@ -321,16 +325,17 @@ func (s *BeaconState) UnmarshalSSZ(ssz []byte) error {
} }
func (s *BeaconState) MarshalSSZ() ([]byte, error) { func (s *BeaconState) MarshalSSZ() ([]byte, error) {
spec := chooseSpec(s.spec)
var err error var err error
var buf bytes.Buffer var buf bytes.Buffer
encodingWriter := codec.NewEncodingWriter(&buf) encodingWriter := codec.NewEncodingWriter(&buf)
if s.IsBellatrix() { if s.IsBellatrix() {
err = s.bellatrix.Serialize(configs.Mainnet, encodingWriter) err = s.bellatrix.Serialize(spec, encodingWriter)
} else if s.IsAltair() { } else if s.IsAltair() {
err = s.altair.Serialize(configs.Mainnet, encodingWriter) err = s.altair.Serialize(spec, encodingWriter)
} else if s.IsPhase0() { } else if s.IsPhase0() {
err = s.phase0.Serialize(configs.Mainnet, encodingWriter) err = s.phase0.Serialize(spec, encodingWriter)
} else { } else {
err = errors.New("BeaconState not set") err = errors.New("BeaconState not set")
} }
@ -371,17 +376,19 @@ func (s *BeaconState) Slot() Slot {
return 0 return 0
} }
func (b *BeaconState) HashTreeRoot() Root { func (s *BeaconState) HashTreeRoot() Root {
if b.IsBellatrix() { spec := chooseSpec(s.spec)
return Root(b.bellatrix.HashTreeRoot(configs.Mainnet, tree.Hash))
if s.IsBellatrix() {
return Root(s.bellatrix.HashTreeRoot(spec, tree.Hash))
} }
if b.IsAltair() { if s.IsAltair() {
return Root(b.altair.HashTreeRoot(configs.Mainnet, tree.Hash)) return Root(s.altair.HashTreeRoot(spec, tree.Hash))
} }
if b.IsPhase0() { if s.IsPhase0() {
return Root(b.phase0.HashTreeRoot(configs.Mainnet, tree.Hash)) return Root(s.phase0.HashTreeRoot(spec, tree.Hash))
} }
return Root{} return Root{}
@ -398,3 +405,14 @@ func (s *BeaconState) GetAltair() *altair.BeaconState {
func (s *BeaconState) GetPhase0() *phase0.BeaconState { func (s *BeaconState) GetPhase0() *phase0.BeaconState {
return s.phase0 return s.phase0
} }
func chooseSpec(spec *common.Spec) *common.Spec {
if nil == spec {
return configs.Mainnet
}
return spec
}
func makeDecodingReader(ssz []byte) *codec.DecodingReader {
return codec.NewDecodingReader(bytes.NewReader(ssz), uint64(len(ssz)))
}