lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove minGasPrice

cl-refactor
Gav Wood 10 years ago
parent
7521f3856d
commit
fa78d8bb9a
10 changed files with 16 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      alethzero/MainWin.cpp
  2. 6
      eth/main.cpp
  3. 18
      libethcore/BlockInfo.cpp
  4. 4
      libethcore/BlockInfo.h
  5. 2
      libethcore/CommonEth.cpp
  6. 4
      libethereum/BlockChain.cpp
  7. 7
      libethereum/Executive.cpp
  8. 1
      libethereum/State.cpp
  9. 1
      libweb3jsonrpc/WebThreeStubServer.cpp
  10. 12
      neth/main.cpp

1
alethzero/MainWin.cpp
View File

@ -1259,7 +1259,6 @@ void Main::on_blocks_currentItemChanged()
s << "<br/>D/TD: <b>2^" << log2((double)info.difficulty) << "</b>/<b>2^" << log2((double)details.totalDifficulty) << "</b>"; s << "<br/>D/TD: <b>2^" << log2((double)info.difficulty) << "</b>/<b>2^" << log2((double)details.totalDifficulty) << "</b>";
s << "&nbsp;&emsp;&nbsp;Children: <b>" << details.children.size() << "</b></h5>"; s << "&nbsp;&emsp;&nbsp;Children: <b>" << details.children.size() << "</b></h5>";
s << "<br/>Gas used/limit: <b>" << info.gasUsed << "</b>/<b>" << info.gasLimit << "</b>"; s << "<br/>Gas used/limit: <b>" << info.gasUsed << "</b>/<b>" << info.gasLimit << "</b>";
s << "&nbsp;&emsp;&nbsp;Minimum gas price: <b>" << formatBalance(info.minGasPrice) << "</b>";
s << "<br/>Coinbase: <b>" << pretty(info.coinbaseAddress).toHtmlEscaped().toStdString() << "</b> " << info.coinbaseAddress; s << "<br/>Coinbase: <b>" << pretty(info.coinbaseAddress).toHtmlEscaped().toStdString() << "</b> " << info.coinbaseAddress;
s << "<br/>Nonce: <b>" << info.nonce << "</b>"; s << "<br/>Nonce: <b>" << info.nonce << "</b>";
s << "<br/>Parent: <b>" << info.parentHash << "</b>"; s << "<br/>Parent: <b>" << info.parentHash << "</b>";

6
eth/main.cpp
View File

@ -498,8 +498,6 @@ int main(int argc, char** argv)
if (size > 0) if (size > 0)
cwarn << "Invalid address length:" << size; cwarn << "Invalid address length:" << size;
} }
else if (gasPrice < info.minGasPrice)
cwarn << "Minimum gas price is" << info.minGasPrice;
else if (gas < minGas) else if (gas < minGas)
cwarn << "Minimum gas amount is" << minGas; cwarn << "Minimum gas amount is" << minGas;
else if (ssize < 40) else if (ssize < 40)
@ -561,7 +559,7 @@ int main(int argc, char** argv)
BlockInfo info(blockData); BlockInfo info(blockData);
u256 minGas = (u256)Client::txGas(0, 0); u256 minGas = (u256)Client::txGas(0, 0);
Address dest = h160(fromHex(hexAddr)); Address dest = h160(fromHex(hexAddr));
c->transact(us.secret(), amount, dest, bytes(), minGas, info.minGasPrice); c->transact(us.secret(), amount, dest, bytes(), minGas);
} }
} }
else else
@ -601,8 +599,6 @@ int main(int argc, char** argv)
u256 minGas = (u256)Client::txGas(init.size(), 0); u256 minGas = (u256)Client::txGas(init.size(), 0);
if (endowment < 0) if (endowment < 0)
cwarn << "Invalid endowment"; cwarn << "Invalid endowment";
else if (gasPrice < info.minGasPrice)
cwarn << "Minimum gas price is" << info.minGasPrice;
else if (gas < minGas) else if (gas < minGas)
cwarn << "Minimum gas amount is" << minGas; cwarn << "Minimum gas amount is" << minGas;
else else

