Fixed fakebeacon

beacon/fakebeacon/api_func.go

@@ -3,6 +3,7 @@ package fakebeacon
 import (
 	"context"
 	"sort"
+	"strconv"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto/kzg4844"
@@ -11,9 +12,10 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
+// spec: https://ethereum.github.io/beacon-APIs/#/Beacon/getBlobSidecars
 type BlobSidecar struct {
 	Blob          kzg4844.Blob       `json:"blob"`
-	Index         int                `json:"index"`
+	Index         Uint64String       `json:"index"`
 	KZGCommitment kzg4844.Commitment `json:"kzg_commitment"`
 	KZGProof      kzg4844.Proof      `json:"kzg_proof"`
 }
@@ -39,6 +41,23 @@ type IndexedBlobHash struct {
 	Hash  common.Hash // hash of the blob, used for consistency checks
 }
 
+// Uint64String is a decimal string representation of an uint64, for usage in the Beacon API JSON encoding
+type Uint64String uint64
+
+func (v Uint64String) MarshalText() (out []byte, err error) {
+	out = strconv.AppendUint(out, uint64(v), 10)
+	return
+}
+
+func (v *Uint64String) UnmarshalText(b []byte) error {
+	n, err := strconv.ParseUint(string(b), 0, 64)
+	if err != nil {
+		return err
+	}
+	*v = Uint64String(n)
+	return nil
+}
+
 func configSpec() ReducedConfigData {
 	return ReducedConfigData{SecondsPerSlot: "1"}
 }
@@ -72,7 +91,7 @@ func beaconBlobSidecars(ctx context.Context, backend ethapi.Backend, slot uint64
 			}
 			if fullBlob || idx == indices[curIdx] {
 				res.Data = append(res.Data, &BlobSidecar{
-					Index:         idx,
+					Index:         Uint64String(idx),
 					Blob:          sideCar.Blobs[i],
 					KZGCommitment: sideCar.Commitments[i],
 					KZGProof:      sideCar.Proofs[i],

beacon/fakebeacon/utils.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/internal/ethapi"
+	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
@@ -19,8 +20,10 @@ func fetchBlockNumberByTime(ctx context.Context, ts int64, backend ethapi.Backen
 	if ts > blockTime {
 		return nil, errors.New("time too large")
 	}
+	blockPeriod := getBlockPeriod(backend.ChainConfig())
+	adjustedBlockPeriod := getBlockPeriod(backend.ChainConfig())*2 - 1
 	blockNum := currentHeader.Number.Uint64()
-	estimateEndNumber := int64(blockNum) - (blockTime-ts)/5
+	estimateEndNumber := int64(blockNum) - (blockTime-ts)/adjustedBlockPeriod
 	// find the end number
 	for {
 		header, err := backend.HeaderByNumber(ctx, rpc.BlockNumber(estimateEndNumber))
@@ -39,10 +42,10 @@ func fetchBlockNumberByTime(ctx context.Context, ts int64, backend ethapi.Backen
 		}
 
 		// let the estimateEndNumber a little bigger than real value
-		if headerTime > ts+12 {
-			estimateEndNumber -= (headerTime - ts) / 5
+		if headerTime > ts+(blockPeriod*4) {
+			estimateEndNumber -= (headerTime - ts) / adjustedBlockPeriod
 		} else if headerTime < ts {
-			estimateEndNumber += (ts-headerTime)/5 + 1
+			estimateEndNumber += (ts-headerTime)/adjustedBlockPeriod + 1
 		} else {
 			// search one by one
 			for headerTime >= ts {
@@ -63,3 +66,16 @@ func fetchBlockNumberByTime(ctx context.Context, ts int64, backend ethapi.Backen
 		}
 	}
 }
+
+func getBlockPeriod(cfg *params.ChainConfig) int64 {
+	switch {
+	case cfg.ChainID.Cmp(params.OasysMainnetChainConfig.ChainID) == 0:
+		return params.SHORT_BLOCK_TIME_SECONDS
+	case cfg.ChainID.Cmp(params.OasysTestnetChainConfig.ChainID) == 0:
+		return params.SHORT_BLOCK_TIME_SECONDS
+	case cfg.Oasys != nil:
+		return int64(cfg.Oasys.Period) // for local chain
+	default:
+		return 1
+	}
+}