Fix issues raised by christoph & arkadiy.

alethzero/MainWin.cpp

@@ -317,9 +317,7 @@ void Main::install(AccountNamer* _adopt)
 
 void Main::uninstall(AccountNamer* _kill)
 {
-	auto it = m_namers.find(_kill);
-	if (it != m_namers.end())
-		m_namers.erase(it);
+	m_namers.erase(_kill);
 	refreshAll();
 }
 

libdevcrypto/WordList.cpp

@@ -35,7 +35,7 @@ strings const WordList =
 	"have",
 	"to",
 	"it",
-	"I",
+	"i",
 	"that",
 	"for",
 	"you",
@@ -198,7 +198,7 @@ strings const WordList =
 	"start",
 	"hand",
 	"might",
-	"American",
+	"american",
 	"show",
 	"part",
 	"about",
@@ -233,7 +233,7 @@ strings const WordList =
 	"like",
 	"night",
 	"live",
-	"Mr",
+	"mr",
 	"point",
 	"believe",
 	"hold",
@@ -567,7 +567,7 @@ strings const WordList =
 	"court",
 	"produce",
 	"eat",
-	"American",
+	"american",
 	"teach",
 	"oil",
 	"half",
@@ -617,7 +617,7 @@ strings const WordList =
 	"attention",
 	"draw",
 	"film",
-	"Republican",
+	"republican",
 	"tree",
 	"source",
 	"red",
@@ -661,7 +661,7 @@ strings const WordList =
 	"administration",
 	"south",
 	"husband",
-	"Congress",
+	"congress",
 	"floor",
 	"campaign",
 	"material",
@@ -819,7 +819,7 @@ strings const WordList =
 	"region",
 	"television",
 	"box",
-	"TV",
+	"tv",
 	"training",
 	"pretty",
 	"trade",
@@ -849,7 +849,7 @@ strings const WordList =
 	"answer",
 	"skill",
 	"sister",
-	"PM",
+	"pm",
 	"professor",
 	"operation",
 	"financial",
@@ -928,7 +928,7 @@ strings const WordList =
 	"that",
 	"spring",
 	"firm",
-	"Democrat",
+	"democrat",
 	"radio",
 	"visit",
 	"management",
@@ -1060,7 +1060,7 @@ strings const WordList =
 	"reality",
 	"coach",
 	"step",
-	"Mrs",
+	"mrs",
 	"yard",
 	"beat",
 	"violence",
@@ -1137,7 +1137,7 @@ strings const WordList =
 	"forest",
 	"video",
 	"global",
-	"Senate",
+	"senate",
 	"reform",
 	"access",
 	"restaurant",
@@ -1209,7 +1209,7 @@ strings const WordList =
 	"spirit",
 	"experience",
 	"replace",
-	"British",
+	"british",
 	"encourage",
 	"lot",
 	"lot",
@@ -1222,7 +1222,7 @@ strings const WordList =
 	"brain",
 	"feature",
 	"afternoon",
-	"AM",
+	"am",
 	"weekend",
 	"dozen",
 	"possibility",
@@ -1233,7 +1233,7 @@ strings const WordList =
 	"beginning",
 	"date",
 	"generally",
-	"African",
+	"african",
 	"very",
 	"sorry",
 	"crisis",
@@ -1248,7 +1248,7 @@ strings const WordList =
 	"vision",
 	"status",
 	"normal",
-	"Chinese",
+	"chinese",
 	"ship",
 	"solution",
 	"stone",
@@ -1278,7 +1278,7 @@ strings const WordList =
 	"tradition",
 	"winter",
 	"village",
-	"Soviet",
+	"soviet",
 	"refuse",
 	"sales",
 	"roll",
@@ -1295,16 +1295,16 @@ strings const WordList =
 	"potential",
 	"increase",
 	"middle",
-	"European",
+	"european",
 	"presence",
 	"independent",
 	"district",
 	"shape",
 	"reader",
-	"Ms",
+	"ms",
 	"contract",
 	"crowd",
-	"Christian",
+	"christian",
 	"express",
 	"apartment",
 	"willing",
@@ -1395,8 +1395,8 @@ strings const WordList =
 	"insist",
 	"failure",
 	"annual",
-	"French",
-	"Christmas",
+	"french",
+	"christmas",
 	"comment",
 	"responsible",
 	"affair",
@@ -1467,7 +1467,7 @@ strings const WordList =
 	"smile",
 	"location",
 	"clothes",
-	"Indian",
+	"indian",
 	"quiet",
 	"dress",
 	"promise",
@@ -1494,14 +1494,14 @@ strings const WordList =
 	"dangerous",
 	"remind",
 	"moral",
-	"United",
+	"united",
 	"category",
 	"relatively",
 	"victory",
 	"key",
 	"academic",
 	"visit",
-	"Internet",
+	"internet",
 	"healthy",
 	"fire",
 	"negative",
@@ -1597,7 +1597,7 @@ strings const WordList =
 	"leaf",
 	"direct",
 	"dry",
-	"Russian",
+	"russian",
 	"instruction",
 	"fight",
 	"pool",
@@ -1653,7 +1653,7 @@ strings const WordList =
 	"presidential",
 	"emotional",
 	"commitment",
-	"Supreme",
+	"supreme",
 	"bear",
 	"pocket",
 	"thin",
@@ -1688,7 +1688,7 @@ strings const WordList =
 	"organize",
 	"jury",
 	"breast",
-	"Iraqi",
+	"iraqi",
 	"human",
 	"acknowledge",
 	"theme",
@@ -1757,7 +1757,7 @@ strings const WordList =
 	"prefer",
 	"truly",
 	"earth",
-	"Japanese",
+	"japanese",
 	"chest",
 	"search",
 	"thick",
@@ -1795,7 +1795,7 @@ strings const WordList =
 	"sheet",
 	"ought",
 	"ensure",
-	"Catholic",
+	"catholic",
 	"extremely",
 	"extent",
 	"component",
@@ -1822,7 +1822,7 @@ strings const WordList =
 	"guide",
 	"circumstance",
 	"snow",
-	"English",
+	"english",
 	"politician",
 	"steal",
 	"pursue",
@@ -1835,7 +1835,7 @@ strings const WordList =
 	"influence",
 	"surgery",
 	"correct",
-	"Jewish",
+	"jewish",
 	"blame",
 	"estimate",
 	"due",
@@ -1863,7 +1863,7 @@ strings const WordList =
 	"rating",
 	"golden",
 	"motion",
-	"German",
+	"german",
 	"gender",
 	"solve",
 	"fee",
@@ -1943,7 +1943,7 @@ strings const WordList =
 	"clean",
 	"except",
 	"beer",
-	"English",
+	"english",
 	"reference",
 	"tear",
 	"doubt",
@@ -2047,8 +2047,8 @@ strings const WordList =
 	"towards",
 	"expose",
 	"rural",
-	"AIDS",
-	"Jew",
+	"aids",
+	"jew",
 	"narrow",
 	"cream",
 	"secretary",
@@ -2128,7 +2128,7 @@ strings const WordList =
 	"forever",
 	"fun",
 	"regard",
-	"Israeli",
+	"israeli",
 	"association",
 	"twenty",
 	"knock",
@@ -2247,11 +2247,11 @@ strings const WordList =
 	"error",
 	"release",
 	"cop",
-	"Arab",
+	"arab",
 	"double",
 	"walk",
 	"sand",
-	"Spanish",
+	"spanish",
 	"rule",
 	"hit",
 	"print",
@@ -2294,7 +2294,7 @@ strings const WordList =
 	"present",
 	"joke",
 	"coat",
-	"Mexican",
+	"mexican",
 	"symptom",
 	"contact",
 	"manufacturer",
@@ -2366,7 +2366,7 @@ strings const WordList =
 	"another",
 	"attach",
 	"for",
-	"Indian",
+	"indian",
 	"disaster",
 	"parking",
 	"prospect",
@@ -2397,7 +2397,7 @@ strings const WordList =
 	"illustrate",
 	"boot",
 	"monitor",
-	"Asian",
+	"asian",
 	"entertainment",
 	"bean",
 	"evaluation",
@@ -2536,7 +2536,7 @@ strings const WordList =
 	"occasionally",
 	"mayor",
 	"consideration",
-	"CEO",
+	"ceo",
 	"secure",
 	"pink",
 	"smoke",
@@ -2575,13 +2575,13 @@ strings const WordList =
 	"quit",
 	"absence",
 	"roll",
-	"Latin",
+	"latin",
 	"rapidly",
 	"jail",
 	"comment",
 	"diversity",
 	"honest",
-	"Palestinian",
+	"palestinian",
 	"pace",
 	"employment",
 	"speaker",
@@ -2641,11 +2641,11 @@ strings const WordList =
 	"phrase",
 	"ingredient",
 	"stake",
-	"Muslim",
+	"muslim",
 	"dream",
 	"fiber",
 	"activist",
-	"Islamic",
+	"islamic",
 	"snap",
 	"terrorism",
 	"refugee",
@@ -2686,8 +2686,8 @@ strings const WordList =
 	"wonder",
 	"clock",
 	"chocolate",
-	"Italian",
-	"Canadian",
+	"italian",
+	"canadian",
 	"ceiling",
 	"sweep",
 	"advertising",
@@ -2786,13 +2786,13 @@ strings const WordList =
 	"though",
 	"expansion",
 	"elite",
-	"Olympic",
+	"olympic",
 	"dirt",
 	"odd",
 	"rice",
 	"bullet",
 	"tight",
-	"Bible",
+	"bible",
 	"chart",
 	"solar",
 	"decline",
@@ -2878,7 +2878,7 @@ strings const WordList =
 	"assistant",
 	"offense",
 	"counter",
-	"DNA",
+	"dna",
 	"smell",
 	"potentially",
 	"transfer",
@@ -2981,7 +2981,7 @@ strings const WordList =
 	"radical",
 	"stress",
 	"adapt",
-	"Irish",
+	"irish",
 	"honey",
 	"correspondent",
 	"pale",
@@ -3072,7 +3072,7 @@ strings const WordList =
 	"fund",
 	"ski",
 	"limitation",
-	"OK",
+	"ok",
 	"trace",
 	"appointment",
 	"preference",
@@ -3105,7 +3105,7 @@ strings const WordList =
 	"mall",
 	"derive",
 	"scandal",
-	"PC",
+	"pc",
 	"helpful",
 	"impress",
 	"heel",
@@ -3125,7 +3125,7 @@ strings const WordList =
 	"examination",
 	"publisher",
 	"strengthen",
-	"French",
+	"french",
 	"proposed",
 	"myth",
 	"sophisticated",
@@ -3153,7 +3153,7 @@ strings const WordList =
 	"narrative",
 	"photographer",
 	"helicopter",
-	"Catholic",
+	"catholic",
 	"modest",
 	"provider",
 	"delay",
@@ -3181,7 +3181,7 @@ strings const WordList =
 	"assignment",
 	"restriction",
 	"across",
-	"Palestinian",
+	"palestinian",
 	"laboratory",
 	"workshop",
 	"differently",
@@ -3216,19 +3216,19 @@ strings const WordList =
 	"versus",
 	"manufacturing",
 	"risk",
-	"Christian",
+	"christian",
 	"complex",
 	"absolute",
 	"chef",
 	"discrimination",
 	"offensive",
-	"German",
+	"german",
 	"suit",
 	"boom",
 	"register",
 	"appoint",
 	"heritage",
-	"God",
+	"god",
 	"terrorist",
 	"dominant",
 	"successfully",
@@ -3366,7 +3366,7 @@ strings const WordList =
 	"rope",
 	"concrete",
 	"prescription",
-	"African-American",
+	"african-american",
 	"chase",
 	"document",
 	"brick",
@@ -3547,7 +3547,7 @@ strings const WordList =
 	"cold",
 	"classical",
 	"estimated",
-	"T-shirt",
+	"t-shirt",
 	"online",
 	"unemployment",
 	"civilization",
