Skip to content

Conversation

stylesuxx
Copy link
Contributor

If multiple entries are possible, wrapping Type should be OBJ_DYN.

fixes #19579

…iple entries are possible, wrapping Type should be OBJ_DYN. fixes #19579
@maflcko
Copy link
Member

maflcko commented Jul 25, 2020

OBJ vs OBJ_DYN tells whether the keys are static string literals ore dynamic run-time strings. I.e

{ "txid" : "$runtime_hex" }  # OBJ
{ "$runtime_hex" : 1337   }  # OBJ_DYN

So the diff looks correct. Concept ACK

@promag
Copy link
Contributor

promag commented Jul 26, 2020

I've missed this detail, didn't fully review #17809. So only difference is this https://github.com/bitcoin/bitcoin/pull/17809/files#diff-a2c210f0004fc59cf7e73a29076dd7a8R660 right?

@maflcko
Copy link
Member

maflcko commented Jul 26, 2020

So only difference is ...

Jup

@promag
Copy link
Contributor

promag commented Jul 26, 2020

ACK

@maflcko
Copy link
Member

maflcko commented Jul 31, 2020

Rendered diff:

diff --git a/getmempoolancestors b/getmempoolancestors
index c0710e1..1d4e56c 100644
--- a/getmempoolancestors
+++ b/getmempoolancestors
@@ -42,8 +42,7 @@ Result (for verbose = true):
     ...
   ],
   "bip125-replaceable" : true|false,    (boolean) Whether this transaction could be replaced due to BIP125 (replace-by-fee)
-  "unbroadcast" : true|false,           (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
-  ...
+  "unbroadcast" : true|false            (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
 }
 
 Examples:
diff --git a/getmempooldescendants b/getmempooldescendants
index 02512ac..43be4fc 100644
--- a/getmempooldescendants
+++ b/getmempooldescendants
@@ -43,9 +43,9 @@ Result (for verbose = true):
       ...
     ],
     "bip125-replaceable" : true|false,    (boolean) Whether this transaction could be replaced due to BIP125 (replace-by-fee)
-    "unbroadcast" : true|false,           (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
-    ...
-  }
+    "unbroadcast" : true|false            (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
+  },
+  ...
 }
 
 Examples:
diff --git a/getmempoolentry b/getmempoolentry
index 18ba2f1..2b66128 100644
--- a/getmempoolentry
+++ b/getmempoolentry
@@ -35,8 +35,7 @@ Result:
     ...
   ],
   "bip125-replaceable" : true|false,    (boolean) Whether this transaction could be replaced due to BIP125 (replace-by-fee)
-  "unbroadcast" : true|false,           (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
-  ...
+  "unbroadcast" : true|false            (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
 }
 
 Examples:
diff --git a/getrawmempool b/getrawmempool
index 0323e3e..edcdf20 100644
--- a/getrawmempool
+++ b/getrawmempool
@@ -44,9 +44,9 @@ Result (for verbose = true):
       ...
     ],
     "bip125-replaceable" : true|false,    (boolean) Whether this transaction could be replaced due to BIP125 (replace-by-fee)
-    "unbroadcast" : true|false,           (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
-    ...
-  }
+    "unbroadcast" : true|false            (boolean) Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
+  },
+  ...
 }
 
 Examples:

@maflcko maflcko merged commit a63a26f into bitcoin:master Jul 31, 2020
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jul 31, 2020
…hould be OBJ.

ae4958b rpc: RPCResult Type of MempoolEntryDescription should be OBJ. If multiple entries are possible, wrapping Type should be OBJ_DYN. fixes bitcoin#19579 (Chris L)

Pull request description:

  If multiple entries are possible, wrapping Type should be OBJ_DYN.

  fixes bitcoin#19579

Top commit has no ACKs.

Tree-SHA512: 59cf9f6e9729a69a867e924d8306e0cd6b70a3d702fc5a4111345874bb1224ee51ac3f70cea61b25cfe6bde7f65cb02528d52acc20dda4eda692eddf34f217e8
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Sep 6, 2021
Summary:
If multiple entries are possible, wrapping Type should be OBJ_DYN. fixes #19579

This is a backport of [[bitcoin/bitcoin#19585 | core#19585]]

Test Plan: `ninja all check-all`

Reviewers: #bitcoin_abc, majcosta

Reviewed By: #bitcoin_abc, majcosta

Differential Revision: https://reviews.bitcoinabc.org/D10051
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Output formatting for: bitcoin-cli help getrawmempool
4 participants