aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-02-14Handle "conflicted" transactions properlyGavin Andresen
Extend CMerkleTx::GetDepthInMainChain with the concept of a "conflicted" transaction-- a transaction generated by the wallet that is not in the main chain or in the mempool, and, therefore, will likely never be confirmed. GetDepthInMainChain() now returns -1 for conflicted transactions (0 for unconfirmed-but-in-the-mempool, and >1 for confirmed). This makes getbalance, getbalance '*', and listunspent all agree when there are mutated transactions in the wallet. Before: listunspent: one 49BTC output getbalance: 96 BTC (change counted twice) getbalance '*': 46 BTC (spends counted twice) After: all agree, 49 BTC available to spend.
2014-02-13Make qa/rpc-tests/ compatible with OSXGavin Andresen
Reworked send.sh, so it works properly on my Mac (killall send.sh doesn't work, because the process name is 'bash' not 'send.sh'). So now send.sh writes a .send.pid file, and invoking it as send.sh -STOP (as the bitcoind -walletnotify) signals that PID.
2014-02-13Merge pull request #3662Wladimir J. van der Laan
0542619 Rename IsConfirmed to IsTrusted to better match the intended behavior. (Gregory Maxwell)
2014-02-13Merge pull request #3668Wladimir J. van der Laan
3a1c20b Add raw transaction hex to `gettransaction` wallet RPC (Wladimir J. van der Laan)
2014-02-13Add raw transaction hex to `gettransaction` wallet RPCWladimir J. van der Laan
This allows getting raw transaction data from the wallet even if the transaction is no longer in the blockchain / mempool (for example if it got orphaned due to malleability abuse).
2014-02-13Merge pull request #3657Wladimir J. van der Laan
fdbc2b1 If requested, actually treat uncomfirmed change as being uncomfirmed (b6393ce9-d324-4fe1-996b-acf82dbc3d53)
2014-02-12Rename IsConfirmed to IsTrusted to better match the intended behavior.Gregory Maxwell
This doesn't change the functionality at all.
2014-02-12If requested, actually treat uncomfirmed change as being uncomfirmedb6393ce9-d324-4fe1-996b-acf82dbc3d53
This commit strengthens 1bbca249b202c4802cc2c4d4de4a26e6392b4d92 by updating the CWalletTx::IsConfirmed() function. If (bSpendZeroConfChange==false), then IsConfirmed() should actually treat unconfirmed change as being unconfirmed.
2014-02-11Merge pull request #3651Wladimir J. van der Laan
1bbca24 Add option to avoid spending unconfirmed change (Wladimir J. van der Laan)
2014-02-11Merge pull request #3025 from sipa/noncanpushGregory Maxwell
Make signatures with non-canonical data pushes non-standard.
2014-02-11Add HasCanonicalPushes(), and use it in IsStandardTxPieter Wuille
2014-02-11Move IsPushOnly() to script.cppPieter Wuille
2014-02-11Add option to avoid spending unconfirmed changeWladimir J. van der Laan
2014-02-10Merge pull request #3622Wladimir J. van der Laan
c13a13e gitian: add -D flag to ar for deterministic output for linux deps (Wladimir J. van der Laan) 1552145 gitian: Sort generated source distribution archive (Wladimir J. van der Laan) aabcd11 gitian: Make linux boost dependency completely deterministic (Wladimir J. van der Laan) aa93485 gitian: Make linux build of OpenSSL deterministic (Wladimir J. van der Laan)
2014-02-10Merge pull request #3625Wladimir J. van der Laan
4ce9106 gitian: sort generated source distribution archive for windows (Wladimir J. van der Laan) 6b55e6b gitian: Post-process .a libraries for win to be deterministic (Wladimir J. van der Laan) c43d1e5 gitian: Make windows dependencies outputs fully deterministic (Wladimir J. van der Laan)
2014-02-10gitian: sort generated source distribution archive for windowsWladimir J. van der Laan
Make the bitcoin-X.X.X.tar.gz deterministic.
2014-02-10gitian: Post-process .a libraries for win to be deterministicWladimir J. van der Laan
2014-02-10gitian: add -D flag to ar for deterministic output for linux depsWladimir J. van der Laan
ar -D: Operate in deterministic mode. When adding files and the archive index use zero for UIDs, GIDs, timestamps, and use consistent file modes for all files. When this option is used, if ar is used with identical options and identical input files, multiple runs will create identical output files regardless of the input files' owners, groups, file modes, or modification times.
2014-02-10gitian: Sort generated source distribution archiveWladimir J. van der Laan
Sort the filenames in the resulting tar, normalize the time/date and user/group information.
2014-02-09Merge pull request #3638Wladimir J. van der Laan
cdb6c16 remove setting methods in wallet/walletdb (Cozz Lovan) 44eb59e [Qt] remove broken OptionsModel::Upgrade() (Cozz Lovan)
2014-02-09Merge pull request #3606Wladimir J. van der Laan
6943cb9 small changes to rpc command help message strings (Philip Kaufmann)
2014-02-09doc: add gist link to 'reject' P2P message mention in release notesWladimir J. van der Laan
2014-02-08Merge pull request #3644 from sipa/cleannotesWladimir J. van der Laan
Correct/add/merge a few release notes entries
2014-02-08Correct/add/merge a few release notes entriesPieter Wuille
2014-02-08Merge pull request #3609 from sipa/limitorphanblocksGavin Andresen
Limit the number of orphan blocks in memory
2014-02-08Merge pull request #3642 from petertodd/v0.9-release-notes-formatting-fixesWladimir J. van der Laan
v0.9 release notes formatting fixes
2014-02-08Cleanup v0.9 release notesPeter Todd
2014-02-08gitian: Make windows dependencies outputs fully deterministicWladimir J. van der Laan
Sort .zip order, and other determinism changes to make sure builds are repeatable for windows deps.
2014-02-07doc: add preliminary release notes for 0.9.0Wladimir J. van der Laan
2014-02-07remove setting methods in wallet/walletdbCozz Lovan
2014-02-07[Qt] remove broken OptionsModel::Upgrade()Cozz Lovan
2014-02-07Merge pull request #3608Wladimir J. van der Laan
de21e8f build: Make sure historical release notes end up in distributions (Wladimir J. van der Laan)
2014-02-07Merge pull request #3635Pieter Wuille
12edce5 Update the address for downloading libpng (Micha)
2014-02-07Update the address for downloading libpngMicha
The FTP server what we get libpng from only keeps the latest version in its main folder. Older versions are in the "history" folder. Apparently version 1.6.9 has been released, so 1.6.8 has moved to the history folder.
2014-02-06gitian: Make linux boost dependency completely deterministicWladimir J. van der Laan
It appears that the output was different every time. This doesn't affect the final bitcoind/bitcoin-qt, but is confusing nevertheless. Fix it by using FAKETIME and zipping files in deterministic order.
2014-02-06gitian: Make linux build of OpenSSL deterministicWladimir J. van der Laan
OpenSSL was embedding a timestamp causing its build to be non-deterministic. Change deps-linux to be deterministic by using FAKETIME as needed and disabling it when it gets in the way.
2014-02-05Merge pull request #3634Wladimir J. van der Laan
505867a -Wl,-z,relro and -z,now were wiping out environmental LDFLAGS passed in by the user. I moved them to HARDENING_* where they belong. (Midnight Magic)
2014-02-05-Wl,-z,relro and -z,now were wiping out environmental LDFLAGS passed in by ↵Midnight Magic
the user. I moved them to HARDENING_* where they belong.
2014-02-05Merge pull request #3627 from calvintam/fix_typosGavin Andresen
Typo fix: `anonimized => anonymized` + `infromation => information`
2014-02-05Typo fix: `anonimized => anonymized` + `infromation => information`Calvin Tam
2014-02-03Merge pull request #3613 from cozz/cozz1Wladimir J. van der Laan
[Qt] Fix nTransactionFee in qt-settings
2014-02-03Merge pull request #3621 from gubatron/build-osx-qt-dependency-missingGavin Andresen
added missing homebrew qt dependency on mac osx build documentation.
2014-02-03Merge pull request #3620Wladimir J. van der Laan
65615a3 Gitian fixes for 0.9.0rc1 build (Wladimir J. van der Laan)
2014-02-03added missing homebrew qt dependency on mac osx build documentation.gubatron
2014-02-03Gitian fixes for 0.9.0rc1 buildWladimir J. van der Laan
- Add 'g++' package (virtualbox images don't have this by default) - Workaround for determinism in Qt5 resources - Pass --disable-maintainer-mode --disable-dependency-tracking to configure for libqrencode to avoid random errors about missing m4 directory - Fix typo -with-pic -> --with-pic It is not necessary to rebuild dependencies after this commit. Fixes #3610 and #3612.
2014-02-02[Qt] Fix nTransactionFee in qt-settingsCozz Lovan
2014-01-31Limit the number of orphan blocksPieter Wuille
In case the total number of orphan blocks in memory exceeds a limit (currently set to 750), a random orphan block (which is not depended on by another orphan block) is dropped. This means it will need to be downloaded again, but it won't consume memory until then.
2014-01-31build: Make sure historical release notes end up in distributionsWladimir J. van der Laan
Adds the historical release notes to release tarballs and windows installers.
2014-01-31Merge pull request #3605v0.9.0rc1Wladimir J. van der Laan
69baec9 doc: Add historical release notes (Wladimir J. van der Laan)
2014-01-30Merge pull request #3592Wladimir J. van der Laan
c117d9e Support for error messages and a few more rejection reasons (Luke Dashjr) 14e7ffc Use standard BIP 22 rejection reasons where applicable (Luke Dashjr)