diff --git a/config/config.yaml b/config/config.yaml index 086fd2def..8f73f3cbf 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -138,7 +138,6 @@ bee-configs: swap-enable: true swap-endpoint: "ws://geth-swap.geth-swap:8546" swap-factory-address: "0x09ad42a7d020244920309ffa14ea376dd2d3b7d5" - swap-legacy-factory-addresses: "0x657241f4494a2f15ba75346e691d753a978c72df" swap-initial-deposit: 500000000000000000 tracing-enabled: true tracing-endpoint: "tempo-tempo-distributed-distributor.observability:6831" diff --git a/config/local.yaml b/config/local.yaml index 0f81ce1f4..12e7c3f07 100644 --- a/config/local.yaml +++ b/config/local.yaml @@ -189,7 +189,6 @@ bee-configs: swap-enable: true swap-endpoint: "ws://geth-swap:8546" swap-factory-address: "0x09ad42a7d020244920309ffa14ea376dd2d3b7d5" - swap-legacy-factory-addresses: "0x657241f4494a2f15ba75346e691d753a978c72df" swap-initial-deposit: 500000000000000000 verbosity: 5 welcome-message: "Welcome to the Swarm, this is a local cluster!" diff --git a/config/testnet-giant.yaml b/config/testnet-giant.yaml index 47b531ae2..a44f94368 100644 --- a/config/testnet-giant.yaml +++ b/config/testnet-giant.yaml @@ -107,7 +107,6 @@ bee-configs: swap-enable: true swap-endpoint: "ws://private-goerli-geth.private-goerli-geth:8546" swap-factory-address: "" - swap-legacy-factory-addresses: "" swap-initial-deposit: 10000000000000000 tracing-enabled: false tracing-endpoint: "tempo-tempo-distributed-distributor.observability:6831" diff --git a/config/testnet.yaml b/config/testnet.yaml index 9baeaaa7d..d5b947475 100644 --- a/config/testnet.yaml +++ b/config/testnet.yaml @@ -109,7 +109,6 @@ bee-configs: swap-enable: true swap-endpoint: "ws://private-goerli-geth.private-goerli-geth:8546" swap-factory-address: "" - swap-legacy-factory-addresses: "" swap-initial-deposit: 10000000000000000 tracing-enabled: false tracing-endpoint: "tempo-tempo-distributed-distributor.observability:6831" diff --git a/pkg/config/bee.go b/pkg/config/bee.go index f081cc9eb..f69a5557f 100644 --- a/pkg/config/bee.go +++ b/pkg/config/bee.go @@ -12,55 +12,54 @@ type BeeConfig struct { // parent to inherit settings from *Inherit `yaml:",inline"` // Bee configuration - AllowPrivateCIDRs *bool `yaml:"allow-private-cidrs"` - APIAddr *string `yaml:"api-addr"` - BlockTime *uint64 `yaml:"block-time"` - Bootnodes *string `yaml:"bootnodes"` - BootnodeMode *bool `yaml:"bootnode-mode"` - CacheCapacity *uint64 `yaml:"cache-capacity"` - ClefSignerEnable *bool `yaml:"clef-signer-enable"` - ClefSignerEndpoint *string `yaml:"clef-signer-endpoint"` - CORSAllowedOrigins *string `yaml:"cors-allowed-origins"` - DataDir *string `yaml:"data-dir"` - DbOpenFilesLimit *int `yaml:"db-open-files-limit"` - DbBlockCacheCapacity *int `yaml:"db-block-cache-capacity"` - DbWriteBufferSize *int `yaml:"db-write-buffer-size"` - DbDisableSeeksCompaction *bool `yaml:"db-disable-seeks-compaction"` - DebugAPIAddr *string `yaml:"debug-api-addr"` - DebugAPIEnable *bool `yaml:"debug-api-enable"` - FullNode *bool `yaml:"full-node"` - NATAddr *string `yaml:"nat-addr"` - Mainnet *bool `yaml:"mainnet"` - NetworkID *uint64 `yaml:"network-id"` - P2PAddr *string `yaml:"p2p-addr"` - P2PWSEnable *bool `yaml:"pwp-ws-enable"` - Password *string `yaml:"password"` - PaymentEarly *uint64 `yaml:"payment-early-percent"` - PaymentThreshold *uint64 `yaml:"payment-threshold"` - PaymentTolerance *uint64 `yaml:"payment-tolerance-percent"` - PostageStampAddress *string `yaml:"postage-stamp-address"` - PostageContractStartBlock *uint64 `yaml:"postage-stamp-start-block"` - PriceOracleAddress *string `yaml:"price-oracle-address"` - RedistributionAddress *string `yaml:"redistribution-address"` - StakingAddress *string `yaml:"staking-address"` - StorageIncentivesEnable *string `yaml:"storage-incentives-enable"` - ResolverOptions *string `yaml:"resolver-options"` - Restricted *bool `yaml:"restricted"` - TokenEncryptionKey *string `yaml:"token-encryption-key"` - AdminPassword *string `yaml:"admin-password"` - ChequebookEnable *bool `yaml:"chequebook-enable"` - SwapEnable *bool `yaml:"swap-enable"` - SwapEndpoint *string `yaml:"swap-endpoint"` - SwapDeploymentGasPrice *string `yaml:"swap-deployment-gas-price"` - SwapFactoryAddress *string `yaml:"swap-factory-address"` - SwapLegacyFactoryAddresses *string `yaml:"swap-legacy-factory-addresses"` - SwapInitialDeposit *uint64 `yaml:"swap-initial-deposit"` - TracingEnabled *bool `yaml:"tracing-enabled"` - TracingEndpoint *string `yaml:"tracing-endpoint"` - TracingServiceName *string `yaml:"tracing-service-name"` - Verbosity *uint64 `yaml:"verbosity"` - WelcomeMessage *string `yaml:"welcome-message"` - WarmupTime *time.Duration `yaml:"warmup-time"` + AllowPrivateCIDRs *bool `yaml:"allow-private-cidrs"` + APIAddr *string `yaml:"api-addr"` + BlockTime *uint64 `yaml:"block-time"` + Bootnodes *string `yaml:"bootnodes"` + BootnodeMode *bool `yaml:"bootnode-mode"` + CacheCapacity *uint64 `yaml:"cache-capacity"` + ClefSignerEnable *bool `yaml:"clef-signer-enable"` + ClefSignerEndpoint *string `yaml:"clef-signer-endpoint"` + CORSAllowedOrigins *string `yaml:"cors-allowed-origins"` + DataDir *string `yaml:"data-dir"` + DbOpenFilesLimit *int `yaml:"db-open-files-limit"` + DbBlockCacheCapacity *int `yaml:"db-block-cache-capacity"` + DbWriteBufferSize *int `yaml:"db-write-buffer-size"` + DbDisableSeeksCompaction *bool `yaml:"db-disable-seeks-compaction"` + DebugAPIAddr *string `yaml:"debug-api-addr"` + DebugAPIEnable *bool `yaml:"debug-api-enable"` + FullNode *bool `yaml:"full-node"` + NATAddr *string `yaml:"nat-addr"` + Mainnet *bool `yaml:"mainnet"` + NetworkID *uint64 `yaml:"network-id"` + P2PAddr *string `yaml:"p2p-addr"` + P2PWSEnable *bool `yaml:"pwp-ws-enable"` + Password *string `yaml:"password"` + PaymentEarly *uint64 `yaml:"payment-early-percent"` + PaymentThreshold *uint64 `yaml:"payment-threshold"` + PaymentTolerance *uint64 `yaml:"payment-tolerance-percent"` + PostageStampAddress *string `yaml:"postage-stamp-address"` + PostageContractStartBlock *uint64 `yaml:"postage-stamp-start-block"` + PriceOracleAddress *string `yaml:"price-oracle-address"` + RedistributionAddress *string `yaml:"redistribution-address"` + StakingAddress *string `yaml:"staking-address"` + StorageIncentivesEnable *string `yaml:"storage-incentives-enable"` + ResolverOptions *string `yaml:"resolver-options"` + Restricted *bool `yaml:"restricted"` + TokenEncryptionKey *string `yaml:"token-encryption-key"` + AdminPassword *string `yaml:"admin-password"` + ChequebookEnable *bool `yaml:"chequebook-enable"` + SwapEnable *bool `yaml:"swap-enable"` + SwapEndpoint *string `yaml:"swap-endpoint"` + SwapDeploymentGasPrice *string `yaml:"swap-deployment-gas-price"` + SwapFactoryAddress *string `yaml:"swap-factory-address"` + SwapInitialDeposit *uint64 `yaml:"swap-initial-deposit"` + TracingEnabled *bool `yaml:"tracing-enabled"` + TracingEndpoint *string `yaml:"tracing-endpoint"` + TracingServiceName *string `yaml:"tracing-service-name"` + Verbosity *uint64 `yaml:"verbosity"` + WelcomeMessage *string `yaml:"welcome-message"` + WarmupTime *time.Duration `yaml:"warmup-time"` } // Export exports BeeConfig to orchestration.Config diff --git a/pkg/orchestration/k8s/helpers.go b/pkg/orchestration/k8s/helpers.go index 8db3be798..267abeba6 100644 --- a/pkg/orchestration/k8s/helpers.go +++ b/pkg/orchestration/k8s/helpers.go @@ -52,7 +52,6 @@ swap-enable: {{.SwapEnable}} swap-endpoint: {{.SwapEndpoint}} swap-deployment-gas-price: {{.SwapDeploymentGasPrice}} swap-factory-address: {{.SwapFactoryAddress}} -swap-legacy-factory-addresses: {{.SwapLegacyFactoryAddresses}} swap-initial-deposit: {{.SwapInitialDeposit}} tracing-enable: {{.TracingEnabled}} tracing-endpoint: {{.TracingEndpoint}} diff --git a/pkg/orchestration/node.go b/pkg/orchestration/node.go index e375d5d2e..7f42f8ffd 100644 --- a/pkg/orchestration/node.go +++ b/pkg/orchestration/node.go @@ -113,53 +113,52 @@ type CreateOptions struct { // Config represents Bee configuration type Config struct { - AllowPrivateCIDRs bool // allow to advertise private CIDRs to the public network - APIAddr string // HTTP API listen address - BlockTime uint64 // chain block time - Bootnodes string // initial nodes to connect to - BootnodeMode bool // cause the node to always accept incoming connections - CacheCapacity uint64 // cache capacity in chunks, multiply by 4096 (MaxChunkSize) to get approximate capacity in bytes - ClefSignerEnable bool // enable clef signer - ClefSignerEndpoint string // clef signer endpoint - CORSAllowedOrigins string // origins with CORS headers enabled - DataDir string // data directory - DbOpenFilesLimit int // number of open files allowed by database - DbBlockCacheCapacity int // size of block cache of the database in bytes - DbWriteBufferSize int // size of the database write buffer in bytes - DbDisableSeeksCompaction bool // disables DB compactions triggered by seeks - DebugAPIAddr string // debug HTTP API listen address - DebugAPIEnable bool // enable debug HTTP API - FullNode bool // cause the node to start in full mode - Mainnet bool // enable mainnet - NATAddr string // NAT exposed address - NetworkID uint64 // ID of the Swarm network - P2PAddr string // P2P listen address - P2PWSEnable bool // enable P2P WebSocket transport - Password string // password for decrypting keys - PaymentEarly uint64 // amount in BZZ below the peers payment threshold when we initiate settlement - PaymentThreshold uint64 // threshold in BZZ where you expect to get paid from your peers - PaymentTolerance uint64 // excess debt above payment threshold in BZZ where you disconnect from your peer - PostageStampAddress string // postage stamp address - PostageContractStartBlock uint64 // postage stamp address - PriceOracleAddress string // price Oracle address - ResolverOptions string // ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url - Restricted bool // start node in restricted mode - TokenEncryptionKey string // username for API authentication - AdminPassword string // password hash for API authentication - ChequebookEnable bool // enable chequebook - SwapEnable bool // enable swap - SwapEndpoint string // swap ethereum blockchain endpoint - SwapDeploymentGasPrice string // gas price in wei to use for deployment and funding - SwapFactoryAddress string // swap factory address - SwapLegacyFactoryAddresses string // swap legacy factory addresses - RedistributionAddress string // redistribution address - StakingAddress string // staking address - StorageIncentivesEnable string // storage incentives enable flag - SwapInitialDeposit uint64 // initial deposit if deploying a new chequebook - TracingEnabled bool // enable tracing - TracingEndpoint string // endpoint to send tracing data - TracingServiceName string // service name identifier for tracing - Verbosity uint64 // log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace - WelcomeMessage string // send a welcome message string during handshakes - WarmupTime time.Duration // warmup time pull/pushsync protocols + AllowPrivateCIDRs bool // allow to advertise private CIDRs to the public network + APIAddr string // HTTP API listen address + BlockTime uint64 // chain block time + Bootnodes string // initial nodes to connect to + BootnodeMode bool // cause the node to always accept incoming connections + CacheCapacity uint64 // cache capacity in chunks, multiply by 4096 (MaxChunkSize) to get approximate capacity in bytes + ClefSignerEnable bool // enable clef signer + ClefSignerEndpoint string // clef signer endpoint + CORSAllowedOrigins string // origins with CORS headers enabled + DataDir string // data directory + DbOpenFilesLimit int // number of open files allowed by database + DbBlockCacheCapacity int // size of block cache of the database in bytes + DbWriteBufferSize int // size of the database write buffer in bytes + DbDisableSeeksCompaction bool // disables DB compactions triggered by seeks + DebugAPIAddr string // debug HTTP API listen address + DebugAPIEnable bool // enable debug HTTP API + FullNode bool // cause the node to start in full mode + Mainnet bool // enable mainnet + NATAddr string // NAT exposed address + NetworkID uint64 // ID of the Swarm network + P2PAddr string // P2P listen address + P2PWSEnable bool // enable P2P WebSocket transport + Password string // password for decrypting keys + PaymentEarly uint64 // amount in BZZ below the peers payment threshold when we initiate settlement + PaymentThreshold uint64 // threshold in BZZ where you expect to get paid from your peers + PaymentTolerance uint64 // excess debt above payment threshold in BZZ where you disconnect from your peer + PostageStampAddress string // postage stamp address + PostageContractStartBlock uint64 // postage stamp address + PriceOracleAddress string // price Oracle address + ResolverOptions string // ENS compatible API endpoint for a TLD and with contract address, can be repeated, format [tld:][contract-addr@]url + Restricted bool // start node in restricted mode + TokenEncryptionKey string // username for API authentication + AdminPassword string // password hash for API authentication + ChequebookEnable bool // enable chequebook + SwapEnable bool // enable swap + SwapEndpoint string // swap ethereum blockchain endpoint + SwapDeploymentGasPrice string // gas price in wei to use for deployment and funding + SwapFactoryAddress string // swap factory address + RedistributionAddress string // redistribution address + StakingAddress string // staking address + StorageIncentivesEnable string // storage incentives enable flag + SwapInitialDeposit uint64 // initial deposit if deploying a new chequebook + TracingEnabled bool // enable tracing + TracingEndpoint string // endpoint to send tracing data + TracingServiceName string // service name identifier for tracing + Verbosity uint64 // log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace + WelcomeMessage string // send a welcome message string during handshakes + WarmupTime time.Duration // warmup time pull/pushsync protocols }