Browse Source

Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

cl-refactor
Gav Wood 10 years ago
parent
commit
e283961f03
  1. 2
      README.md
  2. 6
      libethereum/Client.cpp

2
README.md

@ -24,7 +24,7 @@ Ethereum is based on a design in an original whitepaper by Vitalik Buterin. This
- *LianaHus* (**Liana Husikyan**) Solidity - *LianaHus* (**Liana Husikyan**) Solidity
- *chfast* (**Paweł Bylica**) EVMJIT - *chfast* (**Paweł Bylica**) EVMJIT
- *cubedro* (**Marian Oancea**) web3.js - *cubedro* (**Marian Oancea**) web3.js
- *gluk250* (**Vlad Gluhovsky**) Whisper - *gluk256* (**Vlad Gluhovsky**) Whisper
- *programmerTim* (**Tim Hughes**) libethash-cl - *programmerTim* (**Tim Hughes**) libethash-cl
And let's not forget: Caktux (neth, ongoing CI), Eric Lombrozo (original MinGW32 cross-compilation), Marko Simovic (original CI). And let's not forget: Caktux (neth, ongoing CI), Eric Lombrozo (original MinGW32 cross-compilation), Marko Simovic (original CI).

6
libethereum/Client.cpp

@ -694,8 +694,14 @@ void Client::onPostStateChanged()
void Client::startMining() void Client::startMining()
{ {
clog(ClientNote) << "MiningBenefactor: " << address();
if (address() != Address())
{
m_wouldMine = true; m_wouldMine = true;
rejigMining(); rejigMining();
}
else
clog(ClientNote) << "You need to set a MiningBenefactor in order to mine!";
} }
void Client::rejigMining() void Client::rejigMining()

Loading…
Cancel
Save