New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: PrioritiseTransaction updates the mempool tx counter #10196

Merged
merged 2 commits into from May 17, 2017

Conversation

Projects
None yet
8 participants
@sdaftuar
Member

sdaftuar commented Apr 12, 2017

The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

@fanquake fanquake added the Mempool label Apr 12, 2017

@TheBlueMatt

This comment has been minimized.

Show comment
Hide comment
@TheBlueMatt

TheBlueMatt Apr 12, 2017

Contributor

utACK 909306c

Contributor

TheBlueMatt commented Apr 12, 2017

utACK 909306c

@gmaxwell

utACK.

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Apr 17, 2017

Member

Test for this?

Member

sipa commented Apr 17, 2017

Test for this?

@sdaftuar

This comment has been minimized.

Show comment
Hide comment
@sdaftuar

sdaftuar Apr 18, 2017

Member

@sipa Test added in 6a61424

Member

sdaftuar commented Apr 18, 2017

@sipa Test added in 6a61424

@luke-jr

This comment has been minimized.

Show comment
Hide comment
@luke-jr

luke-jr Apr 19, 2017

Member

utACK, good catch

Member

luke-jr commented Apr 19, 2017

utACK, good catch

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Apr 21, 2017

Bugfix: PrioritiseTransaction updates the mempool tx counter
The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

Github-Pull: #10196
Rebased-From: 909306c

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Apr 21, 2017

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Apr 21, 2017

sdaftuar added some commits Apr 3, 2017

Bugfix: PrioritiseTransaction updates the mempool tx counter
The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().
@sdaftuar

This comment has been minimized.

Show comment
Hide comment
@sdaftuar

sdaftuar May 6, 2017

Member

Rebased (due to conflict in the test)

Member

sdaftuar commented May 6, 2017

Rebased (due to conflict in the test)

@sdaftuar

This comment has been minimized.

Show comment
Hide comment
@sdaftuar

sdaftuar May 12, 2017

Member

Anything else needed here?

Member

sdaftuar commented May 12, 2017

Anything else needed here?

@@ -115,5 +115,16 @@ def run_test(self):
assert_equal(self.nodes[0].sendrawtransaction(tx_hex), tx_id)
assert(tx_id in self.nodes[0].getrawmempool())
# Test that calling prioritisetransaction is sufficient to trigger

This comment has been minimized.

@paveljanik

paveljanik May 12, 2017

Contributor

nit: What about some self.log.info call here?

self.log.info("Assert that prioritising transaction changes the block template")
@paveljanik

paveljanik May 12, 2017

Contributor

nit: What about some self.log.info call here?

self.log.info("Assert that prioritising transaction changes the block template")
@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik May 12, 2017

Contributor

tested ACK 6c2e25c

Test fails on master, so OK.

Contributor

paveljanik commented May 12, 2017

tested ACK 6c2e25c

Test fails on master, so OK.

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa May 17, 2017

Member

utACK 6c2e25c

Member

sipa commented May 17, 2017

utACK 6c2e25c

@sipa sipa merged commit 6c2e25c into bitcoin:master May 17, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

sipa added a commit that referenced this pull request May 17, 2017

Merge #10196: Bugfix: PrioritiseTransaction updates the mempool tx co…
…unter

6c2e25c [qa] Test prioritise_transaction / getblocktemplate interaction (Suhas Daftuar)
acc2e4b Bugfix: PrioritiseTransaction updates the mempool tx counter (Suhas Daftuar)

Tree-SHA512: dcf834df52d84d5eb86acb847c3f28d3cffd1f78f3092b8ff8913c2c400675a071c48a19cd852fdbaac1582aa1dba23433e0e16055831ef2a5e76dde91199941

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 5, 2017

Bugfix: PrioritiseTransaction updates the mempool tx counter
The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

Github-Pull: #10196
Rebased-From: acc2e4b

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 5, 2017

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 5, 2017

Bugfix: PrioritiseTransaction updates the mempool tx counter
The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

Github-Pull: #10196
Rebased-From: acc2e4b

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 5, 2017

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Jun 5, 2017

nomnombtc added a commit to nomnombtc/bitcoin that referenced this pull request Jul 17, 2017

Bugfix: PrioritiseTransaction updates the mempool tx counter
The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

Github-Pull: #10196
Rebased-From: 909306c

nomnombtc added a commit to nomnombtc/bitcoin that referenced this pull request Jul 17, 2017

karel-3d added a commit to karel-3d/bitcoin that referenced this pull request Oct 30, 2017

Bugfix: PrioritiseTransaction updates the mempool tx counter
The mempool's nTransactionsUpdated is used by getblocktemplate
to trigger new invocations of CreateNewBlock().

Github-Pull: #10196
Rebased-From: 909306c

karel-3d added a commit to karel-3d/bitcoin that referenced this pull request Oct 30, 2017

codablock added a commit to codablock/dash that referenced this pull request Jan 26, 2018

Merge #10196: Bugfix: PrioritiseTransaction updates the mempool tx co…
…unter

6c2e25c [qa] Test prioritise_transaction / getblocktemplate interaction (Suhas Daftuar)
acc2e4b Bugfix: PrioritiseTransaction updates the mempool tx counter (Suhas Daftuar)

Tree-SHA512: dcf834df52d84d5eb86acb847c3f28d3cffd1f78f3092b8ff8913c2c400675a071c48a19cd852fdbaac1582aa1dba23433e0e16055831ef2a5e76dde91199941
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment