SKALED-1431 debug_getFutureTransactions call

libethereum/Client.h

@@ -145,6 +145,8 @@
     /// Retrieve pending transactions
     Transactions pending() const override;
 
+    Transactions debugGetFutureTransactions() const { return m_tq.debugGetFutureTransactions(); }
+
     /// Queues a block for import.
     ImportResult queueBlock( bytes const& _block, bool _isSafe = false );
 

libethereum/TransactionQueue.cpp

@@ -537,3 +537,14 @@
         MICROPROFILE_LEAVE();
     }
 }
+
+Transactions TransactionQueue::debugGetFutureTransactions() const {
+    Transactions res;
+    ReadGuard l( m_lock );
+    for ( auto addressAndMap : m_future ) {
+        for ( auto nonceAndTransaction : addressAndMap.second ) {
+            res.push_back( nonceAndTransaction.second.transaction );
+        }  // for nonce
+    }      // for address
+    return res;
+}

libethereum/TransactionQueue.h

@@ -123,6 +123,8 @@ class TransactionQueue {
     template < class... Args >
     Transactions topTransactionsSync( unsigned _limit, Args... args );
 
+    Transactions debugGetFutureTransactions() const;
+
     /// Get a hash set of transactions in the queue
     /// @returns A hash set of all transactions in the queue
     const h256Hash knownTransactions() const;

libweb3jsonrpc/Debug.cpp

@@ -239,8 +239,8 @@
 
         TransactionSkeleton ts = toTransactionSkeleton( _call );
 
         return m_eth.traceCall(
             ts.from, ts.value, ts.to, ts.data, ts.gas, ts.gasPrice, bN, _jsonTraceConfig );
     } catch ( Exception const& _e ) {
         BOOST_THROW_EXCEPTION( jsonrpc::JsonRpcException( _e.what() ) );
     }
@@ -345,3 +345,17 @@
 
     return boost::chrono::duration_cast< boost::chrono::milliseconds >( t2 - t1 ).count();
 }
+
+Json::Value Debug::debug_getFutureTransactions() {
+    try {
+        checkPrivilegedAccess();
+        auto res = toJson( m_eth.debugGetFutureTransactions() );
+        for ( auto& t : res )
+            t.removeMember( "data" );
+        return res;
+    } catch ( std::exception const& _e ) {
+        BOOST_THROW_EXCEPTION( jsonrpc::JsonRpcException( _e.what() ) );
+    } catch ( ... ) {
+        BOOST_THROW_EXCEPTION( jsonrpc::JsonRpcException( "Unknown error" ) );
+    }  // catch
+}

libweb3jsonrpc/Debug.h

@@ -62,6 +62,8 @@ class Debug : public DebugFace {
     virtual uint64_t debug_doStateDbCompaction() override;
     virtual uint64_t debug_doBlocksDbCompaction() override;
 
+    virtual Json::Value debug_getFutureTransactions() override;
+
 private:
     eth::Client& m_eth;
     SkaleDebugInterface* m_debugInterface = nullptr;

libweb3jsonrpc/DebugFace.h

@@ -98,6 +98,10 @@
         this->bindAndAddMethod( jsonrpc::Procedure( "debug_doBlocksDbCompaction",
                                     jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, NULL ),
             &dev::rpc::DebugFace::debug_doBlocksDbCompactionI );
+
+        this->bindAndAddMethod( jsonrpc::Procedure( "debug_getFutureTransactions",
+                                    jsonrpc::PARAMS_BY_POSITION, jsonrpc::JSON_STRING, NULL ),
+            &dev::rpc::DebugFace::debug_getFutureTransactionsI );
     }
     inline virtual void debug_accountRangeAtI( const Json::Value& request, Json::Value& response ) {
         response = this->debug_accountRangeAt( request[0u].asString(), request[1u].asInt(),
@@ -179,6 +183,10 @@
         response = this->debug_doBlocksDbCompaction();
     }
 
+    virtual void debug_getFutureTransactionsI( const Json::Value&, Json::Value& response ) {
+        response = this->debug_getFutureTransactions();
+    }
+
     virtual Json::Value debug_accountRangeAt(
         const std::string& param1, int param2, const std::string& param3, int param4 ) = 0;
     virtual Json::Value debug_traceTransaction(
@@ -207,6 +215,8 @@
 
     virtual uint64_t debug_doStateDbCompaction() = 0;
     virtual uint64_t debug_doBlocksDbCompaction() = 0;
+
+    virtual Json::Value debug_getFutureTransactions() = 0;
 };
 
 }  // namespace rpc

libweb3jsonrpc/Net.h

@@ -44,7 +44,7 @@ class Net : public NetFace {
     virtual bool net_listening() override;
 
 private:
-    const dev::eth::ChainParams& m_chainParams;
+    const dev::eth::ChainParams m_chainParams;
 };
 
 }  // namespace rpc

skaled/main.cpp

@@ -1988,7 +1988,7 @@ int main( int argc, char** argv ) try {
 #else
         // debug interface is enabled on core node if bEnabledAPIs_debug is true
         auto pDebugFace = bEnabledAPIs_debug ?
-                              new rpc::Debug( *g_client, &debugInterface, argv_string ) :
+                              new rpc::Debug( *g_client, &debugInterface, argv_string, true ) :
                               nullptr;
 #endif
 

test/unittests/libweb3jsonrpc/jsonrpc.cpp

@@ -346,7 +346,7 @@ struct JsonRpcFixture : public TestOutputHelperFixture {
         rpcServer.reset( new FullServer( ethFace , new rpc::Net( chainParams ),
             new rpc::Web3( /*web3->clientVersion()*/ ),  // TODO Add real version?
             new rpc::AdminEth( *client, *gasPricer, keyManager, *sessionManager.get() ),
-            /*new rpc::AdminNet(*web3, *sessionManager), */ new rpc::Debug( *client ),
+            /*new rpc::AdminNet(*web3, *sessionManager), */ new rpc::Debug( *client, nullptr, "", true ),
             new rpc::Test( *client ) ) );
 
         //