OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
monacoinproject [Sun, 6 Apr 2014 17:24:26 +0000 (02:24 +0900)]
getnormalizedtxid now explains itself.
monacoinproject [Sun, 6 Apr 2014 17:23:38 +0000 (02:23 +0900)]
Add normalized transaction hash
Rebased-from:
e7853a9
Rebased-by: Warren Togami <wtogami@gmail.com>
Original code from bitcoin#3656
Warning
=======
This patch was rejected from Bitcoin Core and must be considered
experimental.
Theoretically it is compatible with the de facto standard as utilized by
blockchain.info and a few vendors.
monacoinproject [Sun, 6 Apr 2014 17:19:30 +0000 (02:19 +0900)]
Monacoin: reject fee > 1 MONA in sendrawtransaction
monacoinproject [Sun, 6 Apr 2014 17:17:01 +0000 (02:17 +0900)]
Remove "conflicted" as transaction category.
We were losing information about sent/received by overriding the
category in case of a conflicted transaction.
Hence, remove the "conflicted" category.
Conflicted status of a transaction can still be determined by looking
for confirmations<0.
monacoinproject [Sun, 6 Apr 2014 17:15:07 +0000 (02:15 +0900)]
Add HasCanonicalPushes(), and use it in IsStandardTx
Conflicts:
src/script.cpp
src/script.h
monacoinproject [Sun, 6 Apr 2014 17:10:10 +0000 (02:10 +0900)]
qt: Add option to (not) spend unconfirmed change
- Add a wallet tab to options dialog
- Move fee setting to wallet tab
- Add new setting to set -nospendzeroconfchange from UI
Conflicts:
src/qt/optionsmodel.cpp
src/qt/optionsmodel.h
Conflicts:
src/qt/forms/optionsdialog.ui
src/qt/optionsmodel.h
monacoinproject [Sun, 6 Apr 2014 17:02:38 +0000 (02:02 +0900)]
Bump copyright years to 2014 for changed files
monacoinproject [Sun, 6 Apr 2014 15:51:01 +0000 (00:51 +0900)]
Handle "conflicted" transactions properly
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.
Conflicts:
src/qt/walletmodel.cpp
src/wallet.cpp
Conflicts:
src/wallet.cpp
monacoinproject [Sun, 6 Apr 2014 15:39:00 +0000 (00:39 +0900)]
If requested, actually treat uncomfirmed change as being uncomfirmed
This commit strengthens
1bbca24 by updating the CWalletTx::IsConfirmed()
function.
If (bSpendZeroConfChange==false), then IsConfirmed() should actually
treat unconfirmed change as being unconfirmed.
monacoinproject [Sun, 6 Apr 2014 15:37:35 +0000 (00:37 +0900)]
Partial: Fix off-by-one errors in use of IsFinalTx()
Conflicts:
src/main.cpp
src/miner.cpp
src/qt/transactiondesc.cpp
src/qt/transactionrecord.cpp
monacoinproject [Sun, 6 Apr 2014 15:35:11 +0000 (00:35 +0900)]
qt: add missing cs_wallet lock in AddressTableModel::setData
duplicate check in AddressTableModel::setData accesses
wallet data structure as well as SetAddressBook without proper LOCK, fix
this.
Conflicts:
src/qt/addresstablemodel.cpp
monacoinproject [Sun, 6 Apr 2014 15:30:40 +0000 (00:30 +0900)]
[raw] reject insanely high fees by default in sendrawtransaction
There have been several incidents where mainnet experimentation with
raw transactions resulted in insane fees. This is hard to prevent
in the raw transaction api because the inputs may not be known.
Since sending doesn't work if the inputs aren't known, we can catch
it there.
This rejects fees > than 10000 * nMinRelayTxFee or 1 BTC with the
defaults and can be overridden with a bool at the rpc.
Conflicts:
src/main.cpp
src/main.h
src/rpcrawtransaction.cpp
monacoinproject [Sun, 6 Apr 2014 15:23:56 +0000 (00:23 +0900)]
Add option to avoid spending unconfirmed change
Conflicts:
src/init.cpp
src/wallet.cpp
src/wallet.h
monacoinproject [Sun, 6 Apr 2014 15:19:56 +0000 (00:19 +0900)]
Fix `getaddednodeinfo` RPC call with dns=false
The getaddednodeinfo RPC call, when invoked with the dns flag set to
false, returns a malformed JSON object with duplicate keys.
Change this to return an array of objects with one key as
shown in the help message.
Fixes #3581.
monacoinproject [Sun, 6 Apr 2014 15:17:50 +0000 (00:17 +0900)]
Add check for valid keys in `importprivkey`
The base58 armoring was checked, but not the resulting private key,
which could be out of range. Fix this by adding a check.
Conflicts:
src/rpcdump.cpp
Conflicts:
src/rpcdump.cpp
monacoinproject [Sun, 6 Apr 2014 15:16:13 +0000 (00:16 +0900)]
qt: Fix richtext detection hang issue on very old Qt versions
Alternative implementation. Thanks to @awoland for the original.
Fixes #3486.
monacoinproject [Sun, 6 Apr 2014 15:14:42 +0000 (00:14 +0900)]
Bugfix: Undefine _FORTIFY_SOURCE before redefining it, to avoid warni…
…ngs on compilers that define it by default
monacoinproject [Sun, 6 Apr 2014 15:12:06 +0000 (00:12 +0900)]
Don't create empty transactions when reading corrupted wallet
The current transaction loading code is not exception safe.
An exception during deserialization causes an empty transaction
to be left behind in the wallet.
Fix this by building the transaction separately and adding
it only to the wallet at the end.
Fixes #3333.
monacoinproject [Sun, 6 Apr 2014 15:10:15 +0000 (00:10 +0900)]
Explicitly ensure that wallet is unlocked in `importprivkey`
This makes for a more useful error reply (fixes #957).
monacoinproject [Sun, 6 Apr 2014 15:08:35 +0000 (00:08 +0900)]
Update build-osx.md
Conflicts:
doc/build-osx.md
monacoinproject [Sun, 6 Apr 2014 15:07:17 +0000 (00:07 +0900)]
Change release-process.md to sign release tags
Conflicts:
doc/release-process.md
monacoinproject [Sun, 6 Apr 2014 15:06:25 +0000 (00:06 +0900)]
Partial: Sanitize assert usage and refuse to compile with NDEBUG.
There were quite a few places where assert() was used with side effects,
making operation with NDEBUG non-functional. This commit fixes all the
cases I know about, but also adds an #error on NDEBUG because the code
is untested without assertions and may still have vulnerabilities if
used without assert.
Conflicts:
src/key.cpp
src/main.cpp
src/wallet.cpp
monacoinproject [Sun, 6 Apr 2014 14:19:30 +0000 (23:19 +0900)]
doc: replace DOS with MSYS shell to be more consistent
A plain DOS window doesn't have the right path settings, whereas
the MSYS shell window does.
Conflicts:
doc/build-msw.md
monacoinproject [Sun, 6 Apr 2014 14:18:07 +0000 (23:18 +0900)]
qt: add license header to source files
Closes #839
Conflicts:
src/qt/addressbookpage.cpp
src/qt/guiutil.cpp
src/qt/intro.cpp
src/qt/intro.h
src/qt/macnotificationhandler.h
src/qt/optionsdialog.cpp
src/qt/optionsmodel.cpp
src/qt/paymentrequestplus.cpp
src/qt/paymentrequestplus.h
src/qt/paymentserver.cpp
src/qt/receivecoinsdialog.cpp
src/qt/receivecoinsdialog.h
src/qt/receiverequestdialog.cpp
src/qt/receiverequestdialog.h
src/qt/trafficgraphwidget.cpp
src/qt/trafficgraphwidget.h
src/qt/walletmodeltransaction.cpp
src/qt/walletmodeltransaction.h
monacoinproject [Sun, 6 Apr 2014 14:03:10 +0000 (23:03 +0900)]
Show short scriptPubKeys correctly
Previously bitcoin-qt's -debug transaction info was showing
CTxOut([error])
It is valid for a scriptPubKey to be any size, for example simply
OP_RETURN is valid and can be used to destroy a TXOUT to mining fees.
Conflicts:
src/core.cpp
monacoinproject [Sun, 6 Apr 2014 14:01:26 +0000 (23:01 +0900)]
Bug fix: CDataStream::GetAndClear() when nReadPos > 0
Changed CDataStream::GetAndClear() to use the most obvious
get get and clear instead of a tricky swap().
Added a unit test for CDataStream insert/erase/GetAndClear.
Note: GetAndClear() is not performance critical, it is used only
by the send-a-message-to-the-network code. Bug was not noticed
before now because the send-a-message code never erased from the
stream.
monacoinproject [Sun, 6 Apr 2014 13:59:30 +0000 (22:59 +0900)]
bitcoingui: show main window (if hidden) on modal messages
Conflicts:
src/qt/bitcoingui.cpp
Conflicts:
src/qt/bitcoingui.cpp
monacoinproject [Sun, 6 Apr 2014 13:56:52 +0000 (22:56 +0900)]
RPC: prevent crash with walletpassphrase
- fix crash with walletpassphrase by checking if RPC server is running
and
give a friendly error message how to fix this (fixes #3100)
- add 3 new RPCErrorCodes RPC_SERVER_NOT_STARTED
- use the new code where needed / missing
Upstream:
4315ec1
Conflicts:
src/rpcnet.cpp
src/rpcwallet.cpp
monacoinproject [Sun, 6 Apr 2014 13:53:47 +0000 (22:53 +0900)]
Bugfix: Supress "address" key in transaction details, when the destin…
…ation isn't recognized
Previously, it would pass corrupt/random through base58.
monacoinproject [Sun, 6 Apr 2014 13:43:54 +0000 (22:43 +0900)]
Bugfix: Avoid trying to parse outputs that aren't relevant to CWallet…
…Tx::GetAmounts
This fixes a warning when an output we aren't concerned with can't be
parsed.
monacoinproject [Sun, 6 Apr 2014 13:39:48 +0000 (22:39 +0900)]
Avoid core dump if rpc port is in use.
The cleanup code needs to check for NULL rpcworkers thread group.
monacoinproject [Sun, 6 Apr 2014 13:37:38 +0000 (22:37 +0900)]
Update Qt 4.8.3 download link
Conflicts:
contrib/gitian-descriptors/README
monacoinproject [Sun, 6 Apr 2014 13:35:55 +0000 (22:35 +0900)]
Bitcoin-Qt: prevent stuck/unusable debug window on exit
- when closing the client with an open debug window, that window could
become stuck/unsuable (it was still shown wherea the main window was
hidden already)
- fix this by hiding the debug window, when quitting the the client
monacoinproject [Sun, 6 Apr 2014 13:34:47 +0000 (22:34 +0900)]
fix #3049 by changing comment for CNetAddr::IsRFC4193()
monacoinproject [Sun, 6 Apr 2014 13:33:17 +0000 (22:33 +0900)]
misc small spelling/indentation fixes
monacoinproject [Sun, 6 Apr 2014 13:30:22 +0000 (22:30 +0900)]
Bitcoin-Qt: BitcoinGUI::message() updates/fixes
- ensure message boxes are shown in center of our main window, not
centered on the users desktop
- always prefer user supplied titles for message boxes over the
functions
defaults (fixes a bug, where transaction info messages did not contain
information, if it was incoming or outgoing)
monacoinproject [Sun, 6 Apr 2014 13:26:01 +0000 (22:26 +0900)]
Fix minor unit test memory leaks
monacoinproject [Sun, 6 Apr 2014 13:23:52 +0000 (22:23 +0900)]
Make settxfee clear that units are MONA/KB.
monacoinproject [Sun, 9 Mar 2014 16:38:48 +0000 (01:38 +0900)]
readme
The rest is the same as Bitcoin.
じゃないわ
monacoinproject [Sun, 9 Mar 2014 10:47:01 +0000 (19:47 +0900)]
fix
KGWに切り替わるブロックを80000に決めた
scrypt_1024_1_1_256_sp_sse2を使ってた部分をなおした
monacoinproject [Mon, 24 Feb 2014 15:27:41 +0000 (00:27 +0900)]
8.6.2
update 8.6.2
bugfix
kgw
monacoinproject [Wed, 15 Jan 2014 06:35:11 +0000 (22:35 -0800)]
Merge pull request #1 from ohac/master
fix leveldb and .gitignore files
OHASHI Hideya [Sat, 11 Jan 2014 02:53:57 +0000 (11:53 +0900)]
bitcoin-qt.pro: merge with litecoin
OHASHI Hideya [Sat, 11 Jan 2014 02:21:37 +0000 (11:21 +0900)]
remove trash file
OHASHI Hideya [Sat, 11 Jan 2014 01:40:59 +0000 (10:40 +0900)]
fix build problem
OHASHI Hideya [Sat, 11 Jan 2014 00:37:17 +0000 (09:37 +0900)]
fix leveldb and .gitignore files
monacoinproject [Wed, 1 Jan 2014 06:10:19 +0000 (15:10 +0900)]
Update README.md
monacoinproject [Wed, 1 Jan 2014 00:52:22 +0000 (09:52 +0900)]
build_config.mk commit
monacoinproject [Wed, 1 Jan 2014 00:12:39 +0000 (09:12 +0900)]
Initial commit