Merge pull request #4832 from ethereum/registrar

Remove obsolete regstrar field form chain params

Author: chfast

libethcore/ChainOperationParams.cpp

@@ -49,8 +49,7 @@ ChainOperationParams::ChainOperationParams():
 	networkID(0x0),
 	minimumDifficulty(0x020000),
 	difficultyBoundDivisor(0x0800),
-	durationLimit(0x0d),
-	registrar("0x5e70c0bbcd5636e0f9f9316e9f8633feb64d4050")
+	durationLimit(0x0d)
 {
 }
 

libethcore/ChainOperationParams.h

@@ -101,7 +101,6 @@ struct ChainOperationParams
 	u256 difficultyBoundDivisor;
 	u256 durationLimit;
 	bool allowFutureBlocks = false;
-	u256 registrar;
 
 	/// Precompiled contracts as specified in the chain params.
 	std::unordered_map<Address, PrecompiledContract> precompiled;

libethereum/ChainParams.cpp

@@ -82,13 +82,12 @@ string const c_durationLimit = "durationLimit";
 string const c_chainID = "chainID";
 string const c_networkID = "networkID";
 string const c_allowFutureBlocks = "allowFutureBlocks";
-string const c_registrar = "registrar";
 
 set<string> const c_knownParamNames = {c_minGasLimit, c_maxGasLimit, c_gasLimitBoundDivisor,
     c_homesteadForkBlock, c_EIP150ForkBlock, c_EIP158ForkBlock, c_accountStartNonce,
     c_maximumExtraDataSize, c_tieBreakingGas, c_blockReward, c_byzantiumForkBlock, c_eWASMForkBlock,
     c_constantinopleForkBlock, c_daoHardforkBlock, c_minimumDifficulty, c_difficultyBoundDivisor,
-    c_durationLimit, c_chainID, c_networkID, c_allowFutureBlocks, c_registrar};
+    c_durationLimit, c_chainID, c_networkID, c_allowFutureBlocks};
 } // anonymous namespace
 
 ChainParams ChainParams::loadConfig(
@@ -128,7 +127,6 @@ ChainParams ChainParams::loadConfig(
 	setOptionalU256Parameter(cp.minimumDifficulty, c_minimumDifficulty);
 	setOptionalU256Parameter(cp.difficultyBoundDivisor, c_difficultyBoundDivisor);
 	setOptionalU256Parameter(cp.durationLimit, c_durationLimit);
-	setOptionalU256Parameter(cp.registrar, c_registrar);
 
 	if (params.count(c_chainID))
 		cp.chainID = int(u256(fromBigEndian<u256>(fromHex(params.at(c_chainID).get_str()))));

libethereum/GenesisInfo.cpp

@@ -40,7 +40,6 @@ R"E(
 		"difficultyBoundDivisor": "0x0800",
 		"durationLimit": "0x0d",
 		"blockReward": "0x4563918244F40000",
-		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
 		"networkID" : "0x1"
 	},
 	"genesis": {