From 600cf8441b8cf346eec08aee9acdf932b114d052 Mon Sep 17 00:00:00 2001 From: Stan Kladko <13399135+kladkogex@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:20:41 +0100 Subject: [PATCH 1/2] 1932_better_consensus_patch_timestamp --- libconsensus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libconsensus b/libconsensus index 9683c93ec..fda7a2ff8 160000 --- a/libconsensus +++ b/libconsensus @@ -1 +1 @@ -Subproject commit 9683c93ec19d4dd28724d9ec2e105677360918d1 +Subproject commit fda7a2ff89e34e924920a5b3682d93757cc4b0e3 From bbadcdf941208cfab51886cfce1ee5d5b919345a Mon Sep 17 00:00:00 2001 From: Oleh Nikolaiev Date: Tue, 9 Jul 2024 16:23:12 +0100 Subject: [PATCH 2/2] #1938 fix gas price for type2 txns --- libweb3jsonrpc/JsonHelper.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libweb3jsonrpc/JsonHelper.cpp b/libweb3jsonrpc/JsonHelper.cpp index b2828a1c2..5ee633768 100644 --- a/libweb3jsonrpc/JsonHelper.cpp +++ b/libweb3jsonrpc/JsonHelper.cpp @@ -95,8 +95,7 @@ Json::Value toJson( dev::eth::Transaction const& _t, std::pair< h256, unsigned > res["to"] = _t.isCreation() ? Json::Value() : toJS( _t.receiveAddress() ); res["from"] = toJS( _t.safeSender() ); res["gas"] = toJS( _t.gas() ); - if ( _t.txType() != dev::eth::TransactionType::Type2 ) - res["gasPrice"] = toJS( _t.gasPrice() ); + res["gasPrice"] = toJS( _t.gasPrice() ); res["nonce"] = toJS( _t.nonce() ); res["value"] = toJS( _t.value() ); res["blockHash"] = toJS( _location.first ); @@ -344,8 +343,7 @@ Json::Value toJson( dev::eth::Transaction const& _t ) { res["to"] = _t.isCreation() ? Json::Value() : toJS( _t.to() ); res["from"] = toJS( _t.from() ); res["gas"] = toJS( _t.gas() ); - if ( _t.txType() != dev::eth::TransactionType::Type2 ) - res["gasPrice"] = toJS( _t.gasPrice() ); + res["gasPrice"] = toJS( _t.gasPrice() ); res["value"] = toJS( _t.value() ); res["data"] = toJS( _t.data(), 32 ); res["nonce"] = toJS( _t.nonce() );