gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-07-30 23:50:24 -07:00
Code Issues Packages Projects Releases Wiki Activity
6,369 Commits 9 Branches 78 Tags
0415863747116450c525b83082da500e39b17f1e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
luigi1111 0415863747 Merge pull request #4177 
e7c0fcd epee: set jsonrpc to '2.0' in parse error return data (moneromooo-monero)
 2018-08-15 17:42:09 -05:00
luigi1111 7aa2030cee Merge pull request #4174 
ff37bd0 wallet2: fix O(n^2) behaviour in import_key_images (moneromooo-monero)
 2018-08-15 17:40:55 -05:00
luigi1111 b531858c02 Merge pull request #4173 
3940e12 daemon.print_bc: don't print difficulty twice (stoffu)
 2018-08-15 17:39:35 -05:00
luigi1111 2102e6c738 Merge pull request #4172 
3a4c3ac simplewallet.unspent_outputs: fix wrong logic for parsing (stoffu)
 2018-08-15 17:38:36 -05:00
luigi1111 a68143bc52 Merge pull request #4171 
9127a8b wallet-rpc: filter getbalance response by address index (stoffu)
 2018-08-15 17:37:23 -05:00
luigi1111 564e9c3b5f Merge pull request #4170 
1c6cfd3 wallet-rpc: add get_address_index command (stoffu)
 2018-08-15 17:35:49 -05:00
luigi1111 8c4b3f3736 Merge pull request #4166 
5e675de simplewallet: fix language detection when using --use-english-language-names (moneromooo-monero)
 2018-08-15 17:34:29 -05:00
luigi1111 01475c36c0 Merge pull request #4165 
68b1197 tests: ringdb: use system's temporary dir path (radfish)
 2018-08-15 17:33:06 -05:00
luigi1111 fd3b71129b Merge pull request #4164 
8e24533 blockchain: some batch tx scanning speedup (moneromooo-monero)
 2018-08-15 17:31:24 -05:00
luigi1111 2530dc6710 Merge pull request #4161 
be02eb9 db_lmdb: demote the 'batch already enabled' log, it's harmless (moneromooo-monero)
 2018-08-15 17:27:48 -05:00
luigi1111 e7328ed5b7 Merge pull request #4158 
7db7ec8 wallet rpc: support making integrated address of given standard address (stoffu)
 2018-08-15 17:25:19 -05:00
luigi1111 5e795ee7af Merge pull request #4153 
37f0799 wallet: distinguish coinbase from other txes in show_transfers (moneromooo-monero)
 2018-08-15 17:23:56 -05:00
luigi1111 2a44c2defd Merge pull request #4150 
f2e65c6 wallet2: consider minimum fee when testing if balance is sufficient (stoffu)
 2018-08-15 17:22:36 -05:00
luigi1111 dc7dd56867 Merge pull request #4148 
fead7eb Clarification of boolean options in config file (jonathancross)
 2018-08-15 17:21:10 -05:00
luigi1111 88369c6685 Merge pull request #4138 
7f8bdeb easylogging++: make the logger handle early/late logging (moneromooo-monero)
bc8cbdb stack_trace: print stack traces on stdout if the logger isn't live (moneromooo-monero)
 2018-08-15 17:19:04 -05:00
luigi1111 5295e4eb82 Merge pull request #4137 
63e342b crypto: move null_pkey/null_skey to the cpp file (moneromooo-monero)
0496c7c crypto: do not use boost::value_initialized to init null skey/pkey (moneromooo-monero)
 2018-08-15 17:17:34 -05:00
luigi1111 1d2c08610b Merge pull request #4136 
4307489 wallet: disable core dumps on startup in release mode (moneromooo-monero)
 2018-08-15 17:15:49 -05:00
luigi1111 3b409a3b8a Merge pull request #4130 
979105b abstract_tcp_server2: fix race on shutdown (moneromooo-monero)
 2018-08-15 17:13:35 -05:00
luigi1111 ad13b6d25a Merge pull request #4106 
20eb192 simplewallet: reword 'seed encryption' to 'seed offset' (moneromooo-monero)
 2018-08-15 17:12:12 -05:00
