From 1a63e70ea3d2262fe9be59c1dcb7ccd2365520c8 Mon Sep 17 00:00:00 2001 From: Derek May <32908855+riddlez666@users.noreply.github.com> Date: Tue, 13 Mar 2018 14:19:15 -0700 Subject: [PATCH] testnet --- core/genesis.go | 8 ++++---- eth/config.go | 2 +- eth/protocol.go | 7 +++++-- params/bootnodes.go | 9 +-------- params/config.go | 35 ++++++++++++++++++----------------- params/version.go | 6 +++--- 6 files changed, 32 insertions(+), 35 deletions(-) diff --git a/core/genesis.go b/core/genesis.go index b6ead2250a..4e872b9714 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -312,10 +312,10 @@ func GenesisBlockForTesting(db ethdb.Database, addr common.Address, balance *big func DefaultGenesisBlock() *Genesis { return &Genesis{ Config: params.MainnetChainConfig, - Nonce: 66, - ExtraData: hexutil.MustDecode("0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa"), - GasLimit: 5000, - Difficulty: big.NewInt(17179869184), + Nonce: 64, + ExtraData: hexutil.MustDecode("0x0000000000000000000000000000000000000000000000000000000000000000"), + GasLimit: 3141592, + Difficulty: big.NewInt(1073741824), Alloc: decodePrealloc(mainnetAllocData), } } diff --git a/eth/config.go b/eth/config.go index dd7f42c7d9..067caba407 100644 --- a/eth/config.go +++ b/eth/config.go @@ -43,7 +43,7 @@ var DefaultConfig = Config{ DatasetsInMem: 1, DatasetsOnDisk: 2, }, - NetworkId: 1, + NetworkId: 87766, LightPeers: 100, DatabaseCache: 768, TrieCache: 256, diff --git a/eth/protocol.go b/eth/protocol.go index cd7db57f23..8fee837fa8 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -43,8 +43,11 @@ var ProtocolVersions = []uint{eth63, eth62} // Number of implemented message corresponding to different protocol versions. var ProtocolLengths = []uint64{17, 8} -const ProtocolMaxMsgSize = 10 * 1024 * 1024 // Maximum cap on the size of a protocol message - +//const ProtocolMaxMsgSize = 10 * 1024 * 1024 // Maximum cap on the size of a protocol message +const ( + NetworkId = 87766 + ProtocolMaxMsgSize = 10 * 1024 * 1024 // Maximum cap on the size of a protocol message +) // eth protocol message codes const ( // Protocol messages belonging to eth/62 diff --git a/params/bootnodes.go b/params/bootnodes.go index c7190ae670..cea4db9f7a 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -20,14 +20,7 @@ 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 - - // Ethereum Foundation C++ Bootnodes - "enode://979b7fa28feeb35a4741660a16076f1943202cb72b6af70d327f053e248bab9ba81760f39d0701ef1d8f89cc1fbd2cacba0710a12cd5314d5e0c9021aa3637f9@5.1.83.226:30303", // DE + "enode://fba5bbff0f302105be69ca689c0724d95591e314bd87295237085dd1972f7ebe2f13a231c5a1817a7b1fca6500c1ab56c6ead2de34db3d849a4035b0e7e4a07f@154.20.195.166:30303", // OSO } // TestnetBootnodes are the enode URLs of the P2P bootstrap nodes running on the diff --git a/params/config.go b/params/config.go index dc02c7ca37..cc4b5f19cb 100644 --- a/params/config.go +++ b/params/config.go @@ -24,39 +24,40 @@ import ( ) var ( - MainnetGenesisHash = common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3") // Mainnet genesis hash to enforce below configs on - TestnetGenesisHash = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d") // Testnet genesis hash to enforce below configs on + MainnetGenesisHash = common.HexToHash("0x42b6a7d113fe1f4acc35da7d8f542d5d19794047433726451c25925ef2783dcd") // Mainnet genesis hash to enforce below configs on + TestnetGenesisHash = common.HexToHash("0x42b6a7d113fe1f4acc35da7d8f542d5d19794047433726451c25925ef2783dcd") // Testnet genesis hash to enforce below configs on ) var ( // MainnetChainConfig is the chain parameters to run a node on the main network. MainnetChainConfig = &ChainConfig{ - ChainId: big.NewInt(1), - HomesteadBlock: big.NewInt(1150000), - DAOForkBlock: big.NewInt(1920000), - DAOForkSupport: true, - EIP150Block: big.NewInt(2463000), - EIP150Hash: common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0"), - EIP155Block: big.NewInt(2675000), - EIP158Block: big.NewInt(2675000), - ByzantiumBlock: big.NewInt(4370000), + ChainId: big.NewInt(87766), + HomesteadBlock: big.NewInt(0), + DAOForkBlock: nil, + DAOForkSupport: false, + EIP150Block: big.NewInt(0), + EIP150Hash: common.HexToHash("0x42b6a7d113fe1f4acc35da7d8f542d5d19794047433726451c25925ef2783dcd"), + EIP155Block: big.NewInt(0), + EIP158Block: big.NewInt(0), + ByzantiumBlock: nil, ConstantinopleBlock: nil, Ethash: new(EthashConfig), } // TestnetChainConfig contains the chain parameters to run a node on the Ropsten test network. TestnetChainConfig = &ChainConfig{ - ChainId: big.NewInt(3), + ChainId: big.NewInt(87766), HomesteadBlock: big.NewInt(0), DAOForkBlock: nil, - DAOForkSupport: true, + DAOForkSupport: false, EIP150Block: big.NewInt(0), - EIP150Hash: common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d"), - EIP155Block: big.NewInt(10), - EIP158Block: big.NewInt(10), - ByzantiumBlock: big.NewInt(1700000), + EIP150Hash: common.HexToHash("0x42b6a7d113fe1f4acc35da7d8f542d5d19794047433726451c25925ef2783dcd"), + EIP155Block: big.NewInt(0), + EIP158Block: big.NewInt(0), + ByzantiumBlock: nil, ConstantinopleBlock: nil, Ethash: new(EthashConfig), + } // RinkebyChainConfig contains the chain parameters to run a node on the Rinkeby test network. diff --git a/params/version.go b/params/version.go index 921d075996..c1eabd739c 100644 --- a/params/version.go +++ b/params/version.go @@ -22,9 +22,9 @@ import ( const ( VersionMajor = 1 // Major version component of the current release - VersionMinor = 8 // Minor version component of the current release - VersionPatch = 3 // Patch version component of the current release - VersionMeta = "unstable" // Version metadata to append to the version string + VersionMinor = 0 // Minor version component of the current release + VersionPatch = 0 // Patch version component of the current release + VersionMeta = "usable" // Version metadata to append to the version string ) // Version holds the textual version string.