Skip to content

Commit d9730c0

Browse files
author
Yunshi Sun
authored
Merge pull request #64 from renproject/release/0.3.8
Release/0.3.8
2 parents 28a5a37 + a286c30 commit d9730c0

6 files changed

Lines changed: 15 additions & 33 deletions

File tree

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.7
1+
3.0.8

‎artifacts/install.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ cputype="$(uname -m)"
2323

2424
# download darknode binary depending on the system and architecture
2525
if [ "$ostype" = 'Linux' -a "$cputype" = 'x86_64' ]; then
26-
TERRAFORM_URL='https://releases.hashicorp.com/terraform/0.12.12/terraform_0.12.12_linux_amd64.zip'
26+
TERRAFORM_URL='https://releases.hashicorp.com/terraform/0.12.24/terraform_0.12.24_linux_amd64.zip'
2727
curl -sL 'https://www.github.com/renproject/darknode-cli/releases/latest/download/darknode_linux_amd64' > ./bin/darknode
2828
elif [ "$ostype" = 'Linux' -a "$cputype" = 'aarch64' ]; then
29-
TERRAFORM_URL='https://releases.hashicorp.com/terraform/0.12.12/terraform_0.12.12_linux_arm.zip'
29+
TERRAFORM_URL='https://releases.hashicorp.com/terraform/0.12.24/terraform_0.12.24_linux_arm.zip'
3030
curl -sL 'https://www.github.com/renproject/darknode-cli/releases/latest/download/darknode_linux_arm' > ./bin/darknode
3131
elif [ "$ostype" = 'Darwin' -a "$cputype" = 'x86_64' ]; then
32-
TERRAFORM_URL='https://releases.hashicorp.com/terraform/0.12.12/terraform_0.12.12_darwin_amd64.zip'
32+
TERRAFORM_URL='https://releases.hashicorp.com/terraform/0.12.24/terraform_0.12.24_darwin_amd64.zip'
3333
curl -sL 'https://www.github.com/renproject/darknode-cli/releases/latest/download/darknode_darwin_amd64' > ./bin/darknode
3434
else
3535
echo 'unsupported OS type or architecture'

