Browse Source

compiling all targers

cl-refactor
Marek Kotewicz 10 years ago
parent
commit
aa689d0565
  1. 10
      mix/MixClient.cpp
  2. 1
      mix/MixClient.h
  3. 8
      mix/Web3Server.cpp
  4. 4
      mix/Web3Server.h

10
mix/MixClient.cpp

@ -493,6 +493,16 @@ unsigned MixClient::uncleCount(h256 _blockHash) const
return b[2].itemCount();
}
Transactions MixClient::transactions(h256 _blockHash) const
{
auto bl = bc().block(_blockHash);
RLP b(bl);
Transactions res;
for (unsigned i = 0; i < b[1].itemCount(); i++)
res.emplace_back(b[1][i].data(), CheckSignature::Range);
return res;
}
unsigned MixClient::number() const
{
return bc().number();

1
mix/MixClient.h

@ -72,6 +72,7 @@ public:
eth::BlockInfo uncle(h256 _blockHash, unsigned _i) const override;
unsigned transactionCount(h256 _blockHash) const override;
unsigned uncleCount(h256 _blockHash) const override;
eth::Transactions transactions(h256 _blockHash) const override;
unsigned number() const override;
eth::Transactions pending() const override;
eth::StateDiff diff(unsigned _txi, h256 _block) const override;

8
mix/Web3Server.cpp

@ -55,14 +55,14 @@ void Web3Server::put(std::string const& _name, std::string const& _key, std::str
m_db[k] = _value;
}
Json::Value Web3Server::eth_changed(int _id)
Json::Value Web3Server::eth_getFilterChanges(std::string const& _filterId)
{
return WebThreeStubServerBase::eth_changed(_id);
return WebThreeStubServerBase::eth_getFilterChanges(_filterId);
}
std::string Web3Server::eth_transact(Json::Value const& _json)
std::string Web3Server::eth_sendTransaction(Json::Value const& _json)
{
std::string ret = WebThreeStubServerBase::eth_transact(_json);
std::string ret = WebThreeStubServerBase::eth_sendTransaction(_json);
emit newTransaction();
return ret;
}

4
mix/Web3Server.h

@ -44,8 +44,8 @@ signals:
void newTransaction();
protected:
virtual Json::Value eth_changed(int _id) override;
virtual std::string eth_transact(Json::Value const& _json) override;
virtual Json::Value eth_getFilterChanges(std::string const& _filterId) override;
virtual std::string eth_sendTransaction(Json::Value const& _json) override;
virtual std::string eth_call(Json::Value const& _json) override;
private:

Loading…
Cancel
Save