core/tx_cacher.go

@@ -60,16 +60,9 @@ func newTxSenderCacher(threads int) *txSenderCacher {
 // cache is an infinite loop, caching transaction senders from various forms of
 // data structures.
 func (cacher *txSenderCacher) cache() {
-	for {
-		select {
-		case task := <-cacher.tasks:
-			for i := 0; i < len(task.txs); i += task.inc {
-				types.Sender(task.signer, task.txs[i])
-			}
-		default:
-			if cacher.tasks == nil {
-				return
-			}
+	for task := range cacher.tasks {
+		for i := 0; i < len(task.txs); i += task.inc {
+			types.Sender(task.signer, task.txs[i])
 		}
 	}
 }

docs/getting-started/installation.md

@@ -54,10 +54,20 @@ $ docker pull etclabscore/core-geth:latest
 
 #### Image: `<tag>`
 
-Repository tags like `v1.2.3` correspond to Docker tags like __`version-1.2.3`__.
+##### ⛔ `version-X.Y.Z` Deprecation Notice (2023-01-31)
+
+tl;dr: Use `etclabscore/core-geth:v1.12.9` instead of `etclabscore/core-geth:version-1.12.9`. 
+
+~~Repository tags like `v1.2.3` correspond to Docker tags like __`version-1.2.3`__.~~
+
+__Update (2023-01-31)__
+
+Docker Hub tags are now formatted as __`v1.2.3`__, corresponding exactly with the repository tag (eg. `v1.2.3`).
+The previous format (`version-X.Y.Z`) will be supported through `version-1.12.11` (=`v1.12.11`), but will be discontinued after that.
 
 !!! Example
 
     ```shell
-    $ docker pull etclabscore/core-geth:version-1.11.1
+    $ docker pull etclabscore/core-geth:v1.12.9        # <-- all versions from 1.12.9 and later use this format
+    $ docker pull etclabscore/core-geth:version-1.11.1 # <-- all versions from 1.12.8 and earlier use this format
     ```

eth/sync.go

@@ -107,7 +107,7 @@ func (h *handler) syncTransactions(p *eth.Peer) {
 type chainSyncer struct {
 	handler     *handler
 	force       *time.Timer
-	forced      bool // true when force timer fired
+	forced      uint32 // true when force timer fired
 	warned      time.Time
 	peerEventCh chan struct{}
 	doneCh      chan error // non-nil when sync is running
@@ -166,7 +166,7 @@ func (cs *chainSyncer) loop() {
 		case err := <-cs.doneCh:
 			cs.doneCh = nil
 			cs.force.Reset(forceSyncCycle)
-			cs.forced = false
+			atomic.StoreUint32(&cs.forced, 0)
 
 			// If we've reached the merge transition but no beacon client is available, or
 			// it has not yet switched us over, keep warning the user that their infra is
@@ -176,7 +176,7 @@ func (cs *chainSyncer) loop() {
 				cs.warned = time.Now()
 			}
 		case <-cs.force.C:
-			cs.forced = true
+			atomic.StoreUint32(&cs.forced, 1)
 
 		case <-cs.handler.quitSync:
 			// Disable all insertion on the blockchain. This needs to happen before
@@ -210,7 +210,7 @@ func (cs *chainSyncer) nextSyncOp() *chainSyncOp {
 	}
 	// Ensure we're at minimum peer count.
 	minPeers := defaultMinSyncPeers
-	if cs.forced {
+	if atomic.LoadUint32(&cs.forced) == 1 {
 		minPeers = 1
 	} else if minPeers > cs.handler.maxPeers {
 		minPeers = cs.handler.maxPeers

eth/sync_test.go

@@ -219,7 +219,8 @@ func TestArtificialFinalityFeatureEnablingDisabling_AbleDisable(t *testing.T) {
 		t.Fatalf("sync failed: %v", err)
 	}
 
-	b.handler.chainSync.forced = true
+	atomic.StoreUint32(&b.handler.chainSync.forced, 1)
+
 	next := b.handler.chainSync.nextSyncOp()
 	if next != nil {
 		t.Fatal("non-nil next sync op")
@@ -235,7 +236,7 @@ func TestArtificialFinalityFeatureEnablingDisabling_AbleDisable(t *testing.T) {
 	minArtificialFinalityPeers = oMinAFPeers
 
 	// Next sync op will unset AF because manager only has 1 peer.
-	b.handler.chainSync.forced = true
+	atomic.StoreUint32(&b.handler.chainSync.forced, 1)
 	next = b.handler.chainSync.nextSyncOp()
 	if next != nil {
 		t.Fatal("non-nil next sync op")
@@ -306,7 +307,7 @@ func TestArtificialFinalityFeatureEnablingDisabling_NoDisable(t *testing.T) {
 		t.Fatalf("sync failed: %v", err)
 	}
 
-	b.handler.chainSync.forced = true
+	atomic.StoreUint32(&b.handler.chainSync.forced, 1)
 	next := b.handler.chainSync.nextSyncOp()
 
 	// Revert safety condition overrides to default values.
@@ -324,7 +325,7 @@ func TestArtificialFinalityFeatureEnablingDisabling_NoDisable(t *testing.T) {
 	}
 
 	// Next sync op will unset AF because manager only has 1 peer.
-	b.handler.chainSync.forced = true
+	atomic.StoreUint32(&b.handler.chainSync.forced, 1)
 	next = b.handler.chainSync.nextSyncOp()
 	if next != nil {
 		t.Fatal("non-nil next sync op")
@@ -393,7 +394,7 @@ func TestArtificialFinalityFeatureEnablingDisabling_StaleHead(t *testing.T) {
 		t.Fatalf("sync failed: %v", err)
 	}
 
-	b.handler.chainSync.forced = true
+	atomic.StoreUint32(&b.handler.chainSync.forced, 1)
 	next := b.handler.chainSync.nextSyncOp()
 
 	// Revert safety condition overrides to default values.

params/version.go

@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1          // Major version component of the current release
 	VersionMinor = 12         // Minor version component of the current release
-	VersionPatch = 10         // Patch version component of the current release
+	VersionPatch = 11         // Patch version component of the current release
 	VersionMeta  = "unstable" // Version metadata to append to the version string
 	VersionName  = "CoreGeth"
 )