Access list nil reference issue related to method handler crashed. (d…

…ominant-strategies#224) * Enabling contract deployment * Removed nil access list, set up ways to check rules to add accessList * GasLimitBoundDivisor to 256 Co-authored-by: Alan Orwick <[email protected]>
BaduBoy17 · Apr 4, 2022 · f957207 · f957207
1 parent 2b5ba43
commit f957207
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go
@@ -32,7 +32,7 @@ func VerifyGaslimit(parentGasLimit, headerGasLimit uint64) error {
 		diff *= -1
 	}
 	limit := parentGasLimit / params.GasLimitBoundDivisor
-	if uint64(diff) >= limit && headerGasLimit > params.EmptyGasLimit {
+	if uint64(diff) >= limit {
 		return fmt.Errorf("invalid gas limit: have %d, want %d +-= %d", headerGasLimit, parentGasLimit, limit-1)
 	}
 	if headerGasLimit < params.MinGasLimit {

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -1707,6 +1707,7 @@ func (bc *BlockChain) ReOrgRollBack(header *types.Header) error {
 			}
 			deletedTxs = append(deletedTxs, currentBlock.Transactions()...)
 			collectLogs(currentBlock.Hash())
+
 			currentBlock = bc.GetBlock(currentBlock.ParentHash(), currentBlock.NumberU64()-1)
 			if currentBlock == nil {
 				return fmt.Errorf("invalid current chain")

diff --git a/params/protocol_params.go b/params/protocol_params.go
@@ -20,8 +20,8 @@ import "math/big"
 
 const (
 	GasLimitBoundDivisor uint64 = 256     // The bound divisor of the gas limit, used in update calculations.
-	MinGasLimit          uint64 = 5000    // Minimum the gas limit may ever be.
-	EmptyGasLimit        uint64 = 2000000 // Gas limit at empty blocks
+	MinGasLimit          uint64 = 100000  // Minimum the gas limit may ever be.
+	EmptyGasLimit        uint64 = 4712388 // Gas limit at empty blocks
 	GenesisGasLimit      uint64 = 4712388 // Gas limit of the Genesis block.
 
 	MaximumExtraDataSize  uint64 = 32    // Maximum size extra data may be after Genesis.