Page MenuHomePhabricator
Differential D1801

Begin using billable txn size for wallet and mining
Changes PlannedPublic
Actions

Authored by schancel on Sep 24 2018, 00:05.

Details

Reviewers
jasonbcox
deadalnix
Group Reviewers
Restricted Project
Summary

Currently, we use the full transaction size for a minimum fee calculation.
This commit changes the behavior to charge different effective rates for
portions of the transaction.

Depends on D1798, D1800, D1803, D1804, D1860

Test Plan
make check && ./test/functional/test_runner.py --extended

Diff Detail

Repository
rABC Bitcoin ABC
Branch
billable-size
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 3348
Build 4779: Bitcoin ABC Buildbot (legacy)
Build 4778: arc lint + arc unit

Event Timeline

schancel created this revision.Sep 24 2018, 00:05
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 24 2018, 00:05
schancel updated this revision to Diff 5001.Sep 24 2018, 00:06

Remote release note change

teamcity added a subscriber: teamcity.Sep 24 2018, 00:07

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Sep 24 2018, 00:07

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

schancel updated this revision to Diff 5002.Sep 24 2018, 00:24

Don't touch release-notes

Harbormaster failed remote builds in B3346: Diff 5000!Sep 24 2018, 00:24
teamcity added a comment.Sep 24 2018, 00:24

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

teamcity added a comment.Sep 24 2018, 00:24

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster failed remote builds in B3347: Diff 5001!Sep 24 2018, 00:25
teamcity added a comment.Sep 24 2018, 00:25

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

teamcity added a comment.Sep 24 2018, 00:41

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B3348: Diff 5002.Sep 24 2018, 00:41
schancel retitled this revision from Introduce a billable size that is independent from the total size to Introduce a tx billable size that is independent from the total size.Sep 24 2018, 17:34
schancel edited the summary of this revision. (Show Details)Sep 24 2018, 18:27
schancel added parent revisions: D1804: Rename DEFAULT_BLOCK_MIN_TX_FEE for clarity, D1803: Rename DEFAULT_MIN_RELAY_TX_FEE for clarity.
schancel updated this revision to Diff 5016.Sep 25 2018, 00:18

Rebased auxilliary changes away

Harbormaster completed remote builds in B3354: Diff 5016.Sep 25 2018, 00:18
jasonbcox requested changes to this revision.Sep 25 2018, 00:30
jasonbcox added a subscriber: jasonbcox.

Requesting changes because some errant line deletions in files that are otherwise untouched.

Otherwise, the diff looks good 👍