@@ -3564,16 +3564,16 @@ strings const WordList =
 	"reliable",
 	"excitement",
 	"beef",
-	"Islam",
-	"Roman",
+	"islam",
+	"roman",
 	"stretch",
 	"architecture",
 	"occasional",
 	"administrative",
 	"elbow",
 	"deadly",
-	"Muslim",
-	"Hispanic",
+	"muslim",
+	"hispanic",
 	"allegation",
 	"tip",
 	"confuse",
@@ -3581,7 +3581,7 @@ strings const WordList =
 	"monthly",
 	"duck",
 	"dose",
-	"Korean",
+	"korean",
 	"plead",
 	"initiate",
 	"lecture",
@@ -3762,7 +3762,7 @@ strings const WordList =
 	"freshman",
 	"sweat",
 	"outer",
-	"European",
+	"european",
 	"drunk",
 	"survey",
 	"research",
@@ -3837,7 +3837,7 @@ strings const WordList =
 	"shame",
 	"meaningful",
 	"sidewalk",
-	"Olympics",
+	"olympics",
 	"technological",
 	"signature",
 	"pleasant",
@@ -3919,7 +3919,7 @@ strings const WordList =
 	"pastor",
 	"jazz",
 	"opera",
-	"Japanese",
+	"japanese",
 	"bite",
 	"frame",
 	"evil",
@@ -3945,7 +3945,7 @@ strings const WordList =
 	"gym",
 	"oral",
 	"clerk",
-	"Israeli",
+	"israeli",
 	"envelope",
 	"reporting",
 	"destination",
@@ -4027,7 +4027,7 @@ strings const WordList =
 	"enroll",
 	"diminish",
 	"prevention",
-	"Arab",
+	"arab",
 	"value",
 	"minimize",
 	"chop",
@@ -4063,7 +4063,7 @@ strings const WordList =
 	"representative",
 	"content",
 	"realistic",
-	"Russian",
+	"russian",
 	"hidden",
 	"command",
 	"tender",
@@ -4126,19 +4126,15 @@ strings const WordList =
 	"cart",
 	"oversee",
 	"stem",
-	"o'clock",
 	"elder",
-	"o'clock",
-	"o'clock",
-	"o'clock",
 	"pro",
 	"inspiration",
-	"Dutch",
+	"dutch",
 	"quantity",
 	"trailer",
 	"mate",
 	"o'clock",
-	"Greek",
+	"greek",
 	"genius",
 	"monument",
 	"bid",
@@ -4264,7 +4260,7 @@ strings const WordList =
 	"rent",
 	"calm",
 	"jewelry",
-	"Cuban",
+	"cuban",
 	"haul",
 	"concede",
 	"trace",
@@ -4366,7 +4362,7 @@ strings const WordList =
 	"breeze",
 	"costly",
 	"ambitious",
-	"Christianity",
+	"christianity",
 	"presumably",
 	"influential",
 	"translation",
@@ -4547,7 +4543,7 @@ strings const WordList =
 	"ideal",
 	"constitution",
 	"trainer",
-	"Thanksgiving",
+	"thanksgiving",
 	"scent",
 	"stack",
 	"eyebrow",
@@ -4614,7 +4610,7 @@ strings const WordList =
 	"dip",
 	"likewise",
 	"informal",
-	"Persian",
+	"persian",
 	"feather",
 	"sphere",
 	"tighten",
@@ -4689,7 +4685,6 @@ strings const WordList =
 	"toll",
 	"rim",
 	"embarrassed",
-	"fucking",
 	"cling",
 	"isolated",
 	"blink",

libethereum/Executive.cpp

@@ -383,7 +383,7 @@ bool Executive::go(OnOpFunc const& _onOp)
 		}
 		catch (VMException const& _e)
 		{
-			cnote/*clog(StateSafeExceptions)*/ << "Safe VM Exception. " << diagnostic_information(_e);
+			clog(StateSafeExceptions) << "Safe VM Exception. " << diagnostic_information(_e);
 			m_gas = 0;
 			m_excepted = toTransactionException(_e);
 			m_ext->revert();