Latest config changes from the RC (#190)

Chia-Network · Jan 16, 2025 · 2402595 · 2402595
1 parent b7bffe0
commit 2402595
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -46,6 +46,7 @@ type ChiaConfig struct {
 	HardForkHeight  uint32 `yaml:"HARD_FORK_HEIGHT" json:"HARD_FORK_HEIGHT"`
 	SoftFork4Height uint32 `yaml:"SOFT_FORK4_HEIGHT" json:"SOFT_FORK4_HEIGHT"`
 	SoftFork5Height uint32 `yaml:"SOFT_FORK5_HEIGHT" json:"SOFT_FORK5_HEIGHT"`
+	SoftFork6Height uint32 `yaml:"SOFT_FORK6_HEIGHT" json:"SOFT_FORK6_HEIGHT"`
 }
 
 // PortConfig common port settings found in many sections of the config
@@ -109,6 +110,7 @@ type NetworkConstants struct {
 	HardForkHeight      *uint32 `yaml:"HARD_FORK_HEIGHT,omitempty" json:"HARD_FORK_HEIGHT,omitempty"`
 	SoftFork4Height     *uint32 `yaml:"SOFT_FORK4_HEIGHT,omitempty" json:"SOFT_FORK4_HEIGHT,omitempty"`
 	SoftFork5Height     *uint32 `yaml:"SOFT_FORK5_HEIGHT,omitempty" json:"SOFT_FORK5_HEIGHT,omitempty"`
+	SoftFork6Height     *uint32 `yaml:"SOFT_FORK6_HEIGHT,omitempty" json:"SOFT_FORK6_HEIGHT,omitempty"`
 	PlotFilter128Height *uint32 `yaml:"PLOT_FILTER_128_HEIGHT,omitempty" json:"PLOT_FILTER_128_HEIGHT,omitempty"`
 	PlotFilter64Height  *uint32 `yaml:"PLOT_FILTER_64_HEIGHT,omitempty" json:"PLOT_FILTER_64_HEIGHT,omitempty"`
 	PlotFilter32Height  *uint32 `yaml:"PLOT_FILTER_32_HEIGHT,omitempty" json:"PLOT_FILTER_32_HEIGHT,omitempty"`
@@ -293,6 +295,7 @@ type FullNodeConfig struct {
 	BadPeakCacheSize                 uint16            `yaml:"bad_peak_cache_size" json:"bad_peak_cache_size"`
 	ReservedCores                    uint8             `yaml:"reserved_cores" json:"reserved_cores"`
 	SingleThreaded                   bool              `yaml:"single_threaded" json:"single_threaded"`
+	LogCoins                         bool              `yaml:"log_coins" json:"log_coins"`
 	PeerConnectInterval              uint8             `yaml:"peer_connect_interval" json:"peer_connect_interval"`
 	PeerConnectTimeout               uint8             `yaml:"peer_connect_timeout" json:"peer_connect_timeout"`
 	TargetPeerCount                  uint16            `yaml:"target_peer_count" json:"target_peer_count"`
@@ -310,6 +313,7 @@ type FullNodeConfig struct {
 	EnableProfiler                   bool              `yaml:"enable_profiler" json:"enable_profiler"`
 	ProfileBlockValidation           bool              `yaml:"profile_block_validation" json:"profile_block_validation"`
 	EnableMemoryProfiler             bool              `yaml:"enable_memory_profiler" json:"enable_memory_profiler"`
+	LogMempool                       bool              `yaml:"log_mempool" json:"log_mempool"`
 	LogSqliteCmds                    bool              `yaml:"log_sqlite_cmds" json:"log_sqlite_cmds"`
 	MaxSubscribeItems                uint32            `yaml:"max_subscribe_items" json:"max_subscribe_items"`
 	MaxSubscribeResponseItems        uint32            `yaml:"max_subscribe_response_items" json:"max_subscribe_response_items"`

diff --git a/pkg/config/initial-config.yml b/pkg/config/initial-config.yml
@@ -37,7 +37,7 @@ network_overrides: &network_overrides
       SUB_SLOT_ITERS_STARTING: 67108864
       # Forks activated from the beginning on this network
       HARD_FORK_HEIGHT: 0
-      SOFT_FORK5_HEIGHT: 1340000
+      SOFT_FORK6_HEIGHT: 2000000
       PLOT_FILTER_128_HEIGHT: 6029568
       PLOT_FILTER_64_HEIGHT: 11075328
       PLOT_FILTER_32_HEIGHT: 16121088
@@ -361,6 +361,10 @@ full_node:
   # profiled.
   single_threaded: False
 
+  # when enabled, logs coins additions, removals and reorgs at INFO level.
+  # Requires the log level to be INFO or DEBUG as well.
+  log_coins: False
+
   # How often to initiate outbound connections to other full nodes.
   peer_connect_interval: 30
   # How long to wait for a peer connection
@@ -406,6 +410,10 @@ full_node:
 
   enable_memory_profiler: False
 
+  # this is a debug/auditing facility that saves all spend bundles added to the
+  # mempool, organized by peak height at the time
+  log_mempool: false
+
   # this is a debug and profiling facility that logs all SQLite commands to a
   # separate log file (under logging/sql.log).
   log_sqlite_cmds: False
@@ -432,6 +440,7 @@ full_node:
     - "seeder.dexie.space"
     - "chia.hoffmang.com"
     - "seeder.xchpool.org"
+    - "seeder.xchseeder.com"
   introducer_peer:
     host: introducer.chia.net # Chia AWS introducer IPv4/IPv6
     port: 8444
@@ -682,4 +691,4 @@ simulator:
 
   # Fork Settings
   HARD_FORK_HEIGHT: 0
-  SOFT_FORK5_HEIGHT: 0
+  SOFT_FORK6_HEIGHT: 0