mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-25 06:06:44 +00:00
Merge branch 'juga1980/appendBetter'
This commit is contained in:
commit
3331427653
5 changed files with 4 additions and 6 deletions
|
|
@ -2211,7 +2211,7 @@ func (bc *BlockChain) insertSideChain(block *types.Block, it *insertIterator, ma
|
||||||
}
|
}
|
||||||
// Import all the pruned blocks to make the state available
|
// Import all the pruned blocks to make the state available
|
||||||
var (
|
var (
|
||||||
blocks = make([]*types.Block, 0, len(hashes))
|
blocks []*types.Block
|
||||||
memory uint64
|
memory uint64
|
||||||
)
|
)
|
||||||
for i := len(hashes) - 1; i >= 0; i-- {
|
for i := len(hashes) - 1; i >= 0; i-- {
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,6 @@ func (info *freezerInfo) size() common.StorageSize {
|
||||||
|
|
||||||
func inspect(name string, order map[string]freezerTableConfig, reader ethdb.AncientReader) (freezerInfo, error) {
|
func inspect(name string, order map[string]freezerTableConfig, reader ethdb.AncientReader) (freezerInfo, error) {
|
||||||
info := freezerInfo{name: name}
|
info := freezerInfo{name: name}
|
||||||
info.sizes = make([]tableSize, 0, len(order))
|
|
||||||
for t := range order {
|
for t := range order {
|
||||||
size, err := reader.AncientSize(t)
|
size, err := reader.AncientSize(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -79,7 +78,7 @@ func inspect(name string, order map[string]freezerTableConfig, reader ethdb.Anci
|
||||||
|
|
||||||
// inspectFreezers inspects all freezers registered in the system.
|
// inspectFreezers inspects all freezers registered in the system.
|
||||||
func inspectFreezers(db ethdb.Database) ([]freezerInfo, error) {
|
func inspectFreezers(db ethdb.Database) ([]freezerInfo, error) {
|
||||||
var infos []freezerInfo = make([]freezerInfo, 0, len(freezers))
|
var infos []freezerInfo
|
||||||
for _, freezer := range freezers {
|
for _, freezer := range freezers {
|
||||||
switch freezer {
|
switch freezer {
|
||||||
case ChainFreezerName:
|
case ChainFreezerName:
|
||||||
|
|
|
||||||
|
|
@ -124,5 +124,4 @@ func (p *statePrefetcher) Prefetch(block *types.Block, statedb *state.StateDB, c
|
||||||
|
|
||||||
blockPrefetchTxsValidMeter.Mark(int64(len(block.Transactions())) - fails.Load())
|
blockPrefetchTxsValidMeter.Mark(int64(len(block.Transactions())) - fails.Load())
|
||||||
blockPrefetchTxsInvalidMeter.Mark(fails.Load())
|
blockPrefetchTxsInvalidMeter.Mark(fails.Load())
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ func ValidEip(eipNum int) bool {
|
||||||
return ok
|
return ok
|
||||||
}
|
}
|
||||||
func ActivateableEips() []string {
|
func ActivateableEips() []string {
|
||||||
nums := make([]string, 0, len(activators))
|
var nums []string
|
||||||
for k := range activators {
|
for k := range activators {
|
||||||
nums = append(nums, fmt.Sprintf("%d", k))
|
nums = append(nums, fmt.Sprintf("%d", k))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -136,7 +136,7 @@ func NewEVMInterpreter(evm *EVM) *EVMInterpreter {
|
||||||
default:
|
default:
|
||||||
table = &frontierInstructionSet
|
table = &frontierInstructionSet
|
||||||
}
|
}
|
||||||
extraEips := make([]int, 0, len(evm.Config.ExtraEips))
|
var extraEips []int
|
||||||
if len(evm.Config.ExtraEips) > 0 {
|
if len(evm.Config.ExtraEips) > 0 {
|
||||||
// Deep-copy jumptable to prevent modification of opcodes in other tables
|
// Deep-copy jumptable to prevent modification of opcodes in other tables
|
||||||
table = copyJumpTable(table)
|
table = copyJumpTable(table)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue