Fee structure stuff.

feeStructure.json

@@ -1,38 +1,54 @@
-{
-	"tierStepGas": [ 0, 2, 3, 5, 8, 10, 20 ],
-	"expGas": 10,
-	"expByteGas": 10,
-
-	"sha3Gas": 30,
-	"sha3WordGas": 6,
-
-	"sloadGas": 50,
-	"sstoreSetGas": 20000,
-	"sstoreResetGas": 5000,
-	"sstoreClearGas": 5000,
-	"sstoreRefundGas": 15000,
-	"jumpdestGas": 1,
-
-	"logGas": 375,
-	"logDataGas": 8,
-	"logTopicGas": 375,
-
-	"createGas": 32000,
-
-	"callGas": 40,
-	"callStipend": 2300,
-	"callValueTransferGas": 9000,
-	"callNewAccountGas": 25000,
-
-	"suicideRefundGas": 24000,
-
-	"memoryGas": 3,
-	"quadCoeffDiv": 512,
+var x = {
+	"tierStepGas": { "v": [ 0, 2, 3, 5, 8, 10, 20 ], "d": "Once per operation, for a selection of them." },
+	"expGas": { "v": 10, "d": "Once per EXP instuction." },
+	"expByteGas": { "v": 10, "d": "Times ceil(log256(exponent)) for the EXP instruction." },
+
+	"sha3Gas": { "v": 30, "d": "Once per SHA3 operation." },
+	"sha3WordGas": { "v": 6, "d": "Once per word of the SHA3 operation's data." },
+
+	"sloadGas": { "v": 50, "d": "Multiplied by the number of 32-byte words that are copied (round up) for any *COPY operation and added." },
+	"sstoreSetGas": { "v": 20000, "d": "Once per SLOAD operation." },
+	"sstoreResetGas": { "v": 5000, "d": "Once per SSTORE operation if the zeroness changes from zero." },
+	"sstoreClearGas": { "v": 5000, "d": "Once per SSTORE operation if the zeroness doesn't change." },
+	"sstoreRefundGas": { "v": 15000, "d": "Once per SSTORE operation if the zeroness changes to zero." },
+	"jumpdestGas": { "v": 1, "d": "Refunded gas, once per SSTORE operation if the zeroness changes to zero." },
+
+	"logGas": { "v": 375, "d": "Per LOG* operation." },
+	"logDataGas": { "v": 8, "d": "Per byte in a LOG* operation's data." },
+	"logTopicGas": { "v": 375, "d": "Multiplied by the * of the LOG*, per LOG transaction. e.g. LOG0 incurs 0 * c_txLogTopicGas, LOG4 incurs 4 * c_txLogTopicGas." },
+
+	"createGas": { "v": 32000, "d": "Once per CREATE operation & contract-creation transaction." },
+
+	"callGas": { "v": 40, "d": "Once per CALL operation & message call transaction." },
+	"callStipend": { "v": 2300, "d": "Free gas given at beginning of call." },
+	"callValueTransferGas": { "v": 9000, "d": "Paid for CALL when the value transfor is non-zero." },
+	"callNewAccountGas": { "v": 25000, "d": "Paid for CALL when the destination address didn't exist prior." },
+
+	"suicideRefundGas": { "v": 24000, "d": "Refunded following a suicide operation." },
+
+	"memoryGas": { "v": 3, "d": "Times the address of the (highest referenced byte in memory + 1). NOTE: referencing happens on read, write and in instructions such as RETURN and CALL." },
+	"quadCoeffDiv": { "v": 512, "d": "Divisor for the quadratic particle of the memory cost equation." },
+
+	"createDataGas": { "v": 200, "d": "" },
+	"txGas": { "v": 21000, "d": "Per transaction. NOTE: Not payable on data of calls between transactions." },
+	"txDataZeroGas": { "v": 4, "d": "Per byte of data attached to a transaction that equals zero. NOTE: Not payable on data of calls between transactions." },
+	"txDataNonZeroGas": { "v": 68, "d": "Per byte of data attached to a transaction that is not equal to zero. NOTE: Not payable on data of calls between transactions." },
+
+	"copyGas": { "v": 3, "d": "" },
+	
+	"ecrecoverGas": { "v": 3000, "d": "" },
+	"sha256Gas": { "v": 60, "d": "" },
+	"sha256WordGas": { "v": 12, "d": "" },
+	"ripemd160Gas": { "v": 600, "d": "" },
+	"ripemd160WordGas": { "v": 120, "d": "" },
+	"identityGas": { "v": 15, "d": "" },
+	"identityWordGas": { "v": 3, "d": ""}
+}
 
-	"createDataGas": 200,
-	"txGas": 21000,
-	"txDataZeroGas": 4,
-	"txDataNonZeroGas": 68,
+/*
+// to get C++ .h:
+for (i in x) console.log("/// " + x[i].d + "\nextern u256 const c_" + i + (x[i].v * 0 !== 0 ? "[" + (x[i].v.length + 1) + "]" : "") + ";")
+// to get C++ .cpp:
+for (i in x) console.log("u256 const c_" + i + (x[i].v * 0 === 0 ? " = " + x[i].v : "[] = {" + x[i].v.join(", ") + ", 0}") + ";")
+*/
 
-	"copyGas": 3,
-}

libethereum/Precompiled.cpp

