Default (nonces, threads) = (288, CPU*3/4) for Mainnet (#4741)

Co-authored-by: Matthias <5011972+fasmat@users.noreply.github.com>
spacemeshos · Jul 22, 2023 · 1766164 · 1766164
1 parent 0bd65e1
commit 1766164
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
     needs: filter-changes
     if: ${{ needs.filter-changes.outputs.nondocchanges == 'true' }}
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         os:
           - ubuntu-latest

diff --git a/config/mainnet.go b/config/mainnet.go
@@ -5,6 +5,7 @@ import (
 	"math/big"
 	"os"
 	"path/filepath"
+	"runtime"
 	"time"
 
 	"github.com/spacemeshos/go-spacemesh/activation"
@@ -27,6 +28,14 @@ func MainnetConfig() Config {
 		panic(err)
 	}
 	p2pconfig := p2p.DefaultConfig()
+
+	smeshing := DefaultSmeshingConfig()
+	smeshing.ProvingOpts.Nonces = 288
+	smeshing.ProvingOpts.Threads = uint(runtime.NumCPU() * 3 / 4)
+	if smeshing.ProvingOpts.Threads < 1 {
+		smeshing.ProvingOpts.Threads = 1
+	}
+
 	return Config{
 		BaseConfig: BaseConfig{
 			DataDirParent:       defaultDataDir,
@@ -115,7 +124,7 @@ func MainnetConfig() Config {
 		P2P:      p2pconfig,
 		API:      grpcserver.DefaultConfig(),
 		TIME:     timeConfig.DefaultConfig(),
-		SMESHING: DefaultSmeshingConfig(),
+		SMESHING: smeshing,
 		FETCH:    fetch.DefaultConfig(),
 		LOGGING:  defaultLoggingConfig(),
 		Sync:     syncer.DefaultConfig(),