Skip to content
This repository has been archived by the owner on Apr 4, 2022. It is now read-only.

Commit

Permalink
Final blockchain version
Browse files Browse the repository at this point in the history
  • Loading branch information
webchain-network committed May 8, 2018
1 parent 44904c6 commit 97c88fd
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 19 deletions.
3 changes: 2 additions & 1 deletion cmd/bootnode/main.go
View file
@@ -1,4 +1,5 @@
// Copyright 2015 The go-ethereum Authors
// Copyright 2018 Webchain project
// This file is part of Webchain.
//
// Webchain is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -35,7 +36,7 @@ import (
var Version = "unknown"

var (
listenAddr = flag.String("addr", ":31340", "listen address")
listenAddr = flag.String("addr", ":31440", "listen address")
genKey = flag.String("genkey", "", "generate a node key and quit")
nodeKeyFile = flag.String("nodekey", "", "private key filename")
nodeKeyHex = flag.String("nodekeyhex", "", "private key as hex (for testing)")
Expand Down
2 changes: 1 addition & 1 deletion cmd/webchaind/flags.go
View file
Expand Up @@ -332,7 +332,7 @@ var (
ListenPortFlag = cli.IntFlag{
Name: "port",
Usage: "Network listening port",
Value: 31340,
Value: 31440,
}
BootnodesFlag = cli.StringFlag{
Name: "bootnodes",
Expand Down
18 changes: 9 additions & 9 deletions core/assets/assets.go
View file
Expand Up @@ -149,15 +149,15 @@ func init() {
0x22, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x6e,
0x63, 0x65, 0x22, 0x3a, 0x20, 0x30, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d,
0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6e, 0x65, 0x74, 0x77, 0x6f,
0x72, 0x6b, 0x22, 0x3a, 0x20, 0x33, 0x37, 0x30, 0x32, 0x39, 0x2c, 0x0a,
0x72, 0x6b, 0x22, 0x3a, 0x20, 0x33, 0x37, 0x31, 0x32, 0x39, 0x2c, 0x0a,
0x20, 0x20, 0x20, 0x20, 0x22, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x6e, 0x73,
0x75, 0x73, 0x22, 0x3a, 0x20, 0x22, 0x63, 0x72, 0x79, 0x70, 0x74, 0x6f,
0x6e, 0x69, 0x67, 0x68, 0x74, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20,
0x22, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x22, 0x3a, 0x20, 0x7b,
0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x6e, 0x6f,
0x6e, 0x63, 0x65, 0x22, 0x3a, 0x20, 0x22, 0x30, 0x78, 0x30, 0x30, 0x30,
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x34,
0x31, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x33, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x22, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x3a,
0x20, 0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x22, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68,
Expand All @@ -174,10 +174,10 @@ func init() {
0x22, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x22, 0x61, 0x6c, 0x6c, 0x6f, 0x63, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22,
0x37, 0x62, 0x36, 0x63, 0x39, 0x65, 0x35, 0x39, 0x39, 0x65, 0x66, 0x31,
0x30, 0x38, 0x63, 0x32, 0x37, 0x66, 0x33, 0x33, 0x64, 0x38, 0x37, 0x38,
0x34, 0x39, 0x31, 0x63, 0x30, 0x32, 0x38, 0x30, 0x31, 0x36, 0x39, 0x39,
0x63, 0x38, 0x66, 0x35, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
0x38, 0x63, 0x63, 0x34, 0x31, 0x35, 0x64, 0x35, 0x35, 0x38, 0x31, 0x35,
0x64, 0x30, 0x39, 0x32, 0x64, 0x35, 0x39, 0x64, 0x31, 0x66, 0x66, 0x36,
0x36, 0x62, 0x64, 0x37, 0x35, 0x31, 0x62, 0x61, 0x65, 0x35, 0x31, 0x39,
0x63, 0x39, 0x65, 0x63, 0x22, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
0x20, 0x22, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x3a, 0x20,
0x22, 0x33, 0x35, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
Expand Down Expand Up @@ -243,7 +243,7 @@ func init() {
0x31, 0x30, 0x63, 0x37, 0x66, 0x35, 0x35, 0x62, 0x34, 0x35, 0x66, 0x35,
0x38, 0x36, 0x65, 0x36, 0x61, 0x64, 0x31, 0x34, 0x62, 0x32, 0x30, 0x37,
0x31, 0x62, 0x63, 0x40, 0x32, 0x31, 0x32, 0x2e, 0x33, 0x32, 0x2e, 0x32,
0x35, 0x35, 0x2e, 0x38, 0x30, 0x3a, 0x33, 0x31, 0x33, 0x34, 0x30, 0x22,
0x35, 0x35, 0x2e, 0x38, 0x30, 0x3a, 0x33, 0x31, 0x34, 0x34, 0x30, 0x22,
0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x65,
0x6e, 0x6f, 0x64, 0x65, 0x3a, 0x2f, 0x2f, 0x33, 0x33, 0x66, 0x31, 0x63,
0x36, 0x61, 0x39, 0x66, 0x63, 0x37, 0x65, 0x33, 0x32, 0x30, 0x37, 0x30,
Expand All @@ -257,13 +257,13 @@ func init() {
0x36, 0x62, 0x35, 0x63, 0x63, 0x37, 0x31, 0x30, 0x32, 0x34, 0x38, 0x35,
0x38, 0x34, 0x39, 0x32, 0x66, 0x33, 0x35, 0x63, 0x36, 0x33, 0x37, 0x33,
0x37, 0x64, 0x34, 0x40, 0x32, 0x31, 0x32, 0x2e, 0x33, 0x32, 0x2e, 0x32,
0x35, 0x35, 0x2e, 0x31, 0x39, 0x35, 0x3a, 0x33, 0x31, 0x33, 0x34, 0x30,
0x35, 0x35, 0x2e, 0x31, 0x39, 0x35, 0x3a, 0x33, 0x31, 0x34, 0x34, 0x30,
0x22, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x5d, 0x0a, 0x7d, 0x0a,
},
fi: FileInfo{
name: "mainnet.json",
size: 1438,
modTime: time.Unix(0, 1525417117387550803),
modTime: time.Unix(0, 1525764862297964526),
isDir: false,
},
}, "/core/config/morden.json": File{
Expand Down
10 changes: 5 additions & 5 deletions core/config/mainnet.json
View file
Expand Up @@ -4,18 +4,18 @@
"state": {
"startingNonce": 0
},
"network": 37029,
"network": 37129,
"consensus": "cryptonight",
"genesis": {
"nonce": "0x0000000000000041",
"nonce": "0x0000000000000043",
"timestamp": "",
"parentHash": "",
"extraData": "",
"gasLimit": "0x03000000",
"difficulty": "0x000001",
"coinbase": "",
"alloc": {
"7b6c9e599ef108c27f33d878491c02801699c8f5": {
"8cc415d55815d092d59d1ff66bd751bae519c9ec": {
"balance": "350000000000000000000000000"
}
}
Expand All @@ -40,7 +40,7 @@
]
},
"bootstrap": [
"enode://c6ec9af50be804e32b73f0a24f145b55035d48da4497f9f1cdfd8dfe669288dd0ad39918bfd59a32e4a068daaec146e23381c10c7f55b45f586e6ad14b2071bc@212.32.255.80:31340",
"enode://33f1c6a9fc7e32070b8dfa654ddd18fd3cc8c11f9f21d371414634e8caca758a4166c5caca7f555c0d8481e80452492d1b4fb6b5cc71024858492f35c63737d4@212.32.255.195:31340"
"enode://c6ec9af50be804e32b73f0a24f145b55035d48da4497f9f1cdfd8dfe669288dd0ad39918bfd59a32e4a068daaec146e23381c10c7f55b45f586e6ad14b2071bc@212.32.255.80:31440",
"enode://33f1c6a9fc7e32070b8dfa654ddd18fd3cc8c11f9f21d371414634e8caca758a4166c5caca7f555c0d8481e80452492d1b4fb6b5cc71024858492f35c63737d4@212.32.255.195:31440"
]
}
2 changes: 1 addition & 1 deletion eth/backend.go
View file
Expand Up @@ -233,7 +233,7 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
var genName string
if fmt.Sprintf("%x", genesis.Hash()) == "0cd786a2425d16f152c658316c423e6ce1181e15c3295826d7c9904cba9ce303" {
genName = "morden testnet"
} else if fmt.Sprintf("%x", genesis.Hash()) == "d4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3" {
} else if fmt.Sprintf("%x", genesis.Hash()) == "78e066e78f30695e6c4218db4af16a670085b58e592378e864b40156b87a4c19" {
genName = "mainnet"
} else {
genName = "custom"
Expand Down
3 changes: 2 additions & 1 deletion eth/protocol.go
View file
@@ -1,4 +1,5 @@
// Copyright 2014 The go-ethereum Authors
// Copyright 2018 Webchain project
// This file is part of Webchain.
//
// Webchain is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -42,7 +43,7 @@ var ProtocolVersions = []uint{eth63, eth62}
var ProtocolLengths = []uint64{17, 8}

const (
NetworkId = 37029
NetworkId = 37129
ProtocolMaxMsgSize = 10 * 1024 * 1024 // Maximum cap on the size of a protocol message
)

Expand Down
3 changes: 2 additions & 1 deletion p2p/discover/udp.go
View file
@@ -1,4 +1,5 @@
// Copyright 2015 The go-ethereum Authors
// Copyright 2018 Webchain project
// This file is part of Webchain.
//
// Webchain is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -33,7 +34,7 @@ import (
"github.com/webchain-network/webchaind/rlp"
)

const Version = 44
const Version = 45

// Errors
var (
Expand Down

0 comments on commit 97c88fd

Please sign in to comment.