18
libethcore/BlockInfo.cpp
View File

@ -58,9 +58,9 @@ h256 BlockInfo::headerHashWithoutNonce() const
void BlockInfo::streamRLP(RLPStream& _s, bool _nonce) const void BlockInfo::streamRLP(RLPStream& _s, bool _nonce) const
{ {
_s.appendList(_nonce ? 15 : 14) _s.appendList(_nonce ? 14 : 13)
<< parentHash << sha3Uncles << coinbaseAddress << stateRoot << transactionsRoot << receiptsRoot << logBloom << parentHash << sha3Uncles << coinbaseAddress << stateRoot << transactionsRoot << receiptsRoot << logBloom
<< difficulty << number << minGasPrice << gasLimit << gasUsed << timestamp << extraData; << difficulty << number << gasLimit << gasUsed << timestamp << extraData;
if (_nonce) if (_nonce)
_s << nonce; _s << nonce;
} }
@ -86,12 +86,11 @@ void BlockInfo::populateFromHeader(RLP const& _header, bool _checkNonce)
logBloom = _header[field = 6].toHash<h512>(); logBloom = _header[field = 6].toHash<h512>();
difficulty = _header[field = 7].toInt<u256>(); difficulty = _header[field = 7].toInt<u256>();
number = _header[field = 8].toInt<u256>(); number = _header[field = 8].toInt<u256>();
minGasPrice = _header[field = 9].toInt<u256>(); gasLimit = _header[field = 9].toInt<u256>();
gasLimit = _header[field = 10].toInt<u256>(); gasUsed = _header[field = 10].toInt<u256>();
gasUsed = _header[field = 11].toInt<u256>(); timestamp = _header[field = 11].toInt<u256>();
timestamp = _header[field = 12].toInt<u256>(); extraData = _header[field = 12].toBytes();
extraData = _header[field = 13].toBytes(); nonce = _header[field = 13].toHash<h256>();
nonce = _header[field = 14].toHash<h256>();
} }
catch (Exception const& _e) catch (Exception const& _e)
@ -147,9 +146,6 @@ void BlockInfo::verifyInternals(bytesConstRef _block) const
if (transactionsRoot != t.root()) if (transactionsRoot != t.root())
BOOST_THROW_EXCEPTION(InvalidTransactionsHash(t.root(), transactionsRoot)); BOOST_THROW_EXCEPTION(InvalidTransactionsHash(t.root(), transactionsRoot));
if (minGasPrice > mgp)
BOOST_THROW_EXCEPTION(InvalidMinGasPrice(minGasPrice, mgp));
if (sha3Uncles != sha3(root[2].data())) if (sha3Uncles != sha3(root[2].data()))
BOOST_THROW_EXCEPTION(InvalidUnclesHash()); BOOST_THROW_EXCEPTION(InvalidUnclesHash());
} }

4
libethcore/BlockInfo.h
View File

