nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,637 Commits 10 Branches 68 Tags 223 MiB
986d03d4b2
Commit Graph

869 Commits

Author SHA1 Message Date
moneromooo-monero
bceaf4b788
wallet2: fix transactions not considering rct inputs 
I broke this very recently in 2bf029be17
and didn't notice in time
 2017-02-06 20:20:22 +00:00
Lee Clagett
ce7fcbb4ae Add server auth to monerod, and client auth to wallet-cli and wallet-rpc 2017-02-06 01:15:41 -05:00
Jaquee
7549116ec3
Wallet API: Easylogger wrapper for gui 2017-02-05 20:12:01 +01:00
Jaquee
4efc926d28
Wallet API: Catch error from tools::is_local_address 2017-02-05 11:08:05 +01:00
Jaquee
0cc50bdd11 GUI: Improved refresh performance 2017-02-04 23:25:05 +01:00
Jaquee
805625b541 wallet api: Remove initAsync() and don't start refresh automatically on init 2017-02-04 23:25:03 +01:00
Jaquee
031b060af0 wallet2::init() - disconnect before init if connected 
Makes it possible for GUI to reinit with new daemon without closing and reopening wallet.
 2017-02-04 23:10:20 +01:00
Riccardo Spagni
e56bf442c3
Merge pull request #1669 
4f5b130d wallet_rpc_server: add address book RPC calls (moneromooo-monero)
 2017-02-04 17:28:53 +02:00
Riccardo Spagni
31cf4e7362
Merge pull request #1640 
f97526e6 simplewallet: option to always ask password for any crytical operations (kenshi84)
 2017-02-04 17:18:38 +02:00
moneromooo-monero
4f5b130de9
wallet_rpc_server: add address book RPC calls 2017-02-04 11:40:49 +00:00
kenshi84
f97526e641 simplewallet: option to always ask password for any crytical operations 2017-02-03 09:38:12 +09:00
Riccardo Spagni
58c87786ae
Merge pull request #1652 
fba9332d Changed console output for transaction from L0 to L1 (NanoAkron)
 2017-02-02 21:36:56 +02:00
Riccardo Spagni
011c5a8a7c
Merge pull request #1647 
2bf029be wallet2: fix corner case failing to send a second output (moneromooo-monero)
 2017-02-02 21:35:31 +02:00
Riccardo Spagni
10b625079b
Merge pull request #1645 
9bd9906e Factor is_address_local code into a tools function (moneromooo-monero)
 2017-02-02 21:27:45 +02:00
Riccardo Spagni
614400e5af
Merge pull request #1643 
69d2ad39 wallet_rpc_server: fix logs going to the wrong file (moneromooo-monero)
 2017-02-02 21:26:56 +02:00
Riccardo Spagni
5bb95fc613
Merge pull request #1634 
99f58437 Fix invalid + of std::string and int (Timothy D. Prime)
 2017-02-02 19:43:05 +02:00
Riccardo Spagni
5fb3f97a55
Merge pull request #1629 
c02e1cb9 Updates to epee HTTP client code   - http_simple_client now uses std::chrono for timeouts   - http_simple_client accepts timeouts per connect / invoke call   - shortened names of epee http invoke functions   - invoke command functions only take relative path, connection     is not automatically performed (Lee Clagett)
 2017-02-02 19:32:01 +02:00
Riccardo Spagni
f9e60dcd55
Merge pull request #1617 
0644eed7 Remove boost/foreach.cpp includes (Miguel Herranz)
36dd3e23 Replace BOOST_REVERSE_FOREACH with ranged for (Miguel Herranz)
629e3101 Replace BOOST_FOREACH with C++11 ranged for (Miguel Herranz)
 2017-02-02 18:16:39 +02:00
luigi1111
3cef7fbbb6
Merge pull request 1635 
774a213 Wallet API: Create wallet from keys (Jaqueeee)
 2017-01-30 17:09:38 -06:00
Jaquee
774a21394a
Wallet API: Create wallet from keys 2017-01-30 23:28:09 +01:00
NanoAkron
fba9332de8
Changed console output for transaction from L0 to L1 2017-01-30 03:24:51 +00:00
moneromooo-monero
8c8482ac98
wallet_rpc_server: fix short payment id validation in transfer 2017-01-29 16:10:20 +00:00
moneromooo-monero
2bf029be17
wallet2: fix corner case failing to send a second output 
If a rct transaction can be made with just one input, a second
output will be added. This output will be the smallest amount
output available. However, if this output is a non rct output
with less available fake outs than requested, the transaction
will be rejected. We now check the histogram to only consider
outputs with enough available fake outs in the first place.
 2017-01-28 15:07:15 +00:00
moneromooo-monero
9bd9906e8f
Factor is_address_local code into a tools function 2017-01-28 14:57:47 +00:00
moneromooo-monero
69d2ad3967
wallet_rpc_server: fix logs going to the wrong file 2017-01-28 11:37:21 +00:00
luigi1111
4629ead8c5
Merge pull request #1618 2017-01-27 11:33:26 -06:00
Timothy D. Prime
99f584376e Fix invalid + of std::string and int 
These warnings were emitted by clang++, and they are real bugs.
src/rpc/core_rpc_server.cpp:208:58: warning: adding 'uint64_t'
      (aka 'unsigned long') to a string does not append to the string
      [-Wstring-plus-int]
        res.status = "Error retrieving block at height " + height;
                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~
The obvious intent is achieved by using std::to_string().
 2017-01-26 10:11:37 -08:00
Lee Clagett
c02e1cb943 Updates to epee HTTP client code 
- http_simple_client now uses std::chrono for timeouts
  - http_simple_client accepts timeouts per connect / invoke call
  - shortened names of epee http invoke functions
  - invoke command functions only take relative path, connection
    is not automatically performed
 2017-01-25 15:39:32 -05:00
Riccardo Spagni
6f39ba5909
Merge pull request #1621 
feed6175 fixed typo: monero-wallet-cli,log (kenshi84)
 2017-01-23 08:11:02 -05:00
kenshi84
feed6175ea fixed typo: monero-wallet-cli,log 2017-01-23 11:44:06 +09:00
=
e92c4fff1a
Wallet api: testnet getter 2017-01-22 23:02:01 +01:00
Miguel Herranz
629e3101ab Replace BOOST_FOREACH with C++11 ranged for 2017-01-22 21:38:10 +01:00
Riccardo Spagni
17247b23bf
Merge pull request #1612 
20f71527 wallet2: fix sending a rct tx with a single output available (moneromooo-monero)
 2017-01-22 11:49:20 -05:00
