Commit graph

3024 commits

Author SHA1 Message Date
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 52175502de
Merge pull request #1353
452aeca epee: blind attempt to fix exit hang on windows (moneromooo-monero)
2016-11-24 12:53:35 +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
Riccardo Spagni d094c45822
Merge pull request #1197
fd181b0 Clamp refresh from height to blockchain height. (Dion Ahmetaj)
2016-11-24 12:51:17 +02:00
moneromooo-monero 1d9e223944
rpc: do not include output indices for pool txes
Those aren't yet in the blockchain, so will not be found
(and aren't yet known, since it depends on where exactly the
tx will be mined in the next block or blocks)
2016-11-23 18:56:54 +00:00
moneromooo-monero e227d6e7ac
rpc: bump version after RPC changes 2016-11-22 20:01:20 +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 e05907b3e7
rpc: add output indices to gettransactions
Someone apparently needs that to make a wallet but never asked.
If you read that and that's not what you wanted, the bugtracker
is at https://github.com/monero-project/monero/issues
2016-11-22 20:00:23 +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 452aeca5cd
epee: blind attempt to fix exit hang on windows
Thanks to duckduckgo and the internet.

This might even compile.
2016-11-17 22:10:03 +00: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
Riccardo Spagni 2988e1be8c
Merge pull request #1344
a0131c8 wallet: auto sync outputs and key images in cold signing files (moneromooo-monero)
f806611 wallet2: fill key image and pubkey maps when importing outputs (moneromooo-monero)
5fe363c wallet: cast indices to string in logs to be nice to CLANG (moneromooo-monero)
11ae187 wallet2: try all tx keys when scanning a new transaction (moneromooo-monero)
072d646 wallet2: fill in key image map when importing key images (moneromooo-monero)
23d80b1 core: remove any tx pubkey from extra before adding one (moneromooo-monero)
d72376d simplewallet: add a verbose flag to incoming_transfers (moneromooo-monero)
47413a5 simplewallet: spell out change when signing a transfer (moneromooo-monero)
14cb088 simplewallet: print public keys too on spendkey/viewkey commands (moneromooo-monero)
a99ab49 wallet: fix serialization of new m_key_image_known member (moneromooo-monero)
2016-11-17 16:36:12 +02:00
Riccardo Spagni e2816fefc5
Merge pull request #1337
18772a3 tests: fix another fee test on 32 bit (moneromooo-monero)
2016-11-17 16:30:14 +02:00
Riccardo Spagni b7b54b6cff
Merge pull request #1336
bd4da18 simplewallet: include amount sent in transfer confirmation (moneromooo-monero)
2016-11-17 16:26:49 +02:00
Riccardo Spagni 9e3cedce87
Merge pull request #1335
d48f2e9 wallet: fix serialization of new m_key_image_known member (moneromooo-monero)
2016-11-17 16:26:04 +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 23d80b15fd
core: remove any tx pubkey from extra before adding one
This will happen when signing a transaction from a cold wallet,
and we don't want the placeholder the hot wallet put in it.
2016-11-15 21:20:02 +00:00
moneromooo-monero d72376d467
simplewallet: add a verbose flag to incoming_transfers
Prints pubkey and key image as well
2016-11-13 18:20:46 +00:00
moneromooo-monero 47413a5626
simplewallet: spell out change when signing a transfer
Also catch change to multiple addresses, this is unexpected
2016-11-13 17:48:45 +00:00
moneromooo-monero 14cb088300
simplewallet: print public keys too on spendkey/viewkey commands 2016-11-13 17:24:53 +00:00
moneromooo-monero a99ab49dd5
wallet: fix serialization of new m_key_image_known member 2016-11-13 16:38:29 +00:00
moneromooo-monero 18772a3ba9
tests: fix another fee test on 32 bit 2016-11-13 12:21:52 +00:00
moneromooo-monero bd4da18525
simplewallet: include amount sent in transfer confirmation 2016-11-13 12:12:22 +00:00
moneromooo-monero d48f2e9bc6
wallet: fix serialization of new m_key_image_known member 2016-11-13 12:02:29 +00:00
Riccardo Spagni 9363b2ac19
Merge pull request #1334
265e460 Fixed generate-from-json bug introduced in 358e068 (Lee Clagett)
2016-11-13 11:32:43 +02:00
Riccardo Spagni 56c4514486
Merge pull request #1331
e1dd15b Don't build monero-wallet-rpc when building the GUI (iDunk5400)
2016-11-13 11:32:24 +02:00
Lee Clagett 265e4605ec Fixed generate-from-json bug introduced in 358e068 2016-11-12 21:55:08 -05: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
Riccardo Spagni eb6d66e4fc
Merge pull request #1330
70d4915 wallet: add version dependency to the wallet target (moneromooo-monero)
2016-11-12 17:51:53 +02:00
Riccardo Spagni 41b2886795
Merge pull request #1329
cd929b8 levin: fix wrong value passed as return code to remote call (moneromooo-monero)
2016-11-12 17:51:25 +02:00
Riccardo Spagni 696fcba2a0
Merge pull request #1327
77e5bec added cmd to compile gtest (Gingeropolous)
2016-11-12 17:50:57 +02:00
Riccardo Spagni fd4342097a
Merge pull request #1325
2078cb6 tests: fix tests builds after fluffy blocks merge (moneromooo-monero)
2016-11-12 17:50:26 +02:00
Riccardo Spagni 300cb7b27b
Merge pull request #1322
65528ae Always compile Position Independent Code on 64-bit ARMv8 systems (NanoAkron)
2016-11-12 17:49:31 +02:00
moneromooo-monero 70d4915980
wallet: add version dependency to the wallet target 2016-11-12 12:55:19 +00:00