Output descriptor not included for address index

[braydonf]

Versions
v1.0.2 (2b2e53d)

Expected

For p2sh, p2wpkh, p2pkh, p2wsh output types to be indexed separately.

Actual

Only the address hash is used in the index, so there is the output type is not included between the various output types. This has the result that bech32 (segwit) and base58 (non-segwit) addresses that have the same hash share the same results.

[braydonf]

I have a reproducible test case defined in the indexer branch at commit braydonf@4dd0a9c.