diff -uNr a/bitcoin/manifest b/bitcoin/manifest --- a/bitcoin/manifest f6d48da661101d4ab85441db4a19090939c4859618074ea1e16171700d76b7482f363cdd1cbb1570a494910dcd40456ae936c6c168f89469fdf50f562cb75f8a +++ b/bitcoin/manifest 8a72565420e5da35289c60885864984d1b4421f81148b625ddf72c9ea16718c4cbd47d1b6821fe468123f4597fdac72024ea01cef839001a27db57373d3c2186 @@ -39,3 +39,4 @@ 696655 bitcoin_permissive_mode jfw Add -permissive option to disable the potentially isolating effects of the malleus_mikehearnificarum; remove -caneat option, always allowing 'eatblock' which has no need for such childproofing. 707665 bitcoin_boost_prune_built_libs jfw Reduce precompiled Boost libraries to the four actually in use. 709104 bitcoin_tx_fee_cleanup jfw Add nMinRelayTxFee global accessed with new -minrelaytxfee option, minrelaytxfee field in getinfo, and setminrelaytxfee RPC command. Use this to replace the fixed MIN_RELAY_TX_FEE. Simplify mempool acceptance rules so this threshold always applies (no special-case free transactions or rubber-banding threshold by current block size). Adjust block generation logic accordingly, though it still sorts on a strange age-value priority rather than fee. Simplify wallet to always send using its configured fee (-paytxfee) and change its default to match the default minrelaytxfee, removing the fixed MIN_TX_FEE. Make nTransactionFee access thread-safe and expand the help text for its inconsistently named RPC setter. Fees are now figured properly without premature rounding, as floor((size*rate)/1024) rather than (floor(size/1000)+1)*rate. *NOTE:* This change may substantially impact wallet transaction fees and node memory usage patterns but puts more control over these in the hands of the operator. +712609 bitcoin_fsync_all_blocks jfw Don't skip fsync of blocks to disk during sync, because this can leave the raw block collection unrecoverably inconsistent with the BDB block index in the event of a crash. diff -uNr a/bitcoin/src/main.h b/bitcoin/src/main.h --- a/bitcoin/src/main.h 3cd26bb2979bc7ba58683345760c51e3f7ed974df52d84ed6855ed6e294c18776da4d5f5aa2461cb2bece6e3d9388a035cd485812b29900b406d0472904ea384 +++ b/bitcoin/src/main.h 593317b93b1ca134595672039e5abb0b0dd23efa85d5a7eb170b078fde135c96413bbe8b40cc308c3796dc5a83456903592f3e966d07475e2336c3e6887a6f4f @@ -880,10 +880,7 @@ // Flush stdio buffers and commit to disk before returning fflush(fileout); - if (!IsInitialBlockDownload() || (nBestHeight+1) % 500 == 0) - { - fsync(fileno(fileout)); - } + fsync(fileno(fileout)); return true; }