diff --git a/core/blockchain.go b/core/blockchain.go index 2357faba01..b532d5de93 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -2216,7 +2216,6 @@ func (bc *BlockChain) ProcessBlock(parentRoot common.Hash, block *types.Block, s // optimized execution path for blocks which contain BALs if blockHasAccessList { - panic("TODO: strip bal from body before committing it to disk") return bc.processBlockWithAccessList(parentRoot, block, setHead) } diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 2d216cee77..f6689af73b 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -709,7 +709,6 @@ func ReadBlock(db ethdb.Reader, hash common.Hash, number uint64) *types.Block { func WriteBlock(db ethdb.KeyValueWriter, block *types.Block) { WriteBody(db, block.Hash(), block.NumberU64(), block.Body()) WriteHeader(db, block.Header()) - panic("TODO write access list if it exists") } // WriteAncientBlocks writes entire block data into ancient store and returns the total written size. diff --git a/core/state_transition.go b/core/state_transition.go index ce4c3ca2fe..f2dc377a86 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -462,7 +462,6 @@ func (st *stateTransition) execute() (*ExecutionResult, error) { if t := st.evm.Config.Tracer; t != nil && t.OnGasChange != nil { t.OnGasChange(st.gasRemaining, st.gasRemaining-gas, tracing.GasChangeTxIntrinsicGas) } - fmt.Printf("gas used %d\n", gas) st.gasRemaining -= gas if rules.IsEIP4762 { @@ -569,8 +568,6 @@ func (st *stateTransition) execute() (*ExecutionResult, error) { } } - fmt.Printf("2 used gas is %d, %d\n", st.gasUsed(), peakGasUsed) - return &ExecutionResult{ UsedGas: peakGasUsed, MaxUsedGas: peakGasUsed, diff --git a/tests/block_test_util.go b/tests/block_test_util.go index ceb1df94bf..3de8073b5e 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -227,7 +227,7 @@ func (t *BlockTest) Run(snapshotter bool, scheme string, witness bool, createAnd var blocksWithBAL types.Blocks for i := uint64(1); i <= chain.CurrentBlock().Number.Uint64(); i++ { block := chain.GetBlockByNumber(i) - if block.Body().AccessList == nil { + if block.AccessList() == nil { return fmt.Errorf("block %d missing BAL", block.NumberU64()) } blocksWithBAL = append(blocksWithBAL, block)