Skip to content

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented Dec 1, 2021

For the fields: inputs, outputs, locktime, replaceable. Similar to #23172.

Can be reviewed with --color-moved=dimmed-zebra --color-moved-ws=ignore-all-space.

@fanquake fanquake added the Docs label Dec 1, 2021
@maflcko
Copy link
Member

maflcko commented Dec 1, 2021

review ACK 5bb1f42f492a4e33faebf19e505f67b8581b3001 🙂

Show signature

Signature:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

review ACK 5bb1f42f492a4e33faebf19e505f67b8581b3001 🙂
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
pUiEXAwAqDv3q5tres7kUZ6Gt8laQrVjhLA2/9PS8G8OafKVcwbsL8lhFBpBo4WM
ZeGBKASDrP5Ow4ZiRzQpuIP58ghoKwKblzn1XeLy/HsPLB0ewmapnnUGnzRTIp1K
3SBE/NrqkE/o45Zj1yKXLdmPqf8TpbiAImX75hWc/LoA6sT2I6EfeWW4+lY7mEye
p+bKdEvhR0rGFC1yBZM1bbHmVokVPERGXaLAkKGqcDqgW/Vxsr5H4n5R2NTcYLx9
D0OVQ5lnx/N0YQyu0Ubl02KsJ1bVb5H80oBhItZnDr7SVu7QiswIacMq5HKmGRBc
qSR1XXkChqxbBmzgwZY6Z/IaMvyGJvy9O+XNbci1zPFP4A9GMlhNnp5AEIw0erHk
eIcSNDGv+oHQ2YVKTfVUvpjqtGzLB9ODjvZam2UOEg33rKNxaya2SRwI14a8aqMv
dTAMrOxcqAbMpnaukKj4UuSENBj0NU0GuJYcgS5gYt9Pa1aGhchxUmXnjuhUy43q
rFUjPGAx
=v2Sk
-----END PGP SIGNATURE-----

@maflcko
Copy link
Member

maflcko commented Dec 1, 2021

rendered diff:

diff --git a/createpsbt b/createpsbt
index a8eac97..4253601 100644
--- a/createpsbt
+++ b/createpsbt
@@ -4,7 +4,7 @@ Creates a transaction in the Partially Signed Transaction format.
 Implements the Creator role.
 
 Arguments:
