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

eth/main.cpp

@@ -587,17 +587,26 @@ int main(int argc, char** argv)
 					ClientGuard g(&c);
 					auto h = h160(fromHex(rechex));
 					stringstream s;
-					auto mem = c.state().storage(h);
 
-					for (auto const& i: mem)
+					try
+					{
+						auto storage = c.state().storage(h);
+						for (auto const& i: storage)
 							s << "@" << showbase << hex << i.first << "    " << showbase << hex << i.second << endl;
-					s << endl << disassemble(c.state().code(h));
+						s << endl << disassemble(c.state().code(h)) << endl;
 
 						string outFile = getDataDir() + "/" + rechex + ".evm";
 						ofstream ofs;
 						ofs.open(outFile, ofstream::binary);
 						ofs.write(s.str().c_str(), s.str().length());
 						ofs.close();
+
+						cnote << "Saved" << rechex << "to" << outFile;
+					}
+					catch (eth::InvalidTrie)
+					{
+						cwarn << "Corrupted trie.";
+					}
 				}
 			}
 			else if (cmd == "setSecret")

neth/main.cpp

@@ -151,7 +151,7 @@ void version()
 	exit(0);
 }
 
-Address c_config = Address("9ef0f0d81e040012600b0c1abdef7c48f720f88a");
+Address c_config = Address("661005d2720d855f1d9976f88bb10c1a3398c77f");
 string pretty(h160 _a, eth::State _st)
 {
 	string ns;
@@ -807,17 +807,26 @@ int main(int argc, char** argv)
 				ClientGuard g(&c);
 				auto h = h160(fromHex(rechex));
 				stringstream s;
-				auto mem = c.state().storage(h);
 
-				for (auto const& i: mem)
+				try
+				{
+					auto storage = c.state().storage(h);
+					for (auto const& i: storage)
 						s << "@" << showbase << hex << i.first << "    " << showbase << hex << i.second << endl;
-				s << endl << disassemble(c.state().code(h));
+					s << endl << disassemble(c.state().code(h)) << endl;
 
 					string outFile = getDataDir() + "/" + rechex + ".evm";
 					ofstream ofs;
 					ofs.open(outFile, ofstream::binary);
 					ofs.write(s.str().c_str(), s.str().length());
 					ofs.close();
+
+					cnote << "Saved" << rechex << "to" << outFile;
+				}
+				catch (eth::InvalidTrie)
+				{
+					cwarn << "Corrupted trie.";
+				}
 			}
 		}
 		else if (cmd == "reset")