Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,626 Commits 9 Branches 69 Tags 229 MiB
Commit Graph

5626 Commits

Author SHA1 Message Date
Jean Pierre Dudey 9f9e095a8c
Use `genesis_tx` parameter in `generate_genesis_block`. #3261 
* src/cryptnote_config.h: The constant `config::testnet::GENESIS_TX` was
changed to be the same as `config::GENESIS_TX` (the mainnet's transaction)
because the mainnet's transaction was being used for both networks.

* src/cryptonote_core/cryptonote_tx_utils.cpp: The `generate_genesis_block` function
was ignoring the  `genesis_tx` parameter, and instead it was using the `config::GENESIS_TX`
constant. That's why the testnet genesis transaction was changed. Also five lines of unused
code were removed.

Signed-off-by: Jean Pierre Dudey <jeandudey@hotmail.com>
 2018-03-05 11:19:01 +09:00
Riccardo Spagni c7ace5fa3d
Merge pull request #3303 
e745c1e3 Code modifications to integrate Ledger HW device into monero-wallet-cli. (cslashm)
 2018-03-04 19:03:41 +02:00
cslashm e745c1e38d Code modifications to integrate Ledger HW device into monero-wallet-cli. 
The basic approach it to delegate all sensitive data (master key, secret
ephemeral key, key derivation, ....) and related operations to the device.
As device has low memory, it does not keep itself the values
(except for view/spend keys) but once computed there are encrypted (with AES
are equivalent) and return back to monero-wallet-cli. When they need to be
manipulated by the device, they are decrypted on receive.

Moreover, using the client for storing the value in encrypted form limits
the modification in the client code. Those values are transfered from one
C-structure to another one as previously.

The code modification has been done with the wishes to be open to any
other hardware wallet. To achieve that a C++ class hw::Device has been
introduced. Two initial implementations are provided: the "default", which
remaps all calls to initial Monero code, and  the "Ledger", which delegates
all calls to Ledger device.
 2018-03-04 12:54:53 +01:00
Riccardo Spagni 421ab3119c
Merge pull request #3245 
54c256bc unit_tests.serialization: refactored with ASSERT_EQ_MAP (stoffu)
e6a60938 unit_tests: added gtest utility ASSERT_EQ_MAP for easily testing key-value map (stoffu)
 2018-02-20 17:53:52 +02:00
Riccardo Spagni 2ac3da1251
Merge pull request #3256 
df5273de wallet2: fix auto_low_priority field name typo on load (moneromooo-monero)
 2018-02-20 17:53:38 +02:00
Riccardo Spagni 0d530bd04e
Merge pull request #3295 
6514f0ed db_lmdb: fix return code mixup in for_all_* (moneromooo-monero)
 2018-02-20 17:49:16 +02:00
Riccardo Spagni 46903ec26a
Merge pull request #3294 
fd57e13a simplewallet: typo in generate-from-multisig-keys (stoffu)
 2018-02-20 17:49:05 +02:00
Riccardo Spagni 21335e5c6b
Merge pull request #3293 
4a78a99f cryptonote_core: change wording of fork warning message (moneromooo-monero)
 2018-02-20 17:48:54 +02:00
Riccardo Spagni de79aba488
Merge pull request #3292 
b372ec43 ITS#8324 More for Win32 NTDLL junk (Howard Chu)
 2018-02-20 17:48:42 +02:00
Riccardo Spagni 299af8e43e
Merge pull request #3290 
1d28c0d8 p2p: restore m_testnet assignment lost during rebase (whythat)
 2018-02-20 17:48:29 +02:00
Riccardo Spagni 854a87d633
Merge pull request #3289 
4789f859 wipeable_string: don't try to wipe an empty buffer (moneromooo-monero)
 2018-02-20 17:48:16 +02:00
Riccardo Spagni ea9ddcac7f
Merge pull request #3288 
10f78f63 p2p: need libcryptonote_core due to arg_testnet_on being used (stoffu)
 2018-02-20 17:48:05 +02:00
Riccardo Spagni 8e049d669d
Merge pull request #3266 
bb19386b README.md: bump minimum cmake version to 3.2.0 (iDunk5400)
 2018-02-20 17:47:53 +02:00
Riccardo Spagni fc57e0ef2d
Merge pull request #3263 
d4e728c9 simplewallet: reword donate command message for clarity (Serhack)
 2018-02-20 17:47:42 +02:00
Riccardo Spagni c9aa9370f9
Merge pull request #3260 
b2d4bb9b Remove `voting_version` parameter documentation. (Jean Pierre Dudey)
 2018-02-20 17:47:31 +02:00
Riccardo Spagni 4e9de94565
Merge pull request #3257 
da25757b simplewallet: do nothing in on_skip_transaction (wallet2 already logs warnings) (stoffu)
 2018-02-20 17:47:20 +02:00
Riccardo Spagni ff36fd93fd
Merge pull request #3255 
3962bcb2 Closes #2886: really ignore battery checking (Timothy D. Prime)
 2018-02-20 17:47:03 +02:00
Riccardo Spagni f952da17c3
Merge pull request #3254 
37ee966c add reference to localization workgroup in README.i18n.md (erciccione)
 2018-02-20 17:46:52 +02:00
Riccardo Spagni cfa3af4078
Merge pull request #3247 
89ad162a wallet2: remove unused m_subaddresses_inv (moneromooo-monero)
f2c4c399 wallet2: speed up subaddress generation (by about a third) (moneromooo-monero)
 2018-02-20 17:46:40 +02:00
Riccardo Spagni 6920fdaf4f
Merge pull request #3246 
3c33e131 wallet2: don't store invalid key image when watch-only (stoffu)
0133b348 wallet2: don't throw when spent amount is inconsistent (stoffu)
 2018-02-20 17:46:29 +02:00
Riccardo Spagni e3ad0c9ca6
Merge pull request #3243 
2bc8c3db epee get_ns_count: cast to uint64_t before multiplying 10^9 to avoid overflow (stoffu)
 2018-02-20 17:46:15 +02:00
Riccardo Spagni 0fc5eec9cd
Merge pull request #3235 
6866ed46 Add default value to max_height, otherwise it's 0 (Michał Sałaban)
 2018-02-20 17:46:00 +02:00
moneromooo-monero 6514f0ed7b
db_lmdb: fix return code mixup in for_all_* 2018-02-19 14:55:58 +00:00
stoffu fd57e13a84
simplewallet: typo in generate-from-multisig-keys 2018-02-19 09:51:30 +09:00
moneromooo-monero 4a78a99f96
cryptonote_core: change wording of fork warning message 
An udpate may or may not be available now, but should be soon if not.
This will prevent too many people freaking out.
 2018-02-18 23:44:59 +00:00
Howard Chu b372ec4375
ITS#8324 More for Win32 NTDLL junk 
Use GetProcAddress at runtime, avoid buildtime NTDLL link issues
 2018-02-18 21:56:55 +00:00
whythat 1d28c0d8a9 p2p: restore m_testnet assignment lost during rebase 2018-02-18 17:09:39 +02:00
moneromooo-monero 4789f8598f
wipeable_string: don't try to wipe an empty buffer 
memset_s doesn't like it
 2018-02-18 14:02:36 +00:00
stoffu 10f78f63f1
p2p: need libcryptonote_core due to arg_testnet_on being used 2018-02-18 16:40:43 +09:00
Riccardo Spagni 4f80c50730
Merge pull request #3275 
de397e3f refresh language files (erciccione)
264a8756 fix build error removing <> from payment_id (erciccione)
 2018-02-17 21:49:26 +01:00
Riccardo Spagni 8154df778a
Merge pull request #3276 
ed6c68db crypto: add missing include (WIN32) (iDunk5400)
 2018-02-17 21:48:59 +01:00
Riccardo Spagni 5a8e7fd0e5
Merge pull request #3249 
a4b50a6f handle ^D and ^C while password prompting (Jethro Grassie)
 2018-02-17 21:48:30 +01:00
Riccardo Spagni 5aa50a4504
Merge pull request #3274 
dfabc005 memwipe: add missing #include <stdio.h> (stoffu)
 2018-02-17 11:54:40 +01:00
Riccardo Spagni 6198c816b1
Merge pull request #3170 
b3b2d4d2 options: add testnet option dependencies (whythat)
c5f55bb4 common: implement dynamic option dependencies mechanism (whythat)
05a12ccc options: remove testnet-* options (whythat)
c33cb60e common: implement dependent option descriptor (whythat)
 2018-02-17 11:51:57 +01:00
Riccardo Spagni a2cbedd29f
Merge pull request #3191 
3607d467 core: add --no-fluffy-blocks, and enable fluffy blocks by default (moneromooo-monero)
 2018-02-17 11:48:31 +01:00
Riccardo Spagni bed951323d
Merge pull request #3211 
7c1a607c txpool: Don't bail out when blob_size == tx_size_limit (Leon Klingele)
 2018-02-17 11:47:17 +01:00
whythat b3b2d4d20c options: add testnet option dependencies 2018-02-16 22:32:01 +02:00
whythat c5f55bb4c0 common: implement dynamic option dependencies mechanism 2018-02-16 22:32:01 +02:00
whythat 05a12ccc2d options: remove testnet-* options 2018-02-16 22:32:01 +02:00
iDunk5400 ed6c68db1b
crypto: add missing include (WIN32) 2018-02-16 19:35:31 +01:00
moneromooo-monero 89ad162a3f
wallet2: remove unused m_subaddresses_inv 2018-02-16 17:13:09 +00:00
moneromooo-monero f2c4c39971
wallet2: speed up subaddress generation (by about a third) 2018-02-16 17:13:06 +00:00
stoffu dfabc005d1
memwipe: add missing #include <stdio.h> 2018-02-17 01:06:05 +09:00
erciccione de397e3f55
refresh language files 2018-02-16 17:01:14 +01:00
erciccione 264a875685
fix build error removing <> from payment_id 2018-02-16 16:58:53 +01:00
Leon Klingele 7c1a607c40
txpool: Don't bail out when blob_size == tx_size_limit 
Previously, when blob_size == tx_size_limit, the "m_too_big" property was set
and the transaction was rejected. This should not have been the case.
 2018-02-16 16:27:08 +01:00
whythat c33cb60eb6 common: implement dependent option descriptor 2018-02-16 16:44:40 +02:00
moneromooo-monero 3607d467f3
core: add --no-fluffy-blocks, and enable fluffy blocks by default 2018-02-16 13:46:46 +00:00
Riccardo Spagni ef91d6e61e
Merge pull request #3196 
eda9fb5b p2p: fix testnet/mainnet port mixup (moneromooo-monero)
 2018-02-16 14:31:16 +01:00
Riccardo Spagni 6b1382b6b6
Merge pull request #3199 
30ce8c59 cn_deserialize: check for raw tx_extra (moneromooo-monero)
 2018-02-16 14:29:51 +01:00