Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch swap endpoint to localhost #1731

Merged
merged 4 commits into from
May 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ scoop:
- "if(!(Test-Path $persist_dir\\password)){[System.Web.Security.Membership]::GeneratePassword(32,5) | Set-Content -Path $persist_dir\\password}"
- "if(sc.exe query SwarmBeeSvc | Select-String FAILED){sc.exe create SwarmBeeSvc binPath= \"$dir\\bee.exe start --config=$persist_dir\\bee.yaml\" type= share start= auto displayName= \"Bee\"; sc.exe description SwarmBeeSvc \"Swarm client implemented in Go.\"}"
- "if($global){$ETH_ADDRESS = (((C:\\ProgramData\\scoop\\shims\\bee.exe init --config=$persist_dir\\bee.yaml | Select-String ethereum) -split ' ‘)[-1]).Trim('\"')} else {$ETH_ADDRESS = (((bee.exe init --config=$persist_dir\\bee.yaml | Select-String ethereum) -split ' ‘)[-1]).Trim('\"')}; Write-Host \"Please make sure there is sufficient eth and bzz available on $ETH_ADDRESS address.\nLearn how to fund your node by visiting our docs at https://docs.ethswarm.org/docs/installation/fund-your-node\""
- "Write-Host \"Obtain a free Infura account and set: swap-endpoint: wss://goerli.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx inside $persist_dir\\bee.yaml\""
- "Write-Host \"After the initial fund deploy Bee chequebook with [sudo] $dir\\bee.exe deploy --config=$persist_dir\\bee.yaml\""
- "Write-Host 'Start Bee service with [sudo] sc.exe start SwarmBeeSvc'"

Expand All @@ -195,7 +196,9 @@ brews:
Logs: #{var}/log/swarm-bee/bee.log
Config: #{etc}/swarm-bee/bee.yaml

Bee has SWAP enabled and by default is using slock.it goerli ethereum endpoint.
Bee requires an Ethereum endpoint to function. By default is using ws://localhost:8546 ethereum endpoint.
If needed obtain a free Infura account and set:
`swap-endpoint: wss://goerli.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`
It is recommended to use external signer with bee.
Check documentation for more info:
- SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives
Expand Down
2 changes: 1 addition & 1 deletion cmd/bee/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
cmd.Flags().Bool(optionNameClefSignerEnable, false, "enable clef signer")
cmd.Flags().String(optionNameClefSignerEndpoint, "", "clef signer endpoint")
cmd.Flags().String(optionNameClefSignerEthereumAddress, "", "ethereum address to use from clef signer")
cmd.Flags().String(optionNameSwapEndpoint, "http://localhost:8545", "swap ethereum blockchain endpoint")
cmd.Flags().String(optionNameSwapEndpoint, "ws://localhost:8546", "swap ethereum blockchain endpoint")
cmd.Flags().String(optionNameSwapFactoryAddress, "", "swap factory addresses")
cmd.Flags().StringSlice(optionNameSwapLegacyFactoryAddresses, nil, "legacy swap factory addresses")
cmd.Flags().String(optionNameSwapInitialDeposit, "10000000000000000", "initial deposit if deploying a new chequebook")
Expand Down
4 changes: 2 additions & 2 deletions packaging/bee.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ password-file: /var/lib/bee/password
# standalone: false
## enable swap (default true)
# swap-enable: true
## swap ethereum blockchain endpoint (default "http://localhost:8545")
swap-endpoint: https://rpc.slock.it/goerli
## swap ethereum blockchain endpoint (default "ws://localhost:8546")
vandot marked this conversation as resolved.
Show resolved Hide resolved
# swap-endpoint: ws://localhost:8546
## swap factory address
# swap-factory-address: ""
## initial deposit if deploying a new chequebook (default 10000000000000000)
Expand Down
5 changes: 3 additions & 2 deletions packaging/deb/postinst
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ if [ "$1" = "configure" ]; then
Logs: journalctl -f -u bee.service
Config: /etc/bee/bee.yaml

Bee has SWAP enabled and by default is using slock.it goerli ethereum endpoint.
Bee requires an Ethereum endpoint to function. By default is using ws://localhost:8546 ethereum endpoint.
If needed obtain a free Infura account and set:
`swap-endpoint: wss://goerli.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`
It is recommended to use external signer with bee.
Check documentation for more info:
- SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives
- External signer https://docs.ethswarm.org/docs/installation/bee-clef

After you finish configuration run 'sudo bee-get-addr'.
Expand Down
2 changes: 1 addition & 1 deletion packaging/default
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Configuration for bee daemon

#BEE_SWAP_ENDPOINT=http://localhost:8545
#BEE_SWAP_ENDPOINT=ws://localhost:8546
#BEE_RESOLVER_OPTIONS=
4 changes: 2 additions & 2 deletions packaging/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Set all configuration variables inside `.env`

`clef` is configured with `CLEF_CHAINID=5` for goerli

To configure `bee` set:
- `BEE_SWAP_ENDPOINT=https://rpc.slock.it/goerli`
Bee requires an Ethereum endpoint to function. Obtain a free Infura account and set:
- `BEE_SWAP_ENDPOINT=wss://goerli.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`

Set bee password by either setting `BEE_PASSWORD` or `BEE_PASSWORD_FILE`

Expand Down
4 changes: 2 additions & 2 deletions packaging/docker/env
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ BEE_CLEF_SIGNER_ENABLE=true
# BEE_STANDALONE=false
## enable swap (default true)
# BEE_SWAP_ENABLE=true
## swap ethereum blockchain endpoint (default http://localhost:8545)
# BEE_SWAP_ENDPOINT=http://localhost:8545
## swap ethereum blockchain endpoint (default ws://localhost:8546)
# BEE_SWAP_ENDPOINT=ws://localhost:8546
## swap factory address
# BEE_SWAP_FACTORY_ADDRESS=
## initial deposit if deploying a new chequebook (default 100000000)
Expand Down
4 changes: 2 additions & 2 deletions packaging/homebrew/bee.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ password-file: /usr/local/var/lib/swarm-bee/password
# standalone: false
## enable swap (default true)
# swap-enable: true
## swap ethereum blockchain endpoint (default "http://localhost:8545")
swap-endpoint: https://rpc.slock.it/goerli
## swap ethereum blockchain endpoint (default "ws://localhost:8546")
# swap-endpoint: ws://localhost:8546
## swap factory address
# swap-factory-address: ""
## initial deposit if deploying a new chequebook (default 10000000000000000)
Expand Down
4 changes: 3 additions & 1 deletion packaging/rpm/post
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ if [ $1 -eq 1 ] ; then
Logs: journalctl -f -u bee.service
Config: /etc/bee/bee.yaml

Bee has SWAP enabled and by default is using slock.it goerli ethereum endpoint.
Bee requires an Ethereum endpoint to function. By default is using ws://localhost:8546 ethereum endpoint.
If needed obtain a free Infura account and set:
`swap-endpoint: wss://goerli.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx`
It is recommended to use external signer with bee.
Check documentation for more info:
- SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives
Expand Down
4 changes: 2 additions & 2 deletions packaging/scoop/bee.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ password-file: ./password
# standalone: false
## enable swap (default true)
# swap-enable: true
## swap ethereum blockchain endpoint (default "http://localhost:8545")
swap-endpoint: https://rpc.slock.it/goerli
## swap ethereum blockchain endpoint (default "ws://localhost:8546")
# swap-endpoint: ws://localhost:8546
## swap factory address
# swap-factory-address: ""
## initial deposit if deploying a new chequebook (default 10000000000000000)
Expand Down