swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Merge with changes that implement config file PR #15548. Field *EnsApi string* in swarm/api.Config is replaced with *EnsAPIs []string*. A new field *EnsDisabled bool* is added to swarm/api.Config for easy way to disable ENS resolving with config file. Signature of function swarm.NewSwarm is changed and simplified.
Showing
- .github/CODEOWNERS 9 additions, 0 deletions.github/CODEOWNERS
- .travis.yml 12 additions, 16 deletions.travis.yml
- README.md 1 addition, 1 deletionREADME.md
- VERSION 1 addition, 1 deletionVERSION
- accounts/keystore/account_cache.go 22 additions, 91 deletionsaccounts/keystore/account_cache.go
- accounts/keystore/account_cache_test.go 11 additions, 1 deletionaccounts/keystore/account_cache_test.go
- accounts/keystore/file_cache.go 102 additions, 0 deletionsaccounts/keystore/file_cache.go
- accounts/keystore/keystore_passphrase.go 7 additions, 0 deletionsaccounts/keystore/keystore_passphrase.go
- accounts/keystore/watch.go 5 additions, 1 deletionaccounts/keystore/watch.go
- accounts/manager.go 5 additions, 5 deletionsaccounts/manager.go
- build/ci.go 12 additions, 4 deletionsbuild/ci.go
- cmd/faucet/faucet.go 22 additions, 3 deletionscmd/faucet/faucet.go
- cmd/faucet/faucet.html 7 additions, 10 deletionscmd/faucet/faucet.html
- cmd/faucet/website.go 1 addition, 1 deletioncmd/faucet/website.go
- cmd/geth/accountcmd.go 17 additions, 4 deletionscmd/geth/accountcmd.go
- cmd/geth/consolecmd.go 14 additions, 1 deletioncmd/geth/consolecmd.go
- cmd/puppeth/genesis.go 379 additions, 0 deletionscmd/puppeth/genesis.go
- cmd/puppeth/module_dashboard.go 258 additions, 49 deletionscmd/puppeth/module_dashboard.go
- cmd/puppeth/module_ethstats.go 16 additions, 18 deletionscmd/puppeth/module_ethstats.go
- cmd/puppeth/module_explorer.go 211 additions, 0 deletionscmd/puppeth/module_explorer.go
Loading
Please register or sign in to comment