4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-15 21:06:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,253 Commits 9 Branches 69 Tags 249 MiB
8bed9a42f7
Commit Graph

2253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riccardo Spagni
b66d455536
Merge pull request #716 
789e275 rpc: do not return bans if they're effectively spent (moneromooo-monero)
474e4c0 p2p: lock access to the blocked ips map (moneromooo-monero)
 2016-03-12 16:21:20 +02:00
Riccardo Spagni
bb7b31d5ed
Merge pull request #715 
8bc1bd6 wallet: use minimum mixin when RPC asks for too low mixin (moneromooo-monero)
31d2e0f wallet_rpc_server: make use_fork_rules public (moneromooo-monero)
 2016-03-12 16:14:07 +02:00
moneromooo-monero
28bfc903b9
simplewallet: special ^C handling for windows 
Because obviously it doesn't work as other POSIX platforms.

Reported and tested by luigi1111.
 2016-03-12 14:05:25 +00:00
moneromooo-monero
789e2755f7
rpc: do not return bans if they're effectively spent 
The blocked ip list will still hold them till next time
a connection attempt is made with that IP, so the effective
length of the ban may be negative.
 2016-03-12 13:49:08 +00:00
moneromooo-monero
474e4c00f0
p2p: lock access to the blocked ips map 2016-03-12 13:48:58 +00:00
moneromooo-monero
8bc1bd6b65
wallet: use minimum mixin when RPC asks for too low mixin 
After the fork, normal transfer functions called via RPC
use the minimum mixin 2 if 0 or 1 is requested. While the
incoming transaction may be valid (eg, it has an unmixable
and at most a mixable input), it is a simple way to make
sure RPC users can't get a seemingly random accept/reject
behavior if they don't update their requested mixin.
 2016-03-11 21:32:16 +00:00
moneromooo-monero
31d2e0f84d
wallet_rpc_server: make use_fork_rules public 
We will need it in the wallet RPC server
 2016-03-11 21:31:50 +00:00
Riccardo Spagni
9a04793067
Merge pull request #714 
4917af2 update donation addresses (Riccardo Spagni)
 2016-03-11 22:57:58 +02:00
Riccardo Spagni
4917af265f
update donation addresses 2016-03-11 22:56:53 +02:00
Riccardo Spagni
bc95ef268b
Merge pull request #713 
5b568b0 minor tweaks, add readme for crypto_ops_builder (Riccardo Spagni)
0a4dd68 minor tweaks, add readme for crypto_ops_builder (Riccardo Spagni)
 2016-03-11 22:51:35 +02:00
Riccardo Spagni
e91fffc232 Merge branch 'master' of https://github.com/fluffypony/bitmonero 2016-03-11 22:49:02 +02:00
Riccardo Spagni
0a4dd68c17 minor tweaks, add readme for crypto_ops_builder 2016-03-11 22:48:46 +02:00
Riccardo Spagni
5b568b0c44
minor tweaks, add readme for crypto_ops_builder 2016-03-11 22:46:52 +02:00
Riccardo Spagni
dfd0e9c97d
Merge pull request #712 
66c2fc7 Need to link boost::chrono in more places now (Howard Chu)
b937a2c Use boost::thread instead of std::thread (Howard Chu)
 2016-03-11 20:15:10 +02:00
Riccardo Spagni
c276483dbb
Merge pull request #711 
52056dc WIN32 thread_id is OS-dependent not compiler-dependent (Howard Chu)
87d39f3 WIN32: Need getpid() declaration (Howard Chu)
 2016-03-11 20:13:40 +02:00
Riccardo Spagni
edfef34678
Merge pull request #710 
8941ce0 More for bdec7cb (Howard Chu)
 2016-03-11 20:13:11 +02:00
Howard Chu
66c2fc7b70 Need to link boost::chrono in more places now 2016-03-11 16:17:08 +00:00
Howard Chu
52056dcfc4 WIN32 thread_id is OS-dependent not compiler-dependent 2016-03-11 15:46:09 +00:00
Howard Chu
b937a2c915 Use boost::thread instead of std::thread 
and all other associated IPC
 2016-03-11 15:09:50 +00:00
Howard Chu
87d39f39b3 WIN32: Need getpid() declaration 2016-03-11 13:32:50 +00:00
Howard Chu
8941ce0398 More for bdec7cb 
More uses of db error helper
 2016-03-09 18:24:16 +00:00
Riccardo Spagni
b96147030c
Merge pull request #705 
f7ed167 blockchain_utilities: Update documentation (warptangent)
 2016-03-05 23:14:06 +02:00
Riccardo Spagni
d0f011d873
Merge pull request #704 
e2b7e55 get_payments short ID (luigi1111)
 2016-03-05 23:13:23 +02:00
Riccardo Spagni
38fed83b65
Merge pull request #703 
dfca2ae unit_tests: fix hard fork unit test compilation (warptangent)
 2016-03-05 23:12:32 +02:00
Riccardo Spagni
93605eb05f
Merge pull request #702 
0485d17 blockchain_export: Support BerkeleyDB (warptangent)
41487e3 blockchain_export: Move DB implementation includes (warptangent)
 2016-03-05 23:12:05 +02:00
