From 4b2fa2d184be084a554d9c1afbe76ef4c8e2dfb2 Mon Sep 17 00:00:00 2001 From: Mike Ryan <506296+mikery@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:41:29 +0100 Subject: [PATCH] Fixing type errors resulting from merge --- core/blockchain.go | 2 +- core/state/statedb.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index 40be92a8b..84e51bac3 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -307,7 +307,7 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis bodyRLPCache: lru.NewCache[common.Hash, rlp.RawValue](bodyCacheLimit), receiptsCache: lru.NewCache[common.Hash, []*types.Receipt](receiptsCacheLimit), blockCache: lru.NewCache[common.Hash, *types.Block](blockCacheLimit), - txLookupCache: lru.NewCache[common.Hash, *rawdb.LegacyTxLookupEntry](txLookupCacheLimit), + txLookupCache: lru.NewCache[common.Hash, txLookup](txLookupCacheLimit), futureBlocks: lru.NewCache[common.Hash, *types.Block](maxFutureBlocks), engine: engine, vmConfig: vmConfig, diff --git a/core/state/statedb.go b/core/state/statedb.go index 1ab21244f..2c0474b40 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -612,7 +612,7 @@ func (s *StateDB) getDeletedStateObject(addr common.Address) *stateObject { } } if s.stateSpecimen != nil { - s.stateSpecimen.LogAccountRead(addr, data.Nonce, data.Balance, data.CodeHash) + s.stateSpecimen.LogAccountRead(addr, data.Nonce, data.Balance.ToBig(), data.CodeHash) } // Insert into the live set