@ -66,7 +66,6 @@ public:
h512 logBloom; // TODO LogBloom - get include h512 logBloom; // TODO LogBloom - get include
u256 difficulty; u256 difficulty;
u256 number; u256 number;
u256 minGasPrice;
u256 gasLimit; u256 gasLimit;
u256 gasUsed; u256 gasUsed;
u256 timestamp; u256 timestamp;
@ -95,7 +94,6 @@ public:
logBloom == _cmp.logBloom && logBloom == _cmp.logBloom &&
difficulty == _cmp.difficulty && difficulty == _cmp.difficulty &&
number == _cmp.number && number == _cmp.number &&
minGasPrice == _cmp.minGasPrice &&
gasLimit == _cmp.gasLimit && gasLimit == _cmp.gasLimit &&
gasUsed == _cmp.gasUsed && gasUsed == _cmp.gasUsed &&
timestamp == _cmp.timestamp && timestamp == _cmp.timestamp &&
@ -122,7 +120,7 @@ public:
inline std::ostream& operator<<(std::ostream& _out, BlockInfo const& _bi) inline std::ostream& operator<<(std::ostream& _out, BlockInfo const& _bi)
{ {
_out << _bi.hash << " " << _bi.parentHash << " " << _bi.sha3Uncles << " " << _bi.coinbaseAddress << " " << _bi.stateRoot << " " << _bi.transactionsRoot << " " << _out << _bi.hash << " " << _bi.parentHash << " " << _bi.sha3Uncles << " " << _bi.coinbaseAddress << " " << _bi.stateRoot << " " << _bi.transactionsRoot << " " <<
_bi.receiptsRoot << " " << _bi.logBloom << " " << _bi.difficulty << " " << _bi.number << " " << _bi.minGasPrice << " " << _bi.gasLimit << " " << _bi.receiptsRoot << " " << _bi.logBloom << " " << _bi.difficulty << " " << _bi.number << " " << _bi.gasLimit << " " <<
_bi.gasUsed << " " << _bi.timestamp << " " << _bi.nonce; _bi.gasUsed << " " << _bi.timestamp << " " << _bi.nonce;
return _out; return _out;
} }

2
libethcore/CommonEth.cpp
View File

@ -33,7 +33,7 @@ namespace dev
namespace eth namespace eth
{ {
const unsigned c_protocolVersion = 44; const unsigned c_protocolVersion = 45;
const unsigned c_databaseVersion = 4; const unsigned c_databaseVersion = 4;
static const vector<pair<u256, string>> g_units = static const vector<pair<u256, string>> g_units =

4
libethereum/BlockChain.cpp
View File

@ -101,9 +101,9 @@ bytes BlockChain::createGenesisBlock()
stateRoot = state.root(); stateRoot = state.root();
} }
block.appendList(15) block.appendList(14)
// TODO: maybe make logbloom correct? // TODO: maybe make logbloom correct?
<< h256() << EmptyListSHA3 << h160() << stateRoot << EmptyTrie << EmptyTrie << LogBloom() << c_genesisDifficulty << 0 << 0 << 1000000 << 0 << (unsigned)0 << string() << sha3(bytes(1, 42)); << h256() << EmptyListSHA3 << h160() << stateRoot << EmptyTrie << EmptyTrie << LogBloom() << c_genesisDifficulty << 0 << 0 << 0 << (unsigned)0 << string() << sha3(bytes(1, 42));
block.appendRaw(RLPEmptyList); block.appendRaw(RLPEmptyList);
block.appendRaw(RLPEmptyList); block.appendRaw(RLPEmptyList);
return block.out(); return block.out();

7
libethereum/Executive.cpp
View File

@ -58,13 +58,6 @@ bool Executive::setup(bytesConstRef _rlp)
BOOST_THROW_EXCEPTION(InvalidNonce(nonceReq, m_t.nonce())); BOOST_THROW_EXCEPTION(InvalidNonce(nonceReq, m_t.nonce()));
} }
// Don't like transactions whose gas price is too low. NOTE: this won't stay here forever - it's just until we get a proper gas price discovery protocol going.
if (m_t.gasPrice() < m_s.m_currentBlock.minGasPrice)
{
clog(StateDetail) << "Offered gas-price is too low: Require >" << m_s.m_currentBlock.minGasPrice << " Got" << m_t.gasPrice();
BOOST_THROW_EXCEPTION(GasPriceTooLow());
}
// Check gas cost is enough. // Check gas cost is enough.
u256 gasCost = m_t.data().size() * c_txDataGas + c_txGas; u256 gasCost = m_t.data().size() * c_txDataGas + c_txGas;

1
libethereum/State.cpp
View File

@ -501,7 +501,6 @@ void State::resetCurrent()
m_currentBlock.timestamp = time(0); m_currentBlock.timestamp = time(0);
m_currentBlock.transactionsRoot = h256(); m_currentBlock.transactionsRoot = h256();
m_currentBlock.sha3Uncles = h256(); m_currentBlock.sha3Uncles = h256();
m_currentBlock.minGasPrice = 10 * szabo;
m_currentBlock.populateFromParent(m_previousBlock); m_currentBlock.populateFromParent(m_previousBlock);
// Update timestamp according to clock. // Update timestamp according to clock.

