monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-30 15:39:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4791 commits 9 branches 69 tags 325 MiB
Commit graph

3331 commits

Author SHA1 Message Date
Riccardo Spagni
97c11caf07 Merge pull request #2656 
3492de01 fix lightwallet and subaddresses conflict (Jaquee)
329f149e remove reference to cryptonote::null_hash (Jaquee)
 2017-10-15 19:32:18 +02:00
Jaquee
3492de010b fix lightwallet and subaddresses conflict 2017-10-15 19:19:40 +02:00
Jaquee
329f149e95 remove reference to cryptonote::null_hash 2017-10-15 19:19:40 +02:00
Riccardo Spagni
b293ad9a1a
Merge pull request #2640 
22b51e06 db_lmdb: include chain height when failing to find an output key (moneromooo-monero)
5db433b3 blockchain: avoid exceptions in output verification (moneromooo-monero)
 2017-10-15 18:59:45 +02:00
Riccardo Spagni
344c01c712
Merge pull request #2638 
529a6a4a core: guard against a mined block not finding all txes in the pool (moneromooo-monero)
 2017-10-15 18:58:57 +02:00
Riccardo Spagni
845afb5191
Merge pull request #2613 
2051f89f cmake: build tests last (redfish)
 2017-10-15 18:58:31 +02:00
Riccardo Spagni
73f0c16743
Merge pull request #2606 
4090e8c6 simplewallet: add get/set for refresh-from-height (moneromooo-monero)
 2017-10-15 18:51:11 +02:00
Riccardo Spagni
d5ab55b8d7
Merge pull request #2604 
0a872798 protocol: kick idle peers by dropping them (moneromooo-monero)
 2017-10-15 18:50:32 +02:00
Riccardo Spagni
f1bee553b1
Merge pull request #2602 
bc1b9333 frob level 1 logs a bit for consistency (moneromooo-monero)
 2017-10-15 18:49:48 +02:00
Riccardo Spagni
f484b162db
Merge pull request #2599 
b776c725 daemon: use @N syntax to output_histogram for specific amounts (moneromooo-monero)
 2017-10-15 18:48:19 +02:00
Riccardo Spagni
e50bf5f811
Merge pull request #2597 
c4136134 miner: always update block template when starting (moneromooo-monero)
 2017-10-15 18:47:43 +02:00
Riccardo Spagni
5c3275ddbe
Merge pull request #2596 
06fb9bcf wallet2: fix refresh height calc for new wallets (moneromooo-monero)
 2017-10-15 18:47:16 +02:00
Riccardo Spagni
71253c1dcd
Merge pull request #2592 
dc19659d Remove network_address_base which has been merged with ipv4_network_address in 8b006877 (Michał Sałaban)
2183ade0 Don't try to create wallet-dir when it's not given, don't crash if wallet-dir already exists. (Michał Sałaban)
 2017-10-15 18:39:13 +02:00
Riccardo Spagni
1280ba4f5b
Merge pull request #2589 
8f0cea63 add a command_line function to check for defaulted options (moneromooo-monero)
 2017-10-15 18:38:46 +02:00
Riccardo Spagni
3eac7ab94f
Merge pull request #2587 
cba34494 rpc: out_peers now works again (moneromooo-monero)
 2017-10-15 18:38:12 +02:00
Riccardo Spagni
50f0c1f0e0
Merge pull request #2586 
7b8d3ec6 wallet-cli: add --do-not-relay option (stoffu)
 2017-10-15 18:37:38 +02:00
Riccardo Spagni
1740f0a13e
Merge pull request #2583 
27fdaaa4 Fix building with -DARCH=default -DNO_AES=ON (moneromooo-monero)
 2017-10-15 18:37:14 +02:00
Riccardo Spagni
147ecb6b7a
Merge pull request #2573 
7e7acdc3 daemon: catch out of range exceptions too when calling stoll/stoi (moneromooo-monero)
 2017-10-15 18:34:48 +02:00
Riccardo Spagni
1e577e8fbf
Merge pull request #2571 
8028dde7 block_queue: use boost::uuids::nil_uuid where appropriate (moneromooo-monero)
 2017-10-15 18:34:26 +02:00
Riccardo Spagni
27ed7419bb
Merge pull request #2570 
f139a6ca wallet2: fix backlog being off by 1 (moneromooo-monero)
 2017-10-15 18:33:51 +02:00
Riccardo Spagni
1039b5e813
Merge pull request #2569 
b5b4abb8 simplewallet: fix setting default-ring-size to 0 (moneromooo-monero)
 2017-10-15 18:32:41 +02:00
Riccardo Spagni
c45f3ac4d9
Merge pull request #2568 
7130cf0c Add tools::on_startup, and warn about glibc 2.25 bug if found (moneromooo-monero)
 2017-10-15 18:32:09 +02:00
Riccardo Spagni
2babd2e0a3
Merge pull request #2567 
54940d8c blockchain_import: remove a few commented out obsolete lines (moneromooo-monero)
 2017-10-15 18:29:18 +02:00
Riccardo Spagni
1c546e0d81
Merge pull request #2565 
452d4fae tests: fix hashchain unit tests (moneromooo-monero)
 2017-10-15 18:27:08 +02:00
