global: use clock_time in place of time_now().

Except for tracing, that sticks with time_now().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

Makefile

@@ -600,7 +600,7 @@ check-tmpctx:
 	@if git grep -n 'tal_free[(]tmpctx)' | grep -Ev '^ccan/|/test/|^common/setup.c:|^common/utils.c:'; then echo "Don't free tmpctx!">&2; exit 1; fi
 
 check-discouraged-functions:
-	@if git grep -nE "[^a-z_/](fgets|fputs|gets|scanf|sprintf|randombytes_buf)\(" -- "*.c" "*.h" ":(exclude)ccan/" ":(exclude)contrib/" | grep -Fv '/* discouraged:'; then exit 1; fi
+	@if git grep -nE "[^a-z_/](fgets|fputs|gets|scanf|sprintf|randombytes_buf|time_now)\(" -- "*.c" "*.h" ":(exclude)ccan/" ":(exclude)contrib/" | grep -Fv '/* discouraged:'; then exit 1; fi
 
 check-bad-sprintf:
 	@if git grep -n "%[*]\.s"; then exit 1; fi

common/coin_mvt.c

@@ -3,7 +3,7 @@
 #include <ccan/bitops/bitops.h>
 #include <ccan/ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>
-#include <ccan/time/time.h>
+#include <common/clock_time.h>
 #include <common/coin_mvt.h>
 #include <common/node_id.h>
 #include <common/utils.h>
@@ -155,6 +155,12 @@ static enum mvt_tag mvt_tag_in_db(enum mvt_tag mvt_tag)
 	abort();
 }
 
+/* This puts the coin movements in order */
+u64 coinmvt_current_time(void)
+{
+	return clock_time_progresses().ts.tv_sec;
+}
+
 const char *mvt_tag_str(enum mvt_tag tag)
 {
 	assert((unsigned)tag < NUM_MVT_TAGS);
@@ -338,7 +344,7 @@ static struct chain_coin_mvt *new_chain_coin_mvt_sat(const tal_t *ctx,
 	assert(ok);
 
 	return new_chain_coin_mvt(ctx, channel, account_name,
-				  time_now().ts.tv_sec, tx_txid,
+				  coinmvt_current_time(), tx_txid,
 				  outpoint, payment_hash,
 				  blockheight, tags, direction, amt_msat,
 				  /* All amounts that are sat are
@@ -393,7 +399,7 @@ struct chain_coin_mvt *new_coin_channel_close(const tal_t *ctx,
 		tags = mk_mvt_tags(MVT_CHANNEL_CLOSE);
 
 	mvt = new_chain_coin_mvt(ctx, channel, alt_account,
-				 time_now().ts.tv_sec, txid,
+				 coinmvt_current_time(), txid,
 				 out, NULL, blockheight,
 				 tags,
 				 COIN_DEBIT, amount,
@@ -421,7 +427,7 @@ struct chain_coin_mvt *new_coin_channel_open_proposed(const tal_t *ctx,
 	if (is_leased)
 		mvt_tag_set(&tags, MVT_LEASED);
 
-	mvt = new_chain_coin_mvt(ctx, channel, NULL, time_now().ts.tv_sec,
+	mvt = new_chain_coin_mvt(ctx, channel, NULL, coinmvt_current_time(),
 				 NULL, out, NULL, 0,
 				 tags,
 				 COIN_CREDIT, amount, output_val, 0);
@@ -474,7 +480,7 @@ struct chain_coin_mvt *new_coin_channel_open(const tal_t *ctx,
 					     bool is_leased)
 {
 	return new_coin_channel_open_general(ctx, channel, NULL,
-					     time_now().ts.tv_sec,
+					     coinmvt_current_time(),
 					     out, peer_id, blockheight,
 					     amount, output_val, is_opener, is_leased);
 }
@@ -516,7 +522,7 @@ struct chain_coin_mvt *new_coin_external_spend(const tal_t *ctx,
 					       struct mvt_tags tags)
 {
 	return new_chain_coin_mvt(ctx, NULL, ACCOUNT_NAME_EXTERNAL,
-				  time_now().ts.tv_sec, txid,
+				  coinmvt_current_time(), txid,
 				  outpoint, NULL, blockheight,
 				  tags,
 				  COIN_CREDIT, AMOUNT_MSAT(0), amount, 0);
@@ -584,7 +590,7 @@ struct channel_coin_mvt *new_coin_channel_push(const tal_t *ctx,
 					       struct mvt_tags tags)
 {
 	return new_coin_channel_push_general(ctx, channel, NULL,
-					     time_now().ts.tv_sec,
+					     coinmvt_current_time(),
 					     direction, amount, tags);
 }
 
@@ -731,6 +737,10 @@ void fromwire_chain_coin_mvt(const u8 **cursor, size_t *max, struct chain_coin_m
 	} else
 		mvt->peer_id = NULL;
 	mvt->timestamp = fromwire_u64(cursor, max);
+
+	/* Align onchaind's timestamps with ours if we're deterministic */
+	if (clock_time_overridden())
+		mvt->timestamp = coinmvt_current_time();
 }
 
 struct mvt_tags mk_mvt_tags_(enum mvt_tag tag, ...)

common/coin_mvt.h

@@ -346,4 +346,7 @@ bool mvt_tag_parse(const char *buf, size_t len, enum mvt_tag *tag);
 void towire_chain_coin_mvt(u8 **pptr, const struct chain_coin_mvt *mvt);
 void fromwire_chain_coin_mvt(const u8 **cursor, size_t *max, struct chain_coin_mvt *mvt);
 
+/* Time helper for deterministic timestamps: always moves forwards */
+u64 coinmvt_current_time(void);
+
 #endif /* LIGHTNING_COMMON_COIN_MVT_H */

common/test/Makefile

@@ -6,6 +6,7 @@ COMMON_TEST_PROGRAMS := $(COMMON_TEST_OBJS:.o=)
 COMMON_TEST_COMMON_OBJS :=				\
 	common/autodata.o				\
 	common/randbytes.o				\
+	common/clock_time.o				\
 	common/setup.o					\
 	common/utils.o
 

common/test/run-json.c

@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <ccan/tal/str/str.h>
 #include <common/channel_type.h>
+#include <common/clock_time.h>
 #include <common/json_filter.h>
 #include <common/randbytes.h>
 #include <common/sciddir_or_pubkey.h>

common/test/run-param.c

@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <ccan/array_size/array_size.h>
 #include <common/channel_type.h>
+#include <common/clock_time.h>
 #include <common/memleak.h>
 #include <common/randbytes.h>
 #include <common/setup.h>

common/test/run-route_blinding_test.c

@@ -10,6 +10,7 @@
 #include <ccan/tal/grab_file/grab_file.h>
 #include <ccan/tal/path/path.h>
 #include <common/channel_id.h>
+#include <common/clock_time.h>
 #include <common/json_parse.h>
 #include <common/json_stream.h>
 #include <common/randbytes.h>

common/trace.c

@@ -75,7 +75,7 @@ static void init_span(struct span *s,
 		      const char *name,
 		      struct span *parent)
 {
-	struct timeabs now = time_now();
+	struct timeabs now = time_now(); /* discouraged: but tracing wants non-dev time */
 
 	s->key = key;
 	s->id = pseudorand_u64();
@@ -366,7 +366,7 @@ void trace_span_end(const void *key)
 
 	trace_check_tree();
 
-	struct timeabs now = time_now();
+	struct timeabs now = time_now(); /* discouraged: but tracing wants non-dev time */
 	s->end_time = (now.ts.tv_sec * 1000000) + now.ts.tv_nsec / 1000;
 	DTRACE_PROBE1(lightningd, span_end, s->id);
 	if (trace_to_file) {

connectd/connectd.c

@@ -18,6 +18,7 @@
 #include <ccan/tal/str/str.h>
 #include <common/bech32.h>
 #include <common/bech32_util.h>
+#include <common/clock_time.h>
 #include <common/cryptomsg.h>
 #include <common/daemon_conn.h>
 #include <common/dev_disconnect.h>
@@ -2260,7 +2261,7 @@ static void dev_report_fds(struct daemon *daemon, const u8 *msg)
 void update_recent_timestamp(struct daemon *daemon, struct gossmap *gossmap)
 {
 	/* 2 hours allows for some clock drift, not too much gossip */
-	u32 recent = time_now().ts.tv_sec - 7200;
+	u32 recent = clock_time().ts.tv_sec - 7200;
 
 	/* Only update every minute */
 	if (daemon->gossip_recent_time + 60 > recent)

devtools/bolt11-cli.c

@@ -10,6 +10,7 @@
 #include <ccan/time/time.h>
 #include <common/bech32.h>
 #include <common/bolt11.h>
+#include <common/clock_time.h>
 #include <common/features.h>
 #include <common/setup.h>
 #include <common/utils.h>
@@ -109,7 +110,7 @@ static void encode(const tal_t *ctx,
 	struct pubkey me;
 	bool explicit_n = false;
 
-	b11->timestamp = time_now().ts.tv_sec;
+	b11->timestamp = clock_time().ts.tv_sec;
 	b11->chain = chainparams_for_network("regtest");
 	b11->expiry = 3600;
 	b11->min_final_cltv_expiry = DEFAULT_FINAL_CLTV_DELTA;