Browse Source

small changes

cl-refactor
yann300 10 years ago
parent
commit
f6c9603a6b
  1. 2
      mix/ClientModel.cpp
  2. 2
      mix/ClientModel.h
  3. 2
      mix/MixClient.cpp
  4. 2
      mix/MixClient.h
  5. 3
      mix/qml/BlockChain.qml

2
mix/ClientModel.cpp

@ -302,7 +302,7 @@ void ClientModel::finalizeBlock()
}
}
TransactionSettings ClientModel::transaction(QVariant _tr)
TransactionSettings ClientModel::transaction(QVariant const& _tr) const
{
QVariantMap transaction = _tr.toMap();
QString contractId = transaction.value("contractId").toString();

2
mix/ClientModel.h

@ -270,7 +270,7 @@ private:
void finalizeBlock();
void stopExecution();
void setupExecutionChain();
TransactionSettings transaction(QVariant _tr);
TransactionSettings transaction(QVariant const& _tr) const;
std::atomic<bool> m_running;
std::atomic<bool> m_mining;

2
mix/MixClient.cpp

@ -123,7 +123,7 @@ Transaction MixClient::replaceGas(Transaction const& _t, u256 const& _gas, Secre
return ret;
}
ExecutionResult MixClient::debugTransaction(Transaction const& _t, State const& _state, LastHashes _lastHashes, bool _call)
ExecutionResult MixClient::debugTransaction(Transaction const& _t, State const& _state, LastHashes const& _lastHashes, bool _call)
{
State execState = _state;
execState.addBalance(_t.sender(), _t.gas() * _t.gasPrice()); //give it enough balance for gas estimation

2
mix/MixClient.h

@ -61,7 +61,7 @@ public:
virtual std::pair<h256, Address> submitTransaction(eth::TransactionSkeleton const& _ts, Secret const& _secret) override { return submitTransaction(_ts, _secret, false); }
std::pair<h256, Address> submitTransaction(eth::TransactionSkeleton const& _ts, Secret const& _secret, bool _gasAuto);
dev::eth::ExecutionResult call(Address const& _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, eth::BlockNumber _blockNumber, bool _gasAuto, eth::FudgeFactor _ff = eth::FudgeFactor::Strict);
ExecutionResult debugTransaction(dev::eth::Transaction const& _t, eth:: State const& _state, eth::LastHashes _lastHashes, bool _call);
ExecutionResult debugTransaction(dev::eth::Transaction const& _t, eth:: State const& _state, eth::LastHashes const& _lastHashes, bool _call);
void setAddress(Address _us) override;
void startMining() override;
void stopMining() override;

3
mix/qml/BlockChain.qml

@ -330,10 +330,9 @@ ColumnLayout {
for (var c in blinkReasons)
{
if (blinkReasons[c] === reason)
{
return true
}
}
return false
}

Loading…
Cancel
Save