luigi1111 017e07a035 Merge pull request #4103 
bcab579 wallet: allow adjusting number of rounds for the key derivation function (stoffu)
 2018-08-15 17:09:52 -05:00
luigi1111 dd966c8a3a Merge pull request #4090 
42f3b7c http_protocol_handler: catch invalid numbers when parsing (moneromooo-monero)
0a4a7da http_protocol_handler: fix HTTP/x.y parsing (moneromooo-monero)
 2018-08-15 17:08:10 -05:00
luigi1111 b586ae1310 Merge pull request #4089 
909398e p2p: connect via the bound ip, if any (moneromooo-monero)
 2018-08-15 17:06:17 -05:00
luigi1111 dd8354aa08 Merge pull request #4024 
5a2864c simplewallet: fix delay when setting auto-refresh off (moneromooo-monero)
 2018-08-15 17:05:14 -05:00
luigi1111 4745e3be22 Merge pull request #4020 
c24a0af [monerod] Added blocks remaining count during syncronisation. (Jorropo)
 2018-08-15 17:03:35 -05:00
luigi1111 4cde4cb946 Merge pull request #3528 
34d4b79 wallet2: use a gamma distribution to pick fake outs (moneromooo-monero)
 2018-08-15 17:00:32 -05:00
luigi1111 0dddfeacc9 Merge pull request #4129 
ee31383 db_lmdb: don't sync a read only DB (moneromooo-monero)
 2018-07-27 14:30:57 -05:00
luigi1111 21b1fa1c35 Merge pull request #4126 
8d578f1 memwipe: don't call the workhorse for 0 bytes (moneromooo-monero)
 2018-07-27 14:29:55 -05:00
luigi1111 ff01c3ade4 Merge pull request #4110 
639ca3b core_tests: add --filter to select which tests to run (moneromooo-monero)
 2018-07-27 14:28:49 -05:00
luigi1111 f739a3cbb8 Merge pull request #4109 
2951436 wallet: warn when payment IDs are used (moneromooo-monero)
 2018-07-27 14:27:47 -05:00
luigi1111 dda05f357a Merge pull request #4108 
8c05237 blockchain: cache next block difficulty after adding a block (moneromooo-monero)
 2018-07-27 14:26:01 -05:00
luigi1111 8eb5b0be36 Merge pull request #4098 
96f8c62 README: remove mentions of external miniupnpc dependency (moneromooo-monero)
 2018-07-27 14:25:02 -05:00
luigi1111 3fde902394 Merge pull request #4097 
61caab8 crypto: remove slight bias in key generation due to modulo (moneromooo-monero)
 2018-07-27 14:23:54 -05:00
luigi1111 92b5d6c204 Merge pull request #4091 
a4272de wallet2: unlock keys file before calling verify_password (needed for Windows) (stoffu)
 2018-07-27 14:22:34 -05:00
luigi1111 b293c487fb Merge pull request #3629 
ed7825d monero-wallet-cli: added locked_sweep_all command (jcktm)
 2018-07-27 14:20:23 -05:00
luigi1111 702a41034d Merge pull request #4088 
8c4db68 node_rpc_proxy: factor a few RPC calls using get_info (moneromooo-monero)
 2018-07-19 14:15:16 -05:00
luigi1111 5c102c60dc Merge pull request #4087 
d6440ab wallet2: recover from index out of hashchain bounds error (moneromooo-monero)
 2018-07-19 14:14:10 -05:00
luigi1111 61eea83978 Merge pull request #4081 
d95bc44 blockchain: fix getting invalid block data on failure (moneromooo-monero)
 2018-07-19 14:12:30 -05:00
luigi1111 9474567d76 Merge pull request #4076 
aa0ea0a blockchain: set the m_verifivation_failed flag in a couple more places (moneromooo-monero)
 2018-07-19 14:11:24 -05:00
luigi1111 f6d7e87b67 Merge pull request #4075 
438d52d remove epee from link lines where it's redundant (moneromooo-monero)
 2018-07-19 14:10:20 -05:00
luigi1111 326437c5ff Merge pull request #4074 
ef649f9 crypto: remove unused unsafe random scalar generator (moneromooo-monero)
 2018-07-19 14:08:56 -05:00
