Merge pull request #2742 from CJentzsch/fixDefaultGasPrice

set 50 shannon as default gasPrice

alethzero/MainWin.cpp

@@ -859,9 +859,8 @@ void Main::readSettings(bool _skipGeometry)
 	{
 		p->readSettings(s);
 	});
-
-	static_cast<TrivialGasPricer*>(ethereum()->gasPricer().get())->setAsk(u256(s.value("askPrice", "500000000000").toString().toStdString()));
-	static_cast<TrivialGasPricer*>(ethereum()->gasPricer().get())->setBid(u256(s.value("bidPrice", "500000000000").toString().toStdString()));
+	static_cast<TrivialGasPricer*>(ethereum()->gasPricer().get())->setAsk(u256(s.value("askPrice", QString::fromStdString(toString(c_defaultGasPrice))).toString().toStdString()));
+	static_cast<TrivialGasPricer*>(ethereum()->gasPricer().get())->setBid(u256(s.value("bidPrice", QString::fromStdString(toString(c_defaultGasPrice))).toString().toStdString()));
 
 	ui->upnp->setChecked(s.value("upnp", true).toBool());
 	ui->forcePublicIP->setText(s.value("forceAddress", "").toString());

eth/main.cpp

@@ -153,8 +153,8 @@ void help()
 		/*<< "    -B,--block-fees <n>  Set the block fee profit in the reference unit e.g. ¢ (default: 15)." << endl
 		<< "    -e,--ether-price <n>  Set the ether price in the reference unit e.g. ¢ (default: 30.679)." << endl
 		<< "    -P,--priority <0 - 100>  Default % priority of a transaction (default: 50)." << endl*/
-		<< "    --ask <wei>  Set the minimum ask gas price under which no transactions will be mined (default 500000000000)." << endl
-		<< "    --bid <wei>  Set the bid gas price for to pay for transactions (default 500000000000)." << endl
+		<< "    --ask <wei>  Set the minimum ask gas price under which no transactions will be mined (default " << toString(c_defaultGasPrice) << " )." << endl
+		<< "    --bid <wei>  Set the bid gas price for to pay for transactions (default " << toString(c_defaultGasPrice) << " )." << endl
 		<< endl
 		<< "Client mining:" << endl
 		<< "    -a,--address <addr>  Set the coinbase (mining payout) address to addr (default: auto)." << endl
@@ -384,8 +384,8 @@ int main(int argc, char** argv)
 	TransactionPriority priority = TransactionPriority::Medium;
 //	double etherPrice = 30.679;
 //	double blockFees = 15.0;
-	u256 askPrice("500000000000");
-	u256 bidPrice("500000000000");
+	u256 askPrice = c_defaultGasPrice;
+	u256 bidPrice = c_defaultGasPrice;
 
 	// javascript console
 	bool useConsole = false;