Coreth nits (#1336)

* ensure blob gas is zero in cancun * txlookup limit cleanup * use full faker * use full faker in api tests --------- Co-authored-by: Darioush Jalali <[email protected]>
ava-labs · Sep 9, 2024 · 6fd1328 · 6fd1328
1 parent 400862c
commit 6fd1328
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/consensus/dummy/consensus.go b/consensus/dummy/consensus.go
@@ -262,6 +262,9 @@ func (eng *DummyEngine) verifyHeader(chain consensus.ChainHeaderReader, header *
 		if err := eip4844.VerifyEIP4844Header(parent, header); err != nil {
 			return err
 		}
+		if *header.BlobGasUsed > 0 { // VerifyEIP4844Header ensures BlobGasUsed is non-nil
+			return fmt.Errorf("blobs not enabled on avalanche networks: used %d blob gas, expected 0", *header.BlobGasUsed)
+		}
 	}
 	return nil
 }

diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -121,7 +121,8 @@ func TestStateProcessorErrors(t *testing.T) {
 				},
 				GasLimit: params.TestChainConfig.FeeConfig.GasLimit.Uint64(),
 			}
-			blockchain, _  = NewBlockChain(db, DefaultCacheConfig, gspec, dummy.NewCoinbaseFaker(), vm.Config{}, common.Hash{}, false)
+			// FullFaker used to skip header verification that enforces no blobs.
+			blockchain, _  = NewBlockChain(db, DefaultCacheConfig, gspec, dummy.NewFullFaker(), vm.Config{}, common.Hash{}, false)
 			tooBigInitCode = [params.MaxInitCodeSize + 1]byte{}
 		)
 

diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
@@ -171,6 +171,6 @@ type Config struct {
 
 	// SkipTxIndexing skips indexing transactions.
 	// This is useful for validators that don't need to index transactions.
-	// TxLookupLimit can be still used to control unindexing old transactions.
+	// TransactionHistory can be still used to control unindexing old transactions.
 	SkipTxIndexing bool
 }
diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go
@@ -1819,7 +1819,7 @@ func setupReceiptBackend(t *testing.T, genBlocks int) (*testBackend, []common.Ha
 		txHashes = make([]common.Hash, genBlocks)
 	)
 
-	backend := newTestBackend(t, genBlocks, genesis, dummy.NewCoinbaseFaker(), func(i int, b *core.BlockGen) {
+	backend := newTestBackend(t, genBlocks, genesis, dummy.NewFullFaker(), func(i int, b *core.BlockGen) {
 		var (
 			tx  *types.Transaction
 			err error

diff --git a/plugin/evm/config_test.go b/plugin/evm/config_test.go
@@ -72,33 +72,39 @@ func TestUnmarshalConfig(t *testing.T) {
 			false,
 		},
 		{
-			"empty tx lookup limit",
+			"empty transaction history ",
 			[]byte(`{}`),
-			Config{TxLookupLimit: 0},
+			Config{TransactionHistory: 0},
 			false,
 		},
 		{
-			"zero tx lookup limit",
-			[]byte(`{"tx-lookup-limit": 0}`),
+			"zero transaction history",
+			[]byte(`{"transaction-history": 0}`),
 			func() Config {
-				return Config{TxLookupLimit: 0}
+				return Config{TransactionHistory: 0}
 			}(),
 			false,
 		},
 		{
-			"1 tx lookup limit",
-			[]byte(`{"tx-lookup-limit": 1}`),
+			"1 transaction history",
+			[]byte(`{"transaction-history": 1}`),
 			func() Config {
-				return Config{TxLookupLimit: 1}
+				return Config{TransactionHistory: 1}
 			}(),
 			false,
 		},
 		{
-			"-1 tx lookup limit",
-			[]byte(`{"tx-lookup-limit": -1}`),
+			"-1 transaction history",
+			[]byte(`{"transaction-history": -1}`),
 			Config{},
 			true,
 		},
+		{
+			"deprecated tx lookup limit",
+			[]byte(`{"tx-lookup-limit": 1}`),
+			Config{TransactionHistory: 1, TxLookupLimit: 1},
+			false,
+		},
 		{
 			"allow unprotected tx hashes",
 			[]byte(`{"allow-unprotected-tx-hashes": ["0x803351deb6d745e91545a6a3e1c0ea3e9a6a02a1a4193b70edfcd2f40f71a01c"]}`),
@@ -115,6 +121,7 @@ func TestUnmarshalConfig(t *testing.T) {
 				assert.Error(t, err)
 			} else {
 				assert.NoError(t, err)
+				tmp.Deprecate()
 				assert.Equal(t, tt.expected, tmp)
 			}
 		})