Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SKALED-1431 debug_getFutureTransactions call #1754

Closed
wants to merge 1 commit into from
Closed

SKALED-1431 debug_getFutureTransactions call #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libethereum/Client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@
/// Retrieve pending transactions
Transactions pending() const override;

Transactions DEBUG_getFutureTransactions() const { return m_tq.DEBUGgetFutureTransactions(); }

Check warning on line 130 in libethereum/Client.h

View check run for this annotation

Codecov / codecov/patch

libethereum/Client.h#L130 

Added line #L130 was not covered by tests

/// Queues a block for import.
ImportResult queueBlock( bytes const& _block, bool _isSafe = false );

Expand Down
11 changes: 11 additions & 0 deletions libethereum/TransactionQueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Check warning on line 546 in libethereum/TransactionQueue.cpp

View check run for this annotation

Codecov / codecov/patch

libethereum/TransactionQueue.cpp#L541-L546 

Added lines #L541 - L546 were not covered by tests
} // for nonce
} // for address
return res;

Check warning on line 549 in libethereum/TransactionQueue.cpp

View check run for this annotation

Codecov / codecov/patch

libethereum/TransactionQueue.cpp#L549 

Added line #L549 was not covered by tests
}
2 changes: 2 additions & 0 deletions libethereum/TransactionQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions libweb3jsonrpc/Debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,3 +314,7 @@

return boost::chrono::duration_cast< boost::chrono::milliseconds >( t2 - t1 ).count();
}

Json::Value Debug::debug_getFutureTransactions() {
return toJson( m_eth.DEBUG_getFutureTransactions() );

Check warning on line 319 in libweb3jsonrpc/Debug.cpp

View check run for this annotation

Codecov / codecov/patch

libweb3jsonrpc/Debug.cpp#L318-L319 

Added lines #L318 - L319 were not covered by tests
}
2 changes: 2 additions & 0 deletions libweb3jsonrpc/Debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,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 const& m_eth;
SkaleDebugInterface* m_debugInterface = nullptr;
Expand Down
10 changes: 10 additions & 0 deletions libweb3jsonrpc/DebugFace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -179,6 +183,10 @@
response = this->debug_doBlocksDbCompaction();
}

virtual void debug_getFutureTransactionsI( const Json::Value&, Json::Value& response ) {
response = this->debug_getFutureTransactions();
}

Check warning on line 188 in libweb3jsonrpc/DebugFace.h

View check run for this annotation

Codecov / codecov/patch

libweb3jsonrpc/DebugFace.h#L186-L188 

Added lines #L186 - L188 were not covered by tests

virtual Json::Value debug_accountRangeAt(
const std::string& param1, int param2, const std::string& param3, int param4 ) = 0;
virtual Json::Value debug_traceTransaction(
Expand Down Expand Up @@ -206,6 +214,8 @@

virtual uint64_t debug_doStateDbCompaction() = 0;
virtual uint64_t debug_doBlocksDbCompaction() = 0;

virtual Json::Value debug_getFutureTransactions() = 0;
};

} // namespace rpc
Expand Down
Loading