Decimal wei rather than hex balance.

Memory back to linear cost.

libethereum/CanonBlockChain.cpp

@@ -50,8 +50,8 @@ std::map<Address, Account> const& dev::eth::genesisState()
 		for (auto account: val.get_obj())
 		{
 			u256 balance;
-			if (account.second.get_obj().count("balance"))
-				balance = fromBigEndian<u256>(fromHex(account.second.get_obj()["balance"].get_str()));
+			if (account.second.get_obj().count("wei"))
+				balance = u256(account.second.get_obj()["wei"].get_str());
 			else
 				balance = u256(account.second.get_obj()["finney"].get_str()) * finney;
 			if (account.second.get_obj().count("code"))

libethereum/GenesisInfo.cpp

@@ -24,14 +24,14 @@
 std::string const dev::eth::c_genesisInfo =
 R"ETHEREUM(
 {
-	"dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
-	"e6716f9544a56c530d868e4bfbacb172315bdead": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
-	"b9c015918bdaba24b4ff057a92a3873d6eb201be": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
-	"1a26338f0d905e295fccb71fa9ea849ffa12aaf4": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
-	"2ef47100e0787b915105fd5e3f4ff6752079d5cb": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
-	"cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
-	"6c386a4b26f73c802f34673f7248bb118f97424a": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
-	"e4157b34ea9615cfbde6b4fda419828124b70c78": { "balance": "0000000000000100000000000000000000000000000000000000000000000000" },
+	"dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
+	"e6716f9544a56c530d868e4bfbacb172315bdead": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
+	"b9c015918bdaba24b4ff057a92a3873d6eb201be": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
+	"1a26338f0d905e295fccb71fa9ea849ffa12aaf4": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
+	"2ef47100e0787b915105fd5e3f4ff6752079d5cb": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
+	"cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
+	"6c386a4b26f73c802f34673f7248bb118f97424a": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
+	"e4157b34ea9615cfbde6b4fda419828124b70c78": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
 	"b0afc46d9ce366d06ab4952ca27db1d9557ae9fd": { "finney": "154162184" },
 	"f6b1e9dc460d4d62cc22ec5f987d726929c0f9f0": { "finney": "102774789" },
 	"cc45122d8b7fa0b1eaa6b29e0fb561422a9239d0": { "finney": "51387394" },

libevm/VM.cpp

@@ -35,7 +35,12 @@ void VM::reset(u256 _gas) noexcept
 bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const& _onOp, uint64_t _steps)
 {
 	auto memNeed = [](u256 _offset, dev::u256 _size) { return _size ? (bigint)_offset + _size : (bigint)0; };
-	auto gasForMem = [](bigint _size) -> bigint { bigint s = _size / 32; return (bigint)c_memoryGas * (s + s * s / 1024); };
+	auto gasForMem = [](bigint _size) -> bigint
+	{
+		bigint s = _size / 32;
+//		return (bigint)c_memoryGas * (s + s * s / 1024);
+		return (bigint)c_memoryGas * s;
+	};
 
 	if (m_jumpDests.empty())
 		for (unsigned i = 0; i < _ext.code.size(); ++i)