Skip to content

Commit a3e2f52

Browse files
yann300yann300
committed
merge from develop
2 parents 04bb0ff + e01002b commit a3e2f52

110 files changed

Lines changed: 11467 additions & 1391 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎alethzero/MainWin.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ Main::Main(QWidget *parent) :
145145
cerr << "Block Hash: " << CanonBlockChain::genesis().hash << endl;
146146
cerr << "Block RLP: " << RLP(block) << endl;
147147
cerr << "Block Hex: " << toHex(block) << endl;
148-
cerr << "Network protocol version: " << c_protocolVersion << endl;
148+
cerr << "eth Network protocol version: " << eth::c_protocolVersion << endl;
149149
cerr << "Client database version: " << c_databaseVersion << endl;
150150

151151
ui->configDock->close();
@@ -162,7 +162,7 @@ Main::Main(QWidget *parent) :
162162
QSettings s("ethereum", "alethzero");
163163
m_networkConfig = s.value("peers").toByteArray();
164164
bytesConstRef network((byte*)m_networkConfig.data(), m_networkConfig.size());
165-
m_webThree.reset(new WebThreeDirect(string("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM), getDataDir() + "/AlethZero", false, {"eth", "shh"}, p2p::NetworkPreferences(), network));
165+
m_webThree.reset(new WebThreeDirect(string("AlethZero/v") + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM), getDataDir(), false, {"eth", "shh"}, p2p::NetworkPreferences(), network));
166166

167167
m_httpConnector.reset(new jsonrpc::HttpServer(8080));
168168
m_server.reset(new OurWebThreeStubServer(*m_httpConnector, *web3(), keysAsVector(m_myKeys), this));
@@ -312,7 +312,7 @@ void Main::installBalancesWatch()
312312
Address coinsAddr = getCurrencies();
313313

314314
// TODO: Update for new currencies reg.
315-
for (unsigned i = 0; i < ethereum()->stateAt(coinsAddr, 0); ++i)
315+
for (unsigned i = 0; i < ethereum()->stateAt(coinsAddr, PendingBlock); ++i)
316316
altCoins.push_back(right160(ethereum()->stateAt(coinsAddr, i + 1)));
317317
for (auto i: m_myKeys)
318318
for (auto c: altCoins)
@@ -583,7 +583,7 @@ Address Main::fromString(QString const& _n) const
583583
{
584584
try
585585
{
586-
return Address(fromHex(_n.toStdString(), ThrowType::Throw));
586+
return Address(fromHex(_n.toStdString(), WhenError::Throw));
587587
}
588588
catch (BadHexCharacter& _e)
589589
{
@@ -616,10 +616,10 @@ QString Main::lookup(QString const& _a) const
616616

617617
h256 ret;
618618
// TODO: fix with the new DNSreg contract
619-
// if (h160 dnsReg = (u160)ethereum()->stateAt(c_config, 4, 0))
619+
// if (h160 dnsReg = (u160)ethereum()->stateAt(c_config, 4, PendingBlock))
620620
// ret = ethereum()->stateAt(dnsReg, n);
621621
/* if (!ret)
622-
if (h160 nameReg = (u160)ethereum()->stateAt(c_config, 0, 0))
622+
if (h160 nameReg = (u160)ethereum()->stateAt(c_config, 0, PendingBlock))
623623
ret = ethereum()->stateAt(nameReg, n2);
624624
*/
625625
if (ret && !((u256)ret >> 32))
@@ -937,7 +937,7 @@ void Main::refreshBalances()
937937
u256 totalBalance = 0;
938938
/* map<Address, tuple<QString, u256, u256>> altCoins;
939939
Address coinsAddr = getCurrencies();
940-
for (unsigned i = 0; i < ethereum()->stateAt(coinsAddr, 0); ++i)
940+
for (unsigned i = 0; i < ethereum()->stateAt(coinsAddr, PendingBlock); ++i)
941941
{
942942
auto n = ethereum()->stateAt(coinsAddr, i + 1);
943943
auto addr = right160(ethereum()->stateAt(coinsAddr, n));
@@ -1059,7 +1059,7 @@ void Main::refreshBlockCount()
10591059
{
10601060
cwatch << "refreshBlockCount()";
10611061
auto d = ethereum()->blockChain().details();
1062-
ui->blockCount->setText(QString("%4 #%1 PV%2 D%3 H%5").arg(d.number).arg(c_protocolVersion).arg(c_databaseVersion).arg(m_privateChain.size() ? "[" + m_privateChain + "] " : "testnet").arg(c_ethashVersion));
1062+
ui->blockCount->setText(QString("%4 #%1 PV%2 D%3 H%5").arg(d.number).arg(eth::c_protocolVersion).arg(c_databaseVersion).arg(m_privateChain.size() ? "[" + m_privateChain + "] " : "testnet").arg(c_ethashVersion));
10631063
}
10641064

10651065
void Main::on_turboMining_triggered()
@@ -1357,7 +1357,7 @@ void Main::on_transactionQueue_currentItemChanged()
13571357
auto r = receipt.rlp();
13581358
s << "<div>Receipt: " << toString(RLP(r)) << "</div>";
13591359
s << "<div>Receipt-Hex: " Span(Mono) << toHex(receipt.rlp()) << "</span></div>";
1360-
s << renderDiff(ethereum()->diff(i, 0));
1360+
s << renderDiff(ethereum()->diff(i, PendingBlock));
13611361
// s << "Pre: " << fs.rootHash() << "<br/>";
13621362
// s << "Post: <b>" << ts.rootHash() << "</b>";
13631363
}
@@ -1388,7 +1388,7 @@ void Main::on_inject_triggered()
13881388
QString s = QInputDialog::getText(this, "Inject Transaction", "Enter transaction dump in hex");
13891389
try
13901390
{
1391-
bytes b = fromHex(s.toStdString(), ThrowType::Throw);
1391+
bytes b = fromHex(s.toStdString(), WhenError::Throw);
13921392
ethereum()->inject(&b);
13931393
}
13941394
catch (BadHexCharacter& _e)
@@ -1550,7 +1550,7 @@ void Main::on_debugCurrent_triggered()
15501550
unsigned txi = item->data(Qt::UserRole + 1).toInt();
15511551
bytes t = ethereum()->blockChain().transaction(h, txi);
15521552
State s(ethereum()->state(txi, h));
1553-
Executive e(s, ethereum()->blockChain(), 0);
1553+
Executive e(s, ethereum()->blockChain(), PendingBlock);
15541554
Debugger dw(this, this);
15551555
dw.populate(e, Transaction(t, CheckSignature::Sender));
15561556
dw.exec();

0 commit comments

Comments
 (0)