fix: sane default (#4998)

ethersphere · Feb 11, 2025 · 7711ec8 · 7711ec8
1 parent f1e041f
commit 7711ec8
Show file tree

Hide file tree

Showing 6 changed files with 266 additions and 256 deletions.
diff --git a/cmd/bee/cmd/cmd.go b/cmd/bee/cmd/cmd.go
@@ -246,7 +246,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNameP2PAddr, ":1634", "P2P listen address")
 	cmd.Flags().String(optionNameNATAddr, "", "NAT exposed address")
 	cmd.Flags().Bool(optionNameP2PWSEnable, false, "enable P2P WebSocket transport")
-	cmd.Flags().StringSlice(optionNameBootnodes, []string{""}, "initial nodes to connect to")
+	cmd.Flags().StringSlice(optionNameBootnodes, []string{"/dnsaddr/mainnet.ethswarm.org"}, "initial nodes to connect to")
 	cmd.Flags().Uint64(optionNameNetworkID, chaincfg.Mainnet.NetworkID, "ID of the Swarm network")
 	cmd.Flags().StringSlice(optionCORSAllowedOrigins, []string{}, "origins with CORS headers enabled")
 	cmd.Flags().Bool(optionNameTracingEnabled, false, "enable tracing")
@@ -273,7 +273,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().String(optionNamePriceOracleAddress, "", "price oracle contract address")
 	cmd.Flags().String(optionNameRedistributionAddress, "", "redistribution contract address")
 	cmd.Flags().String(optionNameStakingAddress, "", "staking contract address")
-	cmd.Flags().Uint64(optionNameBlockTime, 15, "chain block time")
+	cmd.Flags().Uint64(optionNameBlockTime, 5, "chain block time")
 	cmd.Flags().String(optionNameSwapDeploymentGasPrice, "", "gas price in wei to use for deployment and funding")
 	cmd.Flags().Duration(optionWarmUpTime, time.Minute*5, "time to warmup the node before some major protocols can be kicked off")
 	cmd.Flags().Bool(optionNameMainNet, true, "triggers connect to main net bootnodes.")

diff --git a/packaging/bee.yaml b/packaging/bee.yaml
@@ -1,91 +1,67 @@
 ## Bee configuration - https://docs.ethswarm.org/docs/working-with-bee/configuration
 
-## HTTP API listen address (default "127.0.0.1:1633")
-# api-addr: "127.0.0.1:1633"
-## chain block time (default 15)
-# block-time: 15
-## initial nodes to connect to (default ["/dnsaddr/mainnet.ethswarm.org"])
+## allow to advertise private CIDRs to the public network
+# allow-private-cidrs: false
+## HTTP API listen address
+# api-addr: 127.0.0.1:1633
+## chain block time
+# block-time: "5"
+## rpc blockchain endpoint
+# blockchain-rpc-endpoint: ""
+## initial nodes to connect to
 # bootnode: ["/dnsaddr/mainnet.ethswarm.org"]
 ## cause the node to always accept incoming connections
 # bootnode-mode: false
-## config file (default is "/home/<user>/.bee.yaml")
+## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
+# cache-capacity: "1000000"
+## enable forwarded content caching
+# cache-retrieval: true
+## enable chequebook
+# chequebook-enable: true
+## config file (default is $HOME/.bee.yaml)
 config: "/etc/bee/bee.yaml"
 ## origins with CORS headers enabled
 # cors-allowed-origins: []
-## data directory (default "/home/<user>/.bee")
+## data directory
 data-dir: "/var/lib/bee"
-## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
-# cache-capacity: 1000000
-## number of open files allowed by database
-# db-open-files-limit: 200
 ## size of block cache of the database in bytes
-# db-block-cache-capacity: 33554432
-## size of the database write buffer in bytes
-# db-write-buffer-size: 33554432
+# db-block-cache-capacity: "33554432"
 ## disables db compactions triggered by seeks
-# db-disable-seeks-compaction: false
+# db-disable-seeks-compaction: true
+## number of open files allowed by database
+# db-open-files-limit: "200"
+## size of the database write buffer in bytes
+# db-write-buffer-size: "33554432"
 ## cause the node to start in full mode
 # full-node: false
