Browse Source

New namereg.

Bug fix for transactions.
cl-refactor
Gav Wood 11 years ago
parent
commit
6e348fb224
  1. 5
      alethzero/MainWin.cpp
  2. 4
      libethereum/TransactionQueue.cpp

5
alethzero/MainWin.cpp

@ -246,7 +246,10 @@ void Main::readSettings()
ui->clientName->setText(s.value("clientName", "").toString());
ui->idealPeers->setValue(s.value("idealPeers", ui->idealPeers->value()).toInt());
ui->port->setValue(s.value("port", ui->port->value()).toInt());
ui->nameReg->setText(s.value("nameReg", "11f62328e131dbb05ce4c73a3de3c7ab1c84a163").toString());
if (s.value("nameReg").toString() == "11f62328e131dbb05ce4c73a3de3c7ab1c84a163")
s.remove("nameReg");
ui->nameReg->setText(s.value("nameReg", "8ff91e5b145a23ab1afef34f12587c18bd42aec0").toString());
}
void Main::on_nameReg_textChanged()

4
libethereum/TransactionQueue.cpp

@ -71,5 +71,7 @@ void TransactionQueue::noteGood(std::pair<h256, bytes> const& _t)
auto r = m_future.equal_range(Transaction(_t.second).sender());
for (auto it = r.first; it != r.second; ++it)
m_data.insert(_t);
m_future.erase(r.first);
cdebug << m_future;
m_future.erase(r.first, r.second);
cdebug << m_future;
}

Loading…
Cancel
Save