warptangent
f7ed167fc0
blockchain_utilities: Update documentation 2016-03-05 13:11:44 -08:00
Riccardo Spagni
32dc08d19a
Merge pull request #700 
bdec7cb BlockchainLMDB: Use DB error helper consistently (warptangent)
c5932eb BlockchainLMDB: Add DB error to exception (warptangent)
a49c355 Blockchain: Omit verbose time stats messages by default (warptangent)
 2016-03-05 23:10:38 +02:00
Riccardo Spagni
c3af15702f
Merge pull request #698 
ee7a8b8 Get rid of lmdb_cur (Howard Chu)
 2016-03-05 23:06:26 +02:00
Riccardo Spagni
14c1e214ad
Merge pull request #696 
d57ec75 Fix language (Howard Chu)
 2016-03-05 23:06:04 +02:00
Riccardo Spagni
80aa57a6cd
Merge pull request #695 
f5affbe More for df239428c0 (Howard Chu)
 2016-03-05 23:05:29 +02:00
luigi1111
e2b7e55be6 get_payments short ID 
Add support for short/integrated/encrypted IDs to get_payments RPC
 2016-03-05 13:30:48 -06:00
warptangent
dfca2ae1b5
unit_tests: fix hard fork unit test compilation 
Match changed BlockchainDB function declaration.
 2016-03-05 10:01:10 -08:00
warptangent
0485d17274
blockchain_export: Support BerkeleyDB 
TEST:

blockchain_export -h

This should show "berkeley" as an available option to --database.

With an existing BerkeleyDB database, run:

blockchain_export --database berkeley
 2016-03-05 06:46:11 -08:00
warptangent
41487e32be
blockchain_export: Move DB implementation includes 2016-03-05 06:46:09 -08:00
warptangent
bdec7cbfb3
BlockchainLMDB: Use DB error helper consistently 2016-03-03 21:27:13 -08:00
warptangent
c5932eb5ea BlockchainLMDB: Add DB error to exception 2016-03-03 20:15:37 -08:00
warptangent
a49c355cae
Blockchain: Omit verbose time stats messages by default 
This is already the default for the daemon, but by checking a command
line argument and calling a Blockchain member function setter.

Initialize the variable to false so it's not dependent on an external
command-line argument check. This allows utilities like
blockchain_import to have a reasonable default without code changes.
 2016-03-03 20:14:48 -08:00
Howard Chu
ee7a8b87f9 Get rid of lmdb_cur 
We don't need it now with per-txn cursors.
 2016-03-03 19:06:27 +00:00
Howard Chu
d57ec7595c Fix language 2016-03-03 00:34:19 +00:00
Howard Chu
f5affbef26 More for df239428c0 
Let ARMv7 work again
 2016-03-03 00:13:13 +00:00
Riccardo Spagni
a7310031f4
Merge pull request #693 
2c823c1 Make partial revert consistent (warptangent)
 2016-03-01 07:40:00 -05:00
warptangent
2c823c1589
Make partial revert consistent 
If user-defined comparator is used, subdb shouldn't be opened with
MDB_INTEGERKEY.

TODO: Again, this will be added back with future schema updates.
 2016-03-01 02:47:16 -08:00
Riccardo Spagni
e0493e8429
Merge pull request #692 
df23942 Revert part of 7db89ed2ee (warptangent)
c9c4060 BlockchainLMDB: Add height and db error to exception (warptangent)
 2016-02-29 21:09:51 -05:00
warptangent
df239428c0
Revert part of 7db89ed2ee 
For now, so existing databases work.

TODO: add these back with future schema updates.
 2016-02-29 18:03:41 -08:00
warptangent
c9c4060dc6
BlockchainLMDB: Add height and db error to exception 2016-02-29 17:52:54 -08:00
Riccardo Spagni
95b3b09e11
Merge pull request #689 
5ab33ca unit_tests: update test openalias address (moneromooo-monero)
 2016-02-29 17:31:07 -05:00
Riccardo Spagni
bf09285443
Merge pull request #688 
c2a1fee simplewallet: prompt for private keys when generating wallets (moneromooo-monero)
4513b4c simplewallet: add a new --restore-from-keys option (moneromooo-monero)
 2016-02-29 17:30:29 -05:00
Riccardo Spagni
c3c4e28061
Merge pull request #687 
5e3557d move g_test_dbg_lock_sleep from a global to a function level static (moneromooo-monero)
 2016-02-29 17:30:10 -05:00
Riccardo Spagni
d60bf4ee36
Merge pull request #686 
7db89ed ARMv7: fix unaligned accesses (Howard Chu)
5a07cef Wrap some more actions in a larger read txn (Howard Chu)
8cc7a36 read txn/cursor stuff (Howard Chu)
86a7f2b core: check whether an update is needed straight away (moneromooo-monero)
ea5fa5e core: print "update needed" hard fork notifications in red (moneromooo-monero)
 2016-02-29 17:29:26 -05:00
Riccardo Spagni
838f7aba7d
Merge pull request #684 
283894d dns_utils: const compatibility with older libunbound (moneromooo-monero)
 2016-02-29 17:28:48 -05:00