Refactor fee rules to make them actually readable. #2660

TheBlueMatt commented at 10:12 AM on May 17, 2013: member

This (nearly) doesn't change fee rules at all:

To make it into the fee transaction area, the dPriority comparison changed from < to <=
We now just ignore transactions > MAX_BLOCK_SIZE/4 instead of doing some calculations to require increasingly large fees as size increases.

Note that fee rules need completely redone anyway, but since I need to be able to read this crap, I figured I'd fix it for anyone else...

in src/main.cpp:None in 70607d369c outdated

 613 | -        {
 614 | -            // Free transaction area
 615 | -            if (nNewBlockSize < 27000)
 616 | -                nMinFee = 0;
 617 | -        }
 618 | +        // There is a free transaction area in blocks created my most miners,

jonasschnelli commented at 10:15 AM on May 17, 2013:

should that not be "...by most miners,"?

TheBlueMatt commented at 10:46 AM on May 17, 2013:

Thanks, fixed

TheBlueMatt commented at 10:47 AM on May 17, 2013: member

Rebased on gmaxwell's remote may 15th stuff since the test-patches otherwise conflict

BitcoinPullTester commented at 11:18 AM on May 17, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/1df51cd02ee4bda81004ea7fb8959138265bcfa3 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

TheBlueMatt commented at 9:39 PM on May 21, 2013: member

Pushed a new commit to fix the obvious GetMinFee bug I missed the first time, probably at least cherry-pick that for 0.8.2

gmaxwell commented at 10:23 PM on May 21, 2013: contributor

"if (txout.nValue < CENT)" is guarded by "if (nMinFee < nBaseFee)" thus the max is unneeded.

BitcoinPullTester commented at 10:25 PM on May 21, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/7225e074c5bc06ab866e3f31ac20755967ca8906 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

TheBlueMatt commented at 7:56 AM on May 22, 2013: member

@gmaxwell Hah, well I suppose thats what happens when you skim...sorry for all the confusion.

in src/main.cpp:None in 1df51cd02e outdated

 615 | @@ -624,13 +616,9 @@ int64 CTransaction::GetMinFee(unsigned int nBlockSize, bool fAllowFree,
 616 |                  nMinFee = nBaseFee;
 617 |      }
 618 |  
 619 | -    // Raise the price as the block approaches full

sipa commented at 4:08 AM on May 30, 2013:

Why is this being removed?

luke-jr commented at 4:10 AM on May 30, 2013:

Maybe because block creation ignores GetMinFee now?

sipa commented at 4:11 AM on May 30, 2013:

That could be it!

BitcoinPullTester commented at 10:20 PM on June 5, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/dcea8cacf7774ee6dd74ffbc5949322bf3aa05d1 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

Refactor fee rules to make them actually readable.

This (nearly) doesn't change fee rules at all:
 * To make it into the fee transaction area, the dPriority comparison
   changed from < to <=
 * We now just ignore transactions > MAX_BLOCK_SIZE/4 instead of
   doing some calculations to require increasingly large fees as
   size increases.

87cce04c17

TheBlueMatt commented at 11:38 AM on June 14, 2013: member

Rebased and updated to remove the redundancy with MAX_STANDARD_TX_SIZE.

sipa commented at 2:48 PM on June 15, 2013: member

ACK

mikehearn commented at 8:16 AM on June 17, 2013: contributor

ACK

BitcoinPullTester commented at 12:30 AM on June 19, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/87cce04c171800d29df1f13ecf9b36c933262b08 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.

sipa referenced this in commit b4a8a326c0 on Jun 22, 2013

sipa merged this on Jun 22, 2013

sipa closed this on Jun 22, 2013

DrahtBot locked this on Sep 8, 2021