@@ -83,10 +83,10 @@ static bytes identityCode(bytesConstRef _in)
 
 static const std::map<unsigned, PrecompiledAddress> c_precompiled =
 {
-	{ 1, { [](bytesConstRef) -> bigint { return (bigint)3000; }, ecrecoverCode }},
-	{ 2, { [](bytesConstRef i) -> bigint { return (bigint)60 + (i.size() + 31) / 32 * 12; }, sha256Code }},
-	{ 3, { [](bytesConstRef i) -> bigint { return (bigint)600 + (i.size() + 31) / 32 * 120; }, ripemd160Code }},
-	{ 4, { [](bytesConstRef i) -> bigint { return (bigint)15 + (i.size() + 31) / 32 * 3; }, identityCode }}
+	{ 1, { [](bytesConstRef) -> bigint { return c_ecrecoverGas; }, ecrecoverCode }},
+	{ 2, { [](bytesConstRef i) -> bigint { return c_sha256Gas + (i.size() + 31) / 32 * c_sha256WordGas; }, sha256Code }},
+	{ 3, { [](bytesConstRef i) -> bigint { return c_ripemd160Gas + (i.size() + 31) / 32 * c_ripemd160WordGas; }, ripemd160Code }},
+	{ 4, { [](bytesConstRef i) -> bigint { return c_identityGas + (i.size() + 31) / 32 * c_identityWordGas; }, identityCode }}
 };
 
 std::map<unsigned, PrecompiledAddress> const& dev::eth::precompiled()

libevm/FeeStructure.cpp

@@ -22,45 +22,48 @@
 #include "FeeStructure.h"
 
 using namespace std;
-using namespace dev;
-using namespace dev::eth;
-
-u256 const dev::eth::c_tierStepGas[8] = { 0, 2, 3, 5, 8, 10, 20, 0 };
-u256 const dev::eth::c_expGas = 10;
-u256 const dev::eth::c_expByteGas = 10;
-
-u256 const dev::eth::c_sha3Gas = 30;
-u256 const dev::eth::c_sha3WordGas = 6;
-
-u256 const dev::eth::c_sloadGas = 50;
-u256 const dev::eth::c_sstoreSetGas = 20000;
-u256 const dev::eth::c_sstoreResetGas = 5000;
-u256 const dev::eth::c_sstoreClearGas = 5000;
-u256 const dev::eth::c_sstoreRefundGas = 15000;
-u256 const dev::eth::c_jumpdestGas = 1;
-
-u256 const dev::eth::c_logGas = 375;
-u256 const dev::eth::c_logDataGas = 8;
-u256 const dev::eth::c_logTopicGas = 375;
-
-u256 const dev::eth::c_createGas = 32000;
-
-u256 const dev::eth::c_callGas = 40;
-u256 const dev::eth::c_callStipend = 2300;
-u256 const dev::eth::c_callValueTransferGas = 9000;
-u256 const dev::eth::c_callNewAccountGas = 25000;
-
-u256 const dev::eth::c_suicideRefundGas = 24000;
-
-u256 const dev::eth::c_memoryGas = 3;
-u256 const dev::eth::c_quadCoeffDiv = 512;
-
-
-u256 const dev::eth::c_createDataGas = 200;
-u256 const dev::eth::c_txGas = 21000;
-u256 const dev::eth::c_txDataZeroGas = 4;
-u256 const dev::eth::c_txDataNonZeroGas = 68;
-
-u256 const dev::eth::c_copyGas = 3;
-
+namespace dev
+{
+namespace eth
+{
+
+//--- BEGIN: AUTOGENERATED FROM /feeStructure.json
+u256 const c_tierStepGas[] = {0, 2, 3, 5, 8, 10, 20, 0};
+u256 const c_expGas = 10;
+u256 const c_expByteGas = 10;
+u256 const c_sha3Gas = 30;
+u256 const c_sha3WordGas = 6;
+u256 const c_sloadGas = 50;
+u256 const c_sstoreSetGas = 20000;
+u256 const c_sstoreResetGas = 5000;
+u256 const c_sstoreClearGas = 5000;
+u256 const c_sstoreRefundGas = 15000;
+u256 const c_jumpdestGas = 1;
+u256 const c_logGas = 375;
+u256 const c_logDataGas = 8;
+u256 const c_logTopicGas = 375;
+u256 const c_createGas = 32000;
+u256 const c_callGas = 40;
+u256 const c_callStipend = 2300;
+u256 const c_callValueTransferGas = 9000;
+u256 const c_callNewAccountGas = 25000;
+u256 const c_suicideRefundGas = 24000;
+u256 const c_memoryGas = 3;
+u256 const c_quadCoeffDiv = 512;
+u256 const c_createDataGas = 200;
+u256 const c_txGas = 21000;
+u256 const c_txDataZeroGas = 4;
+u256 const c_txDataNonZeroGas = 68;
+u256 const c_copyGas = 3;
+u256 const c_ecrecoverGas = 3000;
+u256 const c_sha256Gas = 60;
+u256 const c_sha256WordGas = 12;
+u256 const c_ripemd160Gas = 600;
+u256 const c_ripemd160WordGas = 120;
+u256 const c_identityGas = 15;
+u256 const c_identityWordGas = 3;
+//--- END: AUTOGENERATED FROM /feeStructure.json
+
+}
+}
 

libevm/FeeStructure.h

@@ -61,5 +61,13 @@ extern u256 const c_txGas;					///< Per transaction. NOTE: Not payable on data o
 extern u256 const c_txDataZeroGas;			///< Per byte of data attached to a transaction that equals zero. NOTE: Not payable on data of calls between transactions.
 extern u256 const c_txDataNonZeroGas;		///< Per byte of data attached to a transaction that is not equal to zero. NOTE: Not payable on data of calls between transactions.
 
+extern u256 const c_ecrecoverGas;
+extern u256 const c_sha256Gas;
+extern u256 const c_sha256WordGas;
+extern u256 const c_ripemd160Gas;
+extern u256 const c_ripemd160WordGas;
+extern u256 const c_identityGas;
+extern u256 const c_identityWordGas;
+
 }
 }