diff --git a/hsmd/hsmd.c b/hsmd/hsmd.c
index b65bcf162..ca9380345 100644
--- a/hsmd/hsmd.c
+++ b/hsmd/hsmd.c
@@ -1439,7 +1439,6 @@ static struct io_plan *handle_sign_withdrawal_tx(struct io_conn *conn,
 	u32 change_keyindex;
 	struct utxo **utxos;
 	struct bitcoin_tx *tx;
-	struct ext_key ext;
 	struct pubkey changekey;
 	u8 *scriptpubkey;
 
@@ -1448,12 +1447,10 @@ static struct io_plan *handle_sign_withdrawal_tx(struct io_conn *conn,
 					  &scriptpubkey, &utxos))
 		return bad_req(conn, c, msg_in);
 
-	if (bip32_key_from_parent(&secretstuff.bip32, change_keyindex,
-				  BIP32_FLAG_KEY_PUBLIC, &ext) != WALLY_OK)
+	if (!bip32_pubkey(&secretstuff.bip32, &changekey, change_keyindex))
 		return bad_req_fmt(conn, c, msg_in,
 				   "Failed to get key %u", change_keyindex);
 
-	pubkey_from_der(ext.pub_key, sizeof(ext.pub_key), &changekey);
 	tx = withdraw_tx(tmpctx, cast_const2(const struct utxo **, utxos),
 			 scriptpubkey, satoshi_out,
 			 &changekey, change_out, NULL, NULL);
diff --git a/wallet/walletrpc.c b/wallet/walletrpc.c
index c106bf581..43e27c57a 100644
--- a/wallet/walletrpc.c
+++ b/wallet/walletrpc.c
@@ -98,8 +98,7 @@ static struct command_result *json_withdraw(struct command *cmd,
 	struct withdrawal *withdraw = tal(cmd, struct withdrawal);
 	u32 *feerate_per_kw;
 	struct bitcoin_tx *tx;
-	struct ext_key ext;
-	struct pubkey pubkey;
+	struct pubkey changekey;
 	enum address_parse_result addr_parse;
 	struct command_result *res;
 	u32 *minconf, maxheight;
@@ -147,17 +146,12 @@ static struct command_result *json_withdraw(struct command *cmd,
 	if (res)
 		return res;
 
-	if (bip32_key_from_parent(cmd->ld->wallet->bip32_base, withdraw->wtx.change_key_index,
-			BIP32_FLAG_KEY_PUBLIC, &ext) != WALLY_OK) {
+	if (!bip32_pubkey(cmd->ld->wallet->bip32_base, &changekey,
+			  withdraw->wtx.change_key_index)) {
 		return command_fail(cmd, LIGHTNINGD, "Keys generation failure");
 	}
-
-	if (!secp256k1_ec_pubkey_parse(secp256k1_ctx, &pubkey.pubkey,
-			ext.pub_key, sizeof(ext.pub_key))) {
-		return command_fail(cmd, LIGHTNINGD, "Key parsing failure");
-	}
-
-	txfilter_add_derkey(cmd->ld->owned_txfilter, ext.pub_key);
+	txfilter_add_scriptpubkey(cmd->ld->owned_txfilter,
+				  scriptpubkey_p2wpkh(tmpctx, &changekey));
 
 	u8 *msg = towire_hsm_sign_withdrawal(cmd,
 					     withdraw->wtx.amount,
@@ -302,11 +296,11 @@ static struct command_result *json_newaddr(struct command *cmd,
 					   const jsmntok_t *params)
 {
 	struct json_stream *response;
-	struct ext_key ext;
 	struct pubkey pubkey;
 	enum addrtype *addrtype;
 	s64 keyidx;
 	char *p2sh, *bech32;
+	u8 *b32script;
 
 	if (!param(cmd, buffer, params,
 		   p_opt_def("addresstype", param_newaddr, &addrtype, ADDR_BECH32),
@@ -318,17 +312,15 @@ static struct command_result *json_newaddr(struct command *cmd,
 		return command_fail(cmd, LIGHTNINGD, "Keys exhausted ");
 	}
 
-	if (bip32_key_from_parent(cmd->ld->wallet->bip32_base, keyidx,
-				  BIP32_FLAG_KEY_PUBLIC, &ext) != WALLY_OK) {
+	if (!bip32_pubkey(cmd->ld->wallet->bip32_base, &pubkey, keyidx))
 		return command_fail(cmd, LIGHTNINGD, "Keys generation failure");
-	}
-
-	if (!secp256k1_ec_pubkey_parse(secp256k1_ctx, &pubkey.pubkey,
-				       ext.pub_key, sizeof(ext.pub_key))) {
-		return command_fail(cmd, LIGHTNINGD, "Key parsing failure");
-	}
 
-	txfilter_add_derkey(cmd->ld->owned_txfilter, ext.pub_key);
+	b32script = scriptpubkey_p2wpkh(tmpctx, &pubkey);
+	if (*addrtype & ADDR_BECH32)
+		txfilter_add_scriptpubkey(cmd->ld->owned_txfilter, b32script);
+	if (*addrtype & ADDR_P2SH_SEGWIT)
+		txfilter_add_scriptpubkey(cmd->ld->owned_txfilter,
+					  scriptpubkey_p2sh(tmpctx, b32script));
 
 	p2sh = encode_pubkey_to_addr(cmd, cmd->ld, &pubkey, true, NULL);
 	bech32 = encode_pubkey_to_addr(cmd, cmd->ld, &pubkey, false, NULL);
@@ -365,7 +357,6 @@ static struct command_result *json_listaddrs(struct command *cmd,
 					     const jsmntok_t *params)
 {
 	struct json_stream *response;
-	struct ext_key ext;
 	struct pubkey pubkey;
 	u64 *bip32_max_index;
 
@@ -389,15 +380,8 @@ static struct command_result *json_listaddrs(struct command *cmd,
 			break;
 		}
 
-		if (bip32_key_from_parent(cmd->ld->wallet->bip32_base, keyidx,
-					  BIP32_FLAG_KEY_PUBLIC, &ext) != WALLY_OK) {
-			abort();
-		}
-
-		if (!secp256k1_ec_pubkey_parse(secp256k1_ctx, &pubkey.pubkey,
-					       ext.pub_key, sizeof(ext.pub_key))) {
+		if (!bip32_pubkey(cmd->ld->wallet->bip32_base, &pubkey, keyidx))
 			abort();
-		}
 
 		// p2sh
 		u8 *redeemscript_p2sh;