Skip to content

Add Pectra support #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 5, 2025
Merged

Add Pectra support #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d33cee
add pectra to SupportedVersions
siburu Jan 28, 2025
6158241
define ElectraSpec and add it to the fork paramters for the minimal p…
siburu Jan 29, 2025
963f462
change the Pectra epoch from 8 to 0
siburu Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions beacon/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"slices"

"github.com/hyperledger-labs/yui-relayer/log"
)

var SupportedVersions = []string{"deneb", "electra"}

type Client struct {
endpoint string
}
Expand All @@ -18,8 +21,8 @@ func NewClient(endpoint string) Client {
return Client{endpoint: endpoint}
}

func (Client) SupportedVersion() string {
return "deneb"
func IsSupportedVersion(v string) bool {
return slices.Contains(SupportedVersions, v)
}

func (cl Client) GetGenesis() (*Genesis, error) {
Expand Down Expand Up @@ -57,7 +60,7 @@ func (cl Client) GetBootstrap(finalizedRoot []byte) (*LightClientBootstrapRespon
if err := cl.get(fmt.Sprintf("/eth/v1/beacon/light_client/bootstrap/0x%v", hex.EncodeToString(finalizedRoot[:])), &res); err != nil {
return nil, err
}
if res.Version != cl.SupportedVersion() {
if !IsSupportedVersion(res.Version) {
return nil, fmt.Errorf("unsupported version: %v", res.Version)
}
return &res, nil
Expand All @@ -72,7 +75,7 @@ func (cl Client) GetLightClientUpdates(period uint64, count uint64) (LightClient
return nil, fmt.Errorf("unexpected response length: expected=%v actual=%v", count, len(res))
}
for i := range res {
if res[i].Version != cl.SupportedVersion() {
if !IsSupportedVersion(res[i].Version) {
return nil, fmt.Errorf("unsupported version: %v", res[i].Version)
}
}
Expand All @@ -92,7 +95,7 @@ func (cl Client) GetLightClientFinalityUpdate() (*LightClientFinalityUpdateRespo
if err := cl.get("/eth/v1/beacon/light_client/finality_update", &res); err != nil {
return nil, err
}
if res.Version != cl.SupportedVersion() {
if !IsSupportedVersion(res.Version) {
return nil, fmt.Errorf("unsupported version: %v", res.Version)
}
return &res, nil
Expand All @@ -105,7 +108,7 @@ func (cl Client) get(path string, res any) error {
return err
}
defer r.Body.Close()
bz, err := ioutil.ReadAll(r.Body)
bz, err := io.ReadAll(r.Body)
if err != nil {
return err
}
Expand Down
13 changes: 13 additions & 0 deletions relay/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ var (
ExecutionPayloadStateRootGindex: 34,
ExecutionPayloadBlockNumberGindex: 38,
}
ElectraSpec = lctypes.ForkSpec{
FinalizedRootGindex: 169,
CurrentSyncCommitteeGindex: 86,
NextSyncCommitteeGindex: 87,
ExecutionPayloadGindex: DenebSpec.ExecutionPayloadGindex,
ExecutionPayloadStateRootGindex: DenebSpec.ExecutionPayloadStateRootGindex,
ExecutionPayloadBlockNumberGindex: DenebSpec.ExecutionPayloadBlockNumberGindex,
}
)

var _ core.ProverConfig = (*ProverConfig)(nil)
Expand Down Expand Up @@ -169,6 +177,11 @@ func (prc *ProverConfig) getForkParameters() *lctypes.ForkParameters {
Epoch: 0,
Spec: &DenebSpec,
},
{
Version: []byte{5, 0, 0, 1},
Epoch: 0,
Spec: &ElectraSpec,
},
},
}
case Goerli:
Expand Down