Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
671fd94e
Commit
671fd94e
authored
Dec 01, 2016
by
Nick Johnson
Committed by
Felix Lange
Dec 01, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
swarm/api: Update ENS root address for Ropsten & prod (#3391)
parent
717d2f6f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
config.go
swarm/api/config.go
+3
-4
config_test.go
swarm/api/config_test.go
+1
-1
No files found.
swarm/api/config.go
View file @
671fd94e
...
...
@@ -35,9 +35,8 @@ const (
port
=
"8500"
)
// by default ens root is north internal
var
(
toyNetEnsRoot
=
common
.
HexToAddress
(
"0xd344889e0be3e9ef6c26b0f60ef66a32e83c1b69
"
)
ensRootAddress
=
common
.
HexToAddress
(
"0x112234455c3a32fd11230c42e7bccd4a84e02010
"
)
)
// separate bzz directories
...
...
@@ -82,7 +81,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
Swap
:
swap
.
DefaultSwapParams
(
contract
,
prvKey
),
PublicKey
:
pubkeyhex
,
BzzKey
:
keyhex
,
EnsRoot
:
toyNetEnsRoot
,
EnsRoot
:
ensRootAddress
,
NetworkId
:
networkId
,
}
data
,
err
=
ioutil
.
ReadFile
(
confpath
)
...
...
@@ -113,7 +112,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
self
.
Swap
.
SetKey
(
prvKey
)
if
(
self
.
EnsRoot
==
common
.
Address
{})
{
self
.
EnsRoot
=
toyNetEnsRoot
self
.
EnsRoot
=
ensRootAddress
}
return
...
...
swarm/api/config_test.go
View file @
671fd94e
...
...
@@ -83,7 +83,7 @@ var (
"Port": "8500",
"PublicKey": "0x045f5cfd26692e48d0017d380349bcf50982488bc11b5145f3ddf88b24924299048450542d43527fbe29a5cb32f38d62755393ac002e6bfdd71b8d7ba725ecd7a3",
"BzzKey": "0xe861964402c0b78e2d44098329b8545726f215afa737d803714a4338552fcb81",
"EnsRoot": "0x
d344889e0be3e9ef6c26b0f60ef66a32e83c1b69
",
"EnsRoot": "0x
112234455c3a32fd11230c42e7bccd4a84e02010
",
"NetworkId": 323
}`
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment