diff --git a/consensus/ethash/algorithm.go b/consensus/ubqhash/algorithm.go similarity index 100% rename from consensus/ethash/algorithm.go rename to consensus/ubqhash/algorithm.go diff --git a/consensus/ethash/algorithm_go1.7.go b/consensus/ubqhash/algorithm_go1.7.go similarity index 100% rename from consensus/ethash/algorithm_go1.7.go rename to consensus/ubqhash/algorithm_go1.7.go diff --git a/consensus/ethash/algorithm_go1.8.go b/consensus/ubqhash/algorithm_go1.8.go similarity index 100% rename from consensus/ethash/algorithm_go1.8.go rename to consensus/ubqhash/algorithm_go1.8.go diff --git a/consensus/ethash/algorithm_go1.8_test.go b/consensus/ubqhash/algorithm_go1.8_test.go similarity index 100% rename from consensus/ethash/algorithm_go1.8_test.go rename to consensus/ubqhash/algorithm_go1.8_test.go diff --git a/consensus/ethash/algorithm_test.go b/consensus/ubqhash/algorithm_test.go similarity index 100% rename from consensus/ethash/algorithm_test.go rename to consensus/ubqhash/algorithm_test.go diff --git a/consensus/ethash/consensus.go b/consensus/ubqhash/consensus.go similarity index 100% rename from consensus/ethash/consensus.go rename to consensus/ubqhash/consensus.go diff --git a/consensus/ethash/consensus_test.go b/consensus/ubqhash/consensus_test.go similarity index 100% rename from consensus/ethash/consensus_test.go rename to consensus/ubqhash/consensus_test.go diff --git a/consensus/ethash/ethash.go b/consensus/ubqhash/ethash.go similarity index 100% rename from consensus/ethash/ethash.go rename to consensus/ubqhash/ethash.go diff --git a/consensus/ethash/ethash_test.go b/consensus/ubqhash/ethash_test.go similarity index 100% rename from consensus/ethash/ethash_test.go rename to consensus/ubqhash/ethash_test.go diff --git a/consensus/ethash/sealer.go b/consensus/ubqhash/sealer.go similarity index 100% rename from consensus/ethash/sealer.go rename to consensus/ubqhash/sealer.go diff --git a/params/config.go b/params/config.go index 2aff614f86..6eb20d3573 100644 --- a/params/config.go +++ b/params/config.go @@ -25,19 +25,19 @@ import ( ) var ( - MainnetGenesisHash = common.HexToHash("0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3") // Mainnet genesis hash to enforce below configs on + MainnetGenesisHash = common.HexToHash("0x406f1b7dd39fca54d8c702141851ed8b755463ab5b560e6f19b963b4047418af") // Mainnet genesis hash to enforce below configs on TestnetGenesisHash = common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d") // 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), - EIP150Block: big.NewInt(2463000), - EIP150Hash: common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0"), - EIP155Block: big.NewInt(2675000), - EIP158Block: big.NewInt(2675000), + ChainId: big.NewInt(8), + HomesteadBlock: big.NewInt(0), + EIP150Block: big.NewInt(0), + EIP150Hash: common.HexToHash("0x406f1b7dd39fca54d8c702141851ed8b755463ab5b560e6f19b963b4047418af"), + EIP155Block: big.NewInt(10), + EIP158Block: big.NewInt(10), MetropolisBlock: big.NewInt(math.MaxInt64), // Don't enable yet Ubqhash: new(UbqhashConfig), @@ -80,8 +80,8 @@ var ( // means that all fields must be set at all times. This forces // anyone adding flags to the config to also have to set these // fields. - AllProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(math.MaxInt64) /*disabled*/, new(UbqhashConfig), nil} - TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), nil, new(UbqhashConfig), nil} + AllProtocolChanges = &ChainConfig{big.NewInt(1337), big.NewInt(0), big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(math.MaxInt64) /*disabled*/, new(UbqhashConfig), nil} + TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), nil, new(UbqhashConfig), nil} TestRules = TestChainConfig.Rules(new(big.Int)) )