luigi1111 5fad1c505a Merge pull request #4073 
3474154 gtest: use -fPIC with CLANG too (moneromooo-monero)
 2018-07-19 14:07:49 -05:00
luigi1111 be81a27fa4 Merge pull request #4071 
d6d78f1 Allow fractional outputs to be ignored (stoffu)
 2018-07-19 14:06:54 -05:00
luigi1111 173f7b8f42 Merge pull request #4064 
80d7c6c blockchain_utilities: report file offset where a read error occurs (moneromooo-monero)
 2018-07-19 14:05:51 -05:00
luigi1111 69502c4040 Merge pull request #4062 
13851b2 simplewallet.sweep_all: show usage when parsing fails (stoffu)
 2018-07-19 14:04:42 -05:00
luigi1111 007b835daa Merge pull request #4061 
e6f4d4a unit_tests: do not recreate the same base rct sig all the time (moneromooo-monero)
 2018-07-19 14:03:38 -05:00
luigi1111 5cade94189 Merge pull request #4047 
41b4bf9 tx_pool: cache check_tx_inputs results (moneromooo-monero)
 2018-07-19 14:02:20 -05:00
luigi1111 94ed562148 Merge pull request #4045 
7cdd147 Changed URLs to HTTPS (einsteinsfool)
 2018-07-19 13:56:38 -05:00
luigi1111 9315e12d34 Merge pull request #4033 
3e46db9 rpc: add a non binary get_transaction_pool_hashes RPC (moneromooo-monero)
 2018-07-19 13:55:37 -05:00
luigi1111 cff15e4123 Merge pull request #4032 
87e158b device_ledger: factor the prologue code (moneromooo-monero)
 2018-07-19 13:54:39 -05:00
luigi1111 3235abc184 Merge pull request #4030 
0c41488 miner: show id and height when a block is found (stoffu)
 2018-07-19 13:53:36 -05:00
luigi1111 138aefd0e7 Merge pull request #4029 
bd9e4e3 daemon: show a bit more info with print_block (stoffu)
 2018-07-19 13:52:41 -05:00
luigi1111 2e4653c077 Merge pull request #4023 
6cb9707 simplewallet: remove leftover global debug trace (moneromooo-monero)
 2018-07-19 13:51:44 -05:00
luigi1111 d14a074055 Merge pull request #4021 
09f43b9 crypto: add a README pointing to the SUPERCOP licence (moneromooo-monero)
 2018-07-19 13:50:37 -05:00
luigi1111 3e026ff6ed Merge pull request #4013 
e5592c4 rpc: add blockchain disk size to getinfo (moneromooo-monero)
 2018-07-19 13:40:42 -05:00
luigi1111 21afa71ba6 Merge pull request #3981 
45e419b db: store cumulative rct output distribution in the db for speed (moneromooo-monero)
 2018-07-19 13:39:24 -05:00
luigi1111 d518dae4bf Merge pull request #3973 
50af357 alt_chain_info can now give more info about a particular alt chain (moneromooo-monero)
 2018-07-19 13:37:10 -05:00
luigi1111 025187e6c9 Merge pull request #3854 
149da42 db_lmdb: enable batch transactions by default (stoffu)
34cb6b4 add --regtest and --fixed-difficulty for regression testing (vicsn)
9e1403e update get_info RPC and bump RPC version (vicsn)
207b66e first new functional tests (vicsn)
 2018-07-19 13:35:25 -05:00
luigi1111 33122ab8a6 Merge pull request #3617 
4c00a4d unit_tests: add device unit tests (moneromooo-monero)
 2018-07-19 13:32:36 -05:00
luigi1111 a9b83f5a6e Merge pull request #4067 
9a39b7d wallet2: fix build for windows (std::max again) (moneromooo-monero)
 2018-06-27 21:28:34 -05:00
luigi1111 65c09beaf7 Merge pull request #4069 
49dc78d util: fix mistakes made in #3994 (stoffu)
 2018-06-27 21:25:00 -05:00
luigi1111 8b18401ea0 Merge pull request #4068 
29254fc api/wallet: add missing arg to wallet2::refresh() (stoffu)
 2018-06-27 21:23:50 -05:00
