Merge remote-tracking branch 'origin-pull/1345/head'

1 files changed, 19 insertions, 11 deletions

diff --git a/bip-0370.mediawiki b/bip-0370.mediawiki
index aa43d89..8519473 100644
--- a/bip-0370.mediawiki
+++ b/bip-0370.mediawiki
@@ -62,7 +62,7 @@ The new global types for PSBT Version 2 are as follows:
 | <tt>PSBT_GLOBAL_TX_VERSION = 0x02</tt>
 | None
 | No key data
-| <tt><32-bit uint></tt>
+| <tt><32-bit little endian uint version></tt>
 | The 32-bit little endian signed integer representing the version number of the transaction being created. Note that this is not the same as the PSBT version number specified by the PSBT_GLOBAL_VERSION field.
 | 2
 | 0
@@ -72,7 +72,7 @@ The new global types for PSBT Version 2 are as follows:
 | <tt>PSBT_GLOBAL_FALLBACK_LOCKTIME = 0x03</tt>
 | None
 | No key data
-| <tt><32-bit uint></tt>
+| <tt><32-bit little endian uint locktime></tt>
 | The 32-bit little endian unsigned integer representing the transaction locktime to use if no inputs specify a required locktime.
 |
 | 0
@@ -82,7 +82,7 @@ The new global types for PSBT Version 2 are as follows:
 | <tt>PSBT_GLOBAL_INPUT_COUNT = 0x04</tt>
 | None
 | No key data
-| <tt><compact size uint></tt>
+| <tt><compact size uint input count></tt>
 | Compact size unsigned integer representing the number of inputs in this PSBT.
 | 2
 | 0
@@ -92,7 +92,7 @@ The new global types for PSBT Version 2 are as follows:
 | <tt>PSBT_GLOBAL_OUTPUT_COUNT = 0x05</tt>
 | None
 | No key data
-| <tt><compact size uint></tt>
+| <tt><compact size uint output count></tt>
 | Compact size unsigned integer representing the number of outputs in this PSBT.
 | 2
 | 0
@@ -102,7 +102,7 @@ The new global types for PSBT Version 2 are as follows:
 | <tt>PSBT_GLOBAL_TX_MODIFIABLE = 0x06</tt>
 | None
 | No key data
-| <tt><8-bit uint></tt>
+| <tt><8-bit uint flags></tt>
 | An 8 bit unsigned integer as a bitfield for various transaction modification flags. Bit 0 is the Inputs Modifiable Flag, set to 1 to indicate whether inputs can be added or removed. Bit 1 is the Outputs Modifiable Flag, set to 1 to indicate whether outputs can be added or removed. Bit 2 is the Has SIGHASH_SINGLE flag, set to 1 to indicate whether the transaction has a SIGHASH_SINGLE signature who's input and output pairing must be preserved. Bit 2 essentially indicates that the Constructor must iterate the inputs to determine whether and how to add or remove an input.
 |
 | 0
@@ -126,7 +126,7 @@ The new per-input types for PSBT Version 2 are defined as follows:
 | <tt>PSBT_IN_PREVIOUS_TXID = 0x0e</tt>
 | None
 | No key data
-| <tt><txid></tt>
+| <tt><32 byte txid></tt>
 | 32 byte txid of the previous transaction whose output at PSBT_IN_OUTPUT_INDEX is being spent.
 | 2
 | 0
@@ -136,7 +136,7 @@ The new per-input types for PSBT Version 2 are defined as follows:
 | <tt>PSBT_IN_OUTPUT_INDEX = 0x0f</tt>
 | None
 | No key data
-| <tt><32-bit uint></tt>
+| <tt><32-bit little endian uint index></tt>
 | 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
@@ -146,7 +146,7 @@ The new per-input types for PSBT Version 2 are defined as follows:
 | <tt>PSBT_IN_SEQUENCE = 0x10</tt>
 | None
 | No key data
-| <tt><32-bit uint></tt>
+| <tt><32-bit little endian uint sequence></tt>
 | 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
@@ -156,7 +156,7 @@ The new per-input types for PSBT Version 2 are defined as follows:
 | <tt>PSBT_IN_REQUIRED_TIME_LOCKTIME = 0x11</tt>
 | None
 | No key data
-| <tt><32-bit uint></tt>
+| <tt><32-bit little endian uint locktime></tt>
 | 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
@@ -166,8 +166,16 @@ The new per-input types for PSBT Version 2 are defined as follows:
 | <tt>PSBT_IN_REQUIRED_HEIGHT_LOCKTIME = 0x12</tt>
 | None
 | No key data
+<<<<<<< HEAD
 | <tt><32-bit uiht></tt>
 | 32 bit unsigned little endian integer greater than 0 and less than 500000000 representing the minimum block height that this input requires to be set as the transaction's lock time.
+||||||| b505101a
+| <tt><32-bit uiht></tt>
+| 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.
+=======
+| <tt><32-bit uiht locktime></tt>
+| 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.
+>>>>>>> origin-pull/1345/head
 |
 | 0
 | 2
@@ -190,7 +198,7 @@ The new per-output types for PSBT Version 2 are defined as follows:
 | <tt>PSBT_OUT_AMOUNT = 0x03</tt>
 | None
 | No key data
-| <tt><64-bit int></tt>
+| <tt><64-bit little endian int amount></tt>
 | 64 bit signed little endian integer representing the output's amount in satoshis.
 | 2
 | 0
@@ -200,7 +208,7 @@ The new per-output types for PSBT Version 2 are defined as follows:
 | <tt>PSBT_OUT_SCRIPT = 0x04</tt>
 | None
 | No key data
-| <tt><script></tt>
+| <tt><bytes script></tt>
 | The script for this output, also known as the scriptPubKey. Must be omitted in PSBTv0. Must be provided in PSBTv2.
 | 2
 | 0