+## help for printconfig
+# help: false
+## triggers connect to main net bootnodes.
+# mainnet: true
+## minimum radius storage threshold
+# minimum-storage-radius: "0"
 ## NAT exposed address
 # nat-addr: ""
-## ID of the Swarm network (default 1)
-# network-id: 1
-## P2P listen address (default ":1634")
-# p2p-addr: ":1634"
+## suggester for target neighborhood
+# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
+## ID of the Swarm network
+# network-id: "1"
+## P2P listen address
+# p2p-addr: :1634
 ## enable P2P WebSocket transport
 # p2p-ws-enable: false
 ## password for decrypting keys
 # password: ""
 ## path to a file that contains password for decrypting keys
 password-file: "/var/lib/bee/password"
-## percentage below the peers payment threshold when we initiate settlement (default 50)
+## percentage below the peers payment threshold when we initiate settlement
 # payment-early-percent: 50
-## threshold in BZZ where you expect to get paid from your peers (default 13500000). For value greater than int64 or 9223372036854775807 use value in quotes
-# payment-threshold: 13500000
-## excess debt above payment threshold in percentages where you disconnect from your peer (default 25)
+## threshold in BZZ where you expect to get paid from your peers
+# payment-threshold: "13500000"
+## excess debt above payment threshold in percentages where you disconnect from your peer
 # payment-tolerance-percent: 25
 ## postage stamp contract address
 # postage-stamp-address: ""
-## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
-# resolver-options: []
-## enable swap (default false)
-# swap-enable: false
-## swap blockchain endpoint (default "") [deprecated]
-# swap-endpoint: ""
-## blockchain endpoint (default "")
-# blockchain-rpc-endpoint: ""
-## swap factory address
-# swap-factory-address: ""
-## initial deposit if deploying a new chequebook (default 0)
-# swap-initial-deposit: 0
-## gas price in wei to use for deployment and funding (default "")
-# swap-deployment-gas-price: ""
-## enable tracing
-# tracing-enable: false
-## endpoint to send tracing data (default "127.0.0.1:6831")
-# tracing-endpoint: "127.0.0.1:6831"
-## service name identifier for tracing (default "bee")
-# tracing-service-name: "bee"
-## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace (default "info")
-# verbosity: "info"
-## send a welcome message string during handshakes
-# welcome-message: ""
-## triggers connection to main network
-# mainnet: true
-## minimum radius storage threshold
-# minimum-storage-radius: 0
-## reserve capacity doubling (default 0, maximum 1)
-reserve-capacity-doubling: 0
-## allow to advertise private CIDRs to the public network
-# allow-private-cidrs: false
-## enable forwarded content caching
-# cache-retrieval: true
-## enable chequebook
-# chequebook-enable: true
-## help for printconfig
-# help: false
-## suggester for target neighborhood
-# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
 ## postage stamp contract start block number
 # postage-stamp-start-block: "0"
 ## enable pprof mutex profile
@@ -96,6 +72,10 @@ reserve-capacity-doubling: 0
 # price-oracle-address: ""
 ## redistribution contract address
 # redistribution-address: ""
+## reserve capacity doubling
+# reserve-capacity-doubling: 0
+## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
+# resolver-options: []
 ## forces the node to resync postage contract data
 # resync: false
 ## staking contract address
@@ -106,17 +86,37 @@ reserve-capacity-doubling: 0
 # static-nodes: []
 ## enable storage incentives feature
 # storage-incentives-enable: true
+## gas price in wei to use for deployment and funding
+# swap-deployment-gas-price: ""
+## enable swap
+# swap-enable: false
+## swap blockchain endpoint
+# swap-endpoint: ""
+## swap factory addresses
+# swap-factory-address: ""
+## initial deposit if deploying a new chequebook
+# swap-initial-deposit: "0"
 ## neighborhood to target in binary format (ex: 111111001) for mining the initial overlay
 # target-neighborhood: ""
+## enable tracing
+# tracing-enable: false
+## endpoint to send tracing data
+# tracing-endpoint: 127.0.0.1:6831
 ## host to send tracing data
 # tracing-host: ""
 ## port to send tracing data
 # tracing-port: ""
