wallet: re-add ADDR_P2SH_SEGWIT type to enum addrtype

It was long obsoleted, and never appears in the DB, but we do still have
to handle old ones in the code.

We removed it from the enum in
f342630 (v24.02) after deprecating it
in 23.02.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

wallet/wallet.h

@@ -274,6 +274,7 @@ static inline enum channel_state channel_state_in_db(enum channel_state s)
 /* /!\ This is a DB ENUM, please do not change the numbering of any
  * already defined elements (adding is ok) /!\ */
 enum addrtype {
+	ADDR_P2SH_SEGWIT = 1,
 	ADDR_BECH32 = 2,
 	ADDR_P2TR = 4,
 	ADDR_ALL = (ADDR_BECH32 + ADDR_P2TR)
@@ -291,6 +292,10 @@ static inline enum addrtype wallet_addrtype_in_db(enum addrtype t)
 	case ADDR_ALL:
 		BUILD_ASSERT(ADDR_ALL == 6);
 		return t;
+	/* This existed, but is NEVER placed into db */
+	case ADDR_P2SH_SEGWIT:
+		BUILD_ASSERT(ADDR_P2SH_SEGWIT == 1);
+		break;
 	}
 	fatal("%s: %u is invalid", __func__, t);
 }

wallet/walletrpc.c

@@ -75,6 +75,7 @@ encode_pubkey_to_addr(const tal_t *ctx,
 		goto done;
 	}
 
+	case ADDR_P2SH_SEGWIT:
 	case ADDR_ALL:
 		abort();
 	}