diff --git a/bip-0174.mediawiki b/bip-0174.mediawiki
index 7ea137fc..4810a0f3 100644
--- a/bip-0174.mediawiki
+++ b/bip-0174.mediawiki
@@ -134,7 +134,7 @@ The global types are defined as follows:
| 0, 2
|}
-The currently defined per-input types are defined as follows:
+Per-input types are defined as follows:
{|
! Name
@@ -146,7 +146,6 @@ The currently defined per-input types are defined as follows:
! Versions Requiring Inclusion
! Versions Requiring Exclusion
! Versions Allowing Inclusion
-! Parent BIP
|-
| Non-Witness UTXO
| PSBT_IN_NON_WITNESS_UTXO = 0x00
@@ -157,7 +156,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| Witness UTXO
| PSBT_IN_WITNESS_UTXO = 0x01
@@ -168,7 +166,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| Partial Signature
| PSBT_IN_PARTIAL_SIG = 0x02
@@ -179,7 +176,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| Sighash Type
| PSBT_IN_SIGHASH_TYPE = 0x03
@@ -190,7 +186,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| Redeem Script
| PSBT_IN_REDEEM_SCRIPT = 0x04
@@ -201,7 +196,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| Witness Script
| PSBT_IN_WITNESS_SCRIPT = 0x05
@@ -212,7 +206,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| BIP 32 Derivation Path
| PSBT_IN_BIP32_DERIVATION = 0x06
@@ -223,7 +216,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| Finalized scriptSig
| PSBT_IN_FINAL_SCRIPTSIG = 0x07
@@ -234,7 +226,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| Finalized scriptWitness
| PSBT_IN_FINAL_SCRIPTWITNESS = 0x08
@@ -245,18 +236,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
-|-
-| Proof-of-reserves commitment
-| PSBT_IN_POR_COMMITMENT = 0x09
-| None
-| No key data
-|
-| The UTF-8 encoded commitment message string for the proof-of-reserves. See [[bip-0127.mediawiki|BIP 127]] for more information.
-|
-|
-| 0, 2
-| [[bip-0127.mediawiki|127]]
|-
| RIPEMD160 preimage
| PSBT_IN_RIPEMD160 = 0x0a
@@ -267,7 +246,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| SHA256 preimage
| PSBT_IN_SHA256 = 0x0b
@@ -278,7 +256,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| HASH160 preimage
| PSBT_IN_HASH160 = 0x0c
@@ -289,7 +266,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
|-
| HASH256 preimage
| PSBT_IN_HASH256 = 0x0d
@@ -300,218 +276,6 @@ The currently defined per-input types are defined as follows:
|
|
| 0, 2
-| 174
-|-
-| Previous TXID
-| PSBT_IN_PREVIOUS_TXID = 0x0e
-| None
-| No key data
-| <32 byte txid>
-| 32 byte txid in standard byte order, not display byte order, of the previous transaction whose output at PSBT_IN_OUTPUT_INDEX is being spent.
-| 2
-| 0
-| 2
-| [[bip-0370.mediawiki|370]]
-|-
-| Spent Output Index
-| PSBT_IN_OUTPUT_INDEX = 0x0f
-| None
-| No key data
-| <32-bit little endian uint index>
-| 32 bit little endian integer representing the index of the output being spent in the transaction with the txid of PSBT_IN_PREVIOUS_TXID.
-| 2
-| 0
-| 2
-| [[bip-0370.mediawiki|370]]
-|-
-| Sequence Number
-| PSBT_IN_SEQUENCE = 0x10
-| None
-| No key data
-| <32-bit little endian uint sequence>
-| The 32 bit unsigned little endian integer for the sequence number of this input. If omitted, the sequence number is assumed to be the final sequence number (0xffffffff).
-|
-| 0
-| 2
-| [[bip-0370.mediawiki|370]]
-|-
-| Required Time-based Locktime
-| PSBT_IN_REQUIRED_TIME_LOCKTIME = 0x11
-| None
-| No key data
-| <32-bit little endian uint locktime>
-| 32 bit unsigned little endian integer greater than or equal to 500000000 representing the minimum Unix timestamp that this input requires to be set as the transaction's lock time.
-|
-| 0
-| 2
-| [[bip-0370.mediawiki|370]]
-|-
-| Required Height-based Locktime
-| PSBT_IN_REQUIRED_HEIGHT_LOCKTIME = 0x12
-| None
-| No key data
-| <32-bit uint locktime>
-| 32 bit unsigned little endian integer less than 500000000 representing the minimum block height that this input requires to be set as the transaction's lock time.
-|
-| 0
-| 2
-| [[bip-0370.mediawiki|370]]
-|-
-| Taproot Key Spend Signature
-| PSBT_IN_TAP_KEY_SIG = 0x13
-| None
-| No key data
-| <64 or 65 byte signature>
-| The 64 or 65 byte Schnorr signature for key path spending a Taproot output. Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-|
-| 0, 2
-| [[bip-0371.mediawiki|371]]
-|-
-| Taproot Script Spend Signature
-| PSBT_IN_TAP_SCRIPT_SIG = 0x14
-| <32 byte xonlypubkey>
-| A 32 byte X-only public key involved in a leaf script concatenated with the 32 byte hash of the leaf it is part of.
-| <64 or 65 byte signature>
-| The 64 or 65 byte Schnorr signature for this pubkey and leaf combination. Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-|
-| 0, 2
-| [[bip-0371.mediawiki|371]]
-|-
-| Taproot Leaf Script
-| PSBT_IN_TAP_LEAF_SCRIPT = 0x15
-|
-| The control block for this leaf as specified in BIP 341. The control block contains the merkle tree path to this leaf.
-| <8-bit uint leaf version>
-| The script for this leaf as would be provided in the witness stack followed by the single byte leaf version. Note that the leaves included in this field should be those that the signers of this input are expected to be able to sign for. Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-|
-| 0, 2
-| [[bip-0371.mediawiki|371]]
-|-
-| Taproot Key BIP 32 Derivation Path
-| PSBT_IN_TAP_BIP32_DERIVATION = 0x16
-| <32 byte xonlypubkey>
-| A 32 byte X-only public key involved in this input. It may be the output key, the internal key, or a key present in a leaf script.
-| <32 byte leaf hash>* <4 byte fingerprint> <32-bit little endian uint path element>*
-| A compact size unsigned integer representing the number of leaf hashes, followed by a list of leaf hashes, followed by the 4 byte master key fingerprint concatenated with the derivation path of the public key. The derivation path is represented as 32-bit little endian unsigned integer indexes concatenated with each other. Public keys are those needed to spend this output. The leaf hashes are of the leaves which involve this public key. The internal key does not have leaf hashes, so can be indicated with a hashes len of 0. Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-|
-| 0, 2
-| [[bip-0371.mediawiki|371]]
-|-
-| Taproot Internal Key
-| PSBT_IN_TAP_INTERNAL_KEY = 0x17
-| None
-| No key data
-| <32 byte xonlypubkey>
-| The X-only pubkey used as the internal key in this output. Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-|
-| 0, 2
-| [[bip-0371.mediawiki|371]]
-|-
-| Taproot Merkle Root
-| PSBT_IN_TAP_MERKLE_ROOT = 0x18
-| None
-| No key data
-| <32-byte hash>
-| The 32 byte Merkle root hash. Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-|
-| 0, 2
-| [[bip-0371.mediawiki|371]]
-|-
-| MuSig2 Participant Public Keys
-| PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS = 0x1a
-| <33 byte aggregate pubkey (compressed)>
-| The MuSig2 aggregate public key (compressed) from the KeyAgg algorithm. This key may or may not
-be in the script directly (as x-only). It may instead be a parent public key from which the public keys in the
-script were derived.
-| <33 byte participant pubkey (compressed)>*
-| A list of the compressed public keys of the participants in the MuSig2 aggregate key in the order
-required for aggregation. If sorting was done, then the keys must be in the sorted order.
-|
-|
-| 0, 2
-| [[bip-0373.mediawiki|373]]
-|-
-| MuSig2 Public Nonce
-| PSBT_IN_MUSIG2_PUB_NONCE = 0x1b
-| <33 byte participant pubkey (compressed)> <33 byte aggregate pubkey (compressed)> <32 byte hash or omitted>
-| The compressed public key of the participant providing this nonce, followed by the compressed aggregate public
-key the participant is providing the nonce for, followed by the BIP 341 tapleaf hash of
-the Taproot leaf script that will be signed. If the aggregate key is the taproot internal key or the
-taproot output key, then the tapleaf hash must be omitted. The compressed participant public key must be
-the key found in the script and not the aggregate public key that it was derived from, if it was
-derived from an aggregate key.
-| <66 byte public nonce>
-| The public nonce produced by the NonceGen algorithm.
-|
-|
-| 0, 2
-| [[bip-0373.mediawiki|373]]
-|-
-| MuSig2 Participant Partial Signature
-| PSBT_IN_MUSIG2_PARTIAL_SIG = 0x1c
-| <33 byte participant pubkey (compressed)> <33 byte aggregate pubkey (compressed)> <32 byte hash or omitted>
-| The compressed public key of the participant providing this partial signature, followed by the
-compressed public key the participant is providing the signature for, followed by the BIP 341 tapleaf hash
-of the Taproot leaf script that will be signed. If the aggregate key is the Taproot internal key or
-the Taproot output key, then the tapleaf hash must be omitted. Note that the compressed participant public key must be
-be the key found in the script and not the aggregate public key that it was derived from, if it was
-derived from an aggregate key.
-| <32 byte partial signature>
-| The partial signature produced by the Sign algorithm.
-|
-|
-| 0, 2
-| [[bip-0373.mediawiki|373]]
-|-
-| Silent Payment Input ECDH Share
-| PSBT_IN_SP_ECDH_SHARE = 0x1d
-| <33 byte scan key>
-| The scan key that this ECDH share is for.
-| <33 byte share>
-| An ECDH share for a scan key. The ECDH shared is computed with ''a * B_scan'', where ''a'' is the private key of the corresponding prevout public key, and ''B_scan'' is the scan key of a recipient.
-|
-| 0
-| 2
-| [[bip-0375.mediawiki|375]]
-|-
-| Silent Payment Input DLEQ Proof
-| PSBT_IN_SP_DLEQ = 0x1e
-| <33 byte scan key>
-| The scan key that this proof covers.
-| <64-byte proof>
-| A BIP374 DLEQ proof computed for the matching ECDH share.
-|
-| 0
-| 2
-| [[bip-0375.mediawiki|375]]
-|-
-| Silent Payment Spend Key BIP 32 Derivation Path
-| PSBT_IN_SP_SPEND_BIP32_DERIVATION = 0x1f
-| <33-byte spend key>
-| The 33-byte spend public key used to derive the key locking this input.
-| <4-byte fingerprint> <32-bit little endian uint path element>*
-| The master key fingerprint as defined by BIP 32 concatenated with the derivation path of the spend public key. The derivation path is represented as indexed 32-bit unsigned integers concatenated with each other. Input Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-| 0
-| 2
-| [[bip-0376.mediawiki|376]]
-|-
-| Silent Payment Tweak
-| PSBT_IN_SP_TWEAK = 0x20
-| None
-| No key data
-| <32-byte tweak>
-| A 32-byte raw tweak. Input Finalizers should remove this field after PSBT_IN_FINAL_SCRIPTWITNESS is constructed.
-|
-| 0
-| 2
-| [[bip-0376.mediawiki|376]]
|-
| Proprietary Use Type
| PSBT_IN_PROPRIETARY = 0xFC
@@ -522,7 +286,6 @@ derived from an aggregate key.
|
|
| 0, 2
-| 174
|}
The currently defined per-output ['''Why do we need per-output data?''' Per-output data allows signers
diff --git a/bip-0174/type-registry.mediawiki b/bip-0174/type-registry.mediawiki
index 5cbcc265..d3e1dd60 100644
--- a/bip-0174/type-registry.mediawiki
+++ b/bip-0174/type-registry.mediawiki
@@ -51,3 +51,143 @@ This document collects the fields and types used in PSBTs of any version from al
| PSBT_GLOBAL_PROPRIETARY = 0xFC
| [[bip-0174.mediawiki|174]]
|}
+
+==Per-input Types==
+
+{|
+! Name
+!
+! Parent BIP
+|-
+| Non-Witness UTXO
+| PSBT_IN_NON_WITNESS_UTXO = 0x00
+| [[bip-0174.mediawiki|174]]
+|-
+| Witness UTXO
+| PSBT_IN_WITNESS_UTXO = 0x01
+| [[bip-0174.mediawiki|174]]
+|-
+| Partial Signature
+| PSBT_IN_PARTIAL_SIG = 0x02
+| [[bip-0174.mediawiki|174]]
+|-
+| Sighash Type
+| PSBT_IN_SIGHASH_TYPE = 0x03
+| [[bip-0174.mediawiki|174]]
+|-
+| Redeem Script
+| PSBT_IN_REDEEM_SCRIPT = 0x04
+| [[bip-0174.mediawiki|174]]
+|-
+| Witness Script
+| PSBT_IN_WITNESS_SCRIPT = 0x05
+| [[bip-0174.mediawiki|174]]
+|-
+| BIP 32 Derivation Path
+| PSBT_IN_BIP32_DERIVATION = 0x06
+| [[bip-0174.mediawiki|174]]
+|-
+| Finalized scriptSig
+| PSBT_IN_FINAL_SCRIPTSIG = 0x07
+| [[bip-0174.mediawiki|174]]
+|-
+| Finalized scriptWitness
+| PSBT_IN_FINAL_SCRIPTWITNESS = 0x08
+| [[bip-0174.mediawiki|174]]
+|-
+| Proof-of-reserves commitment
+| PSBT_IN_POR_COMMITMENT = 0x09
+| [[bip-0127.mediawiki|127]]
+|-
+| RIPEMD160 preimage
+| PSBT_IN_RIPEMD160 = 0x0a
+| [[bip-0174.mediawiki|174]]
+|-
+| SHA256 preimage
+| PSBT_IN_SHA256 = 0x0b
+| [[bip-0174.mediawiki|174]]
+|-
+| HASH160 preimage
+| PSBT_IN_HASH160 = 0x0c
+| [[bip-0174.mediawiki|174]]
+|-
+| HASH256 preimage
+| PSBT_IN_HASH256 = 0x0d
+| [[bip-0174.mediawiki|174]]
+|-
+| Previous TXID
+| PSBT_IN_PREVIOUS_TXID = 0x0e
+| [[bip-0370.mediawiki|370]]
+|-
+| Spent Output Index
+| PSBT_IN_OUTPUT_INDEX = 0x0f
+| [[bip-0370.mediawiki|370]]
+|-
+| Sequence Number
+| PSBT_IN_SEQUENCE = 0x10
+| [[bip-0370.mediawiki|370]]
+|-
+| Required Time-based Locktime
+| PSBT_IN_REQUIRED_TIME_LOCKTIME = 0x11
+| [[bip-0370.mediawiki|370]]
+|-
+| Required Height-based Locktime
+| PSBT_IN_REQUIRED_HEIGHT_LOCKTIME = 0x12
+| [[bip-0370.mediawiki|370]]
+|-
+| Taproot Key Spend Signature
+| PSBT_IN_TAP_KEY_SIG = 0x13
+| [[bip-0371.mediawiki|371]]
+|-
+| Taproot Script Spend Signature
+| PSBT_IN_TAP_SCRIPT_SIG = 0x14
+| [[bip-0371.mediawiki|371]]
+|-
+| Taproot Leaf Script
+| PSBT_IN_TAP_LEAF_SCRIPT = 0x15
+| [[bip-0371.mediawiki|371]]
+|-
+| Taproot Key BIP 32 Derivation Path
+| PSBT_IN_TAP_BIP32_DERIVATION = 0x16
+| [[bip-0371.mediawiki|371]]
+|-
+| Taproot Internal Key
+| PSBT_IN_TAP_INTERNAL_KEY = 0x17
+| [[bip-0371.mediawiki|371]]
+|-
+| Taproot Merkle Root
+| PSBT_IN_TAP_MERKLE_ROOT = 0x18
+| [[bip-0371.mediawiki|371]]
+|-
+| MuSig2 Participant Public Keys
+| PSBT_IN_MUSIG2_PARTICIPANT_PUBKEYS = 0x1a
+| [[bip-0373.mediawiki|373]]
+|-
+| MuSig2 Public Nonce
+| PSBT_IN_MUSIG2_PUB_NONCE = 0x1b
+| [[bip-0373.mediawiki|373]]
+|-
+| MuSig2 Participant Partial Signature
+| PSBT_IN_MUSIG2_PARTIAL_SIG = 0x1c
+| [[bip-0373.mediawiki|373]]
+|-
+| Silent Payment Input ECDH Share
+| PSBT_IN_SP_ECDH_SHARE = 0x1d
+| [[bip-0375.mediawiki|375]]
+|-
+| Silent Payment Input DLEQ Proof
+| PSBT_IN_SP_DLEQ = 0x1e
+| [[bip-0375.mediawiki|375]]
+|-
+| Silent Payment Spend Key BIP 32 Derivation Path
+| PSBT_IN_SP_SPEND_BIP32_DERIVATION = 0x1f
+| [[bip-0376.mediawiki|376]]
+|-
+| Silent Payment Tweak
+| PSBT_IN_SP_TWEAK = 0x20
+| [[bip-0376.mediawiki|376]]
+|-
+| Proprietary Use Type
+| PSBT_IN_PROPRIETARY = 0xFC
+| [[bip-0174.mediawiki|174]]
+|}
]