1
libweb3jsonrpc/WebThreeStubServer.cpp
View File

@ -51,7 +51,6 @@ static Json::Value toJson(dev::eth::BlockInfo const& _bi)
res["transactionsRoot"] = toJS(_bi.transactionsRoot); res["transactionsRoot"] = toJS(_bi.transactionsRoot);
res["difficulty"] = toJS(_bi.difficulty); res["difficulty"] = toJS(_bi.difficulty);
res["number"] = (int)_bi.number; res["number"] = (int)_bi.number;
res["minGasPrice"] = toJS(_bi.minGasPrice);
res["gasLimit"] = (int)_bi.gasLimit; res["gasLimit"] = (int)_bi.gasLimit;
res["timestamp"] = (int)_bi.timestamp; res["timestamp"] = (int)_bi.timestamp;
res["extraData"] = jsFromBinary(_bi.extraData); res["extraData"] = jsFromBinary(_bi.extraData);

12
neth/main.cpp
View File

@ -603,7 +603,7 @@ int main(int argc, char** argv)
vector<string> l; vector<string> l;
l.push_back("Amount"); l.push_back("Amount");
stringstream label; stringstream label;
label << "Gas price (" << info.minGasPrice << ")"; label << "Gas price";
l.push_back(label.str()); l.push_back(label.str());
l.push_back("Gas"); l.push_back("Gas");
vector<string> b; vector<string> b;
@ -652,8 +652,6 @@ int main(int argc, char** argv)
if (size > 0) if (size > 0)
cwarn << "Invalid address length:" << size; cwarn << "Invalid address length:" << size;
} }
else if (gasPrice < info.minGasPrice)
cwarn << "Minimum gas price is" << info.minGasPrice;
else if (gas < minGas) else if (gas < minGas)
cwarn << "Minimum gas amount is" << minGas; cwarn << "Minimum gas amount is" << minGas;
else if (ssize < 40) else if (ssize < 40)
@ -704,7 +702,7 @@ int main(int argc, char** argv)
BlockInfo info(blockData); BlockInfo info(blockData);
u256 minGas = (u256)Client::txGas(0, 0); u256 minGas = (u256)Client::txGas(0, 0);
Address dest = h160(fromHex(fields[0])); Address dest = h160(fromHex(fields[0]));
c.transact(us.secret(), amount, dest, bytes(), minGas, info.minGasPrice); c.transact(us.secret(), amount, dest, bytes(), minGas, 10 * dev::eth::szabo);
} }
} }
} }
@ -718,7 +716,7 @@ int main(int argc, char** argv)
vector<string> l; vector<string> l;
l.push_back("Endowment"); l.push_back("Endowment");
stringstream label; stringstream label;
label << "Gas price (" << info.minGasPrice << ")"; label << "Gas price";
l.push_back(label.str()); l.push_back(label.str());
l.push_back("Gas"); l.push_back("Gas");
vector<string> b; vector<string> b;
@ -766,13 +764,11 @@ int main(int argc, char** argv)
u256 minGas = (u256)Client::txGas(init.size(), 0); u256 minGas = (u256)Client::txGas(init.size(), 0);
if (endowment < 0) if (endowment < 0)
cwarn << "Invalid endowment"; cwarn << "Invalid endowment";
else if (gasPrice < info.minGasPrice)
cwarn << "Minimum gas price is" << info.minGasPrice;
else if (gas < minGas) else if (gas < minGas)
cwarn << "Minimum gas amount is" << minGas; cwarn << "Minimum gas amount is" << minGas;
else else
{ {
c.transact(us.secret(), endowment, init, gas, gasPrice); c.transact(us.secret(), endowment, init, gas, 10 * dev::eth::szabo);
} }
} }
} }

Write Preview
Loading…
Cancel
Save