‎cmd/flag.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ var (
2121
}
2222
NetworkFlag = cli.StringFlag{
2323
Name: "network",
24-
Value: "chaosnet",
25-
Usage: "Network of your Darknode (default: chaosnet)",
24+
Value: "mainnet",
25+
Usage: "Network of your Darknode (default: mainnet)",
2626
}
2727
AddressFlag = cli.StringFlag{
2828
Name: "address",

‎cmd/provider/provider.go‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,3 @@ func outputURL(name string) error {
152152
color.Green("Join the network by registering your Darknode at %s", url)
153153
return util.OpenInBrowser(url)
154154
}
155-
156-
func ipfsUrl(network darknode.Network) string {
157-
switch network {
158-
case darknode.Mainnet:
159-
panic("unsupported")
160-
case darknode.Chaosnet:
161-
return "http://157.245.76.68:8080/ipns/QmVq3uLmSpxQoz7Zk7RBaeiBb1DVaKVcCSkPGZKG9xbqvy"
162-
case darknode.Testnet:
163-
return "http://178.128.49.72:8080/ipns/QmU955UGWJFbnEJZMHszhWTP9YBiaxqs2g4Hiw2AP3jXwn"
164-
case darknode.Devnet:
165-
return "http://178.128.49.72:8080/ipns/Qma5uQ7HL87FbuDQZhvQQzc4wyoXY4P7YfKRSCoBy6qgFv"
166-
default:
167-
panic("unknown network")
168-
}
169-
}

‎darknode/network.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const (
2323
// with real-world incentives and punishments.
2424
Chaosnet = Network("chaosnet")
2525

26-
// Mainnet is production network.
26+
// Mainnet is the production network.
2727
Mainnet = Network("mainnet")
2828
)
2929

@@ -47,7 +47,8 @@ func (network Network) BootstrapNodes() []addr.MultiAddress {
4747
bootstraps := make([]addr.MultiAddress, 0, 16)
4848
switch network {
4949
case Mainnet:
50-
panic("unimplemented")
50+
b1, _ := addr.NewSignedMultiAddressFromString("/ip4/63.34.3.233/tcp/18514/ren/8MHeT3SETNbiYLDNCWeJfgH7WZGxp2", "g6WQ7vT1Oa3bRn2IfrsHEaQsQB+ukublxc3VcQvKuEkia/m8ozdAQ+ae7+rJXgv9Xa7gK53sgGK0IWNa9dhUTQA=")
51+
bootstraps = append(bootstraps, b1)
5152
case Chaosnet:
5253
b1, _ := addr.NewSignedMultiAddressFromString("/ip4/3.115.117.251/tcp/18514/ren/8MGrkr3CCG5gxnipWD5RUc8BMQnU1s", "3w8PoELIeSh0sqcb6qONy1FNgSIgP9hELVh44D/IE0saY518C9vWvBYSQn4xUmYRb7Y+nYNPY54NoH1y0zMnXAE=")
5354
b2, _ := addr.NewSignedMultiAddressFromString("/ip4/18.182.28.215/tcp/18514/ren/8MGjmhtNxsqT4NphYt3usvJBXqVTeS", "YntncxzVBMHA+QNwgkdAQc95gSoWXrdf7r1T38+rtYkuCud5EkV7tWy0GDLeSKCvEuOpVtdPFlaVHXQyYNPwVAA=")
@@ -96,13 +97,13 @@ func (network Network) BootstrapNodes() []addr.MultiAddress {
9697
func (network Network) ProtocolAddr() common.Address {
9798
switch network {
9899
case Mainnet:
99-
panic("unimplemented")
100+
return common.HexToAddress("0xc25167fFa19B4d9d03c7d5aa4682c7063F345b66")
100101
case Chaosnet:
101-
return common.HexToAddress("0xeF4de0E97D92757520D78c4d49d8151964f6a85B")
102+
return common.HexToAddress("0xf61e97c464ec0cf48b33262c3a1ef42114275144")
102103
case Testnet:
103-
return common.HexToAddress("0x8E28748620EA6f1285761AF41f311Cf6d05b188B")
104+
return common.HexToAddress("0x59e23c087cA9bd9ce162875811CD6e99134D6d0F")
104105
case Devnet:
105-
return common.HexToAddress("0x1deb773b50b66b0e65e62e41380355a1a2bed2e1")
106+
return common.HexToAddress("0x5045E727D9D9AcDe1F6DCae52B078EC30dC95455")
106107
default:
107108
panic("unknown network")
108109
}

‎go.sum‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
108108
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
109109
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
110110
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
111+
github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
111112
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
112113
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
113114
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
@@ -198,6 +199,7 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa
198199
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
199200
github.com/onsi/gomega v1.6.0 h1:8XTW0fcJZEq9q+Upcyws4JSGua2MFysCL5xkaSgHc+M=
200201
github.com/onsi/gomega v1.6.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
202+
github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
201203
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
202204
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
203205
github.com/oschwald/maxminddb-golang v1.3.1/go.mod h1:3jhIUymTJ5VREKyIhWm66LJiQt04F0UCDdodShpjWsY=
@@ -218,13 +220,10 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
218220
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
219221
github.com/prometheus/tsdb v0.10.0 h1:If5rVCMTp6W2SiRAQFlbpJNgVlgMEd+U2GZckwK38ic=
220222
github.com/prometheus/tsdb v0.10.0/go.mod h1:oi49uRhEe9dPUTlS3JRZOwJuVi6tmh10QSgwXEyGCt4=
221-
github.com/renproject/aw v0.2.4 h1:kOJVNHs28B//5wY1CesC2IPwGYnHZP8H9XtExCa4N1Y=
222-
github.com/renproject/aw v0.2.4/go.mod h1:I3azBybw/W3wWC4/xRxgZFFQrAshVgnUWUqUOSeESWE=
223223
github.com/renproject/aw v0.3.7 h1:KRqeAs/ALx2EtdCHH5PqVe+tpSTclOxUDexN7O4NndI=
224224
github.com/renproject/aw v0.3.7/go.mod h1:CpgAzPcLoCoOEf9HsMMhVtWXuIGTZ1eqAGSPegmj5YI=
225225
github.com/renproject/id v0.1.1 h1:KaV31Xp7SSlyUs5O0vHIw9rhhzrJ0lTOkQXVgbgyPEU=
226226
github.com/renproject/id v0.1.1/go.mod h1:i4OJzgjl4XLcU7nfU9UshX7PaBVpnTk3gEVj8dKa6f8=
227-
github.com/renproject/kv v1.0.0/go.mod h1:B+LKu5xLj9t65LrbsSyzTcgLcPdWCd0qxFEtNB7NRo8=
228227
github.com/renproject/kv v1.0.2 h1:0t8FYMPBQnzwN/DrlHN1MLvRTaN5U5Q8USoMa7gkwo8=
229228
github.com/renproject/kv v1.0.2/go.mod h1:B+LKu5xLj9t65LrbsSyzTcgLcPdWCd0qxFEtNB7NRo8=
230229
github.com/renproject/kv v1.1.0 h1:xaEVeieSSuJrTFj/uvPveyB/gLqEqurJhQLoOKJF8/s=
@@ -287,10 +286,7 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
287286
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
288287
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
289288
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
290-
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
291289
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
292-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
293-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
294290
golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708 h1:pXVtWnwHkrWD9ru3sDxY/qFK/bfc0egRovX91EjWjf4=
295291
golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
296292
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

0 commit comments

Comments
 (0)