+## service name identifier for tracing
+# tracing-service-name: bee
 ## skips the gas estimate step for contract transactions
 # transaction-debug-mode: false
 ## bootstrap node using postage snapshot from the network
 # use-postage-snapshot: false
+## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace
+# verbosity: info
 ## time to warmup the node before some major protocols can be kicked off
-# warmup-time: 30s
+# warmup-time: 5m0s
+## send a welcome message string during handshakes
+# welcome-message: ""
 ## withdrawal target addresses
 # withdrawal-addresses-whitelist: []
diff --git a/packaging/docker/env b/packaging/docker/env
@@ -4,10 +4,10 @@
 
 ## HTTP API listen address (default 127.0.0.1:1633)
 # BEE_API_ADDR=127.0.0.1:1633
-## chain block time (default 15)
-# BEE_BLOCK_TIME=15
-## initial nodes to connect to (default [/dnsaddr/testnet.ethswarm.org])
-# BEE_BOOTNODE=[/dnsaddr/testnet.ethswarm.org]
+## chain block time (default 5)
+# BEE_BLOCK_TIME=5
+## initial nodes to connect to (default [/dnsaddr/mainnet.ethswarm.org])
+# BEE_BOOTNODE=[/dnsaddr/mainnet.ethswarm.org]
 ## cause the node to always accept incoming connections
 # BEE_BOOTNODE_MODE=false
 ## config file (default is /home/<user>/.bee.yaml)

diff --git a/packaging/homebrew-amd64/bee.yaml b/packaging/homebrew-amd64/bee.yaml
@@ -1,91 +1,67 @@
 ## Bee configuration - https://docs.ethswarm.org/docs/working-with-bee/configuration
 
-## HTTP API listen address (default "127.0.0.1:1633")
-# api-addr: "127.0.0.1:1633"
-## chain block time (default 15)
-# block-time: 15
-## initial nodes to connect to (default ["/dnsaddr/mainnet.ethswarm.org"])
+## allow to advertise private CIDRs to the public network
+# allow-private-cidrs: false
+## HTTP API listen address
+# api-addr: 127.0.0.1:1633
+## chain block time
+# block-time: "5"
+## rpc blockchain endpoint
+# blockchain-rpc-endpoint: ""
+## initial nodes to connect to
 # bootnode: ["/dnsaddr/mainnet.ethswarm.org"]
 ## cause the node to always accept incoming connections
 # bootnode-mode: false
-## config file (default is /home/<user>/.bee.yaml)
+## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
+# cache-capacity: "1000000"
+## enable forwarded content caching
+# cache-retrieval: true
+## enable chequebook
+# chequebook-enable: true
+## config file (default is $HOME/.bee.yaml)
 config: "/usr/local/etc/swarm-bee/bee.yaml"
 ## origins with CORS headers enabled
 # cors-allowed-origins: []
-## data directory (default "/home/<user>/.bee")
+## data directory
 data-dir: "/usr/local/var/lib/swarm-bee"
-## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
-# cache-capacity: 1000000
-## number of open files allowed by database
-# db-open-files-limit: 200
 ## size of block cache of the database in bytes
-# db-block-cache-capacity: 33554432
-## size of the database write buffer in bytes
-# db-write-buffer-size: 33554432
+# db-block-cache-capacity: "33554432"
 ## disables db compactions triggered by seeks
-# db-disable-seeks-compaction: false
+# db-disable-seeks-compaction: true
+## number of open files allowed by database
+# db-open-files-limit: "200"
+## size of the database write buffer in bytes
+# db-write-buffer-size: "33554432"
 ## cause the node to start in full mode
 # full-node: false
+## help for printconfig
+# help: false
+## triggers connect to main net bootnodes.
+# mainnet: true
+## minimum radius storage threshold
+# minimum-storage-radius: "0"
 ## NAT exposed address
 # nat-addr: ""
-## ID of the Swarm network (default 1)
-# network-id: 1
-## P2P listen address (default ":1634")
-# p2p-addr: ":1634"
+## suggester for target neighborhood
+# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
+## ID of the Swarm network
+# network-id: "1"
+## P2P listen address
+# p2p-addr: :1634
 ## enable P2P WebSocket transport
 # p2p-ws-enable: false
 ## password for decrypting keys
 # password: ""
 ## path to a file that contains password for decrypting keys
 password-file: "/usr/local/var/lib/swarm-bee/password"
