[RPC] Adding ::minRelayTxFee amount to getmempoolinfo and updating help #12001

pull jeffrade wants to merge 1 commits into bitcoin:master from jeffrade:update_mempoolminfee_help_details changing 3 files +13 −6

jeffrade commented at 12:55 AM on December 24, 2017: contributor
These are RPC document changes from #11475 which is now merged. Took into consideration comments from #11475 and #6941 for this PR.

Biggest change here is when calling getmempoolinfo, will now show the minrelaytxfee in the JSON reponse (see below):
```
$ bitcoin-cli getmempoolinfo
{
  "size": 50,
  "bytes": 13102,
  "usage": 70480,
  "maxmempool": 300000000,
  "mempoolminfee": 0.00001000,
  "minrelaytxfee": 0.00001000
}
```
Fixes #8953
fanquake added the label RPC/REST/ZMQ on Dec 24, 2017
jeffrade force-pushed on Dec 24, 2017
jeffrade force-pushed on Dec 24, 2017
jeffrade commented at 1:59 AM on December 27, 2017: contributor

@laanwj Here is the PR from conversation we had in #11475 I would like a review on to make sure my understanding was correct. Adds minRelayTxFee to the JSON response of getmempoolinfo and updates help description of updated mempoolminfee. Thank you!
mess110 commented at 10:13 AM on December 27, 2017: contributor

Thanks for the patch

I think the key from the Pair should be lower case https://github.com/bitcoin/bitcoin/pull/12001/files#diff-a0c8f511d90e83aa9b5857e819ced344R1361 (test also needs update in this case).
jeffrade force-pushed on Dec 27, 2017
jeffrade commented at 3:49 PM on December 27, 2017: contributor

@mess110 Made suggested lowercase updates and amended my original commit.

Thanks for the review!
mess110 commented at 4:44 PM on December 27, 2017: contributor

utACK ed0b22d
fanquake deleted a comment on Dec 28, 2017

in test/functional/wallet.py:37 in ed0b22dbb9 outdated

  35 | @@ -36,6 +36,9 @@ def run_test(self):
  36 |          self.log.info("Check for mempoolminfee in getmempoolinfo")
  37 |          assert_equal(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))

MarcoFalke commented at 11:09 AM on December 29, 2017:

Wallet is the wrong place to put mempool tests. Please move this one and your addition to mempool_limit.py

See following diff for a sketch:

diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py
index e24dc5a464..d8cc9922fd 100755
--- a/test/functional/mempool_limit.py
+++ b/test/functional/mempool_limit.py
@@ -17,10 +17,14 @@ class MempoolLimitTest(BitcoinTestFramework):
         txouts = gen_return_txouts()
         relayfee = self.nodes[0].getnetworkinfo()['relayfee']
 
+        self.log.info('Check that mempoolminfee is minrelytxfee')
+        assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
+        assert_equal(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
+
         txids = []
         utxos = create_confirmed_utxos(relayfee, self.nodes[0], 91)
 
-        #create a mempool tx that will be evicted
+        self.log.info('Create a mempool tx that will be evicted')
         us0 = utxos.pop()
         inputs = [{ "txid" : us0["txid"], "vout" : us0["vout"]}]
         outputs = {self.nodes[0].getnewaddress() : 0.0001}
@@ -37,10 +41,14 @@ class MempoolLimitTest(BitcoinTestFramework):
             txids.append([])
             txids[i] = create_lots_of_big_transactions(self.nodes[0], txouts, utxos[30*i:30*i+30], 30, (i+1)*base_fee)
 
-        # by now, the tx should be evicted, check confirmation state
+        self.log.info('The tx should be evicted by now')
         assert(txid not in self.nodes[0].getrawmempool())
         txdata = self.nodes[0].gettransaction(txid)
         assert(txdata['confirmations'] ==  0) #confirmation should still be 0
 
+        self.log.info('Check that mempoolminfee is larger than minrelytxfee')
+        assert_equal(self.nodes[0].getmempoolinfo()['minrelaytxfee'], Decimal('0.00001000'))
+        assert_greater_than(self.nodes[0].getmempoolinfo()['mempoolminfee'], Decimal('0.00001000'))
+
 if __name__ == '__main__':
     MempoolLimitTest().main()

MarcoFalke commented at 11:10 AM on December 29, 2017: member

Tested ACK, but needs tests reworked a bit.

[rpc] Adding ::minRelayTxFee amount to getmempoolinfo and updating mempoolminfee help description aad309065d
jeffrade force-pushed on Dec 29, 2017
jeffrade commented at 3:03 PM on December 29, 2017: contributor

@MarcoFalke Made update and amended my commit (thought two commits would probably need to be squashed). Thank you for review and mempool_limit.py diff.

MarcoFalke commented at 5:09 AM on December 30, 2017: member

Thanks for the fixup.

jeffrade commented at 2:52 PM on December 30, 2017: contributor

No problem - happy to contribute!
jonasschnelli commented at 7:39 AM on January 4, 2018: contributor

utACK aad309065d38613a7e98aba39d947ca215b7c2f7
laanwj merged this on Jan 4, 2018
laanwj closed this on Jan 4, 2018
laanwj referenced this in commit a9a49e6e7e on Jan 4, 2018
laanwj commented at 8:38 AM on January 4, 2018: member

@laanwj Here is the PR from conversation we had in #11475 I would like a review on to make sure my understanding was correct

Thanks! utACK aad309065d38613a7e98aba39d947ca215b7c2f7
PastaPastaPasta referenced this in commit a0abbd47a4 on Feb 13, 2020
PastaPastaPasta referenced this in commit a2c8d92ee2 on Feb 27, 2020
PastaPastaPasta referenced this in commit 4e6cd82529 on Feb 27, 2020
PastaPastaPasta referenced this in commit 67cf9591c4 on Feb 27, 2020
ckti referenced this in commit 41fa99cb01 on Mar 28, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#6941 mempoolminfee returns incorrect data before the dynamic mempool limit has changed #8953 'minrelaytxfee' option not covered by tests, listed in Debugging/Testing options #11475 [rpc] mempoolinfo should take ::minRelayTxFee into account