luigi1111 ba0a7294d0 Merge pull request #4000 
4510f41 Wallet API: add some missing override keyword (stoffu)
 2018-06-27 20:18:41 -05:00
luigi1111 4c6de54ee2 Merge pull request #3994 
1d17647 epee.string_tools: add conversion between UTF-8 and UTF-16 (stoffu)
59de6f8 util: add file_locker class (stoffu)
3d623a8 wallet: prevent the same wallet file from being opened by multiple processes (stoffu)
 2018-06-27 20:17:25 -05:00
luigi1111 008b9036a3 Merge pull request #4066 
84d9e7f blockchain: fix build after waiter::wait prototype change (moneromooo-monero)
 2018-06-27 20:15:10 -05:00
luigi1111 0c76dbdd00 Merge pull request #4065 
9b38551 wallet_rpc_server: fix build - forgot to build rpc version (moneromooo-monero)
 2018-06-27 20:13:38 -05:00
luigi1111 2329d2f4c8 Merge pull request #3907 
dcbc17e wallet: include a suggested number of confirmations based on amount (moneromooo-monero)
 2018-06-27 16:32:33 -05:00
luigi1111 8a27caeb22 Merge pull request #3998 
8db23df wallet: on first refresh, start off with a quantized height (moneromooo-monero)
 2018-06-27 16:30:38 -05:00
luigi1111 9453573581 Merge pull request #3995 
0a5292c wallet2: use decoded amount when reporting repeated output key (stoffu)
 2018-06-27 16:28:57 -05:00
luigi1111 c28a2b0d7d Merge pull request #3992 
25c15dc wallet2: use correct fee for split txes (stoffu)
 2018-06-27 16:26:23 -05:00
luigi1111 5eb2e01216 Merge pull request #3991 
798dfcf wallet: allow unspendable unmixable outputs to be discarded (stoffu)
 2018-06-27 16:25:03 -05:00
luigi1111 cbfa0a2a7e Merge pull request #3987 
2d10830 db_ldmb: print db version when complaining about incompatibility (moneromooo-monero)
 2018-06-27 16:23:17 -05:00
luigi1111 87d7612311 Merge pull request #3986 
b628503 Remove old logic saved in comments. (jeandudey)
 2018-06-27 16:22:03 -05:00
luigi1111 3ad4ecd4ff Merge pull request #3982 
08b85a8 cryptonote_config: add get_config to refactor x = testnet ? config::testnet::X : stagenet ? config::stagenet::X : config::X (stoffu)
0cf80ba net_node: resolve host for node addresses given via command line flags (stoffu)
 2018-06-27 15:38:23 -05:00
luigi1111 2d92fa5d69 Merge pull request #3979 
362f5e6 simplewallet: don't confirm missing payment ID when sending to only subaddresses (stoffu)
 2018-06-27 15:36:54 -05:00
luigi1111 a844844cda Merge pull request #3716 
a2b557f 6795bd0 209ec96 ed2c81e a830db2 57ea902 31a895e ba8331c f7f1917 41be339 f025ae9 ef2cb63 dcfd299 5d3e702 2704624 2771a18 0e4c7d0 (moneromooo-monero)
 2018-06-27 15:33:01 -05:00
luigi1111 31f47d72fe Merge pull request #3977 
0309615 device_ledger: fix bad memory access on connect error (moneromooo-monero)
 2018-06-25 15:26:23 -05:00
luigi1111 14372ca95a Merge pull request #3975 
2d5921e blockchain: avoid duplicate db query for height (moneromooo-monero)
 2018-06-25 15:24:45 -05:00
luigi1111 ab7ab29fc0 Merge pull request #3974 
1789b76 cryptonote_protocol_handler: log when dropping a peer (moneromooo-monero)
 2018-06-25 15:23:31 -05:00
luigi1111 c0c6102260 Merge pull request #3972 
8766528 epee: fallback to a counter if gmtime fails when rotating logs (moneromooo-monero)
 2018-06-25 15:21:25 -05:00
luigi1111 a2b08db9c9 Merge pull request #3971 
4ecf714 epee: fix include for ofstream (moneromooo-monero)
 2018-06-25 15:20:12 -05:00
