Add latest config changes from main (#175)

Chia-Network · Nov 21, 2024 · ead46cf · ead46cf
1 parent afcf4f8
commit ead46cf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/pkg/config/anchors_test.go b/pkg/config/anchors_test.go
@@ -23,6 +23,7 @@ func TestLoggingConfigAnchors(t *testing.T) {
 
 	expected := `logging1: &logging
     log_stdout: false
+    log_backcompat: false
     log_filename: ""
     log_level: ""
     log_maxfilesrotation: 0

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -124,6 +124,7 @@ type NetworkConfig struct {
 type LoggingConfig struct {
 	yamlAnchor          *yaml.Node `yaml:"-" json:"-"` // Helps with serializing the anchors to yaml
 	LogStdout           bool       `yaml:"log_stdout" json:"log_stdout"`
+	LogBackcompat       bool       `yaml:"log_backcompat" json:"log_backcompat"`
 	LogFilename         string     `yaml:"log_filename" json:"log_filename"`
 	LogLevel            string     `yaml:"log_level" json:"log_level"`
 	LogMaxFilesRotation uint8      `yaml:"log_maxfilesrotation" json:"log_maxfilesrotation"`
@@ -152,6 +153,7 @@ type SeederConfig struct {
 	PeerConnectTimeout  uint16            `yaml:"peer_connect_timeout" json:"peer_connect_timeout"`
 	CrawlerDBPath       string            `yaml:"crawler_db_path" json:"crawler_db_path"`
 	BootstrapPeers      []string          `yaml:"bootstrap_peers" json:"bootstrap_peers"`
+	StaticPeers         []string          `yaml:"static_peers" json:"static_peers"`
 	MinimumHeight       uint32            `yaml:"minimum_height" json:"minimum_height"`
 	MinimumVersionCount uint32            `yaml:"minimum_version_count" json:"minimum_version_count"`
 	DomainName          string            `yaml:"domain_name" json:"domain_name"`
@@ -194,6 +196,7 @@ type HarvesterConfig struct {
 	SelectedNetwork            *string               `yaml:"selected_network" json:"selected_network"`
 	PlotDirectories            []string              `yaml:"plot_directories" json:"plot_directories"`
 	RecursivePlotScan          bool                  `yaml:"recursive_plot_scan" json:"recursive_plot_scan"`
+	RecursiveFollowLinks       bool                  `yaml:"recursive_follow_links" json:"recursive_follow_links"`
 	PortConfig                 `yaml:",inline" json:",inline"`
 	SSL                        SSLConfig `yaml:"ssl" json:"ssl"`
 	PrivateSSLCA               CAConfig  `yaml:"private_ssl_ca" json:"private_ssl_ca"`
@@ -352,6 +355,7 @@ type IntroducerConfig struct {
 // WalletConfig wallet configuration section
 type WalletConfig struct {
 	PortConfig                     `yaml:",inline" json:",inline"`
+	StartRPCServer                 bool              `yaml:"start_rpc_server" json:"start_rpc_server"`
 	EnableProfiler                 bool              `yaml:"enable_profiler" json:"enable_profiler"`
 	EnableMemoryProfiler           bool              `yaml:"enable_memory_profiler" json:"enable_memory_profiler"`
 	DBSync                         string            `yaml:"db_sync" json:"db_sync"`
@@ -383,6 +387,7 @@ type WalletConfig struct {
 	OutboundRateLimitPercent       uint8             `yaml:"outbound_rate_limit_percent" json:"outbound_rate_limit_percent"`
 	WeightProofTimeout             uint16            `yaml:"weight_proof_timeout" json:"weight_proof_timeout"`
 	AutomaticallyAddUnknownCats    bool              `yaml:"automatically_add_unknown_cats" json:"automatically_add_unknown_cats"`
+	DIDAutoAddLimit                *int              `yaml:"did_auto_add_limit,omitempty" json:"did_auto_add_limit,omitempty"`
 	TxResendTimeoutSecs            uint16            `yaml:"tx_resend_timeout_secs" json:"tx_resend_timeout_secs"`
 	ResetSyncForFingerprint        *int              `yaml:"reset_sync_for_fingerprint" json:"reset_sync_for_fingerprint"`
 	SpamFilterAfterNTxs            uint16            `yaml:"spam_filter_after_n_txs" json:"spam_filter_after_n_txs"`

diff --git a/pkg/config/initial-config.yml b/pkg/config/initial-config.yml
@@ -86,6 +86,7 @@ daemon_ssl:
 # Controls logging of all servers (harvester, farmer, etc..). Each one can be overridden.
 logging: &logging
   log_stdout: False # If True, outputs to stdout instead of a file
+  log_backcompat: False
   log_filename: "log/debug.log"
   log_level: "WARNING" # Can be CRITICAL, ERROR, WARNING, INFO, DEBUG, NOTSET
   log_maxfilesrotation: 7 #  Max files in rotation. Default value 7 if the key is not set
@@ -109,6 +110,9 @@ seeder:
   # Peers used for the initial run.
   bootstrap_peers:
     - "node.chia.net"
+  # Peers to respond with regardless of what the crawler finds
+  # Can be IPs or Hostnames. Hostnames will be resolved to IPs
+  static_peers: []
   # Only consider nodes synced at least to this height.
   minimum_height: 240000
   # How many of a particular version we need to see before reporting it in the logs
@@ -160,6 +164,7 @@ harvester:
   # Plots are searched for in the following directories
   plot_directories: []
   recursive_plot_scan: False # If True the harvester scans plots recursively in the provided directories.
+  recursive_follow_links: False # If True the harvester follows symlinks when scanning for plots recursively
 
   ssl:
     private_crt: "config/ssl/harvester/private_harvester.crt"
@@ -480,6 +485,8 @@ introducer:
     public_key: "config/ssl/full_node/public_full_node.key"
 
 wallet:
+  # If True, starts an RPC server at the following port
+  start_rpc_server: True
   rpc_port: 9256
 
   # when enabled, the wallet will print a pstats profile to the
@@ -564,6 +571,9 @@ wallet:
   # the user accepts the risk/responsibility of verifying the authenticity and origin of unknown CATs
   automatically_add_unknown_cats: False
 
+  # if an unknown DID is sent to us, a wallet will be automatically created
+  did_auto_add_limit: 10
+
   # Interval to resend unconfirmed transactions, even if previously accepted into Mempool
   tx_resend_timeout_secs: 1800