Skip to content

Commit

Permalink
[rpc, bugfix] Enforce maximum value for setmocktime
Browse files Browse the repository at this point in the history
Github-Pull: bitcoin#29869
Rebased-From: c2e0489
  • Loading branch information
dergoegge authored and fanquake committed Apr 16, 2024
1 parent 0a0c969 commit 0c34f12
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions src/rpc/node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <univalue.h>
#include <util/any.h>
#include <util/check.h>
#include <util/time.h>

#include <stdint.h>
#ifdef HAVE_MALLOC_INFO
Expand Down Expand Up @@ -58,9 +59,11 @@ static RPCHelpMan setmocktime()
LOCK(cs_main);

const int64_t time{request.params[0].getInt<int64_t>()};
if (time < 0) {
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime cannot be negative: %s.", time));
constexpr int64_t max_time{Ticks<std::chrono::seconds>(std::chrono::nanoseconds::max())};
if (time < 0 || time > max_time) {
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Mocktime must be in the range [0, %s], not %s.", max_time, time));
}

SetMockTime(time);
const NodeContext& node_context{EnsureAnyNodeContext(request.context)};
for (const auto& chain_client : node_context.chain_clients) {
Expand Down
2 changes: 1 addition & 1 deletion test/functional/rpc_uptime.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def run_test(self):
self._test_uptime()

def _test_negative_time(self):
assert_raises_rpc_error(-8, "Mocktime cannot be negative: -1.", self.nodes[0].setmocktime, -1)
assert_raises_rpc_error(-8, "Mocktime must be in the range [0, 9223372036], not -1.", self.nodes[0].setmocktime, -1)

def _test_uptime(self):
wait_time = 10
Expand Down

0 comments on commit 0c34f12

Please sign in to comment.