src/wallet/rpcwallet.cpp
3410 ↗(On Diff #5016)

Unnecessary for this diff. Please remove.

src/wallet/wallet.cpp
2960 ↗(On Diff #5016)

duplicate space

test/functional/abc-high_priority_transaction.py
16 ↗(On Diff #5016)

remove

test/functional/pruning.py
17 ↗(On Diff #5016)

remove

This revision now requires changes to proceed.Sep 25 2018, 00:30
schancel updated this revision to Diff 5094.Sep 27 2018, 01:36

Fix whitespace nits

Harbormaster completed remote builds in B3401: Diff 5094.Sep 27 2018, 01:36
deadalnix requested changes to this revision.Sep 27 2018, 18:41
deadalnix added a subscriber: deadalnix.

You really should split that up. One to keep track of the billable size in the mempool + unit tests that check that the size is tracked properly with acsendent and descendent txns. This part seems to be mostly taken care of, but would benefit from being unit tested.

The second one to actually start using the billable size. I'm not sure about this part, tbh, and having it isolated from the rest of the change would make review easier.

This revision now requires changes to proceed.Sep 27 2018, 18:41
schancel edited the summary of this revision. (Show Details)Oct 1 2018, 22:23
schancel added a parent revision: D1860: Introduce and track a billable size in addition to real txn size.
schancel retitled this revision from Introduce a tx billable size that is independent from the total size to Implement billable size usage in mining, relaying, and wallet transaction creation.
schancel updated this revision to Diff 5219.Oct 1 2018, 22:28

Rebase

teamcity added a comment.Oct 1 2018, 22:29

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Oct 1 2018, 22:47

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B3475: Diff 5219.Oct 1 2018, 22:47
deadalnix requested changes to this revision.Oct 5 2018, 10:30

Considering there are changes planned in dependencies, I'll put that back on your queue.

This revision now requires changes to proceed.Oct 5 2018, 10:30
schancel updated this revision to Diff 5399.Oct 12 2018, 21:02

Rebase

teamcity added a comment.Oct 12 2018, 21:04

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

schancel updated this revision to Diff 5401.Oct 12 2018, 21:06

Include test here, rather than next item in stack

teamcity added a comment.Oct 12 2018, 21:09

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

schancel updated this revision to Diff 5403.Oct 12 2018, 21:09

Fix billablesize tracking and assertions

schancel added a child revision: D1927: Use a modified size for transaction minimum fee calculation..Oct 12 2018, 21:10
teamcity added a comment.Oct 12 2018, 21:14

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

teamcity added a comment.Oct 12 2018, 21:14

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Harbormaster failed remote builds in B3592: Diff 5401!Oct 12 2018, 21:14
teamcity added a comment.Oct 12 2018, 21:14

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B3590: Diff 5399.Oct 12 2018, 21:15
teamcity added a comment.Oct 12 2018, 21:19

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing failed.

Harbormaster failed remote builds in B3594: Diff 5403!Oct 12 2018, 21:19
schancel planned changes to this revision.Oct 14 2018, 22:20
schancel marked an inline comment as done.
schancel added inline comments.
src/test/mempool_tests.cpp
455 ↗(On Diff #5403)

These need to be moved to the next commit in the stack.

schancel updated this revision to Diff 5419.Oct 15 2018, 17:41

Rebase + Move mempool_tests to proper commits

teamcity added a comment.Oct 15 2018, 17:43

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Oct 15 2018, 17:51

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B3601: Diff 5419.Oct 15 2018, 17:51
jasonbcox accepted this revision.Oct 16 2018, 18:13
schancel retitled this revision from Implement billable size usage in mining, relaying, and wallet transaction creation to Begin using billable txn size for wallet and mining.Oct 22 2018, 21:02
schancel planned changes to this revision.Apr 8 2019, 01:23

Revision Contents
Changeset List

PathSize
src/
6 lines
3 lines
8 lines
2 lines
policy/
2 lines
primitives/
4 lines
4 lines
test/
4 lines
20 lines
71 lines
52 lines
2 lines
10 lines
wallet/
1 line
13 lines
test/
functional/
1 line
9 lines
1 line
test_framework/
2 lines
4 lines
1 line

Diff 5002

View Options

src/init.cpp

Loading...
View Options

src/miner.h

Loading...
View Options

src/miner.cpp

Loading...
View Options

src/net_processing.cpp

Loading...
View Options

src/policy/policy.h

Loading...
View Options

src/primitives/transaction.h

Loading...
View Options

src/primitives/transaction.cpp

Loading...
View Options

src/test/miner_tests.cpp

Loading...
View Options

src/test/transaction_tests.cpp

Loading...
View Options

src/txmempool.h

Loading...
View Options

src/txmempool.cpp

Loading...
View Options

src/validation.h

Loading...
View Options

src/validation.cpp

Loading...
View Options

src/wallet/rpcwallet.cpp

Loading...
View Options

src/wallet/wallet.cpp

Loading...
View Options

test/functional/abc-high_priority_transaction.py

Loading...
View Options

test/functional/fundrawtransaction.py

Loading...
View Options

test/functional/pruning.py

Loading...
View Options

test/functional/test_framework/test_node.py

Loading...
View Options

test/functional/test_framework/util.py

Loading...
View Options

test/functional/wallet-accounts.py

Loading...