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

Fee structure stuff.

cl-refactor
Gav Wood 10 years ago
parent
5d1e93ec0e
commit
f7dba3781a
5 changed files with 109 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 88
      feeStructure.json
  2. 4
      libethereum/GenesisInfo.cpp
  3. 9
      libethereum/Precompiled.cpp
  4. 85
      libevm/FeeStructure.cpp
  5. 8
      libevm/FeeStructure.h

88
feeStructure.json
View File

@ -1,38 +1,54 @@
{ var x = {
"tierStepGas": [ 0, 2, 3, 5, 8, 10, 20 ], "tierStepGas": { "v": [ 0, 2, 3, 5, 8, 10, 20 ], "d": "Once per operation, for a selection of them." },
"expGas": 10, "expGas": { "v": 10, "d": "Once per EXP instuction." },
"expByteGas": 10, "expByteGas": { "v": 10, "d": "Times ceil(log256(exponent)) for the EXP instruction." },
"sha3Gas": 30, "sha3Gas": { "v": 30, "d": "Once per SHA3 operation." },
"sha3WordGas": 6, "sha3WordGas": { "v": 6, "d": "Once per word of the SHA3 operation's data." },
"sloadGas": 50, "sloadGas": { "v": 50, "d": "Multiplied by the number of 32-byte words that are copied (round up) for any *COPY operation and added." },
"sstoreSetGas": 20000, "sstoreSetGas": { "v": 20000, "d": "Once per SLOAD operation." },
"sstoreResetGas": 5000, "sstoreResetGas": { "v": 5000, "d": "Once per SSTORE operation if the zeroness changes from zero." },
"sstoreClearGas": 5000, "sstoreClearGas": { "v": 5000, "d": "Once per SSTORE operation if the zeroness doesn't change." },
"sstoreRefundGas": 15000, "sstoreRefundGas": { "v": 15000, "d": "Once per SSTORE operation if the zeroness changes to zero." },
"jumpdestGas": 1, "jumpdestGas": { "v": 1, "d": "Refunded gas, once per SSTORE operation if the zeroness changes to zero." },
"logGas": 375, "logGas": { "v": 375, "d": "Per LOG* operation." },
"logDataGas": 8, "logDataGas": { "v": 8, "d": "Per byte in a LOG* operation's data." },
"logTopicGas": 375, "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": 32000, "createGas": { "v": 32000, "d": "Once per CREATE operation & contract-creation transaction." },
"callGas": 40, "callGas": { "v": 40, "d": "Once per CALL operation & message call transaction." },
"callStipend": 2300, "callStipend": { "v": 2300, "d": "Free gas given at beginning of call." },
"callValueTransferGas": 9000, "callValueTransferGas": { "v": 9000, "d": "Paid for CALL when the value transfor is non-zero." },
"callNewAccountGas": 25000, "callNewAccountGas": { "v": 25000, "d": "Paid for CALL when the destination address didn't exist prior." },
"suicideRefundGas": 24000, "suicideRefundGas": { "v": 24000, "d": "Refunded following a suicide operation." },
"memoryGas": 3, "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": 512, "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, // to get C++ .h:
"txDataZeroGas": 4, for (i in x) console.log("/// " + x[i].d + "\nextern u256 const c_" + i + (x[i].v * 0 !== 0 ? "[" + (x[i].v.length + 1) + "]" : "") + ";")
"txDataNonZeroGas": 68, // 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,
}

4
libethereum/GenesisInfo.cpp
View File

@ -36,9 +36,5 @@ R"ETHEREUM(
"cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { "wei": "1606938044258990275541962092341162602522202993782792835301376" }, "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
"6c386a4b26f73c802f34673f7248bb118f97424a": { "wei": "1606938044258990275541962092341162602522202993782792835301376" }, "6c386a4b26f73c802f34673f7248bb118f97424a": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
"e4157b34ea9615cfbde6b4fda419828124b70c78": { "wei": "1606938044258990275541962092341162602522202993782792835301376" }, "e4157b34ea9615cfbde6b4fda419828124b70c78": { "wei": "1606938044258990275541962092341162602522202993782792835301376" },
"b0afc46d9ce366d06ab4952ca27db1d9557ae9fd": { "finney": "154162184" },
"f6b1e9dc460d4d62cc22ec5f987d726929c0f9f0": { "finney": "102774789" },
"cc45122d8b7fa0b1eaa6b29e0fb561422a9239d0": { "finney": "51387394" },
"b7576e9d314df41ec5506494293afb1bd5d3f65d": { "finney": "69423399" },
} }
)ETHEREUM"; )ETHEREUM";

9
libethereum/Precompiled.cpp
View File

@ -24,6 +24,7 @@
#include <libdevcrypto/SHA3.h> #include <libdevcrypto/SHA3.h>
#include <libdevcrypto/Common.h> #include <libdevcrypto/Common.h>
#include <libethcore/CommonEth.h> #include <libethcore/CommonEth.h>
#include <libevm/FeeStructure.h>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
using namespace dev::eth; using namespace dev::eth;
@ -82,10 +83,10 @@ static bytes identityCode(bytesConstRef _in)
static const std::map<unsigned, PrecompiledAddress> c_precompiled = static const std::map<unsigned, PrecompiledAddress> c_precompiled =
{ {
{ 1, { [](bytesConstRef) -> bigint { return (bigint)3000; }, ecrecoverCode }}, { 1, { [](bytesConstRef) -> bigint { return c_ecrecoverGas; }, ecrecoverCode }},
{ 2, { [](bytesConstRef i) -> bigint { return (bigint)60 + (i.size() + 31) / 32 * 12; }, sha256Code }}, { 2, { [](bytesConstRef i) -> bigint { return c_sha256Gas + (i.size() + 31) / 32 * c_sha256WordGas; }, sha256Code }},
{ 3, { [](bytesConstRef i) -> bigint { return (bigint)600 + (i.size() + 31) / 32 * 120; }, ripemd160Code }}, { 3, { [](bytesConstRef i) -> bigint { return c_ripemd160Gas + (i.size() + 31) / 32 * c_ripemd160WordGas; }, ripemd160Code }},
{ 4, { [](bytesConstRef i) -> bigint { return (bigint)15 + (i.size() + 31) / 32 * 3; }, identityCode }} { 4, { [](bytesConstRef i) -> bigint { return c_identityGas + (i.size() + 31) / 32 * c_identityWordGas; }, identityCode }}
}; };
std::map<unsigned, PrecompiledAddress> const& dev::eth::precompiled() std::map<unsigned, PrecompiledAddress> const& dev::eth::precompiled()

85
libevm/FeeStructure.cpp
View File

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

8
libevm/FeeStructure.h
View File

@ -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_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_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;
} }
} }

Write Preview
Loading…
Cancel
Save