Riccardo Spagni
960886aa04
Merge pull request #2109 
97c2e449 wallet2+API: use separate callbacks for lightwallets (Jaquee)
d9261867 walletAPI: correct confirmations in txHistory for unsynced wallets (Jaquee)
9442b043 walletAPI: lightwallet exceptions (Jaquee)
fc922934 walletAPI: add lightwallet login() and importWalletRequest() (Jaquee)
79207743 walletAPI: init() lightwallet and SSL support (Jaquee)
dde5a1fc walletAPI: add tx unlock_time (Jaquee)
bba5cbed wallet2: remove obsolete get_num_rct_outputs() call from create_transactions_2 (Jaquee)
7a482f30 wallet2: create_transactions_2 lightwallet support (Jaquee)
ce61b818 wallet2: get_outs lightwallet support (Jaquee)
1197cb71 wallet2: commit_tx() lightwallet support (Jaquee)
43b57804 wallet2: refactor is_tx_spendtime_unlocked() (Jaquee)
32e2b003 wallet2: add lightwallet exceptions to common functions (Jaquee)
2e692fc0 wallet2: refresh() lightwallet support (Jaquee)
f44d156c my/openmonero API functions (Jaquee)
288d3c75 wallet2: add remove_obsolete_pool_txs() (Jaquee)
2c6aad7e wallet2: add on_pool_tx_removed callback (Jaquee)
ff7c30aa wallet2: light wallet member variables (Jaquee)
e2a276cb wallet2: add ssl option to init() (Jaquee)
a13540be add string_tools::validate_hex() (Jaquee)
fd773d88 refactor cryptonote_basic::add_tx_pub_key_to_extra (Jaquee)
8bfa6c2d lightwallet rpc server commands (Jaquee)
76961ddc Serializer: string to integer conversion for MyMonero compatibility (Jaquee)
1cf940f2 epee http_client SSL support (Jaquee)
eec10137 CMakeLists.txt - Add openssl include dir (Jaquee)
 2017-10-15 18:25:08 +02:00
Jaquee
97c2e449ce wallet2+API: use separate callbacks for lightwallets 2017-10-15 17:58:28 +02:00
Jaquee
d92618675b walletAPI: correct confirmations in txHistory for unsynced wallets 2017-10-15 17:58:28 +02:00
Jaquee
9442b04302 walletAPI: lightwallet exceptions 2017-10-15 17:57:45 +02:00
Jaquee
fc9229342d walletAPI: add lightwallet login() and importWalletRequest() 2017-10-15 17:57:43 +02:00
Jaquee
79207743b8 walletAPI: init() lightwallet and SSL support 2017-10-15 17:56:35 +02:00
Jaquee
dde5a1fc36 walletAPI: add tx unlock_time 2017-10-15 17:54:17 +02:00
Jaquee
bba5cbed8f wallet2: remove obsolete get_num_rct_outputs() call from create_transactions_2 2017-10-15 17:54:14 +02:00
Jaquee
7a482f302b wallet2: create_transactions_2 lightwallet support 2017-10-15 17:51:20 +02:00
Jaquee
ce61b8189b wallet2: get_outs lightwallet support 2017-10-15 17:50:03 +02:00
Jaquee
1197cb71e9 wallet2: commit_tx() lightwallet support 2017-10-15 17:48:45 +02:00
Jaquee
43b57804f8 wallet2: refactor is_tx_spendtime_unlocked() 2017-10-15 17:48:45 +02:00
Jaquee
32e2b0030e wallet2: add lightwallet exceptions to common functions 2017-10-15 17:48:41 +02:00
Jaquee
2e692fc05a wallet2: refresh() lightwallet support 2017-10-15 17:42:50 +02:00
Jaquee
f44d156cbd my/openmonero API functions 2017-10-15 17:42:29 +02:00
Jaquee
288d3c75c3 wallet2: add remove_obsolete_pool_txs() 2017-10-15 17:39:54 +02:00
Jaquee
2c6aad7ea7 wallet2: add on_pool_tx_removed callback 2017-10-15 17:35:15 +02:00
Jaquee
ff7c30aadc wallet2: light wallet member variables 2017-10-15 17:35:08 +02:00
Riccardo Spagni
56ea442fd3
Merge pull request #2555 
a4b4651c dns_utils: allow an optional DNS server IP in DNS_PUBLIC (moneromooo-monero)
 2017-10-15 17:33:09 +02:00
Riccardo Spagni
d316b3d266
Merge pull request #2554 
d74336d5 wallet: encrypt (un)signed tx, also optionally save unencrypted raw tx hexstr (stoffu)
 2017-10-15 17:32:30 +02:00
Jaquee
e2a276cbb5 wallet2: add ssl option to init() 2017-10-15 17:32:13 +02:00
Jaquee
fd773d88cd refactor cryptonote_basic::add_tx_pub_key_to_extra 2017-10-15 17:32:09 +02:00
Riccardo Spagni
d8bc28cc36
Merge pull request #2552 
69ce33f2 core: fix failure to sync when a tx is already in the pool (moneromooo-monero)
 2017-10-15 17:31:37 +02:00
Riccardo Spagni
62629541a5
Merge pull request #2550 
735fafec simplewallet: allow 1/yes/y as well as true for start_mining options (moneromooo-monero)
 2017-10-15 17:31:14 +02:00
Riccardo Spagni
ce1016254a
Merge pull request #2549 
bf2d9113 simplewallet: fix --restore-from-height being ignored (moneromooo-monero)
 2017-10-15 17:30:53 +02:00
Jaquee
8bfa6c2d9f lightwallet rpc server commands 2017-10-15 17:30:23 +02:00