luigi1111 b1be364f08 Merge pull request #3966 
948c482 simplewallet: grammar fix in warning message (moneromooo-monero)
 2018-06-25 15:16:38 -05:00
luigi1111 3afaedf365 Merge pull request #3964 
9ddb07f update readme to include debian one liner for deps (Gingeropolous)
 2018-06-25 15:15:32 -05:00
luigi1111 89b99ef2d8 Merge pull request #3963 
f61fe2e Update readme to include pcslite dependency (Gingeropolous)
 2018-06-25 15:13:57 -05:00
luigi1111 8fad35f8e2 Merge pull request #3962 
55c7fb8 epee: adaptive connection timeout system (moneromooo-monero)
 2018-06-25 15:12:37 -05:00
luigi1111 66212837ab Merge pull request #3957 
2bb2c1b password: flush cout when prompting for password without newline (moneromooo-monero)
 2018-06-25 15:10:54 -05:00
luigi1111 506be80601 Merge pull request #3955 
d7a6b72 wallet2: fix bulletproof cold signing (moneromooo-monero)
 2018-06-25 15:09:48 -05:00
luigi1111 741a773025 Merge pull request #3948 
c367609 blockchain_import: warn+delay about using --dangerous-unverified-import (moneromooo-monero)
 2018-06-25 14:58:19 -05:00
luigi1111 ea1d54aeb7 Merge pull request #3947 
8cc4606 snap: strip metadata from icon.png (moneromooo-monero)
 2018-06-25 14:56:07 -05:00
luigi1111 26562e9f3c Merge pull request #3941 
bf26920 wallet2: fix get_approximate_blockchain_height for stagenet (stoffu)
 2018-06-25 14:54:54 -05:00
luigi1111 c3ec5373b3 Merge pull request #3936 
d81e042 tx_pool: initialize bitflags padding since it gets written to storage (moneromooo-monero)
 2018-06-25 14:53:27 -05:00
luigi1111 473d984d88 Merge pull request #3921 
8fc0cdb wallet2: lower default for subaddress lookahead when restoring with hardware (stoffu)
248310d Move parse_subaddress_lookahead() from simplewallet.cpp to util.cpp (stoffu)
46e90b7 Wallet API: add support for wallet creation from hardware device (stoffu)
 2018-06-25 14:49:30 -05:00
luigi1111 1eddabf0a4 Merge pull request #3677 
d45cd37 fix typos in language files and rpc_args.cpp (ordtrogen)
 2018-06-25 14:41:48 -05:00
luigi1111 ff7dc087ae Merge pull request #3407 
7bf99a2 fix string handling for donation message (cryptochangements34)
 2018-06-25 14:39:01 -05:00
luigi1111 ffab67004c Merge pull request #3784 
261ee56 don't limit miner threads in wallet (cryptochangements34)
 2018-06-20 15:15:19 -05:00
luigi1111 9a3712541e Merge pull request #3939 
62c8c07 wallet: do not log by default if we're not asked to log to console (moneromooo-monero)
 2018-06-20 14:52:55 -05:00
luigi1111 34c57d071f Merge pull request #3938 
01cc978 ringct: remove an unnecessary scalarmultBase in zeroCommit (moneromooo-monero)
 2018-06-20 14:51:31 -05:00
luigi1111 0a24673fef Merge pull request #3933 
2861289 readme - explain building master vs. release (Gingeropolous)
 2018-06-20 14:46:04 -05:00
luigi1111 3721298cf6 Merge pull request #3932 
8962f00 simplewallet: add optional trusted/untrusted argument to set_daemon (moneromooo-monero)
941a608 util: consider Tor/I2P addresses to be non local (moneromooo-monero)
2b3357e README: mention --untrusted-daemon (moneromooo-monero)
 2018-06-20 14:44:54 -05:00
luigi1111 306365d4e6 Merge pull request #3927 
5f00df3 Update Readme to indicate recommended version (Gingeropolous)
 2018-06-20 14:42:38 -05:00
luigi1111 7935bc5f6b Merge pull request #3924 
afed978 Fixes #3645: error on freebsd lambda return values forced to std::string (rockhouse)
 2018-06-20 14:41:05 -05:00