Merge pull request #5691 from ethereum/txdata-cost-reduction

gumb0 · web-flow · commit 8d7b0dcc0b12 · 2019-07-22T14:03:47.000+02:00
EIP-2028: Set tx data nonzero byte cost to 16 in Istanbul
diff --git a/libethcore/EVMSchedule.h b/libethcore/EVMSchedule.h
@@ -150,6 +150,7 @@ static const EVMSchedule ConstantinopleFixSchedule = [] {
 static const EVMSchedule IstanbulSchedule = [] {
     EVMSchedule schedule = ConstantinopleFixSchedule;
     schedule.accountVersion = 1;
+    schedule.txDataNonZeroGas = 16;
     return schedule;
 }();
 
diff --git a/test/unittests/libethereum/Transaction.cpp b/test/unittests/libethereum/Transaction.cpp
@@ -33,8 +33,10 @@ BOOST_FIXTURE_TEST_SUITE(libethereum, TestOutputHelperFixture)
 
 BOOST_AUTO_TEST_CASE(TransactionGasRequired)
 {
+    // Transaction data is 0358ac39584bc98a7c979f984b03, 14 bytes
     Transaction tr(fromHex("0xf86d800182521c94095e7baea6a6c7c4c2dfeb977efac326af552d870a8e0358ac39584bc98a7c979f984b031ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"), CheckTransaction::None);
-    BOOST_CHECK_EQUAL(tr.baseGasRequired(FrontierSchedule), 21952);
+    BOOST_CHECK_EQUAL(tr.baseGasRequired(FrontierSchedule), 14 * 68 + 21000);
+    BOOST_CHECK_EQUAL(tr.baseGasRequired(IstanbulSchedule), 14 * 16 + 21000);
 }
 
 BOOST_AUTO_TEST_CASE(ExecutionResultOutput)

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,10 @@ BOOST_FIXTURE_TEST_SUITE(libethereum, TestOutputHelperFixture)`
`33`	`33`
`34`	`34`	`BOOST_AUTO_TEST_CASE(TransactionGasRequired)`
`35`	`35`	`{`
	`36`	`+ // Transaction data is 0358ac39584bc98a7c979f984b03, 14 bytes`
`36`	`37`	`Transaction tr(fromHex("0xf86d800182521c94095e7baea6a6c7c4c2dfeb977efac326af552d870a8e0358ac39584bc98a7c979f984b031ba048b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353a0efffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"), CheckTransaction::None);`
`37`		`- BOOST_CHECK_EQUAL(tr.baseGasRequired(FrontierSchedule), 21952);`
	`38`	`+ BOOST_CHECK_EQUAL(tr.baseGasRequired(FrontierSchedule), 14 * 68 + 21000);`
	`39`	`+ BOOST_CHECK_EQUAL(tr.baseGasRequired(IstanbulSchedule), 14 * 16 + 21000);`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`BOOST_AUTO_TEST_CASE(ExecutionResultOutput)`