diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.linux-mingw | 7 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 24 | ||||
| -rw-r--r-- | src/qt/guiutil.cpp | 6 | ||||
| -rw-r--r-- | src/qt/locale/bitcoin_en.ts | 237 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 4 | ||||
| -rw-r--r-- | src/qt/test/test_main.cpp | 7 | ||||
| -rw-r--r-- | src/qt/test/uritests.cpp | 2 | ||||
| -rw-r--r-- | src/rpcrawtransaction.cpp | 11 |
8 files changed, 174 insertions, 124 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index fc22bb76ee..51439c7b7c 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -7,11 +7,12 @@ DEPSDIR:=/usr/i586-mingw32msvc USE_UPNP:=0 INCLUDEPATHS= \ + -I"$(CURDIR)" \ + -I"$(CURDIR)"/obj \ -I"$(DEPSDIR)/boost_1_49_0" \ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \ -I"$(DEPSDIR)/openssl-1.0.1b/include" \ - -I"$(DEPSDIR)" \ - -I"$(CURDIR)"/obj \ + -I"$(DEPSDIR)" LIBPATHS= \ -L"$(DEPSDIR)/boost_1_49_0/stage/lib" \ @@ -88,7 +89,7 @@ obj-test/%.o: test/%.cpp $(HEADERS) i586-mingw32msvc-g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $< test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS) + i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework-mt-s $(LIBS) clean: diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 219397dbf9..5fe9e5218a 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -37,30 +37,34 @@ QT_TRANSLATE_NOOP("bitcoin-core", "" "Number of seconds to keep misbehaving peers from reconnecting (default: " "86400)"), QT_TRANSLATE_NOOP("bitcoin-core", "" +"Set maximum size of high-priority/low-fee transactions in bytes (default: " +"27000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "" "Unable to bind to %s on this computer. Bitcoin is probably already running."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Warning: -paytxfee is set very high. This is the transaction fee you will " +"Warning: -paytxfee is set very high! This is the transaction fee you will " "pay if you send a transaction."), QT_TRANSLATE_NOOP("bitcoin-core", "" -"Warning: Please check that your computer's date and time are correct. If " +"Warning: Displayed transactions may not be correct! You may need to upgrade, " +"or other nodes may need to upgrade."), +QT_TRANSLATE_NOOP("bitcoin-core", "" +"Warning: Please check that your computer's date and time are correct! If " "your clock is wrong Bitcoin will not work properly."), QT_TRANSLATE_NOOP("bitcoin-core", "" "You must set rpcpassword=<password> in the configuration file:\n" "%s\n" "If the file does not exist, create it with owner-readable-only file " "permissions."), -QT_TRANSLATE_NOOP("bitcoin-core", "" -"\n" -"SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "Accept command line and JSON-RPC commands"), QT_TRANSLATE_NOOP("bitcoin-core", "Accept connections from outside (default: 1 if no -proxy or -connect)"), QT_TRANSLATE_NOOP("bitcoin-core", "Add a node to connect to and attempt to keep the connection open"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow DNS lookups for -addnode, -seednode and -connect"), QT_TRANSLATE_NOOP("bitcoin-core", "Allow JSON-RPC connections from specified IP address"), -QT_TRANSLATE_NOOP("bitcoin-core", "An error occured while setting up the RPC port %i for listening: %s"), +QT_TRANSLATE_NOOP("bitcoin-core", "An error occurred while setting up the RPC port %i for listening: %s"), QT_TRANSLATE_NOOP("bitcoin-core", "Bind to given address. Use [host]:port notation for IPv6"), QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin version"), QT_TRANSLATE_NOOP("bitcoin-core", "Bitcoin"), +QT_TRANSLATE_NOOP("bitcoin-core", "Block creation options:"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot downgrade wallet"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot initialize keypool"), QT_TRANSLATE_NOOP("bitcoin-core", "Cannot resolve -bind address: '%s'"), @@ -112,6 +116,7 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Prepend debug output with timestamp"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescan the block chain for missing wallet transactions"), QT_TRANSLATE_NOOP("bitcoin-core", "Rescanning..."), QT_TRANSLATE_NOOP("bitcoin-core", "Run in the background as a daemon and accept commands"), +QT_TRANSLATE_NOOP("bitcoin-core", "SSL options: (see the Bitcoin Wiki for SSL setup instructions)"), QT_TRANSLATE_NOOP("bitcoin-core", "Select the version of socks proxy to use (4-5, default: 5)"), QT_TRANSLATE_NOOP("bitcoin-core", "Send command to -server or bitcoind"), QT_TRANSLATE_NOOP("bitcoin-core", "Send commands to node running on <ip> (default: 127.0.0.1)"), @@ -123,6 +128,9 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Server private key (default: server.pem)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database cache size in megabytes (default: 25)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set database disk log size in megabytes (default: 100)"), QT_TRANSLATE_NOOP("bitcoin-core", "Set key pool size to <n> (default: 100)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set maximum block size in bytes (default: 250000)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Set minimum block size in bytes (default: 0)"), +QT_TRANSLATE_NOOP("bitcoin-core", "Shrink debug.log file on client startup (default: 1 when no -debug)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify configuration file (default: bitcoin.conf)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify connection timeout (in milliseconds)"), QT_TRANSLATE_NOOP("bitcoin-core", "Specify data directory"), @@ -143,6 +151,6 @@ QT_TRANSLATE_NOOP("bitcoin-core", "Use proxy to reach tor hidden services (defau QT_TRANSLATE_NOOP("bitcoin-core", "Use the test network"), QT_TRANSLATE_NOOP("bitcoin-core", "Username for JSON-RPC connections"), QT_TRANSLATE_NOOP("bitcoin-core", "Wallet needed to be rewritten: restart Bitcoin to complete"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low"), -QT_TRANSLATE_NOOP("bitcoin-core", "Warning: this version is obsolete, upgrade required"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: Disk space is low!"), +QT_TRANSLATE_NOOP("bitcoin-core", "Warning: This version is obsolete, upgrade required!"), };
\ No newline at end of file diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index 558eff6d5d..d2d7716dbd 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -4,7 +4,6 @@ #include "bitcoinunits.h" #include "util.h" #include "init.h" -#include "base58.h" #include <QString> #include <QDateTime> @@ -81,11 +80,6 @@ bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out) if(uri.scheme() != QString("bitcoin")) return false; - // check if the address is valid - CBitcoinAddress addressFromUri(uri.path().toStdString()); - if (!addressFromUri.IsValid()) - return false; - SendCoinsRecipient rv; rv.address = uri.path(); rv.amount = 0; diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts index c6baca2dd9..849ff47a52 100644 --- a/src/qt/locale/bitcoin_en.ts +++ b/src/qt/locale/bitcoin_en.ts @@ -216,12 +216,22 @@ This product includes software developed by the OpenSSL Project for use in the O </message> <message> <location line="+1"/> - <source>WARNING: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>! -Are you sure you wish to encrypt your wallet?</source> + <source>Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!</source> <translation type="unfinished"></translation> </message> <message> - <location line="+9"/> + <location line="+0"/> + <source>Are you sure you wish to encrypt your wallet?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+106"/> + <location line="+24"/> + <source>Warning: The Caps Lock key is on!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-121"/> <location line="+49"/> <source>Wallet encrypted</source> <translation type="unfinished"></translation> @@ -232,13 +242,7 @@ Are you sure you wish to encrypt your wallet?</source> <translation type="unfinished"></translation> </message> <message> - <location line="+96"/> - <location line="+24"/> - <source>Warning: The Caps Lock key is on.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-115"/> + <location line="+5"/> <location line="+7"/> <location line="+42"/> <location line="+6"/> @@ -292,12 +296,12 @@ Are you sure you wish to encrypt your wallet?</source> <translation type="unfinished"></translation> </message> <message> - <location line="+247"/> + <location line="+248"/> <source>Synchronizing with network...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-325"/> + <location line="-326"/> <source>&Overview</source> <translation type="unfinished"></translation> </message> @@ -387,7 +391,7 @@ Are you sure you wish to encrypt your wallet?</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+240"/> + <location line="+241"/> <source>~%n block(s) remaining</source> <translation> <numerusform>~%n block remaining</numerusform> @@ -395,12 +399,12 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location line="+11"/> + <location line="+6"/> <source>Downloaded %1 of %2 blocks of transaction history (%3% done).</source> <translation type="unfinished"></translation> </message> <message> - <location line="-258"/> + <location line="-254"/> <source>&Export...</source> <translation type="unfinished"></translation> </message> @@ -530,12 +534,12 @@ Are you sure you wish to encrypt your wallet?</source> </translation> </message> <message> - <location line="+48"/> + <location line="+40"/> <source>Downloaded %1 blocks of transaction history.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location line="+15"/> + <location line="+22"/> <source>%n second(s) ago</source> <translation> <numerusform>%n second ago</numerusform> @@ -661,7 +665,7 @@ Address: %4 <context> <name>ClientModel</name> <message> - <location filename="../clientmodel.cpp" line="+84"/> + <location filename="../clientmodel.cpp" line="+86"/> <source>Network Alert</source> <translation type="unfinished"></translation> </message> @@ -951,12 +955,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location filename="../optionsdialog.cpp" line="+63"/> + <location filename="../optionsdialog.cpp" line="+55"/> <source>default</source> <translation type="unfinished"></translation> </message> <message> - <location line="+133"/> + <location line="+134"/> <location line="+9"/> <source>Warning</source> <translation type="unfinished"></translation> @@ -968,7 +972,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+25"/> + <location line="+29"/> <source>The supplied proxy address is invalid.</source> <translation type="unfinished"></translation> </message> @@ -1557,7 +1561,7 @@ Address: %4 </message> <message> <location line="-73"/> - <source>Wallet unlock was canceled.</source> + <source>Wallet unlock was cancelled.</source> <translation type="unfinished"></translation> </message> <message> @@ -2097,22 +2101,22 @@ Address: %4 <context> <name>bitcoin-core</name> <message> - <location filename="../bitcoinstrings.cpp" line="+62"/> + <location filename="../bitcoinstrings.cpp" line="+65"/> <source>Bitcoin version</source> <translation type="unfinished"></translation> </message> <message> - <location line="+76"/> + <location line="+81"/> <source>Usage:</source> <translation type="unfinished"></translation> </message> <message> - <location line="-22"/> + <location line="-25"/> <source>Send command to -server or bitcoind</source> <translation type="unfinished"></translation> </message> <message> - <location line="-19"/> + <location line="-20"/> <source>List commands</source> <translation type="unfinished"></translation> </message> @@ -2127,7 +2131,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+19"/> + <location line="+23"/> <source>Specify configuration file (default: bitcoin.conf)</source> <translation type="unfinished"></translation> </message> @@ -2137,7 +2141,7 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-42"/> + <location line="-46"/> <source>Generate coins</source> <translation type="unfinished"></translation> </message> @@ -2147,12 +2151,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+55"/> + <location line="+59"/> <source>Specify data directory</source> <translation type="unfinished"></translation> </message> <message> - <location line="-5"/> + <location line="-8"/> <source>Set database cache size in megabytes (default: 25)</source> <translation type="unfinished"></translation> </message> @@ -2162,12 +2166,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> + <location line="+6"/> <source>Specify connection timeout (in milliseconds)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-28"/> + <location line="-32"/> <source>Listen for connections on <port> (default: 8333 or testnet: 18333)</source> <translation type="unfinished"></translation> </message> @@ -2182,22 +2186,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+59"/> + <location line="+63"/> <source>Specify your own public address</source> <translation type="unfinished"></translation> </message> <message> - <location line="-69"/> + <location line="-74"/> <source>Bind to given address. Use [host]:port notation for IPv6</source> <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+76"/> <source>Threshold for disconnecting misbehaving peers (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-96"/> + <location line="-104"/> <source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source> <translation type="unfinished"></translation> </message> @@ -2207,27 +2211,57 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+31"/> + <location line="+34"/> <source>Accept command line and JSON-RPC commands</source> <translation type="unfinished"></translation> </message> <message> - <location line="+59"/> + <location line="+60"/> <source>Run in the background as a daemon and accept commands</source> <translation type="unfinished"></translation> </message> <message> - <location line="+29"/> + <location line="+33"/> <source>Use the test network</source> <translation type="unfinished"></translation> </message> <message> - <location line="-87"/> + <location line="-92"/> <source>Accept connections from outside (default: 1 if no -proxy or -connect)</source> <translation type="unfinished"></translation> </message> <message> + <location line="-20"/> + <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+5"/> + <source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Warning: Displayed transactions may not be correct! You may need to upgrade, or other nodes may need to upgrade.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+3"/> + <source>Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly.</source> + <translation type="unfinished"></translation> + </message> + <message> <location line="+13"/> + <source>An error occurred while setting up the RPC port %i for listening: %s</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+4"/> + <source>Block creation options:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+6"/> <source>Connect only to the specified node(s)</source> <translation type="unfinished"></translation> </message> @@ -2283,6 +2317,11 @@ Address: %4 </message> <message> <location line="+4"/> + <source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> <source>Select the version of socks proxy to use (4-5, default: 5)</source> <translation type="unfinished"></translation> </message> @@ -2297,7 +2336,22 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+21"/> + <location line="+7"/> + <source>Set maximum block size in bytes (default: 250000)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Set minimum block size in bytes (default: 0)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+1"/> + <source>Shrink debug.log file on client startup (default: 1 when no -debug)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="+15"/> <source>Use UPnP to map the listening port (default: 0)</source> <translation type="unfinished"></translation> </message> @@ -2317,12 +2371,17 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="+3"/> - <source>Warning: this version is obsolete, upgrade required</source> + <location line="+2"/> + <source>Warning: Disk space is low!</source> <translation type="unfinished"></translation> </message> <message> - <location line="-37"/> + <location line="+1"/> + <source>Warning: This version is obsolete, upgrade required!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location line="-41"/> <source>Password for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> @@ -2332,32 +2391,32 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-39"/> + <location line="-40"/> <source>Allow JSON-RPC connections from specified IP address</source> <translation type="unfinished"></translation> </message> <message> - <location line="+58"/> + <location line="+60"/> <source>Send commands to node running on <ip> (default: 127.0.0.1)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-84"/> + <location line="-89"/> <source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+104"/> + <location line="+112"/> <source>Upgrade wallet to latest format</source> <translation type="unfinished"></translation> </message> <message> - <location line="-12"/> + <location line="-15"/> <source>Set key pool size to <n> (default: 100)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-13"/> + <location line="-14"/> <source>Rescan the block chain for missing wallet transactions</source> <translation type="unfinished"></translation> </message> @@ -2377,18 +2436,12 @@ Address: %4 <translation type="unfinished"></translation> </message> <message> - <location line="-39"/> - <source> -SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+87"/> + <location line="+52"/> <source>Use OpenSSL (https) for JSON-RPC connections</source> <translation type="unfinished"></translation> </message> <message> - <location line="-18"/> + <location line="-21"/> <source>Server certificate file (default: server.cert)</source> <translation type="unfinished"></translation> </message> @@ -2398,47 +2451,42 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-104"/> + <location line="-109"/> <source>Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+128"/> - <source>Warning: Disk space is low</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-15"/> + <location line="+121"/> <source>This help message</source> <translation type="unfinished"></translation> </message> <message> - <location line="-110"/> + <location line="-118"/> <source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+45"/> <source>Bitcoin</source> <translation type="unfinished"></translation> </message> <message> - <location line="+71"/> + <location line="+76"/> <source>Unable to bind to %s on this computer (bind returned error %d, %s)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-64"/> + <location line="-68"/> <source>Connect through socks proxy</source> <translation type="unfinished"></translation> </message> <message> - <location line="-12"/> + <location line="-13"/> <source>Allow DNS lookups for -addnode, -seednode and -connect</source> <translation type="unfinished"></translation> </message> <message> - <location line="+42"/> + <location line="+43"/> <source>Loading addresses...</source> <translation type="unfinished"></translation> </message> @@ -2458,12 +2506,12 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+67"/> + <location line="+71"/> <source>Wallet needed to be rewritten: restart Bitcoin to complete</source> <translation type="unfinished"></translation> </message> <message> - <location line="-69"/> + <location line="-73"/> <source>Error loading wallet.dat</source> <translation type="unfinished"></translation> </message> @@ -2473,7 +2521,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+43"/> + <location line="+47"/> <source>Unknown network specified in -onlynet: '%s'</source> <translation type="unfinished"></translation> </message> @@ -2483,7 +2531,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-69"/> + <location line="-73"/> <source>Cannot resolve -bind address: '%s'</source> <translation type="unfinished"></translation> </message> @@ -2508,27 +2556,27 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-51"/> + <location line="-55"/> <source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds </source> <translation type="unfinished"></translation> </message> <message> - <location line="+50"/> + <location line="+54"/> <source>Error: Transaction creation failed </source> <translation type="unfinished"></translation> </message> <message> - <location line="+40"/> + <location line="+41"/> <source>Sending...</source> <translation type="unfinished"></translation> </message> <message> - <location line="-94"/> + <location line="-99"/> <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source> <translation type="unfinished"></translation> </message> <message> - <location line="+70"/> + <location line="+74"/> <source>Invalid amount</source> <translation type="unfinished"></translation> </message> @@ -2543,7 +2591,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-44"/> + <location line="-45"/> <source>Add a node to connect to and attempt to keep the connection open</source> <translation type="unfinished"></translation> </message> @@ -2553,7 +2601,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+47"/> + <location line="+48"/> <source>Find peers using internet relay chat (default: 0)</source> <translation type="unfinished"></translation> </message> @@ -2563,12 +2611,7 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="-43"/> - <source>Warning: -paytxfee is set very high. This is the transaction fee you will pay if you send a transaction.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="+61"/> + <location line="+18"/> <source>Loading wallet...</source> <translation type="unfinished"></translation> </message> @@ -2598,12 +2641,12 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source> <translation type="unfinished"></translation> </message> <message> - <location line="+59"/> + <location line="+63"/> <source>To use the %s option</source> <translation type="unfinished"></translation> </message> <message> - <location line="-124"/> + <location line="-132"/> <source>%s, you must set a rpcpassword in the configuration file: %s It is recommended you use the following random password: @@ -2615,26 +2658,16 @@ If the file does not exist, create it with owner-readable-only file permissions. <translation type="unfinished"></translation> </message> <message> - <location line="+70"/> + <location line="+74"/> <source>Error</source> <translation type="unfinished"></translation> </message> <message> - <location line="-19"/> - <source>An error occured while setting up the RPC port %i for listening: %s</source> - <translation type="unfinished"></translation> - </message> - <message> - <location line="-13"/> + <location line="-30"/> <source>You must set rpcpassword=<password> in the configuration file: %s If the file does not exist, create it with owner-readable-only file permissions.</source> <translation type="unfinished"></translation> </message> - <message> - <location line="-3"/> - <source>Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.</source> - <translation type="unfinished"></translation> - </message> </context> </TS> diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 2c46ea5a70..789681ad90 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -7,6 +7,7 @@ #include "sendcoinsentry.h" #include "guiutil.h" #include "askpassphrasedialog.h" +#include "base58.h" #include <QMessageBox> #include <QLocale> @@ -273,6 +274,9 @@ bool SendCoinsDialog::handleURI(const QString &uri) // URI has to be valid if (GUIUtil::parseBitcoinURI(uri, &rv)) { + CBitcoinAddress address(rv.address.toStdString()); + if (!address.IsValid()) + return false; pasteEntry(rv); return true; } diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 5b11e39ea3..af2d358fc4 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -6,6 +6,11 @@ // This is all you need to run all the tests
int main(int argc, char *argv[])
{
+ bool fInvalid = false;
+
URITests test1;
- QTest::qExec(&test1);
+ if (QTest::qExec(&test1) != 0)
+ fInvalid = true;
+
+ return fInvalid;
}
diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index a281c39ca5..4662f5ed31 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -47,7 +47,7 @@ void URITests::uriTests() uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=100&label=Wikipedia Example")); QVERIFY(GUIUtil::parseBitcoinURI(uri, &rv)); QVERIFY(rv.address == QString("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")); - QVERIFY(rv.amount == 10000000000); + QVERIFY(rv.amount == 10000000000LL); QVERIFY(rv.label == QString("Wikipedia Example")); uri.setUrl(QString("bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?message=Wikipedia Example Address")); diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index 66e4d85f37..57cba15ecf 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -321,18 +321,23 @@ Value signrawtransaction(const Array& params, bool fHelp) // Fetch previous transactions (inputs): map<COutPoint, CScript> mapPrevOut; + for (unsigned int i = 0; i < mergedTx.vin.size(); i++) { + CTransaction tempTx; MapPrevTx mapPrevTx; CTxDB txdb("r"); map<uint256, CTxIndex> unused; bool fInvalid; - mergedTx.FetchInputs(txdb, unused, false, false, mapPrevTx, fInvalid); + + // FetchInputs aborts on failure, so we go one at a time. + tempTx.vin.push_back(mergedTx.vin[i]); + tempTx.FetchInputs(txdb, unused, false, false, mapPrevTx, fInvalid); // Copy results into mapPrevOut: - BOOST_FOREACH(const CTxIn& txin, mergedTx.vin) + BOOST_FOREACH(const CTxIn& txin, tempTx.vin) { const uint256& prevHash = txin.prevout.hash; - if (mapPrevTx.count(prevHash)) + if (mapPrevTx.count(prevHash) && mapPrevTx[prevHash].second.vout.size()>txin.prevout.n) mapPrevOut[txin.prevout] = mapPrevTx[prevHash].second.vout[txin.prevout.n].scriptPubKey; } } |