Skip to content

Commit 7711ec8

Browse files
istaeistae
authored
fix: sane default (#4998)
1 parent f1e041f commit 7711ec8

File tree

6 files changed

+266
-256
lines changed

6 files changed

+266
-256
lines changed

‎cmd/bee/cmd/cmd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
246246
cmd.Flags().String(optionNameP2PAddr, ":1634", "P2P listen address")
247247
cmd.Flags().String(optionNameNATAddr, "", "NAT exposed address")
248248
cmd.Flags().Bool(optionNameP2PWSEnable, false, "enable P2P WebSocket transport")
249-
cmd.Flags().StringSlice(optionNameBootnodes, []string{""}, "initial nodes to connect to")
249+
cmd.Flags().StringSlice(optionNameBootnodes, []string{"/dnsaddr/mainnet.ethswarm.org"}, "initial nodes to connect to")
250250
cmd.Flags().Uint64(optionNameNetworkID, chaincfg.Mainnet.NetworkID, "ID of the Swarm network")
251251
cmd.Flags().StringSlice(optionCORSAllowedOrigins, []string{}, "origins with CORS headers enabled")
252252
cmd.Flags().Bool(optionNameTracingEnabled, false, "enable tracing")
@@ -273,7 +273,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
273273
cmd.Flags().String(optionNamePriceOracleAddress, "", "price oracle contract address")
274274
cmd.Flags().String(optionNameRedistributionAddress, "", "redistribution contract address")
275275
cmd.Flags().String(optionNameStakingAddress, "", "staking contract address")
276-
cmd.Flags().Uint64(optionNameBlockTime, 15, "chain block time")
276+
cmd.Flags().Uint64(optionNameBlockTime, 5, "chain block time")
277277
cmd.Flags().String(optionNameSwapDeploymentGasPrice, "", "gas price in wei to use for deployment and funding")
278278
cmd.Flags().Duration(optionWarmUpTime, time.Minute*5, "time to warmup the node before some major protocols can be kicked off")
279279
cmd.Flags().Bool(optionNameMainNet, true, "triggers connect to main net bootnodes.")

‎packaging/bee.yaml‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,67 @@
11
## Bee configuration - https://docs.ethswarm.org/docs/working-with-bee/configuration
22

3-
## HTTP API listen address (default "127.0.0.1:1633")
4-
# api-addr: "127.0.0.1:1633"
5-
## chain block time (default 15)
6-
# block-time: 15
7-
## initial nodes to connect to (default ["/dnsaddr/mainnet.ethswarm.org"])
3+
## allow to advertise private CIDRs to the public network
4+
# allow-private-cidrs: false
5+
## HTTP API listen address
6+
# api-addr: 127.0.0.1:1633
7+
## chain block time
8+
# block-time: "5"
9+
## rpc blockchain endpoint
10+
# blockchain-rpc-endpoint: ""
11+
## initial nodes to connect to
812
# bootnode: ["/dnsaddr/mainnet.ethswarm.org"]
913
## cause the node to always accept incoming connections
1014
# bootnode-mode: false
11-
## config file (default is "/home/<user>/.bee.yaml")
15+
## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
16+
# cache-capacity: "1000000"
17+
## enable forwarded content caching
18+
# cache-retrieval: true
19+
## enable chequebook
20+
# chequebook-enable: true
21+
## config file (default is $HOME/.bee.yaml)
1222
config: "/etc/bee/bee.yaml"
1323
## origins with CORS headers enabled
1424
# cors-allowed-origins: []
15-
## data directory (default "/home/<user>/.bee")
25+
## data directory
1626
data-dir: "/var/lib/bee"
17-
## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
18-
# cache-capacity: 1000000
19-
## number of open files allowed by database
20-
# db-open-files-limit: 200
2127
## size of block cache of the database in bytes
22-
# db-block-cache-capacity: 33554432
23-
## size of the database write buffer in bytes
24-
# db-write-buffer-size: 33554432
28+
# db-block-cache-capacity: "33554432"
2529
## disables db compactions triggered by seeks
26-
# db-disable-seeks-compaction: false
30+
# db-disable-seeks-compaction: true
31+
## number of open files allowed by database
32+
# db-open-files-limit: "200"
33+
## size of the database write buffer in bytes
34+
# db-write-buffer-size: "33554432"
2735
## cause the node to start in full mode
2836
# full-node: false
37+
## help for printconfig
38+
# help: false
39+
## triggers connect to main net bootnodes.
40+
# mainnet: true
41+
## minimum radius storage threshold
42+
# minimum-storage-radius: "0"
2943
## NAT exposed address
3044
# nat-addr: ""
31-
## ID of the Swarm network (default 1)
32-
# network-id: 1
33-
## P2P listen address (default ":1634")
34-
# p2p-addr: ":1634"
45+
## suggester for target neighborhood
46+
# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
47+
## ID of the Swarm network
48+
# network-id: "1"
49+
## P2P listen address
50+
# p2p-addr: :1634
3551
## enable P2P WebSocket transport
3652
# p2p-ws-enable: false
3753
## password for decrypting keys
3854
# password: ""
3955
## path to a file that contains password for decrypting keys
4056
password-file: "/var/lib/bee/password"
41-
## percentage below the peers payment threshold when we initiate settlement (default 50)
57+
## percentage below the peers payment threshold when we initiate settlement
4258
# payment-early-percent: 50
43-
## 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
44-
# payment-threshold: 13500000
45-
## excess debt above payment threshold in percentages where you disconnect from your peer (default 25)
59+
## threshold in BZZ where you expect to get paid from your peers
60+
# payment-threshold: "13500000"
61+
## excess debt above payment threshold in percentages where you disconnect from your peer
4662
# payment-tolerance-percent: 25
4763
## postage stamp contract address
4864
# postage-stamp-address: ""
49-
## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
50-
# resolver-options: []
51-
## enable swap (default false)
52-
# swap-enable: false
53-
## swap blockchain endpoint (default "") [deprecated]
54-
# swap-endpoint: ""
55-
## blockchain endpoint (default "")
56-
# blockchain-rpc-endpoint: ""
57-
## swap factory address
58-
# swap-factory-address: ""
59-
## initial deposit if deploying a new chequebook (default 0)
60-
# swap-initial-deposit: 0
61-
## gas price in wei to use for deployment and funding (default "")
62-
# swap-deployment-gas-price: ""
63-
## enable tracing
64-
# tracing-enable: false
65-
## endpoint to send tracing data (default "127.0.0.1:6831")
66-
# tracing-endpoint: "127.0.0.1:6831"
67-
## service name identifier for tracing (default "bee")
68-
# tracing-service-name: "bee"
69-
## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace (default "info")
70-
# verbosity: "info"
71-
## send a welcome message string during handshakes
72-
# welcome-message: ""
73-
## triggers connection to main network
74-
# mainnet: true
75-
## minimum radius storage threshold
76-
# minimum-storage-radius: 0
77-
## reserve capacity doubling (default 0, maximum 1)
78-
reserve-capacity-doubling: 0
79-
## allow to advertise private CIDRs to the public network
80-
# allow-private-cidrs: false
81-
## enable forwarded content caching
82-
# cache-retrieval: true
83-
## enable chequebook
84-
# chequebook-enable: true
85-
## help for printconfig
86-
# help: false
87-
## suggester for target neighborhood
88-
# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
8965
## postage stamp contract start block number
9066
# postage-stamp-start-block: "0"
9167
## enable pprof mutex profile
@@ -96,6 +72,10 @@ reserve-capacity-doubling: 0
9672
# price-oracle-address: ""
9773
## redistribution contract address
9874
# redistribution-address: ""
75+
## reserve capacity doubling
76+
# reserve-capacity-doubling: 0
77+
## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
78+
# resolver-options: []
9979
## forces the node to resync postage contract data
10080
# resync: false
10181
## staking contract address
@@ -106,17 +86,37 @@ reserve-capacity-doubling: 0
10686
# static-nodes: []
10787
## enable storage incentives feature
10888
# storage-incentives-enable: true
89+
## gas price in wei to use for deployment and funding
90+
# swap-deployment-gas-price: ""
91+
## enable swap
92+
# swap-enable: false
93+
## swap blockchain endpoint
94+
# swap-endpoint: ""
95+
## swap factory addresses
96+
# swap-factory-address: ""
97+
## initial deposit if deploying a new chequebook
98+
# swap-initial-deposit: "0"
10999
## neighborhood to target in binary format (ex: 111111001) for mining the initial overlay
110100
# target-neighborhood: ""
101+
## enable tracing
102+
# tracing-enable: false
103+
## endpoint to send tracing data
104+
# tracing-endpoint: 127.0.0.1:6831
111105
## host to send tracing data
112106
# tracing-host: ""
113107
## port to send tracing data
114108
# tracing-port: ""
109+
## service name identifier for tracing
110+
# tracing-service-name: bee
115111
## skips the gas estimate step for contract transactions
116112
# transaction-debug-mode: false
117113
## bootstrap node using postage snapshot from the network
118114
# use-postage-snapshot: false
115+
## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace
116+
# verbosity: info
119117
## time to warmup the node before some major protocols can be kicked off
120-
# warmup-time: 30s
118+
# warmup-time: 5m0s
119+
## send a welcome message string during handshakes
120+
# welcome-message: ""
121121
## withdrawal target addresses
122122
# withdrawal-addresses-whitelist: []

‎packaging/docker/env‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
## HTTP API listen address (default 127.0.0.1:1633)
66
# BEE_API_ADDR=127.0.0.1:1633
7-
## chain block time (default 15)
8-
# BEE_BLOCK_TIME=15
9-
## initial nodes to connect to (default [/dnsaddr/testnet.ethswarm.org])
10-
# BEE_BOOTNODE=[/dnsaddr/testnet.ethswarm.org]
7+
## chain block time (default 5)
8+
# BEE_BLOCK_TIME=5
9+
## initial nodes to connect to (default [/dnsaddr/mainnet.ethswarm.org])
10+
# BEE_BOOTNODE=[/dnsaddr/mainnet.ethswarm.org]
1111
## cause the node to always accept incoming connections
1212
# BEE_BOOTNODE_MODE=false
1313
## config file (default is /home/<user>/.bee.yaml)

‎packaging/homebrew-amd64/bee.yaml‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,67 @@
11
## Bee configuration - https://docs.ethswarm.org/docs/working-with-bee/configuration
22

3-
## HTTP API listen address (default "127.0.0.1:1633")
4-
# api-addr: "127.0.0.1:1633"
5-
## chain block time (default 15)
6-
# block-time: 15
7-
## initial nodes to connect to (default ["/dnsaddr/mainnet.ethswarm.org"])
3+
## allow to advertise private CIDRs to the public network
4+
# allow-private-cidrs: false
5+
## HTTP API listen address
6+
# api-addr: 127.0.0.1:1633
7+
## chain block time
8+
# block-time: "5"
9+
## rpc blockchain endpoint
10+
# blockchain-rpc-endpoint: ""
11+
## initial nodes to connect to
812
# bootnode: ["/dnsaddr/mainnet.ethswarm.org"]
913
## cause the node to always accept incoming connections
1014
# bootnode-mode: false
11-
## config file (default is /home/<user>/.bee.yaml)
15+
## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
16+
# cache-capacity: "1000000"
17+
## enable forwarded content caching
18+
# cache-retrieval: true
19+
## enable chequebook
20+
# chequebook-enable: true
21+
## config file (default is $HOME/.bee.yaml)
1222
config: "/usr/local/etc/swarm-bee/bee.yaml"
1323
## origins with CORS headers enabled
1424
# cors-allowed-origins: []
15-
## data directory (default "/home/<user>/.bee")
25+
## data directory
1626
data-dir: "/usr/local/var/lib/swarm-bee"
17-
## cache capacity in chunks, multiply by 4096 to get approximate capacity in bytes
18-
# cache-capacity: 1000000
19-
## number of open files allowed by database
20-
# db-open-files-limit: 200
2127
## size of block cache of the database in bytes
22-
# db-block-cache-capacity: 33554432
23-
## size of the database write buffer in bytes
24-
# db-write-buffer-size: 33554432
28+
# db-block-cache-capacity: "33554432"
2529
## disables db compactions triggered by seeks
26-
# db-disable-seeks-compaction: false
30+
# db-disable-seeks-compaction: true
31+
## number of open files allowed by database
32+
# db-open-files-limit: "200"
33+
## size of the database write buffer in bytes
34+
# db-write-buffer-size: "33554432"
2735
## cause the node to start in full mode
2836
# full-node: false
37+
## help for printconfig
38+
# help: false
39+
## triggers connect to main net bootnodes.
40+
# mainnet: true
41+
## minimum radius storage threshold
42+
# minimum-storage-radius: "0"
2943
## NAT exposed address
3044
# nat-addr: ""
31-
## ID of the Swarm network (default 1)
32-
# network-id: 1
33-
## P2P listen address (default ":1634")
34-
# p2p-addr: ":1634"
45+
## suggester for target neighborhood
46+
# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
47+
## ID of the Swarm network
48+
# network-id: "1"
49+
## P2P listen address
50+
# p2p-addr: :1634
3551
## enable P2P WebSocket transport
3652
# p2p-ws-enable: false
3753
## password for decrypting keys
3854
# password: ""
3955
## path to a file that contains password for decrypting keys
4056
password-file: "/usr/local/var/lib/swarm-bee/password"
41-
## percentage below the peers payment threshold when we initiate settlement (default 50)
57+
## percentage below the peers payment threshold when we initiate settlement
4258
# payment-early-percent: 50
43-
## 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
44-
# payment-threshold: 13500000
45-
## excess debt above payment threshold in percentages where you disconnect from your peer (default 25)
59+
## threshold in BZZ where you expect to get paid from your peers
60+
# payment-threshold: "13500000"
61+
## excess debt above payment threshold in percentages where you disconnect from your peer
4662
# payment-tolerance-percent: 25
4763
## postage stamp contract address
4864
# postage-stamp-address: ""
49-
## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
50-
# resolver-options: []
51-
## enable swap (default false)
52-
# swap-enable: false
53-
## swap blockchain endpoint (default "") [deprecated]
54-
# swap-endpoint: ""
55-
## blockchain rpc endpoint (default "")
56-
# blockchain-rpc-endpoint: ""
57-
## swap factory address
58-
# swap-factory-address: ""
59-
## initial deposit if deploying a new chequebook (default 0)
60-
# swap-initial-deposit: 0
61-
## gas price in wei to use for deployment and funding (default "")
62-
# swap-deployment-gas-price: ""
63-
## enable tracing
64-
# tracing-enable: false
65-
## endpoint to send tracing data (default "127.0.0.1:6831")
66-
# tracing-endpoint: "127.0.0.1:6831"
67-
## service name identifier for tracing (default "bee")
68-
# tracing-service-name: "bee"
69-
## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace (default "info")
70-
# verbosity: "info"
71-
## send a welcome message string during handshakes
72-
# welcome-message: ""
73-
## triggers connection to main network
74-
# mainnet: true
75-
# ## minimum radius storage threshold
76-
# minimum-storage-radius: 0
77-
## reserve capacity doubling (default 0, maximum 1)
78-
reserve-capacity-doubling: 0
79-
## allow to advertise private CIDRs to the public network
80-
# allow-private-cidrs: false
81-
## enable forwarded content caching
82-
# cache-retrieval: true
83-
## enable chequebook
84-
# chequebook-enable: true
85-
## help for printconfig
86-
# help: false
87-
## suggester for target neighborhood
88-
# neighborhood-suggester: https://api.swarmscan.io/v1/network/neighborhoods/suggestion
8965
## postage stamp contract start block number
9066
# postage-stamp-start-block: "0"
9167
## enable pprof mutex profile
@@ -96,6 +72,10 @@ reserve-capacity-doubling: 0
9672
# price-oracle-address: ""
9773
## redistribution contract address
9874
# redistribution-address: ""
75+
## reserve capacity doubling
76+
# reserve-capacity-doubling: 0
77+
## ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url
78+
# resolver-options: []
9979
## forces the node to resync postage contract data
10080
# resync: false
10181
## staking contract address
@@ -106,17 +86,37 @@ reserve-capacity-doubling: 0
10686
# static-nodes: []
10787
## enable storage incentives feature
10888
# storage-incentives-enable: true
89+
## gas price in wei to use for deployment and funding
90+
# swap-deployment-gas-price: ""
91+
## enable swap
92+
# swap-enable: false
93+
## swap blockchain endpoint
94+
# swap-endpoint: ""
95+
## swap factory addresses
96+
# swap-factory-address: ""
97+
## initial deposit if deploying a new chequebook
98+
# swap-initial-deposit: "0"
10999
## neighborhood to target in binary format (ex: 111111001) for mining the initial overlay
110100
# target-neighborhood: ""
101+
## enable tracing
102+
# tracing-enable: false
103+
## endpoint to send tracing data
104+
# tracing-endpoint: 127.0.0.1:6831
111105
## host to send tracing data
112106
# tracing-host: ""
113107
## port to send tracing data
114108
# tracing-port: ""
109+
## service name identifier for tracing
110+
# tracing-service-name: bee
115111
## skips the gas estimate step for contract transactions
116112
# transaction-debug-mode: false
117113
## bootstrap node using postage snapshot from the network
118114
# use-postage-snapshot: false
115+
## log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace
116+
# verbosity: info
119117
## time to warmup the node before some major protocols can be kicked off
120-
# warmup-time: 30s
118+
# warmup-time: 5m0s
119+
## send a welcome message string during handshakes
120+
# welcome-message: ""
121121
## withdrawal target addresses
122122
# withdrawal-addresses-whitelist: []

0 commit comments

Comments
 (0)