Skip to content

Commit

Permalink
prepare gilt for go live. (set bootnodes, genesis settings and rewards)
Browse files Browse the repository at this point in the history
  • Loading branch information
mariameda committed Apr 9, 2018
1 parent 10624b1 commit 5c18a8b
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ethdir="$workspace/src/github.com/NiluPlatform"
if [ ! -L "$ethdir/go-nilu" ]; then
mkdir -p "$ethdir"
cd "$ethdir"
ln -s ../../../../../. go-ethereum
ln -s ../../../../../. go-nilu
cd "$root"
fi

Expand Down
2 changes: 1 addition & 1 deletion consensus/ethash/consensus.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
// Ethash proof-of-work protocol constants.
var (
FrontierBlockReward *big.Int = big.NewInt(5e+18) // Block reward in wei for successfully mining a block
ByzantiumBlockReward *big.Int = big.NewInt(3e+18) // Block reward in wei for successfully mining a block upward from Byzantium
ByzantiumBlockReward *big.Int = big.NewInt(8e+18) // Block reward in wei for successfully mining a block upward from Byzantium
maxUncles = 2 // Maximum number of uncles allowed in a single block
allowedFutureBlockTime = 15 * time.Second // Max time from current time allowed for blocks, before they're considered future blocks
)
Expand Down
2 changes: 1 addition & 1 deletion core/genesis_alloc.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ package core
// Use mkalloc.go to create/update them.

// nolint: misspell
const mainnetAllocData = "\xe1\xe0\x94\xc2\xd7\u03d5d]3\x00au\xb7\x89\x89\x03\\|\x90a\xd3\xf9\x8a\xbc:\xc3b}E\x00\xe3\x8e8"
const mainnetAllocData = "\xc0"
const testnetAllocData = "\xe1\xe0\x94\xc2\xd7\u03d5d]3\x00au\xb7\x89\x89\x03\\|\x90a\xd3\xf9\x8a\xbc:\xc3b}E\x00\xe3\x8e8"
const rinkebyAllocData = "\xe1\xe0\x94\xc2\xd7\u03d5d]3\x00au\xb7\x89\x89\x03\\|\x90a\xd3\xf9\x8a\xbc:\xc3b}E\x00\xe3\x8e8"
2 changes: 1 addition & 1 deletion eth/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var DefaultConfig = Config{
DatasetsInMem: 1,
DatasetsOnDisk: 2,
},
NetworkId: 42,
NetworkId: 512,
LightPeers: 20,
DatabaseCache: 128,
GasPrice: big.NewInt(18 * params.Shannon),
Expand Down
2 changes: 1 addition & 1 deletion internal/ethapi/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,7 @@ func (s *PublicTransactionPoolAPI) GetRawTransactionByHash(ctx context.Context,
func (s *PublicTransactionPoolAPI) GetTransactionReceipt(hash common.Hash) (map[string]interface{}, error) {
tx, blockHash, blockNumber, index := core.GetTransaction(s.b.ChainDb(), hash)
if tx == nil {
return nil, errors.New("unknown transaction")
return nil, nil
}
receipt, _, _, _ := core.GetReceipt(s.b.ChainDb(), hash) // Old receipts don't have the lookup data available
if receipt == nil {
Expand Down
14 changes: 4 additions & 10 deletions params/bootnodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,10 @@ package params
// the main Ethereum network.
var MainnetBootnodes = []string{
// Ethereum Foundation Go Bootnodes
//"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303", // IE
//"enode://3f1d12044546b76342d59d4a05532c14b85aa669704bfe1f864fe079415aa2c02d743e03218e57a33fb94523adb54032871a6c51b2cc5514cb7c7e35b3ed0a99@13.93.211.84:30303", // US-WEST
//"enode://78de8a0916848093c73790ead81d1928bec737d565119932b98c6b100d944b7a95e94f847f689fc723399d2e31129d182f7ef3863f2b4c820abbf3ab2722344d@191.235.84.50:30303", // BR
//"enode://158f8aab45f6d19c6cbf4a089c2670541a8da11978a2f90dbf6a502a4a3bab80d288afdbeb7ec0ef6d92de563767f3b1ea9e8e334ca711e9f8e2df5a0385e8e6@13.75.154.138:30303", // AU
//"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303", // SG
//"enode://76a37d170c97c3b04785bc501cc570b81f7d257949638d9c8a569edcc41a4a59ac27d4bb20cb84d2a8996e59b0702c97cc0cea50b60a9204c5ba266d81a348c8@164.132.141.202:30303",
//"enode://60048d19e50b65ac5467098631177c1449aec197f63ffa55dda82d76d511d36b99139e6060e3cefbb3b8784924032ad7cbdf75e02ed958cf6124bc25755c140a@164.132.141.202:30301",
"enode://7ec59ac77c538690cb28930d811831c75d453a57f71f5f9f3c53d9e8405aa21fcb9beef48074b8c5411b484d36a6b6856832dc7cb074f2ef207946fbf3feb07c@164.132.141.202:30303",
// Ethereum Foundation C++ Bootnodes
//"enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303", // DE
"enode://71a64f683569a5a4c059cef490e1e86522a67aef18185f6a61cf8a3d6596e2758ef4d34acf3618caeb051d78bc876c0f9617a0903d08509b4e87d8f48928c58a@164.132.141.202:30303",
"enode://cf9bc560173c84d7cfa2967ada380a1abae7d13a084440a9f6ebfcf774b29feed214b7f0adf899a985b398416f099b5ee10f34e2412ae1a12c859c71f1c79cf8@209.250.234.227:30303",
"enode://88755850d21d6da35ef8e8d9539fb0208ca7a548572fbfb637949aec719032f1c500fbc346a59d37977ceb55d237135ee47e21d4fc0cab85a63ec9231201c3c7@45.77.177.233:30303",
"enode://85a8da1273b26e2d0cc65651b1ddfc6311194cc00cc76dd122bb9da685abb3ce81f9c325ad260df48e1068117dc1df05989e269786bdf69cfe8423a8ef446123@144.202.1.133:30303",
}

// TestnetBootnodes are the enode URLs of the P2P bootstrap nodes running on the
Expand Down
2 changes: 1 addition & 1 deletion params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var (
var (
// MainnetChainConfig is the chain parameters to run a node on the main network.
MainnetChainConfig = &ChainConfig{
ChainId: big.NewInt(42),
ChainId: big.NewInt(512),
HomesteadBlock: big.NewInt(0),
DAOForkBlock: big.NewInt(0),
DAOForkSupport: false,
Expand Down

0 comments on commit 5c18a8b

Please sign in to comment.