-## percentage below the peers payment threshold when we initiate settlement (default 50)
+## percentage below the peers payment threshold when we initiate settlement
 # payment-early-percent: 50
-## threshold in BZZ where you expect to get paid from your peers (default 13500000). For value greater than int64 or 9223372036854775807 use value in quotes
-# payment-threshold: 13500000
-## excess debt above payment threshold in percentages where you disconnect from your peer (default 25)
+## threshold in BZZ where you expect to get paid from your peers
+# payment-threshold: "13500000"
+## excess debt above payment threshold in percentages where you disconnect from your peer
 # payment-tolerance-percent: 25
 ## postage stamp contract address
 # postage-stamp-address: ""
-## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
-# resolver-options: []
-## enable swap (default false)
-# swap-enable: false
-## swap blockchain endpoint (default "") [deprecated]
-# swap-endpoint: ""
-## blockchain rpc endpoint (default "")
-# blockchain-rpc-endpoint: ""
-## swap factory address
-# swap-factory-address: ""
-## initial deposit if deploying a new chequebook (default 0)
-# swap-initial-deposit: 0
-## gas price in wei to use for deployment and funding (default "")
-# swap-deployment-gas-price: ""
-## enable tracing
-# tracing-enable: false
-## endpoint to send tracing data (default "127.0.0.1:6831")
-# tracing-endpoint: "127.0.0.1:6831"
-## service name identifier for tracing (default "bee")
-# tracing-service-name: "bee"
-## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace (default "info")
-# verbosity: "info"
-## send a welcome message string during handshakes
-# welcome-message: ""
-## triggers connection to main network
-# mainnet: true
-# ## minimum radius storage threshold
-# minimum-storage-radius: 0
-## reserve capacity doubling (default 0, maximum 1)
-reserve-capacity-doubling: 0
-## allow to advertise private CIDRs to the public network
-# allow-private-cidrs: false
-## enable forwarded content caching
-# cache-retrieval: true
-## enable chequebook
-# chequebook-enable: true
-## help for printconfig
-# help: false
-## suggester for target neighborhood
-# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
 ## postage stamp contract start block number
 # postage-stamp-start-block: "0"
 ## enable pprof mutex profile
@@ -96,6 +72,10 @@ reserve-capacity-doubling: 0
 # price-oracle-address: ""
 ## redistribution contract address
 # redistribution-address: ""
+## reserve capacity doubling
+# reserve-capacity-doubling: 0
+## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
+# resolver-options: []
 ## forces the node to resync postage contract data
 # resync: false
 ## staking contract address
@@ -106,17 +86,37 @@ reserve-capacity-doubling: 0
 # static-nodes: []
 ## enable storage incentives feature
 # storage-incentives-enable: true
+## gas price in wei to use for deployment and funding
+# swap-deployment-gas-price: ""
+## enable swap
+# swap-enable: false
+## swap blockchain endpoint
+# swap-endpoint: ""
+## swap factory addresses
+# swap-factory-address: ""
+## initial deposit if deploying a new chequebook
+# swap-initial-deposit: "0"
 ## neighborhood to target in binary format (ex: 111111001) for mining the initial overlay
 # target-neighborhood: ""
+## enable tracing
+# tracing-enable: false
+## endpoint to send tracing data
+# tracing-endpoint: 127.0.0.1:6831
 ## host to send tracing data
 # tracing-host: ""
 ## port to send tracing data
 # tracing-port: ""
+## service name identifier for tracing
+# tracing-service-name: bee
 ## skips the gas estimate step for contract transactions
 # transaction-debug-mode: false
 ## bootstrap node using postage snapshot from the network
 # use-postage-snapshot: false
+## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace
+# verbosity: info
 ## time to warmup the node before some major protocols can be kicked off
-# warmup-time: 30s
+# warmup-time: 5m0s
+## send a welcome message string during handshakes
+# welcome-message: ""
 ## withdrawal target addresses
 # withdrawal-addresses-whitelist: []