Skip to content

Commit

Permalink
Merge branch master into core26
Browse files Browse the repository at this point in the history
  • Loading branch information
timemarkovqtum committed May 9, 2024
2 parents 42b8a21 + cc65314 commit 559867b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/cryptopp/drbg.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,12 @@ class NIST_DRBG : public RandomNumberGenerator
virtual unsigned int GetMaxNonce() const=0;

//! \brief Provides the maximum size of a request to GenerateBlock
//! \returns The the maximum size of a request to GenerateBlock(), in bytes
//! \returns The maximum size of a request to GenerateBlock(), in bytes
//! \details The equivalent class constant is <tt>MAXIMUM_BYTES_PER_REQUEST</tt>
virtual unsigned int GetMaxBytesPerRequest() const=0;

//! \brief Provides the maximum number of requests before a reseed
//! \returns The the maximum number of requests before a reseed, in bytes
//! \returns The maximum number of requests before a reseed, in bytes
//! \details The equivalent class constant is <tt>MAXIMUM_REQUESTS_BEFORE_RESEED</tt>.
//! <tt>MAXIMUM_REQUESTS_BEFORE_RESEED</tt> has been reduced from 2<sup>48</sup> to <tt>INT_MAX</tt>
//! to fit the underlying C++ datatype.
Expand Down
6 changes: 3 additions & 3 deletions src/node/miner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1103,10 +1103,10 @@ class MyDelegations : public DelegationFilterBase
// Address map
std::map<uint160, bool> mapAddress;

// Get all addreses with coins
// Get all addresses with coins
SelectAddress(mapAddress, nHeight);

// Get all addreses for delegations in the GUI
// Get all addresses for delegations in the GUI
for(auto item : pwallet->mapDelegation)
{
uint160 address = item.second.delegateAddress;
Expand Down Expand Up @@ -1943,7 +1943,7 @@ class StakeMiner : public IStakeMiner

if (SignBlock(d->pblockfilled, *(d->pwallet), d->nTotalFees, blockTime, d->setCoins, d->mapSolveSelectedCoins[blockTime], d->mapSolveDelegateCoins[blockTime], true)) {
// Should always reach here unless we spent too much time processing transactions and the timestamp is now invalid
// CheckStake also does CheckBlock and AcceptBlock to propogate it to the network
// CheckStake also does CheckBlock and AcceptBlock to propagate it to the network
bool validBlock = false;
while(!validBlock) {
if (IsStale(d->pblockfilled)) {
Expand Down
2 changes: 1 addition & 1 deletion src/rpc/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ static inline JSONRPCRequest& transformNamedArguments(const JSONRPCRequest& _in,
}
// Process expected parameters. If any parameters were left unspecified in
// the request before a parameter that was specified, null values need to be
// inserted at the unspecifed parameter positions, and the "hole" variable
// inserted at the unspecified parameter positions, and the "hole" variable
// below tracks the number of null values that need to be inserted.
// The "initial_hole_size" variable stores the size of the initial hole,
// i.e. how many initial positional arguments were left unspecified. This is
Expand Down

0 comments on commit 559867b

Please sign in to comment.