address more lint errors

beacon/engine/types.go

@@ -18,10 +18,11 @@ package engine
 
 import (
 	"fmt"
-	"github.com/ethereum/go-ethereum/core/types/bal"
 	"math/big"
 	"slices"
 
+	"github.com/ethereum/go-ethereum/core/types/bal"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"

core/blockchain.go

@@ -606,6 +606,7 @@ func (bc *BlockChain) processBlockWithAccessList(parentRoot common.Hash, block *
 	var (
 		startTime = time.Now()
 		procTime  time.Duration
+		statedb   *state.StateDB
 	)
 
 	useAsyncReads := bc.cfg.BALExecutionMode != BALExecutionModeNoBatchIO
@@ -620,7 +621,7 @@ func (bc *BlockChain) processBlockWithAccessList(parentRoot common.Hash, block *
 	if err != nil {
 		return nil, err
 	}
-	statedb, err := state.NewWithReader(parentRoot, bc.statedb, prefetchReader)
+	statedb, err = state.NewWithReader(parentRoot, bc.statedb, prefetchReader)
 
 	if bc.logger != nil && bc.logger.OnBlockStart != nil {
 		bc.logger.OnBlockStart(tracing.BlockEvent{

core/state/bal_state_transition.go

@@ -1,6 +1,11 @@
 package state
 
 import (
+	"maps"
+	"sync"
+	"sync/atomic"
+	"time"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/types/bal"
@@ -9,10 +14,6 @@ import (
 	"github.com/ethereum/go-ethereum/trie/trienode"
 	"github.com/holiman/uint256"
 	"golang.org/x/sync/errgroup"
-	"maps"
-	"sync"
-	"sync/atomic"
-	"time"
 )
 
 // BALStateTransition is responsible for performing the state root update

core/state/reader_eip_7928.go

@@ -63,9 +63,10 @@ package state
 //                    └─────────────────────────────┘
 
 import (
-	"github.com/ethereum/go-ethereum/crypto"
 	"sync"
 
+	"github.com/ethereum/go-ethereum/crypto"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/types/bal"

core/types/bal/bal.go

@@ -202,7 +202,7 @@ func newConstructionAccountAccesses() *ConstructionAccountAccesses {
 	}
 }
 
-// StateDiff contains state mutations occuring over one or more access list
+// StateDiff contains state mutations occurring over one or more access list
 // index.
 type StateDiff struct {
 	Mutations map[common.Address]*AccountMutations `json:"Mutations,omitempty"`