Cleanup

Author: Manav-Aggarwal

block/manager.go

@@ -691,9 +691,6 @@ func (m *Manager) publishBlockInternal(ctx context.Context) error {
 
 	g, ctx := errgroup.WithContext(ctx)
 	g.Go(func() error { return m.headerBroadcaster.WriteToStoreAndBroadcast(ctx, header) })
-	if len(data.Txs) > 0 {
-		m.logger.Debug("broadcasting data", "height", data.Metadata.Height, "txs", len(data.Txs))
-	}
 	g.Go(func() error { return m.dataBroadcaster.WriteToStoreAndBroadcast(ctx, data) })
 	if err := g.Wait(); err != nil {
 		return err

execution/evm/docker/chain/genesis.json

@@ -12,22 +12,11 @@
     "berlinBlock": 0,
     "londonBlock": 0,
     "mergeNetsplitBlock": 0,
-    "bedrockBlock":0,
-    "regolithTime":0,
-    "canyonTime":0,
     "terminalTotalDifficulty": 0,
     "terminalTotalDifficultyPassed": true,
-    "ecotoneTime": 0,
-    "fjordTime": 0,
-    "graniteTime": 0,
     "shanghaiTime": 0,
     "cancunTime": 0,
-    "pragueTime": 0,
-    "optimism": {
-      "eip1559Elasticity": 6,
-      "eip1559Denominator": 50,
-      "eip1559DenominatorCanyon": 250
-    }
+    "pragueTime": 0
   },
   "nonce": "0x0",
   "timestamp": "0x0",

execution/evm/execution_test.go

@@ -1,3 +1,6 @@
+//go:build evm
+// +build evm
+
 package evm
 
 import (
@@ -83,9 +86,7 @@ func TestEngineExecution(t *testing.T) {
 		lastHeight, lastHash, lastTxs := checkLatestBlock(tt, ctx)
 		log.Println("lastTxs", lastTxs)
 
-		// Clear transaction pool and get proper starting nonce
-		lastNonce := ClearTransactionPool(tt, TEST_PRIVATE_KEY)
-		tt.Logf("Starting with nonce: %d", lastNonce)
+		lastNonce := uint64(0)
 
 		// Use a base timestamp and increment for each block to ensure proper ordering
 		baseTimestamp := time.Now()
@@ -158,8 +159,6 @@ func TestEngineExecution(t *testing.T) {
 
 	// start new container and try to sync
 	t.Run("Sync chain", func(tt *testing.T) {
-		//tt.Skip("Skip sync chain")
-		tt.Logf("Starting Sync_chain test...")
 		jwtSecret := SetupTestRethEngine(t, DOCKER_PATH, JWT_FILENAME)
 
 		executionClient, err := NewEngineExecutionClient(

execution/evm/test_helpers.go

@@ -1,3 +1,6 @@
+//go:build evm
+// +build evm
+
 package evm
 
 import (
@@ -126,7 +129,7 @@ func GetRandomTransaction(t *testing.T, privateKeyHex, toAddressHex, chainID str
 	chainId, ok := new(big.Int).SetString(chainID, 10)
 	require.True(t, ok)
 	txValue := big.NewInt(1000000000000000000)
-	gasPrice := big.NewInt(100000000000) // Increased to 100 Gwei to handle replacement scenarios and ensure acceptance
+	gasPrice := big.NewInt(30000000000)
 	toAddress := common.HexToAddress(toAddressHex)
 	data := make([]byte, 16)
 	_, err = rand.Read(data)
@@ -156,25 +159,6 @@ func SubmitTransaction(t *testing.T, tx *types.Transaction) {
 	require.NoError(t, err)
 }
 
-// ClearTransactionPool attempts to clear the transaction pool by getting current nonce from blockchain
-func ClearTransactionPool(t *testing.T, privateKeyHex string) uint64 {
-	t.Helper()
-	rpcClient, err := ethclient.Dial("http://localhost:8545")
-	require.NoError(t, err)
-	defer rpcClient.Close()
-
-	privateKey, err := crypto.HexToECDSA(privateKeyHex)
-	require.NoError(t, err)
-	address := crypto.PubkeyToAddress(privateKey.PublicKey)
-
-	// Get the current nonce from the latest block (not pending)
-	nonce, err := rpcClient.NonceAt(context.Background(), address, nil)
-	require.NoError(t, err)
-
-	t.Logf("Current nonce for address %s: %d", address.Hex(), nonce)
-	return nonce
-}
-
 // CheckTxIncluded checks if a transaction with the given hash was included in a block and succeeded.
 func CheckTxIncluded(t *testing.T, txHash common.Hash) bool {
 	t.Helper()