moneromooo-monero
20f7152769
wallet2: fix sending a rct tx with a single output available 
This would have tried to send a second output to make the tx
look like the 2/2 ideal, but it would not fail to find one
because picking an output from preferred_inputs priority list
did not remove it from the unused tranfer/dust outputs, so
it would try to send the same output twice.

While there, I also added a check to avoid sending a second
input if it's related to the first. Better 1/2 than linking
inputs, I think.
 2017-01-22 15:16:45 +00:00
Riccardo Spagni
39aaea8e62
Merge pull request #1599 
17246d05 wallet: print exception message on get_random_outs_error (moneromooo-monero)
 2017-01-20 21:00:01 -05:00
moneromooo-monero
17246d051d
wallet: print exception message on get_random_outs_error 2017-01-20 18:01:13 +00:00
moneromooo-monero
87c658f83b
wallet2_api: add API to set log categories 2017-01-16 21:14:44 +00:00
moneromooo-monero
693c190881
wallet: add a node RPC cache layer for simple RPC calls 
Mostly getinfo and get_hard_fork_info, which are called
pretty often. This speeds up transfers as a bonus.
 2017-01-16 08:59:15 +00:00
moneromooo-monero
d86ae2bec6
wallet2: reuse fake outs when adjusting fee on transfer 
This avoids indirectly leaking the real output to the daemon,
and is faster.

This will still happen for more complex cases, especially
when cancelling a tx and "re-rolling" it.
 2017-01-16 08:59:08 +00:00
Riccardo Spagni
ab69d5b367
Merge pull request #1569 
16b8b66a specify restore height by YYYY-MM-DD format (kenshi84)
 2017-01-15 20:32:57 -05:00
kenshi84
16b8b66adc specify restore height by YYYY-MM-DD format 2017-01-16 10:00:28 +09:00
moneromooo-monero
5833d66f65
Change logging to easylogging++ 
This replaces the epee and data_loggers logging systems with
a single one, and also adds filename:line and explicit severity
levels. Categories may be defined, and logging severity set
by category (or set of categories). epee style 0-4 log level
maps to a sensible severity configuration. Log files now also
rotate when reaching 100 MB.

To select which logs to output, use the MONERO_LOGS environment
variable, with a comma separated list of categories (globs are
supported), with their requested severity level after a colon.
If a log matches more than one such setting, the last one in
the configuration string applies. A few examples:

This one is (mostly) silent, only outputting fatal errors:

MONERO_LOGS=*:FATAL

This one is very verbose:

MONERO_LOGS=*:TRACE

This one is totally silent (logwise):

MONERO_LOGS=""

