From e80f522aad179ebce0c22e2bb169ef5134daf434 Mon Sep 17 00:00:00 2001
From: james-prysm <james@prysmaticlabs.com>
Date: Fri, 1 Nov 2024 16:03:07 -0500
Subject: [PATCH] more fixes but still WIP

---
 beacon-chain/execution/engine_client.go       |  3 ---
 testing/endtoend/component_handler_test.go    |  3 +++
 .../endtoend/components/eth1/transactions.go  | 22 +++++++++----------
 testing/endtoend/params/params.go             |  2 +-
 time/slots/slottime.go                        |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/beacon-chain/execution/engine_client.go b/beacon-chain/execution/engine_client.go
index 5215dba78cf4..6acb0eafd7d1 100644
--- a/beacon-chain/execution/engine_client.go
+++ b/beacon-chain/execution/engine_client.go
@@ -216,7 +216,6 @@ func (s *Service) ForkchoiceUpdated(
 	}
 	switch attrs.Version() {
 	case version.Bellatrix:
-		log.Error("BELLATRIX!!!!!!")
 		a, err := attrs.PbV1()
 		if err != nil {
 			return nil, nil, err
@@ -226,7 +225,6 @@ func (s *Service) ForkchoiceUpdated(
 			return nil, nil, handleRPCError(err)
 		}
 	case version.Capella:
-		log.Error("CAPELLLAAAAAAA")
 		a, err := attrs.PbV2()
 		if err != nil {
 			return nil, nil, err
@@ -236,7 +234,6 @@ func (s *Service) ForkchoiceUpdated(
 			return nil, nil, handleRPCError(err)
 		}
 	case version.Deneb, version.Electra:
-		log.Error("DENEBBBB")
 		a, err := attrs.PbV3()
 		if err != nil {
 			return nil, nil, err
diff --git a/testing/endtoend/component_handler_test.go b/testing/endtoend/component_handler_test.go
index 11a1ece74424..b1bd682aeae9 100644
--- a/testing/endtoend/component_handler_test.go
+++ b/testing/endtoend/component_handler_test.go
@@ -169,6 +169,9 @@ func (c *componentHandler) setup() {
 		c.eth1Proxy = proxies
 	}
 
+	// timeout while we wait for the eth1 client to sync
+	time.Sleep(10 * time.Second)
+
 	// Beacon nodes.
 	beaconNodes := components.NewBeaconNodes(config)
 	g.Go(func() error {
diff --git a/testing/endtoend/components/eth1/transactions.go b/testing/endtoend/components/eth1/transactions.go
index c36993a2e435..929521e73cd8 100644
--- a/testing/endtoend/components/eth1/transactions.go
+++ b/testing/endtoend/components/eth1/transactions.go
@@ -257,34 +257,34 @@ func RandomBlobTx(rpc *rpc.Client, f *filler.Filler, sender common.Address, nonc
 		// 4844 transaction without AL
 		tip, feecap, err := getCaps(rpc, gasPrice)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "getCaps")
 		}
 		data, err := randomBlobData()
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "randomBlobData")
 		}
 		return New4844Tx(nonce, &to, gas, chainID, tip, feecap, value, code, big.NewInt(1000000), data, make(types.AccessList, 0)), nil
 	case 1:
 		// 4844 transaction with AL nonce, to, value, gas, gasPrice, code
 		tx := types.NewTx(&types.AccessListTx{
-			Nonce:    nonce,
-			To:       &to,
-			Value:    value,
-			Gas:      gas,
-			GasPrice: gasPrice,
-			Data:     code,
+			Nonce: nonce,
+			To:    &to,
+			Value: value,
+			Gas:   gas,
+			//GasPrice: gasPrice,
+			Data: code,
 		})
 		al, err := txfuzz.CreateAccessList(rpc, tx, sender)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "CreateAccessList")
 		}
 		tip, feecap, err := getCaps(rpc, gasPrice)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "getCaps")
 		}
 		data, err := randomBlobData()
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "randomBlobData")
 		}
 		return New4844Tx(nonce, &to, gas, chainID, tip, feecap, value, code, big.NewInt(1000000), data, *al), nil
 	}
diff --git a/testing/endtoend/params/params.go b/testing/endtoend/params/params.go
index 3246110edd7c..df3a2d4818e6 100644
--- a/testing/endtoend/params/params.go
+++ b/testing/endtoend/params/params.go
@@ -159,7 +159,7 @@ const (
 
 	jaegerTracingPort = 9150
 
-	startupBufferSecs = 5
+	startupBufferSecs = 35
 )
 
 func logDir() string {
diff --git a/time/slots/slottime.go b/time/slots/slottime.go
index 4c5f97bf021b..ba065e1cc3bb 100644
--- a/time/slots/slottime.go
+++ b/time/slots/slottime.go
@@ -265,7 +265,7 @@ func SyncCommitteePeriodStartEpoch(e primitives.Epoch) (primitives.Epoch, error)
 // given slot start time
 func SecondsSinceSlotStart(s primitives.Slot, genesisTime, timeStamp uint64) (uint64, error) {
 	if timeStamp < genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot {
-		return 0, fmt.Errorf("could not compute seconds since slot start: invalid timestamp. got %d, want %d", timeStamp, genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot)
+		return 0, fmt.Errorf("could not compute seconds since slot start: invalid timestamp.slot%d got %d, want %d", s, timeStamp, genesisTime+uint64(s)*params.BeaconConfig().SecondsPerSlot)
 	}
 	return timeStamp - genesisTime - uint64(s)*params.BeaconConfig().SecondsPerSlot, nil
 }