Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
2 changes: 1 addition & 1 deletion build/checksums.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# version:spec-tests pectra-devnet-6@v1.0.0
# https://github.com/ethereum/execution-spec-tests/releases
# https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-6%40v1.0.0/
b69211752a3029083c020dc635fe12156ca1a6725a08559da540a0337586a77e fixtures_pectra-devnet-6.tar.gz
5ed3bec40a02776a4096c17b84b59fb20fd99fbabba8101fdac3d35a001cf82a fixtures_pectra-devnet-6.tar.gz

# version:golang 1.24.2
# https://go.dev/dl/
Expand Down
15 changes: 12 additions & 3 deletions build/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,22 @@ func doTest(cmdline []string) {
verbose = flag.Bool("v", false, "Whether to log verbosely")
race = flag.Bool("race", false, "Execute the race detector")
short = flag.Bool("short", false, "Pass the 'short'-flag to go test")
eest = flag.Bool("eest", false, "Download and run execution-spec-tests fixtures (EEST)")
cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
)
flag.CommandLine.Parse(cmdline)

// Get test fixtures.
csdb := build.MustLoadChecksums("build/checksums.txt")
downloadSpecTestFixtures(csdb, *cachedir)
// SYSCOIN Only download execution-spec-tests fixtures when explicitly requested.
// Sysgeth carries additional precompiles and consensus hooks which can make
// upstream EEST fixtures mismatched; keep this opt-in to avoid noisy failures.
enableEEST := *eest || os.Getenv("GETH_EEST") == "1"
Comment thread
sidhujag marked this conversation as resolved.
var csdb *build.ChecksumDB
if enableEEST || *dlgo {
csdb = build.MustLoadChecksums("build/checksums.txt")
}
if enableEEST {
downloadSpecTestFixtures(csdb, *cachedir)
}

// Configure the toolchain.
tc := build.GoToolchain{GOARCH: *arch, CC: *cc}
Expand Down
8 changes: 6 additions & 2 deletions cmd/geth/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ func makeFullNode(ctx *cli.Context) *node.Node {

// Start metrics export if enabled
utils.SetupMetrics(&cfg.Metrics)
// SYSCOIN
if err := maybeBootstrapState(ctx, stack); err != nil {
utils.Fatalf("Failed to apply state bootstrap: %v", err)
}

backend, eth := utils.RegisterEthService(stack, &cfg.Eth)

Expand Down Expand Up @@ -246,8 +250,8 @@ func makeFullNode(ctx *cli.Context) *node.Node {
blsyncer := blsync.NewClient(utils.MakeBeaconLightConfig(ctx))
blsyncer.SetEngineRPC(rpc.DialInProc(srv))
stack.RegisterLifecycle(blsyncer)
// SYSCOIN
} else if eth.BlockChain().GetChainConfig().SyscoinBlock == nil {
// SYSCOIN
} else if eth.BlockChain().Config().SyscoinBlock == nil {
// Launch the engine API for interacting with external consensus client.
err := catalyst.Register(stack, eth)
if err != nil {
Expand Down
6 changes: 6 additions & 0 deletions cmd/geth/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ var (
utils.MinerNewPayloadTimeoutFlag, // deprecated
// SYSCOIN
utils.NEVMPubFlag,
utils.StateBootstrapFileFlag,
utils.StateBootstrapURLFlag,
utils.StateBootstrapSHA256Flag,
utils.StateBootstrapForceFlag,
utils.NATFlag,
utils.NoDiscoverFlag,
utils.DiscoveryV4Flag,
Expand Down Expand Up @@ -247,6 +251,8 @@ func init() {
utils.ShowDeprecated,
// See snapshot.go
snapshotCommand,
// SYSCOIN See state_bootstrap_cmd.go
stateBootstrapCommand,
// See verkle.go
verkleCommand,
}
Expand Down
Loading
Loading