diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-21 17:13:25 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-21 17:14:13 +0100 |
| commit | c24337964f2d0500975abb4ef55c324daaf349b6 (patch) | |
| tree | 5eadaffa84911c3886fa9de2a8eeccc49fd5e328 /src/main.h | |
| parent | 8ea5ef1d39942a6a73cf1a012c37a92eb6dc6c60 (diff) | |
| parent | 901b01d674031f9aca717deeb372bafa160a24af (diff) | |
| download | bitcoin-c24337964f2d0500975abb4ef55c324daaf349b6.tar.xz | |
Merge pull request #7062
901b01d Remove GetMinRelayFee (Suhas Daftuar)
27fae34 Use fee deltas for determining mempool acceptance (Suhas Daftuar)
9ef2a25 Update replace-by-fee logic to use fee deltas (Suhas Daftuar)
eb30666 Fix mempool limiting for PrioritiseTransaction (Suhas Daftuar)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index 25a0063873..7ae4893e07 100644 --- a/src/main.h +++ b/src/main.h @@ -300,8 +300,6 @@ struct CDiskTxPos : public CDiskBlockPos }; -CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowFree); - /** * Count ECDSA signature operations the old-fashioned (pre-0.6) way * @return number of sigops this transaction's outputs will produce when spent |