-1. inputs                      (json array, required) The json objects
+1. inputs                      (json array, required) The inputs
      [
        {                       (json object)
          "txid": "hex",        (string, required) The transaction id
diff --git a/createrawtransaction b/createrawtransaction
index cd68d55..787eb2e 100644
--- a/createrawtransaction
+++ b/createrawtransaction
@@ -31,7 +31,7 @@ Arguments:
        ...
      ]
 3. locktime                    (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs
-4. replaceable                 (boolean, optional, default=false) Marks this transaction as BIP125-replaceable.
+4. replaceable                 (boolean, optional, default=false) Marks this transaction as BIP125 replaceable.
                                Allows this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible.
 
 Result:

@maflcko
Copy link
Member

maflcko commented Dec 1, 2021

Maybe add the - for BIP125-replacable?

For the fields: inputs, outputs, locktime, replaceable
@fanquake fanquake force-pushed the undup_create_tx_doc branch from 5bb1f42 to c771ee8 Compare December 1, 2021 11:25
@fanquake
Copy link
Member Author

fanquake commented Dec 1, 2021

Maybe add the - for BIP125-replacable?

Done. Added to FundTxDoc as well.

@maflcko
Copy link
Member

maflcko commented Dec 1, 2021

ACK c771ee8 😸

Show signature

Signature:

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK c771ee8571dc63d27747ef565671eb1dcdc0ff4b 😸
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
pUhd/AwAuWCNiLEVqg20NYsBxrZC+fbL3sCJfpT9hDUIogN49LmpvQIZuY4qliHz
AnF4ttfGmMupUSHVSIaOyCSHLwecDdYbotOicOCZAa/AQA3YTfcj2HqEwwZZ59ul
2doL/eJ5z+umklkAAkXhoA1RGdsrflwIxpIYVORmFuuajjvmHBKNZf+nGg8c708S
9txBI6OxpXh3q+XHmnw2b64SQ62saqbtOCnqXzV/PRoip6DIjezO2F5yp0xG3rJr
fDYsf/CXQIpOl9pgrHWyzxTV4l7xxlhrCL5ULO6i6pYY4wTzgtuprqRpYxxd6ljp
y2qWjHd3MOa1F1brFjX5zBjU8tSaN20pXQHkpYdABlv2O2U1MglCJdNeFl8/OvbL
UlP+NClCW30c7YqzLsuS6ptMD61Qiyeb1SaaPs1Fr7LkkjaY9TTmCvP53F+RP2JL
bet6q9jcynq7VxSo7X0eRjs/O7GWsKYKoVS3NzO6y8jxrib0djRz3SL9d/rqx8f+
+fnoVx7M
=/3Cu
-----END PGP SIGNATURE-----

@maflcko
Copy link
Member

maflcko commented Dec 1, 2021

rendered diff:

diff --git a/createpsbt b/createpsbt
index a8eac97..a1018ca 100644
--- a/createpsbt
+++ b/createpsbt
@@ -4,7 +4,7 @@ Creates a transaction in the Partially Signed Transaction format.
 Implements the Creator role.
 
 Arguments:
-1. inputs                      (json array, required) The json objects
+1. inputs                      (json array, required) The inputs
      [
        {                       (json object)
          "txid": "hex",        (string, required) The transaction id
@@ -28,7 +28,7 @@ Arguments:
        ...
      ]
 3. locktime                    (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs
-4. replaceable                 (boolean, optional, default=false) Marks this transaction as BIP125 replaceable.
+4. replaceable                 (boolean, optional, default=false) Marks this transaction as BIP125-replaceable.
                                Allows this transaction to be replaced by a transaction with higher fees. If provided, it is an error if explicit sequence numbers are incompatible.
 
 Result:
diff --git a/fundrawtransaction b/fundrawtransaction
index 4490741..a93652c 100644
--- a/fundrawtransaction
+++ b/fundrawtransaction
@@ -42,7 +42,7 @@ Arguments:
                                       "unset"
                                       "economical"
                                       "conservative"
-       "replaceable": bool,           (boolean, optional, default=wallet default) Marks this transaction as BIP125 replaceable.
+       "replaceable": bool,           (boolean, optional, default=wallet default) Marks this transaction as BIP125-replaceable.
                                       Allows this transaction to be replaced by a transaction with higher fees
        "solving_data": {              (json object, optional) Keys and scripts needed for producing a final transaction with a dummy signature.
                                       Used for fee estimation during coin selection.
diff --git a/send b/send
index 28c0ea6..2a59110 100644
--- a/send
+++ b/send
@@ -59,7 +59,7 @@ Arguments:
                                          "unset"
                                          "economical"
                                          "conservative"
-       "replaceable": bool,              (boolean, optional, default=wallet default) Marks this transaction as BIP125 replaceable.
+       "replaceable": bool,              (boolean, optional, default=wallet default) Marks this transaction as BIP125-replaceable.
                                          Allows this transaction to be replaced by a transaction with higher fees
        "solving_data": {                 (json object, optional) Keys and scripts needed for producing a final transaction with a dummy signature.
                                          Used for fee estimation during coin selection.
diff --git a/walletcreatefundedpsbt b/walletcreatefundedpsbt
index 1f3f357..d2a172f 100644
--- a/walletcreatefundedpsbt
+++ b/walletcreatefundedpsbt
@@ -55,7 +55,7 @@ Arguments:
                                       "unset"
                                       "economical"
                                       "conservative"
-       "replaceable": bool,           (boolean, optional, default=wallet default) Marks this transaction as BIP125 replaceable.
+       "replaceable": bool,           (boolean, optional, default=wallet default) Marks this transaction as BIP125-replaceable.
                                       Allows this transaction to be replaced by a transaction with higher fees
        "solving_data": {              (json object, optional) Keys and scripts needed for producing a final transaction with a dummy signature.
                                       Used for fee estimation during coin selection.

@maflcko maflcko merged commit e7507f3 into bitcoin:master Dec 1, 2021
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Dec 1, 2021
@fanquake fanquake deleted the undup_create_tx_doc branch December 2, 2021 01:38
RandyMcMillan pushed a commit to RandyMcMillan/mempool-tab that referenced this pull request Dec 23, 2021
44750a8 doc: use BIP125-replaceable (fanquake)
9c00e9c doc: Extract CreateTxDoc in rawtransaction (fanquake)

Pull request description:

  For the fields: inputs, outputs, locktime, replaceable. Similar to #23172.

  Can be reviewed with `--color-moved=dimmed-zebra --color-moved-ws=ignore-all-space`.

ACKs for top commit:
  MarcoFalke:
    ACK 44750a8 😸

Tree-SHA512: e6e4211b89bedec472f8381b3cbea5670f82b728955888c794f694164b8d8bdd51a99c64762b625357ac2171005712b82f81ee7c1b8f5c5620bdedeeefa2b9da
@bitcoin bitcoin locked and limited conversation to collaborators Dec 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants