1
0
mirror of https://github.com/bitcoin/bips.git synced 2025-05-19 12:08:05 +00:00

Merge pull request #870 from dgpv/patch-10

BIP-174: add missing types to Appendix A; fix proprietary type names
This commit is contained in:
Luke Dashjr 2020-01-03 04:31:45 +00:00 committed by GitHub
commit ed3b31c136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -200,7 +200,7 @@ The currently defined per-input types are defined as follows:
** Value: The UTF-8 encoded commitment message string for the proof-of-reserves. See [[bip-0127.mediawiki|BIP 127]] for more information. ** Value: The UTF-8 encoded commitment message string for the proof-of-reserves. See [[bip-0127.mediawiki|BIP 127]] for more information.
*** <tt>{porCommitment}</tt> *** <tt>{porCommitment}</tt>
* Type: Proprietary Use Type <tt>PSBT_INPUT_PROPRIETARY = 0xFC</tt> * Type: Proprietary Use Type <tt>PSBT_IN_PROPRIETARY = 0xFC</tt>
** Key: Variable length identifier prefix, followed by a subtype, followed by the key data itself. ** Key: Variable length identifier prefix, followed by a subtype, followed by the key data itself.
*** <tt>{0xFC}|<prefix>|{subtype}|{key data}</tt> *** <tt>{0xFC}|<prefix>|{subtype}|{key data}</tt>
** Value: Any value data as defined by the proprietary type user. ** Value: Any value data as defined by the proprietary type user.
@ -228,7 +228,7 @@ determine which outputs are change outputs and verify that the change is returni
** Value: The 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. ** Value: The 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.
*** <tt>{master key fingerprint}|{32-bit uint}|...|{32-bit uint}</tt> *** <tt>{master key fingerprint}|{32-bit uint}|...|{32-bit uint}</tt>
* Type: Proprietary Use Type <tt>PSBT_OUTPUT_PROPRIETARY = 0xFC</tt> * Type: Proprietary Use Type <tt>PSBT_OUT_PROPRIETARY = 0xFC</tt>
** Key: Variable length identifier prefix, followed by a subtype, followed by the key data itself. ** Key: Variable length identifier prefix, followed by a subtype, followed by the key data itself.
*** <tt>{0xFC}|<prefix>|{subtype}|{key data}</tt> *** <tt>{0xFC}|<prefix>|{subtype}|{key data}</tt>
** Value: Any value data as defined by the proprietary type user. ** Value: Any value data as defined by the proprietary type user.
@ -748,6 +748,21 @@ Any data types, their associated scope and BIP number must be defined here
| PSBT_GLOBAL_UNSIGNED_TX | PSBT_GLOBAL_UNSIGNED_TX
| BIP 174 | BIP 174
|- |-
| Global
| 1
| PSBT_GLOBAL_XPUB
| BIP 174
|-
| Global
| 251
| PSBT_GLOBAL_VERSION
| BIP 174
|-
| Global
| 252
| PSBT_GLOBAL_PROPRIETARY
| BIP 174
|-
| Input | Input
| 0 | 0
| PSBT_IN_NON_WITNESS_UTXO | PSBT_IN_NON_WITNESS_UTXO
@ -798,6 +813,11 @@ Any data types, their associated scope and BIP number must be defined here
| PSBT_IN_POR_COMMITMENT | PSBT_IN_POR_COMMITMENT
| [[bip-0127.mediawiki|BIP 127]] | [[bip-0127.mediawiki|BIP 127]]
|- |-
| Input
| 252
| PSBT_IN_PROPRIETARY
| BIP 174
|-
| Output | Output
| 0 | 0
| PSBT_OUT_REDEEM_SCRIPT | PSBT_OUT_REDEEM_SCRIPT
@ -812,4 +832,9 @@ Any data types, their associated scope and BIP number must be defined here
| 2 | 2
| PSBT_OUT_BIP32_DERIVATION | PSBT_OUT_BIP32_DERIVATION
| BIP 174 | BIP 174
|-
| Output
| 252
| PSBT_OUT_PROPRIETARY
| BIP 174
|} |}