diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c
index e7f7d142a..595bfa249 100644
--- a/lightningd/peer_control.c
+++ b/lightningd/peer_control.c
@@ -478,7 +478,7 @@ void add_peer(struct lightningd *ld, u64 unique_id,
 		= peer->next_index[REMOTE]
 		= peer->num_revocations_received = 0;
 	peer->next_htlc_id = 0;
-	shachain_init(&peer->their_shachain);
+	wallet_shachain_init(ld->wallet, &peer->their_shachain);
 	peer->closing_sig_received = NULL;
 
 	idname = type_to_string(peer, struct pubkey, id);
diff --git a/lightningd/peer_control.h b/lightningd/peer_control.h
index e0cdd39c1..831d4d490 100644
--- a/lightningd/peer_control.h
+++ b/lightningd/peer_control.h
@@ -10,6 +10,7 @@
 #include <lightningd/channel_config.h>
 #include <lightningd/peer_state.h>
 #include <stdbool.h>
+#include <wallet/wallet.h>
 #include <wire/peer_wire.h>
 
 #define ANNOUNCE_MIN_DEPTH 6
@@ -29,7 +30,7 @@ struct peer {
 	u8 *error;
 
 	/* Their shachain. */
-	struct shachain their_shachain;
+	struct wallet_shachain their_shachain;
 
  	/* What's happening. */
  	enum peer_state state;
diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c
index dbca93bdb..f7d9dcd69 100644
--- a/lightningd/peer_htlcs.c
+++ b/lightningd/peer_htlcs.c
@@ -1131,9 +1131,9 @@ int peer_got_revoke(struct peer *peer, const u8 *msg)
 	 * A receiving node MAY fail if the `per_commitment_secret` was not
 	 * generated by the protocol in [BOLT #3]
 	 */
-	if (!shachain_add_hash(&peer->their_shachain,
-			       shachain_index(revokenum),
-			       &per_commitment_secret)) {
+	if (!wallet_shachain_add_hash(peer->ld->wallet, &peer->their_shachain,
+				      shachain_index(revokenum),
+				      &per_commitment_secret)) {
 		char *err = tal_fmt(peer,
 				    "Bad per_commitment_secret %s for %"PRIu64,
 				    type_to_string(msg, struct sha256,