This one outputs all errors and warnings, except for the
"verify" category, which prints just fatal errors (the verify
category is used for logs about incoming transactions and
blocks, and it is expected that some/many will fail to verify,
hence we don't want the spam):

MONERO_LOGS=*:WARNING,verify:FATAL

Log levels are, in decreasing order of priority:
FATAL, ERROR, WARNING, INFO, DEBUG, TRACE

Subcategories may be added using prefixes and globs. This
example will output net.p2p logs at the TRACE level, but all
other net* logs only at INFO:

MONERO_LOGS=*:ERROR,net*:INFO,net.p2p:TRACE

Logs which are intended for the user (which Monero was using
a lot through epee, but really isn't a nice way to go things)
should use the "global" category. There are a few helper macros
for using this category, eg: MGINFO("this shows up by default")
or MGINFO_RED("this is red"), to try to keep a similar look
and feel for now.

Existing epee log macros still exist, and map to the new log
levels, but since they're used as a "user facing" UI element
as much as a logging system, they often don't map well to log
severities (ie, a log level 0 log may be an error, or may be
something we want the user to see, such as an important info).
In those cases, I tried to use the new macros. In other cases,
I left the existing macros in. When modifying logs, it is
probably best to switch to the new macros with explicit levels.

The --log-level options and set_log commands now also accept
category settings, in addition to the epee style log levels.
 2017-01-16 00:25:46 +00:00
Riccardo Spagni
ec323d8c3f
Merge pull request #1561 
d561f4ad enable clang checks that were disabled (Chris Vickio)
0aefb2f6 remove std::move from return statements (pessimizing-move warning) (Chris Vickio)
629d5b76 change counter from bool to int (deprecated-increment-bool warning) (Chris Vickio)
fb76d439 add extra braces around subobjects (missing-braces warning) (Chris Vickio)
3b6d5f25 make struct/class declarations consistent (mismatched-tags warning) (Chris Vickio)
fcf66925 remove unused fields from network_throttle (unused-private-field warning) (Chris Vickio)
296f8c16 inline unused function (for unused-function warning) (Chris Vickio)
 2017-01-15 19:01:08 -05:00
Riccardo Spagni
9cda94d0aa
Merge pull request #1574 
d276a165 wallet2: use at least two rct inputs if possible (moneromooo-monero)
 2017-01-15 14:55:40 -05:00
Riccardo Spagni
f00797a1f2
Merge pull request #1573 
dea53962 fix timeout in check_connection (Jaquee)
 2017-01-15 14:55:12 -05:00
Riccardo Spagni
31de98793f
Merge pull request #1567 
c9f13c5e wallet2: fix tx reroll not updating fee is going up a kB step (moneromooo-monero)
 2017-01-15 14:47:44 -05:00
Riccardo Spagni
865f5bef34
Merge pull request #1564 
1d317981 Wallet API: add key image import/export functions (Jaquee)
 2017-01-15 14:46:52 -05:00
Riccardo Spagni
935f50471c
Merge pull request #1560 
46550c0b Wallet API: add rescanSpent() (Jaquee)
 2017-01-15 14:44:49 -05:00
Chris Vickio
0aefb2f60a remove std::move from return statements (pessimizing-move warning) 2017-01-15 19:23:33 +03:00
Chris Vickio
629d5b7689 change counter from bool to int (deprecated-increment-bool warning) 2017-01-15 19:23:33 +03:00
moneromooo-monero
d276a16526
wallet2: use at least two rct inputs if possible 
If we'd make a rct tx with just one input, we try to add
a second one to match the 2/2 ideal. This means more txes
use that template (and are thus using a larger anonymity
set), and it coalesces outputs "for free". We use the
smallest amount outputs in priority for this, so we can
"clean" the wallet at the same time.
 2017-01-14 21:43:01 +00:00
Jaquee
dea53962a3
fix timeout in check_connection 2017-01-14 14:45:30 +01:00
Chris Vickio
3b6d5f255d make struct/class declarations consistent (mismatched-tags warning) 2017-01-14 15:06:07 +03:00
moneromooo-monero
c9f13c5e54
wallet2: fix tx reroll not updating fee is going up a kB step 2017-01-13 22:28:19 +00:00
Jaquee
1d3179816b
Wallet API: add key image import/export functions 2017-01-13 23:02:20 +01:00
Jaquee
4a0176740d
Wallet API: support integrated addresses in address book. 2017-01-13 22:41:17 +01:00
Jaquee
46550c0b4f
Wallet API: add rescanSpent() 2017-01-13 22:05:39 +01:00
Riccardo Spagni
2806842200
Merge pull request #1562 
a081b39c Move key image export/import functions to wallet2 (Jaquee)
 2017-01-13 14:38:29 -05:00
Riccardo Spagni
2a2f02e375
Merge pull request #1559 
db56a03f Wallet2 + API: Callbacks for unconfirmed transfers (Jaquee)
 2017-01-13 14:37:12 -05:00
Riccardo Spagni
faa33fc326
Merge pull request #1541 
0d3918e1 Wallet api: Update trustedDaemon when daemon is changed (Jaquee)
dbb838f4 GUI cold signing (Jaquee)
afb85a02 Wallet API: functions for supporting/creating view only wallets (Jaquee)
 2017-01-13 14:34:55 -05:00
Riccardo Spagni
e51afeb90f
Merge pull request #1540 
79b4e1f9 Cold signing: make sure short payment id isnt encrypted twice (Jaquee)
 2017-01-13 14:34:26 -05:00
Riccardo Spagni
36b84ded95
Merge pull request #1526 
5eed5b05 Wallet API: functions for supporting/creating view only wallets (Jaquee)
 2017-01-13 14:32:26 -05:00
Riccardo Spagni
aeeb24991a
Merge pull request #1523 
d81cb087 Added (not yet enabled) HTTP client authentication (Lee Clagett)
 2017-01-13 14:32:08 -05:00
Riccardo Spagni
71c7577370
Merge pull request #1513 
a813ab50 wallet2_api: add solo mining API (moneromooo-monero)
 2017-01-13 13:24:45 -05:00
Jaquee
a081b39c01
Move key image export/import functions to wallet2 2017-01-13 12:49:10 +01:00
Jaquee
db56a03ff2
Wallet2 + API: Callbacks for unconfirmed transfers 2017-01-12 18:25:34 +01:00
Lee Clagett
d81cb08704 Added (not yet enabled) HTTP client authentication 2017-01-11 03:21:17 -05:00
Jaquee
0d3918e15b
Wallet api: Update trustedDaemon when daemon is changed 2017-01-10 22:49:30 +01:00
Jaquee
dbb838f4d0
GUI cold signing 
fix conflict
 2017-01-10 22:49:17 +01:00
Jaquee
afb85a028f
Wallet API: functions for supporting/creating view only wallets 2017-01-10 22:49:11 +01:00
Jaquee
5eed5b056b
Wallet API: functions for supporting/creating view only wallets 2017-01-10 22:34:46 +01:00
moneromooo-monero
a813ab50fe
wallet2_api: add solo mining API 2017-01-09 10:12:55 +00:00
kenshi84
f1dde1a429 wallet cli: print originating block heights of mixin keys when making transfer 2017-01-09 15:10:34 +09:00
Riccardo Spagni
c6ec939626
Merge pull request #1542 
60fe1b61 Add parse_uri to wallet2_api (MoroccanMalinois)
 2017-01-08 16:47:42 -08:00
Riccardo Spagni
59021496d8
Merge pull request #1537 
c2135082 simplewallet: add a show_transfer <txid> command (moneromooo-monero)
19c4041d wallet_rpc_server: new RPC call to get a transfer by txid (moneromooo-monero)
 2017-01-08 16:44:29 -08:00
Riccardo Spagni
6cbfe0f849
Merge pull request #1521 
21c5af5a wallet2_api: add an address book payment id lookup API (moneromooo-monero)
 2017-01-08 16:42:08 -08:00
Riccardo Spagni
ba9744d400
Merge pull request #1515 
ada7c7da portable serializer: tests added (kenshi84)
f390a0e2 portable serializer: make signerd/unsigned tx portable, ignore archive version checking (kenshi84)
 2017-01-08 16:41:44 -08:00
Riccardo Spagni
da05900524
Merge pull request #1509 
29333c41 wallet api: prevent setting refresh height too high (Jaquee)
 2017-01-08 16:39:23 -08:00
Riccardo Spagni
13c5da2aa3
Merge pull request #1508 
4585ada4 Wallet2: faster exit while refreshing (Jaquee)
 2017-01-08 16:39:07 -08:00
Riccardo Spagni
0ce4618bea
Merge pull request #1504 
5f4ac6b9 wallet2 bugfix: store watch_only flag properly with rewrite() (kenshi84)
 2017-01-08 16:38:19 -08:00
Riccardo Spagni
06de09daf4
Merge pull request #1501 
cebae0c5 wallet2: check the node returned the real output when requested (moneromooo-monero)
 2017-01-08 16:37:11 -08:00
Riccardo Spagni
1736b7ef6b
Merge pull request #1500 
c0a0fcaf wallet2_api: some new APIs to access daemon state (moneromooo-monero)
 2017-01-08 16:36:46 -08:00
Riccardo Spagni
03497f0268
Merge pull request #1497 
50511677 wallet2: fix large reorgs failing (moneromooo-monero)
 2017-01-08 16:35:14 -08:00
MoroccanMalinois
60fe1b61e0 Add parse_uri to wallet2_api 2017-01-08 22:53:24 +00:00
Jaquee
79b4e1f997
Cold signing: make sure short payment id isnt encrypted twice 2017-01-08 21:04:53 +01:00
moneromooo-monero
19c4041df5
wallet_rpc_server: new RPC call to get a transfer by txid 2017-01-08 13:16:22 +00:00
kenshi84
ada7c7da8f portable serializer: tests added 2017-01-03 09:14:48 +09:00
kenshi84
f390a0e2dc portable serializer: make signerd/unsigned tx portable, ignore archive version checking 2017-01-02 20:04:58 +09:00
moneromooo-monero
21c5af5a8a
wallet2_api: add an address book payment id lookup API 2017-01-01 16:06:34 +00:00
Jaquee
29333c417e
wallet api: prevent setting refresh height too high 2016-12-27 19:38:05 +01:00
Jaquee
4585ada453
Wallet2: faster exit while refreshing 2016-12-27 19:12:18 +01:00
moneromooo-monero
cebae0c510
wallet2: check the node returned the real output when requested 2016-12-27 09:38:10 +00:00
kenshi84
5f4ac6b909 wallet2 bugfix: store watch_only flag properly with rewrite() 2016-12-26 18:33:24 +09:00
moneromooo-monero
c0a0fcaff0
wallet2_api: some new APIs to access daemon state 2016-12-25 12:31:50 +00:00
moneromooo-monero
505116771e
wallet2: fix large reorgs failing 
If a reorg was large enough that a full 1000 block chunk
from the daemon was all known blocks, refresh would stop,
and no reorg would happen.
 2016-12-24 16:04:37 +00:00
kenshi84
99580adf66 make openalias also available for solo miner; introduce namespace tools::dns_utils; support integrated address with dns lookup 2016-12-21 23:12:15 +09:00
Riccardo Spagni
9777de1890
Merge pull request #1474 
fc40b3e7 Lower connection timeout in check_connection() (Jaquee)
 2016-12-20 17:47:58 +02:00
Riccardo Spagni
e170cbe013
Merge pull request #1473 
e3639f5c Removed unused functions (Lee Clagett)
 2016-12-20 17:47:16 +02:00
Riccardo Spagni
6847999fb8
Merge pull request #1472 
2bddb8eb Refactored password prompting for wallets (Lee Clagett)
 2016-12-20 17:46:58 +02:00
Riccardo Spagni
233ba51ad9
Merge pull request #1468 
9a2cd722 wallet2_api: add an API to the OpenAlias resolver (moneromooo-monero)
 2016-12-20 17:45:13 +02:00
Riccardo Spagni
b9b9028e50
Merge pull request #1462 
07b9138c support importing unportable outputs (kenshi84)
2ac80075 also use portable serializer for boost_serialization_helper.h and net_node.inl, completely adandon boost/archive/binary_oarchive.hpp (kenshi84)
d1d6e27a moved boost cpp into hpp since they're supposed to be header only (kenshi84)
66e6af89 added experimental boost::archive::portable_binary_{i|o}archive (kenshi84)
 2016-12-20 17:40:11 +02:00
kenshi84
2ac8007544 also use portable serializer for boost_serialization_helper.h and net_node.inl, completely adandon boost/archive/binary_oarchive.hpp 2016-12-20 13:04:19 +09:00
kenshi84
d1d6e27ab6 moved boost cpp into hpp since they're supposed to be header only 2016-12-20 12:27:23 +09:00
Lee Clagett
2bddb8ebee Refactored password prompting for wallets 2016-12-19 20:00:43 -05:00
Jaquee
fc40b3e732
Lower connection timeout in check_connection() 2016-12-19 21:19:02 +01:00
Lee Clagett
e3639f5cc3 Removed unused functions 2016-12-19 14:47:26 -05:00
moneromooo-monero
9a2cd72257
wallet2_api: add an API to the OpenAlias resolver 2016-12-17 13:05:17 +00:00
Lee Clagett
427054c3d5 Enabled HTTP auth support for monero-wallet-rpc 2016-12-16 23:59:46 -05:00
kenshi84
66e6af89ce added experimental boost::archive::portable_binary_{i|o}archive 2016-12-16 23:46:24 +09:00
Riccardo Spagni
73e50749e2
Merge pull request #1455 
4bb0bff2 AddressBook: use unsigned type for row ID's (anonimal)
 2016-12-15 14:35:47 +02:00
Riccardo Spagni
00898fe750
Merge pull request #1452 
944b6079 Wallet API: Do not refresh while daemon is syncing + fixed fast refresh when creating wallet offline + improved close wallet logic (make sure refresh thread is stopped) (Jaquee)
 2016-12-15 14:28:15 +02:00
Riccardo Spagni
aa47ea41a7
Merge pull request #1444 
bdc3d749 Adding HTTP Digest Auth (but not yet enabled) (Lee Clagett)
 2016-12-15 14:25:49 +02:00
Jaquee
944b6079d9
Wallet API: Do not refresh while daemon is syncing 
+ fixed fast refresh when creating wallet offline
+ improved close wallet logic (make sure refresh thread is stopped)
 2016-12-15 12:31:09 +01:00
anonimal
4bb0bff233
AddressBook: use unsigned type for row ID's 
Fixes build warnings and may also prevent future headaches.
 2016-12-14 21:37:49 +00:00
Riccardo Spagni
183d3657f3
Merge pull request #1446 
b2adfa8c Bitmonero namespace renamed Monero. Bitmonero namespace alias added so that third party uses of the wallet api can transition. (Randi Joseph)
 2016-12-13 19:13:09 +02:00
Randi Joseph
b2adfa8c51 Bitmonero namespace renamed Monero. Bitmonero namespace alias added so that third party uses of the wallet api can transition. 2016-12-13 10:21:38 -05:00
Lee Clagett
bdc3d7496f Adding HTTP Digest Auth (but not yet enabled) 2016-12-13 00:19:54 -05:00
luigi1111
0fb5dc870d
monero-wallet-cli wording changes 'n' stuff 
Possibly other pedantry. Pedants are people too.
 2016-12-12 19:53:28 -06:00
Jaquee
3b4539ee7e
addressbook updates 2016-12-12 21:50:50 +01:00
Riccardo Spagni
aa7a926681
Merge pull request #1434 
5df92877 GUI address book (Jaquee)
 2016-12-12 22:39:38 +02:00
Jaquee
5df92877c7 GUI address book 2016-12-12 00:43:02 +01:00
moneromooo-monero
c5c45ca660
wallet: bring forward use of the dynamic fee 
It was 14 days after v4, it is now one day after it.

luigi1111's suggestion
 2016-12-10 15:39:26 +00:00
Riccardo Spagni
2d0fbaf35b
Merge pull request #1422 
9b00d80f wallet2: pass by const ref where possible (moneromooo-monero)
 2016-12-10 14:49:34 +02:00
Riccardo Spagni
930aceb242
Merge pull request #1419 
f4a3ce15 Fix sending outputs from a tx with more than one pubkey (moneromooo-monero)
 2016-12-10 14:48:56 +02:00
moneromooo-monero
9b00d80f85
wallet2: pass by const ref where possible 
Reported by kenshi84
 2016-12-10 11:43:44 +00:00
moneromooo-monero
f4a3ce15c1
Fix sending outputs from a tx with more than one pubkey 
A bug in cold signing caused a spurious pubkey to be included
in transactions, so we need to ensure we use the correct one
when sending outputs from one of those.
 2016-12-09 18:21:21 +00:00
Riccardo Spagni
8e1a8c6adc
Merge pull request #1415 
6c44f5c6 wallet: send 0 change to a random address where necessary with rct (moneromooo-monero)
 2016-12-08 23:44:40 +02:00
Riccardo Spagni
f9503d2789
Merge pull request #1405 
d1a75754 Remove infinite loop in refresh code (Jaquee)
 2016-12-08 23:43:19 +02:00
moneromooo-monero
6c44f5c6eb
wallet: send 0 change to a random address where necessary with rct 
If a rct transaction would cause no change to be generated, a zero
change output is added, and sent to a randomly generated address.
This ensures that no transaction will be sent with just one output,
which could cause the receiver to be able to determine which of the
inputs in the sent rings is the real one.
This is very rare, since it requires the sum of outputs to be equal
to the sum of outputs plus the fee, which is now a function of the
last few blocks.
 2016-12-07 21:05:50 +00:00
Lee Clagett
18462aa065 Added confirmation before binding wallet-rpc to external IP 2016-12-05 21:45:11 -05:00
Jaquee
d1a75754df
Remove infinite loop in refresh code 
This reverts commit fd181b03bb.
 2016-12-05 13:02:45 +01:00
Riccardo Spagni
b500a64524
Merge pull request #1399 
73ac3b8e wallet2: avoid possible undefined behavior on empty string (moneromooo-monero)
 2016-12-04 22:28:48 +02:00
Riccardo Spagni
f2ea2afb77
Merge pull request #1398 
f4772bae Fix a few minor typos (Pierre Boyer)
 2016-12-04 22:28:22 +02:00
Riccardo Spagni
977dd9b76c
Merge pull request #1385 
5783dd8c tests: add unit tests for uri parsing (moneromooo-monero)
82ba2108 wallet: add API and RPC to create/parse monero: URIs (moneromooo-monero)
d9001b43 epee: add functions to convert from URL format (ie, %XX values) (moneromooo-monero)
 2016-12-04 22:19:06 +02:00
Riccardo Spagni
836c748366
Merge pull request #1388 
fcd178ef wallet_api: add a few daemon related getters (moneromooo-monero)
 2016-12-04 22:17:48 +02:00
Riccardo Spagni
3d533d1037
Merge pull request #1380 
657a70e0 wallet: add a getter for the filename path (moneromooo-monero)
 2016-12-04 22:02:40 +02:00
moneromooo-monero
73ac3b8e26
wallet2: avoid possible undefined behavior on empty string 2016-12-04 14:56:06 +00:00
Pierre Boyer
f4772bae81 Fix a few minor typos 2016-12-04 14:13:54 +01:00
moneromooo-monero
fcd178ef33
wallet_api: add a few daemon related getters 
Blockchain height, version, Mining hash rate...
 2016-11-29 10:54:38 +00:00
moneromooo-monero
82ba2108e9
wallet: add API and RPC to create/parse monero: URIs 2016-11-28 17:54:22 +00:00
moneromooo-monero
657a70e004
wallet: add a getter for the filename path 2016-11-26 14:19:57 +00:00
moneromooo-monero
d6086f5b4e
Improve daemon RPC version handling 
Daemon RPC version is now composed of a major and minor number,
so that incompatible changes bump the major version, while
compatible changes can still bump the minor version without
causing clients to unnecessarily complain.
 2016-11-26 12:56:44 +00:00
Riccardo Spagni
c36cb54340
Merge pull request #1372 
17b6bd6 Fix DNS failures in offline mode preventing daemon startup (moneromooo-monero)
 2016-11-24 13:01:35 +02:00
Riccardo Spagni
2497a2d547
Merge pull request #1369 
6d76072 simplewallet: remove double confirmation when submitting signed tx (moneromooo-monero)
92dea04 wallet2: fix wrong change being recorded for cold signed txes (moneromooo-monero)
 2016-11-24 13:00:32 +02:00
Riccardo Spagni
3fa1b6623a
Merge pull request #1361 
1d9e223 rpc: do not include output indices for pool txes (moneromooo-monero)
e227d6e rpc: bump version after RPC changes (moneromooo-monero)
2c0173c Add a get_outs (fully text based) version of get_outs.bin (moneromooo-monero)
e05907b rpc: add output indices to gettransactions (moneromooo-monero)
 2016-11-24 12:57:00 +02:00
Riccardo Spagni
a26b27f66e
Merge pull request #1358 
7abfc54 wallet: fix exporting outputs and key images with txes with two pubkeys (moneromooo-monero)
 2016-11-24 12:55:14 +02:00
Riccardo Spagni
25369df4d8
Merge pull request #1357 
5fc36f9 wallet2_api: fix history leak on destruction (moneromooo-monero)
 2016-11-24 12:54:25 +02:00
Riccardo Spagni
f801dc8567
Merge pull request #1356 
69b188c wallet2_api: fix payment ids from integrated addresses being ignored (moneromooo-monero)
 2016-11-24 12:53:59 +02:00
Riccardo Spagni
570acdc686
Merge pull request #1352 
d01f5c7 wallet2: fix illegal memory access removing newlines from password (moneromooo-monero)
 2016-11-24 12:53:14 +02:00
Riccardo Spagni
2121f3b2f0
Merge pull request #1351 
e6264a2 wallet2: fix decrypting a bit too much in authenticated mode (moneromooo-monero)
 2016-11-24 12:52:54 +02:00
moneromooo-monero
17b6bd6d35
Fix DNS failures in offline mode preventing daemon startup 2016-11-23 23:14:49 +00:00
moneromooo-monero
92dea04929
wallet2: fix wrong change being recorded for cold signed txes 2016-11-23 20:27:22 +00:00
moneromooo-monero
2c0173c722
Add a get_outs (fully text based) version of get_outs.bin 2016-11-22 20:00:40 +00:00
moneromooo-monero
7abfc5474c
wallet: fix exporting outputs and key images with txes with two pubkeys 
This also needs to make sure to pick the correct one, in the case
where cold signing caused to tx keys to be included.
 2016-11-19 09:36:40 +00:00
moneromooo-monero
5fc36f981c
wallet2_api: fix history leak on destruction 2016-11-18 21:42:08 +00:00
moneromooo-monero
69b188c4b2
wallet2_api: fix payment ids from integrated addresses being ignored 2016-11-18 19:13:43 +00:00
Dion Ahmetaj
fd181b03bb Clamp refresh from height to blockchain height. 2016-11-18 13:40:55 -05:00
moneromooo-monero
d01f5c7f1f
wallet2: fix illegal memory access removing newlines from password 2016-11-17 20:43:58 +00:00
moneromooo-monero
e6264a2c35
wallet2: fix decrypting a bit too much in authenticated mode 2016-11-17 20:31:00 +00:00
Riccardo Spagni
dbf2ab56c5
Merge pull request #1346 
4eb7347 wallet: return fee in transfer RPC (moneromooo-monero)
 2016-11-17 16:40:37 +02:00
Riccardo Spagni
5df6f0be80
Merge pull request #1318 
4fca34d Wallet2: calculate approximate blockchain height on offline creation (Jacob Brydolf)
 2016-11-17 16:37:30 +02:00
moneromooo-monero
4eb7347fdd
wallet: return fee in transfer RPC 2016-11-16 18:56:45 +00:00
moneromooo-monero
a0131c8be3
wallet: auto sync outputs and key images in cold signing files 
When passing around unsigned and signed transactions, outputs
and key images are passed along (outputs are passed along unsigned
transactions from the hot wallet to the cold wallet, key images
are passed along with signed transations from the cold wallet
to the hot wallet), to allow more user friendly syncing between
hot and cold wallets.
 2016-11-16 09:22:24 +00:00
moneromooo-monero
f8066116dd
wallet2: fill key image and pubkey maps when importing outputs 2016-11-16 09:22:18 +00:00
moneromooo-monero
5fe363cd22
wallet: cast indices to string in logs to be nice to CLANG 2016-11-16 09:22:13 +00:00
moneromooo-monero
11ae1873f8
wallet2: try all tx keys when scanning a new transaction 
The vast majority of transactions will have just one tx pubkey,
but a bug with cold wallet signing caused two such keys to be
there, with the second one being the real one.
 2016-11-16 09:22:05 +00:00
moneromooo-monero
072d646a45
wallet2: fill in key image map when importing key images 2016-11-15 21:20:08 +00:00
moneromooo-monero
a99ab49dd5
wallet: fix serialization of new m_key_image_known member 2016-11-13 16:38:29 +00:00
Jacob Brydolf
4fca34ddb4
Wallet2: calculate approximate blockchain height on offline creation 
Wallet API: add approximateBlockChainHeight()
 2016-11-13 03:36:44 +01:00
iDunk5400
e1dd15b050
Don't build monero-wallet-rpc when building the GUI 2016-11-12 19:22:19 +01:00
moneromooo-monero
70d4915980
wallet: add version dependency to the wallet target 2016-11-12 12:55:19 +00:00
Riccardo Spagni
6a2bb62827
Merge pull request #1316 
358e068 Created monero-wallet-rpc, moving functionality from monero-wallet-cli (Lee Clagett)
 2016-11-11 12:48:39 +02:00
Riccardo Spagni
a3cd7230f8
Merge pull request #1315 
9150a16 Wallet API: use stored refresh height when rebuilding cache (Jacob Brydolf)
 2016-11-11 12:35:47 +02:00
Riccardo Spagni
3fd13080b7
Merge pull request #1314 
63772e4 wallet: fix corner case of no recent outputs available (moneromooo-monero)
 2016-11-11 12:35:25 +02:00
Lee Clagett
358e068e87 Created monero-wallet-rpc, moving functionality from monero-wallet-cli 2016-11-10 16:39:27 -05:00
moneromooo-monero
1669621937
wallet2_api: support for sweeping all 2016-11-09 19:32:37 +00:00
Jacob Brydolf
9150a16ed1
Wallet API: use stored refresh height when rebuilding cache 2016-11-09 18:46:03 +01:00
moneromooo-monero
63772e4048
wallet: fix corner case of no recent outputs available 
Also clarify related logs
 2016-11-09 14:01:54 +00:00
Riccardo Spagni
dc5e0e45cd
Merge pull request #1310 
40a68e2 wallet2_api: add API for create_unmixable_sweep_transactions (moneromooo-monero)
 2016-11-09 14:11:57 +02:00
Riccardo Spagni
56c594a8fe
Merge pull request #1309 
c441a61 wallet2_api: API to sign and verify a message (moneromooo-monero)
 2016-11-09 14:10:39 +02:00
Riccardo Spagni
06ca304b06
Merge pull request #1307 
4dcb74f wallet_api: PendingTransaction::txCount - number of split transactions (Ilya Kitaev)
 2016-11-09 14:10:12 +02:00
Riccardo Spagni
144a7f090a
Merge pull request #1305 
c80f4d4 wallet: fix output collision detection for view wallets (moneromooo-monero)
 2016-11-09 14:08:34 +02:00
moneromooo-monero
c441a61ef6
wallet2_api: API to sign and verify a message 2016-11-08 21:21:08 +00:00
Ilya Kitaev
4dcb74f97f wallet_api: PendingTransaction::txCount - number of split transactions 2016-11-09 00:13:18 +03:00
Riccardo Spagni
e8a55db29d
Merge pull request #1308 
0c530de Wallet API: Pause refresh while creating transaction (Jacob Brydolf)
 2016-11-08 22:57:04 +02:00
Riccardo Spagni
18fdd8116e
Merge pull request #1306 
8aba0d4 wallet: encrypt outputs and key images files with the view key (moneromooo-monero)
 2016-11-08 22:55:56 +02:00
Riccardo Spagni
7c7a6cf2f8
Merge pull request #1302 
63fe6fd wallet2_api: allow connection to return "yes, but wrong version" (moneromooo-monero)
 2016-11-08 22:53:13 +02:00
Riccardo Spagni
96e0138ebf
Merge pull request #1301 
35da3cb Wallet API: added getTxKey() (Jacob Brydolf)
 2016-11-08 22:50:13 +02:00
Jacob Brydolf
35da3cb074 Wallet API: added getTxKey() 2016-11-08 21:48:26 +01:00
Riccardo Spagni
c57ce06a97
Merge pull request #1300 
eb19492 wallet2_api: do not copy the whole pending tx when iterating (moneromooo-monero)
 2016-11-08 22:48:04 +02:00
Riccardo Spagni
af2ceb29fa
Merge pull request #1298 
97288a5 wallet2_api: add API for tx notes (moneromooo-monero)
 2016-11-08 22:45:54 +02:00
Riccardo Spagni
c05cecf036
Merge pull request #1297 
af8a260 wallet_api: txkey checking functions for the GUI (moneromooo.monero)
 2016-11-08 22:44:15 +02:00
Riccardo Spagni
4c44d896d3
Merge pull request #1285 
a970a4e refresh speedup (luigi1111)
 2016-11-08 22:34:26 +02:00
Riccardo Spagni
0fa6cbef3f
Merge pull request #1276 
18f66f4 wallet: use the dynamic per kB fee (moneromooo-monero)
e6deb8a rpc: add a dynamic fee estimation RPC call (moneromooo-monero)
82dbba1 core: dynamic fee algorithm from ArticMine (moneromooo-monero)
 2016-11-08 22:33:13 +02:00
moneromooo-monero
40a68e22fa
wallet2_api: add API for create_unmixable_sweep_transactions 2016-11-08 20:03:07 +00:00
Jacob Brydolf
0c530de057
Wallet API: Pause refresh while creating transaction 2016-11-08 13:20:42 +01:00
moneromooo-monero
8aba0d4b4c
wallet: encrypt outputs and key images files with the view key 
This key is available to both cold and hot wallet.
Authenticated encryption will guard against interception and/or
modification of the file.
 2016-11-07 20:01:05 +00:00
moneromooo-monero
c80f4d416d
wallet: fix output collision detection for view wallets 
View wallets do not have the spend secret key, and are thus
unable to derive key images for incoming outputs. Moreover,
a previous patch set key images to zero as a means to mark
an output as having an unknown key image, so they could be
filled in when importing key images at a later time. That
later patch caused spurious collisions. We now use public
keys to detect duplicate outputs. Public keys obtained from
the blockchain are checked to be identical to the ones
derived locally, so can't be spoofed.
 2016-11-07 18:59:30 +00:00
moneromooo-monero
63fe6fd9ba
wallet2_api: allow connection to return "yes, but wrong version" 2016-11-07 12:00:29 +00:00
moneromooo-monero
eb194925ec
wallet2_api: do not copy the whole pending tx when iterating 2016-11-06 10:36:08 +00:00
moneromooo-monero
97288a5ce2
wallet2_api: add API for tx notes 2016-11-05 21:19:08 +00:00
moneromooo.monero
af8a2600aa
wallet_api: txkey checking functions for the GUI 2016-11-05 15:24:05 +00:00
moneromooo-monero
b5d6faada3
wallet: fix bad amounts/fees again 
m_amount_out was sometimes getting initialized with the sum of
an transaction's outputs, and sometimes with the sum of outputs
that were not change. This caused confusion and bugs. We now
always set it to the sum of outputs. This reverts an earlier
fix for bad amounts as this used the other semantics. The wallet
data should be converted automatically in a percentage of cases
that I'm hesitant to estimate. In any case, restoring from seed
or keys or rebuilding the cache will get it right.
 2016-11-02 23:11:30 +00:00
luigi1111
a970a4e3cf
refresh speedup 
Compute derivation only once per tx, instead of once per output. Approx 33% faster while using 75% as much CPU on my machine. Note old functions in cryptonote_core (lookup_acc_outs and is_out_to_acc) are still used by tests.
 2016-11-01 11:24:04 -05:00
Riccardo Spagni
b06c1abaa6
Merge pull request #1278 
43ec2d0 Wallet API: added walletExists logic (Jacob Brydolf)
 2016-11-01 15:29:44 +02:00
Riccardo Spagni
6f85b20d92
Merge pull request #1283 
4869db7 adding static_assert to pod functions in string tools (Lee Clagett)
 2016-11-01 15:13:10 +02:00
Riccardo Spagni
d53bc2eddf
Merge pull request #1281 
bb560dd wallet: new import_outputs/export_outputs commands (moneromooo-monero)
 2016-11-01 15:12:03 +02:00
Lee Clagett
4869db702a adding static_assert to pod functions in string tools 2016-10-31 13:22:21 -04:00
moneromooo-monero
18f66f44ef
wallet: use the dynamic per kB fee 2016-10-31 08:38:06 +00:00
moneromooo-monero
bb560dd814
wallet: new import_outputs/export_outputs commands 
The intended use is to export outputs from a hot wallet, which
can scan incoming transfers from the network, and import them
in the cold wallet, which can't. The cold wallet can then compute
key images for those outputs, which can then be exported with
export_key_images, etc.
 2016-10-30 19:37:09 +00:00
Jacob Brydolf
43ec2d002a
Wallet API: added walletExists logic 2016-10-30 15:34:50 +01:00
moneromooo-monero
7e6d3cf441
wallet: set incoming outputs' key image to 0 on view wallets 
This allows rescan_spent to know the daemon response to those
is not valid.
 2016-10-30 12:14:33 +00:00
moneromooo-monero
1f9e6a46d8
wallet: print tx overview on submit_transfer too 
This is on the potentially compromised wallet, but still guards
against stupid mistakes.
 2016-10-30 10:49:22 +00:00
Riccardo Spagni
83b0511731
Merge pull request #1270 
fdef09f Wallet API: make sure path exists before searching for wallets (Jacob Brydolf)
 2016-10-29 11:35:48 +02:00
Jacob Brydolf
fdef09f11c Wallet API: make sure path exists before searching for wallets 2016-10-28 22:29:33 +02:00
moneromooo-monero
069d688cf7
simplewallet: log transactions to submit in submit_transfer 
Not as trustworthy as this is in the view wallet, the one
that's considered compromised.
 2016-10-26 13:17:29 +01:00
moneromooo-monero
31abac4daf
wallet: fix pre-rct cold wallet signing not splitting change 
Re-creating the transaction on the cold wallet was not splitting
the change, causing the transaction to be rejected by the network.
This worked on testnet since amounts do not have to be split.

Also add selected_transfers, which can now be saved since they're
size_t rather than iterators. This allows the view wallet to
properly set the sent outputs as spent and update balance.

Bump transfer file version numbers to match.
 2016-10-25 21:44:31 +01:00
Riccardo Spagni
4e98d2958c
Merge pull request #1246 
372f338 wallet: sanity check on selected transfer indices in signed ptx (moneromooo-monero)
 2016-10-23 19:09:18 +02:00
Riccardo Spagni
92095104fe
Merge pull request #1230 
06b642d wallet_api: add address validation functions (moneromooo-monero)
 2016-10-23 19:04:01 +02:00
Riccardo Spagni
4f6ea2eb6a
Merge pull request #1229 
b6b86ab wallet2_api: recognize full size payment ids as valid (moneromooo-monero)
 2016-10-22 22:19:43 +02:00
Riccardo Spagni
b3d4505ae1
Merge pull request #1228 
2bf65df wallet_api: do not override invalid payment id (moneromooo-monero)
 2016-10-22 22:18:36 +02:00
Riccardo Spagni
09f62ed33e
Merge pull request #1225 
04da979 Always confirm transfers defaults to ON/YES (NanoAkron)
 2016-10-22 22:16:39 +02:00
Riccardo Spagni
f800390ccc
Merge pull request #1224 
8231997 simplewallet: fix sweep_all misreporting sweeped amount for rct outputs (moneromooo-monero)
985f61a wallet: force 0 mixin transactions to use pre-rct txes (moneromooo-monero)
 2016-10-22 22:15:50 +02:00
Riccardo Spagni
7c5431624e
Merge pull request #1223 
0950be9 wallet: speed up output selection, and fix bug with relatedness calculation (moneromooo-monero)
0eba133 wallet: fix mixup between mixin 2 and 4 before/after v5 (moneromooo-monero)
 2016-10-22 22:15:16 +02:00
Riccardo Spagni
9feb358e46
Merge pull request #1220 
e76dcdd wallet: improve error messages when not enough money for transfer (moneromooo-monero)
 2016-10-22 22:12:17 +02:00
Riccardo Spagni
e48ef1684c
Merge pull request #1219 
2d7083c wallet_api: fix wrong amount in tx history (moneromooo-monero)
b5f2001 simplewallet: fix wrong amount in show_transfers (moneromooo-monero)
 2016-10-22 22:11:12 +02:00
Riccardo Spagni
b53c9e5549
Merge pull request #1200 
a3748f4 Rewrote add_wallet_create_if_needed for clearer flow and behaviour (NanoAkron)
 2016-10-22 22:07:38 +02:00
moneromooo-monero
372f338682
wallet: sanity check on selected transfer indices in signed ptx 2016-10-22 18:07:26 +01:00
moneromooo-monero
06b642dfe4
wallet_api: add address validation functions 
The payment id from integrated addresses is also parsed
 2016-10-16 16:52:45 +01:00
moneromooo-monero
b6b86ab347
wallet2_api: recognize full size payment ids as valid 2016-10-16 13:54:53 +01:00
moneromooo-monero
2bf65dfb8d
wallet_api: do not override invalid payment id 
Instead, return an empty string to mark the error
 2016-10-16 13:17:29 +01:00
NanoAkron
a3748f40ea
Rewrote add_wallet_create_if_needed for clearer flow and behaviour 2016-10-15 22:29:28 +01:00
NanoAkron
04da979f46
Always confirm transfers defaults to ON/YES 2016-10-15 20:38:07 +01:00
moneromooo-monero
8231997b66
simplewallet: fix sweep_all misreporting sweeped amount for rct outputs 
RingCT outputs will be 0 in the vin, so we need to get the actual
amount from elsewhere.
 2016-10-15 19:18:52 +01:00
moneromooo-monero
985f61a4ec
wallet: force 0 mixin transactions to use pre-rct txes 
rct transactions does not support 0 mixin, and those are
now typically dust sweep transactions, for which a lower
fee is a must.
 2016-10-15 18:42:04 +01:00
moneromooo-monero
88faec75fe
wallet: select part of the fake outs from recent outputs 
25% of the outputs are selected from the last 5 days (if possible),
in order to avoid the common case of sending recently received
outputs again. 25% and 5 days are subject to review later, since
it's just a wallet level change.
 2016-10-15 18:17:16 +01:00
moneromooo-monero
0950be9e34
wallet: speed up output selection, and fix bug with relatedness calculation 2016-10-15 16:32:08 +01:00
moneromooo-monero
0eba1335be
wallet: fix mixup between mixin 2 and 4 before/after v5 2016-10-15 16:07:18 +01:00
moneromooo-monero
e76dcdd810
wallet: improve error messages when not enough money for transfer 2016-10-15 14:31:40 +01:00
moneromooo-monero
2d7083ca56
wallet_api: fix wrong amount in tx history 2016-10-15 13:56:25 +01:00
Jacob Brydolf
a8cd65646c Wallet API: added setRecoveringFromSeed(); 2016-10-10 19:37:10 +02:00
Riccardo Spagni
0673db16ad
Merge pull request #1195 
697ce1d libwallet_api: reverted deleted curly brace (Ilya Kitaev)
bb9094f libwallet_api: fixes for transaction history (Ilya Kitaev)
62b3708 libwallet_api: do not signal on sent/received tx until wallet completely synchronized (Ilya Kitaev)
11fab41 libwallet_api: TransactionHistory: read/write syncchronization (Ilya Kitaev)
559f379 libwallet_api: test: adjusted mixin_count=4 as it's minumum allowed (Ilya Kitaev)
8b0cb8c libwallet_api: some renamings (Ilya Kitaev)
db3282c Initialize transaction history if empty (Ilya Kitaev)
85f5e73 libwallet_api: fixes for transaction history (Ilya Kitaev)
 2016-10-09 14:34:59 +02:00
Riccardo Spagni
8cd01bc378
Merge pull request #1192 
36a89ab libwallet_api: Added option to restore from specific height (Jacob Brydolf)
 2016-10-09 14:33:17 +02:00
Riccardo Spagni
0589209eb4 Merge pull request #1191 
9f31e2d wallet: do not announce pool txes as money spent/received (yet) (moneromooo-monero)
 2016-10-09 14:29:16 +02:00
Jacob Brydolf
36a89ab435
libwallet_api: Added option to restore from specific height 2016-10-08 00:57:09 +02:00
moneromooo-monero
9f31e2d8c0
wallet: do not announce pool txes as money spent/received (yet) 2016-10-07 19:52:05 +01:00
Ilya Kitaev
697ce1d435 libwallet_api: reverted deleted curly brace 2016-10-07 00:43:45 +03:00
Ilya Kitaev
a4390dae07 resolved conflict with 'develop' of https://github.com/mbg033/monero 2016-10-07 00:36:36 +03:00
Ilya Kitaev
62b3708ea5 libwallet_api: do not signal on sent/received tx until wallet completely 
synchronized
 2016-10-07 00:29:13 +03:00
Ilya Kitaev
11fab41c36 libwallet_api: TransactionHistory: read/write syncchronization 2016-10-06 23:25:43 +03:00