aboutsummaryrefslogtreecommitdiffstats
path: root/swarm/api/config.go
diff options
context:
space:
mode:
authorLewis Marshall <lewis@lmars.net>2017-06-18 06:25:39 +0800
committerLewis Marshall <lewis@lmars.net>2017-06-26 18:51:33 +0800
commitf3359d5e585eef09648c7a06a6d3911704f61e73 (patch)
tree3f36e858799621da5df214f428e6dda5be27a173 /swarm/api/config.go
parentfeb29327066d6076d1802cdc1492d43a39cec276 (diff)
downloadgo-tangerine-f3359d5e585eef09648c7a06a6d3911704f61e73.tar
go-tangerine-f3359d5e585eef09648c7a06a6d3911704f61e73.tar.gz
go-tangerine-f3359d5e585eef09648c7a06a6d3911704f61e73.tar.bz2
go-tangerine-f3359d5e585eef09648c7a06a6d3911704f61e73.tar.lz
go-tangerine-f3359d5e585eef09648c7a06a6d3911704f61e73.tar.xz
go-tangerine-f3359d5e585eef09648c7a06a6d3911704f61e73.tar.zst
go-tangerine-f3359d5e585eef09648c7a06a6d3911704f61e73.zip
cmd/swarm: Support using Mainnet for resolving ENS names
Signed-off-by: Lewis Marshall <lewis@lmars.net>
Diffstat (limited to 'swarm/api/config.go')
-rw-r--r--swarm/api/config.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/swarm/api/config.go b/swarm/api/config.go
index 647c153ed..d8d25b1c8 100644
--- a/swarm/api/config.go
+++ b/swarm/api/config.go
@@ -25,6 +25,7 @@ import (
"path/filepath"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/contracts/ens"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/swarm/network"
"github.com/ethereum/go-ethereum/swarm/services/swap"
@@ -36,10 +37,6 @@ const (
DefaultHTTPPort = "8500"
)
-var (
- ensRootAddress = common.HexToAddress("0x112234455c3a32fd11230c42e7bccd4a84e02010")
-)
-
// separate bzz directories
// allow several bzz nodes running in parallel
type Config struct {
@@ -84,7 +81,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
Swap: swap.DefaultSwapParams(contract, prvKey),
PublicKey: pubkeyhex,
BzzKey: keyhex,
- EnsRoot: ensRootAddress,
+ EnsRoot: ens.TestNetAddress,
NetworkId: networkId,
}
data, err = ioutil.ReadFile(confpath)
@@ -129,7 +126,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
self.Swap.SetKey(prvKey)
if (self.EnsRoot == common.Address{}) {
- self.EnsRoot = ensRootAddress
+ self.EnsRoot = ens.TestNetAddress
}
return