Merge pull request #1179 from maticnetwork/v1.2.7-candidate

v1.2.7

builder/files/config.toml

@@ -25,6 +25,7 @@ syncmode = "full"
   # json = false
   # backtrace = ""
   # debug = true
+  # enable-block-tracking = false
 
 [p2p]
   # maxpeers = 1

builder/files/genesis-mainnet-v1.json

@@ -13,7 +13,8 @@
     "muirGlacierBlock": 3395000,
     "berlinBlock": 14750000,
     "londonBlock": 23850000,
-    "shanghaiBlock":50523000,
+    "shanghaiBlock": 50523000,
+    "cancunBlock": 54876000,
     "bor": {
       "jaipurBlock": 23850000,
       "delhiBlock": 38189056,

builder/files/genesis-testnet-v4.json

@@ -14,6 +14,7 @@
     "berlinBlock": 13996000,
     "londonBlock": 22640000,
     "shanghaiBlock": 41874000,
+    "cancunBlock": 45648608,
     "bor": {
       "jaipurBlock": 22770000,
       "delhiBlock": 29638656,

cmd/bootnode/main.go

@@ -15,7 +15,8 @@
 // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 
 // bootnode runs a bootstrap node for the Ethereum Discovery Protocol.
-package main
+// Keep package as bootnode during upstram merge.
+package bootnode
 
 import (
 	"crypto/ecdsa"
@@ -34,6 +35,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/netutil"
 )
 
+// nolint
 func main() {
 	var (
 		listenAddr  = flag.String("addr", ":30301", "listen address")
@@ -213,3 +215,12 @@ func doPortMapping(natm nat.Interface, ln *enode.LocalNode, addr *net.UDPAddr) *
 
 	return extaddr
 }
+
+// Implemented separate functions so that there are minimal conflicts during upstream merge
+func PrintNotice(nodeKey *ecdsa.PublicKey, addr net.UDPAddr) {
+	printNotice(nodeKey, addr)
+}
+
+func DoPortMapping(natm nat.Interface, ln *enode.LocalNode, addr *net.UDPAddr) *net.UDPAddr {
+	return doPortMapping(natm, ln, addr)
+}

core/state/state_object.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"math/big"
+	"sync"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -73,6 +74,7 @@ type stateObject struct {
 	trie Trie // storage trie, which becomes non-nil on first access
 	code Code // contract bytecode, which gets set when code is loaded
 
+	storageMutex   sync.Mutex
 	originStorage  Storage // Storage cache of original entries to dedup rewrites
 	pendingStorage Storage // Storage entries that need to be flushed to disk, at the end of an entire block
 	dirtyStorage   Storage // Storage entries that have been modified in the current transaction execution, reset for every transaction
@@ -175,6 +177,8 @@ func (s *stateObject) GetState(key common.Hash) common.Hash {
 
 // GetCommittedState retrieves a value from the committed account storage trie.
 func (s *stateObject) GetCommittedState(key common.Hash) common.Hash {
+	s.storageMutex.Lock()
+	defer s.storageMutex.Unlock()
 	// If we have a pending write or clean cached, return that
 	if value, pending := s.pendingStorage[key]; pending {
 		return value
@@ -183,6 +187,7 @@ func (s *stateObject) GetCommittedState(key common.Hash) common.Hash {
 	if value, cached := s.originStorage[key]; cached {
 		return value
 	}
+
 	// If the object was destructed in *this* block (and potentially resurrected),
 	// the storage has been cleared out, and we should *not* consult the previous
 	// database about any storage values. The only possible alternatives are:

core/types/block.go

@@ -263,6 +263,7 @@ type Block struct {
 	// inter-peer block relay.
 	ReceivedAt   time.Time
 	ReceivedFrom interface{}
+	AnnouncedAt  *time.Time
 }
 
 // "external" block encoding. used for eth protocol, etc.

core/types/transaction_marshalling.go

@@ -373,29 +373,29 @@ func (tx *Transaction) UnmarshalJSON(input []byte) error {
 		itx.BlobHashes = dec.BlobVersionedHashes
 
 		// signature R
-		var ok bool
+		var overflow bool
 		if dec.R == nil {
 			return errors.New("missing required field 'r' in transaction")
 		}
-		itx.R, ok = uint256.FromBig((*big.Int)(dec.R))
-		if !ok {
+		itx.R, overflow = uint256.FromBig((*big.Int)(dec.R))
+		if overflow {
 			return errors.New("'r' value overflows uint256")
 		}
 		// signature S
 		if dec.S == nil {
 			return errors.New("missing required field 's' in transaction")
 		}
-		itx.S, ok = uint256.FromBig((*big.Int)(dec.S))
-		if !ok {
+		itx.S, overflow = uint256.FromBig((*big.Int)(dec.S))
+		if overflow {
 			return errors.New("'s' value overflows uint256")
 		}
 		// signature V
 		vbig, err := dec.yParityValue()
 		if err != nil {
 			return err
 		}
-		itx.V, ok = uint256.FromBig(vbig)
-		if !ok {
+		itx.V, overflow = uint256.FromBig(vbig)
+		if overflow {
 			return errors.New("'v' value overflows uint256")
 		}
 		if itx.V.Sign() != 0 || itx.R.Sign() != 0 || itx.S.Sign() != 0 {

docs/cli/example_config.toml

@@ -24,10 +24,11 @@ devfakeauthor = false           # Run miner without validator set authorization
   "32000000" = "0x875500011e5eecc0c554f95d07b31cf59df4ca2505f4dbbfffa7d4e4da917c68"
 
 [log]
-  vmodule = ""       # Per-module verbosity: comma-separated list of <pattern>=<level> (e.g. eth/*=5,p2p=4)
-  json = false       # Format logs with JSON
-  backtrace = ""     # Request a stack trace at a specific logging statement (e.g. "block.go:271")
-  debug = true       # Prepends log messages with call-site location (file and line number)  -  {requires some effort}
+  vmodule = ""                    # Per-module verbosity: comma-separated list of <pattern>=<level> (e.g. eth/*=5,p2p=4)
+  json = false                    # Format logs with JSON
+  backtrace = ""                  # Request a stack trace at a specific logging statement (e.g. "block.go:271")
+  debug = true                    # Prepends log messages with call-site location (file and line number)
+  enable-block-tracking = false   # Enables additional logging of information collected while tracking block lifecycle
 
 [p2p]
   maxpeers = 50           # Maximum number of network peers (network disabled if set to 0)

docs/cli/server.md

@@ -204,6 +204,8 @@ The ```bor server``` command runs the Bor client.
 
 - ```log.debug```: Prepends log messages with call-site location (file and line number) (default: false)
 
+- ```log.enable-block-tracking```: Enables additional logging of information collected while tracking block lifecycle (default: false)
+
 - ```log.json```: Format logs with JSON (default: false)
 
 - ```vmodule```: Per-module verbosity: comma-separated list of <pattern>=<level> (e.g. eth/*=5,p2p=4)

eth/backend.go

@@ -272,18 +272,19 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	// Permit the downloader to use the trie cache allowance during fast sync
 	cacheLimit := cacheConfig.TrieCleanLimit + cacheConfig.TrieDirtyLimit + cacheConfig.SnapshotLimit
 	if eth.handler, err = newHandler(&handlerConfig{
-		Database:       chainDb,
-		Chain:          eth.blockchain,
-		TxPool:         eth.txPool,
-		Merger:         eth.merger,
-		Network:        config.NetworkId,
-		Sync:           config.SyncMode,
-		BloomCache:     uint64(cacheLimit),
-		EventMux:       eth.eventMux,
-		RequiredBlocks: config.RequiredBlocks,
-		EthAPI:         blockChainAPI,
-		checker:        checker,
-		txArrivalWait:  eth.p2pServer.TxArrivalWait,
+		Database:            chainDb,
+		Chain:               eth.blockchain,
+		TxPool:              eth.txPool,
+		Merger:              eth.merger,
+		Network:             config.NetworkId,
+		Sync:                config.SyncMode,
+		BloomCache:          uint64(cacheLimit),
+		EventMux:            eth.eventMux,
+		RequiredBlocks:      config.RequiredBlocks,
+		EthAPI:              blockChainAPI,
+		checker:             checker,
+		txArrivalWait:       eth.p2pServer.TxArrivalWait,
+		enableBlockTracking: eth.config.EnableBlockTracking,
 	}); err != nil {
 		return nil, err
 	}

eth/bor_checkpoint_verifier.go

@@ -37,6 +37,8 @@ var (
 	rewindLengthMeter = metrics.NewRegisteredMeter("chain/autorewind/length", nil)
 )
 
+const maxRewindLen uint64 = 126
+
 type borVerifier struct {
 	verify func(ctx context.Context, eth *Ethereum, handler *ethHandler, start uint64, end uint64, hash string, isCheckpoint bool) (string, error)
 }
@@ -117,8 +119,8 @@ func borVerify(ctx context.Context, eth *Ethereum, handler *ethHandler, start ui
 			}
 		}
 
-		if head-rewindTo > 255 {
-			rewindTo = head - 255
+		if head-rewindTo > maxRewindLen {
+			rewindTo = head - maxRewindLen
 		}
 
 		if isCheckpoint {

eth/ethconfig/config.go

@@ -204,6 +204,9 @@ type Config struct {
 
 	// OverrideVerkle (TODO: remove after the fork)
 	OverrideVerkle *big.Int `toml:",omitempty"`
+
+	// EnableBlockTracking allows logging of information collected while tracking block lifecycle
+	EnableBlockTracking bool
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain configuration.