lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

cl-refactor
Gav Wood 9 years ago
parent
785e4dc47e 40c334cc3d
commit
a38294716c
5 changed files with 61 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      eth/main.cpp
  2. 8
      extdep/getstuff.bat
  3. 1
      libethereum/BlockQueue.cpp
  4. 45
      test/libethereum/StateTestsFiller/stSystemOperationsTestFiller.json
  5. 1
      test/libethereum/gaspricer.cpp

12
eth/main.cpp
View File

@ -205,6 +205,10 @@ void help()
<< " -v,--verbosity <0 - 9> Set the log verbosity from 0 to 9 (default: 8)." << endl
<< " -V,--version Show the version and exit." << endl
<< " -h,--help Show this help message and exit." << endl
<< endl
<< "Experimental / Proof of Concept:" << endl
<< " --shh Enable Whisper" << endl
<< endl
;
exit(0);
}
@ -1146,6 +1150,9 @@ int main(int argc, char** argv)
/// Wallet password stuff
string masterPassword;
/// Whisper
bool useWhisper = false;
string configFile = getDataDir() + "/config.rlp";
bytes b = contents(configFile);
@ -1488,6 +1495,8 @@ int main(int argc, char** argv)
}
}
#endif
else if (arg == "--shh")
useWhisper = true;
else if (arg == "-h" || arg == "--help")
help();
else if (arg == "-V" || arg == "--version")
@ -1568,11 +1577,12 @@ int main(int argc, char** argv)
netPrefs.pin = pinning || !privateChain.empty();
auto nodesState = contents((dbPath.size() ? dbPath : getDataDir()) + "/network.rlp");
auto caps = useWhisper ? set<string>{"eth", "shh"} : set<string>{"eth"};
dev::WebThreeDirect web3(
WebThreeDirect::composeClientVersion("++eth", clientName),
dbPath,
withExisting,
nodeMode == NodeMode::Full ? set<string>{"eth"/*, "shh"*/} : set<string>(),
nodeMode == NodeMode::Full ? caps : set<string>(),
netPrefs,
&nodesState);
web3.ethereum()->setMineOnBadChain(mineOnWrongChain);

8
extdep/getstuff.bat
View File

@ -27,13 +27,13 @@ set eth_version=%2
cd download
if not exist %eth_name%-%eth_version%.tar.gz (
for /f "tokens=2 delims={}" %%g in ('bitsadmin /create %eth_name%-%eth_version%.tar.gz') do (
bitsadmin /transfer {%%g} /download /priority normal %eth_server%/%eth_name%-%eth_version%.tar.gz %cd%\%eth_name%-%eth_version%.tar.gz
if not exist %eth_name%-%eth_version%-x64.tar.gz (
for /f "tokens=2 delims={}" %%g in ('bitsadmin /create %eth_name%-%eth_version%-x64.tar.gz') do (
bitsadmin /transfer {%%g} /download /priority normal %eth_server%/%eth_name%-%eth_version%-x64.tar.gz %cd%\%eth_name%-%eth_version%-x64.tar.gz
bitsadmin /cancel {%%g}
)
)
if not exist %eth_name%-%eth_version% cmake -E tar -zxvf %eth_name%-%eth_version%.tar.gz
if not exist %eth_name%-%eth_version% cmake -E tar -zxvf %eth_name%-%eth_version%-x64.tar.gz
cmake -E copy_directory %eth_name%-%eth_version% ..\install\windows
cd ..

1
libethereum/BlockQueue.cpp
View File

@ -76,6 +76,7 @@ void BlockQueue::clear()
m_drainingSet.clear();
m_verified.clear();
m_unverified.clear();
m_verifying.clear();
m_unknownSet.clear();
m_unknown.clear();
m_future.clear();

45
test/libethereum/StateTestsFiller/stSystemOperationsTestFiller.json
View File

@ -2832,5 +2832,48 @@
"to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
"value" : "10"
}
}
},
"extcodecopy" : {
"env" : {
"currentCoinbase" : "4401fcaf7d64d53fb1cfc5c9045c32aa919a8c82",
"currentDifficulty" : "0x7fb7d889155ce8c6",
"currentGasLimit" : "0x58272e28",
"currentNumber" : "0x7608d138",
"currentTimestamp" : "0xa4befad141d51c4f",
"previousHash" : "d30f77155de00f207ad60109897e790f73e9f3431be25717bf3651d91949f041"
},
"pre" : {
"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
"balance" : "0x05c81eb0",
"code" : "0x7f15688566a82f5f946c68028bf626b349e495daa43e33529a76437ac416cd1b7d6e7dae7454bb193b1c28e64a6a935bc373cea0c5cc171fa61277e5604a3bc8aef4de3d38820658600b80797ada6e82e95f6520383f95f5c7dae56b4dc13b6f22ecabfce07c3cff51",
"nonce" : "0xfe",
"storage" : {
}
},
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
"balance" : "0x4d6769f8",
"code" : "0x5a60106017601160116018601c600f601b601d5f60026013600f601a8d5a5b7679177b5dd41a23db52998c4dcd14e88390dcc9f3ed5783601660145f6013600d601f60016011600e600c600d601f60138c7a58f20fd882eb51408a52e569ce80e93270ab53ae9de3fec5498a5c72ce1fcd11bb1553736959df779a616b738c1f407c12459490afe302da311a673488d09e71041d0761dee4829e3c38e0b1b1787810f2e11e2289983c1ab47cf5ebd38c12f1719232b5f3a7b27a9ea8858a071c4169392ec725646311235cbd9534e5d7cd8cb5e2287738a43f803384f4e62fe6629ea2e609a71759edab5c3a58b87e94c95f710aa6059b0663c9f374ce6ea0a000c5d594c41252d4a74d64896a987cc57c24df2ce8ffb85adcc27dce2d19f7006fbc1c5a7b79a319418fd6c27ddebcf170192262d82c1053333f6115c8b258b81e2e84d723c98dbd4535de7f922723a15827bbcfd07f9e2c5027c7736ed68c61b332059d7ec1bae1c1fd41a361d35b996d9740a588b6abf3293236afb927717328c014846148ce67eaf2b33d90672366dafeaae0714eb39e7fd5076a831d8eb4a3546288a3e1a0087aebe80b6bbfa4041330b05d094a697236fe7654d8a7ce630f83a832620125d781666e898f7fdcfd0031",
"nonce" : "0xdd",
"storage" : {
}
},
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0x4f6ca7b90ceb5fd4",
"code" : "0x",
"nonce" : "0x00",
"storage" : {
}
}
},
"transaction" : {
"data" : "0x6e27b0577f2549e5fa01e3db96e7b03a62e489115538620295677faf15040c1c1796bad130e2462a8b8d6bbe0fa35bf12087047ef4ff4e66df8772196b4401998ff7f4219c013a0d927b22d8d3fdf625809abb182507d180e687b666f4f1e4f3b8172e87760f436c701264b89739f3d7c50ec524f16b1a4f91397b760a5209b9b7710544694ecf2729643b3ca545c7",
"gasLimit" : "0x3bd760dd",
"gasPrice" : "0x1cd49878",
"nonce" : "0x00",
"secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
"value" : "0x24a39757"
}
}
}

1
test/libethereum/gaspricer.cpp
View File

@ -17,6 +17,7 @@
/** @file gasPricer.cpp
* @author Christoph Jentzsch <cj@ethdev.com>
* @date 2015
* Gas pricer tests
*/
#include <libtestutils/BlockChainLoader.h>

Write Preview
Loading…
Cancel
Save