Merge branch 'develop' into v3.20.0

skalenetwork · Jul 17, 2024 · 3561ea7 · 3561ea7
2 parents 01dbc36 + 8f89f61
commit 3561ea7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/libconsensus b/libconsensus
diff --git 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() );