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

3196 Commits

Author SHA1 Message Date
Randi Joseph 52db01ea6d Silence CMake policy warning on macos. 
See: https://cmake.org/cmake/help/v3.0/policy/CMP0042.html
 2016-12-23 02:54:34 -05:00
Riccardo Spagni dd580d7bc7
Merge pull request #1487 
37476265 add tx hash to time stats (luigi1111)
 2016-12-22 10:59:02 +02:00
luigi1111 374762654e
add tx hash to time stats 
Also miner tx hash to log level 1 (have you ever tried to find a testnet miner tx hash?)
 2016-12-21 19:20:49 -06:00
Riccardo Spagni a5d0af95b5
Merge pull request #1486 
522ab79e Fixed HTTP auth tests for gcc 4.9 (Lee Clagett)
 2016-12-21 21:51:46 +02:00
Riccardo Spagni 6f539159e8
Merge pull request #1484 
12abe86a core: fix recalculation of emission/fees (moneromooo-monero)
 2016-12-21 20:43:31 +02:00
Lee Clagett 522ab79e9c Fixed HTTP auth tests for gcc 4.9 2016-12-21 13:23:15 -05:00
moneromooo-monero 12abe86ac0
core: fix recalculation of emission/fees 
It was counting things many, many times
 2016-12-21 11:19:04 +00:00
Riccardo Spagni 049b7e9a93
Merge pull request #1483 
af9a7999 account for API difference between 1.58 & 1.59 (kenshi84)
 2016-12-21 10:35:13 +02:00
kenshi84 af9a799925 account for API difference between 1.58 & 1.59 2016-12-21 16:05:31 +09:00
Riccardo Spagni 4fe5c351cd
Merge pull request #1479 
c31e42e2 simplewallet: bump output file format version (moneromooo-monero)
 2016-12-20 23:01:39 +02:00
Riccardo Spagni 04bdce54b7
Merge pull request #1478 
1976eddd common: add missing #include <system_error> for std::error_code (moneromooo-monero)
 2016-12-20 23:01:12 +02:00
Riccardo Spagni 5a66365cdd
Merge pull request #1477 
d55e2266 Fixed uninitialized valgrind errors in serialization tests (Lee Clagett)
 2016-12-20 23:00:54 +02:00
moneromooo-monero c31e42e2bb
simplewallet: bump output file format version 
The serialization format changed, and while there is code
to load the older serialization format, an older monerod
will not be able to load a file saved by a new monerod,
even though both share the same version. This is not good,
and we prefer a version bump.
 2016-12-20 19:02:51 +00:00
moneromooo-monero 1976eddd89
common: add missing #include <system_error> for std::error_code 2016-12-20 18:53:58 +00:00
Lee Clagett d55e2266ca Fixed uninitialized valgrind errors in serialization tests 2016-12-20 12:51:27 -05:00
Riccardo Spagni c7f9d0d971
Merge pull request #1475 
81702b54 Fixes for google test < 1.8 (Lee Clagett)
 2016-12-20 17:48:25 +02:00
Riccardo Spagni 9777de1890
Merge pull request #1474 
fc40b3e7 Lower connection timeout in check_connection() (Jaquee)
 2016-12-20 17:47:58 +02:00
Riccardo Spagni e170cbe013
Merge pull request #1473 
e3639f5c Removed unused functions (Lee Clagett)
 2016-12-20 17:47:16 +02:00
Riccardo Spagni 6847999fb8
Merge pull request #1472 
2bddb8eb Refactored password prompting for wallets (Lee Clagett)
 2016-12-20 17:46:58 +02:00
Riccardo Spagni dca146f823
Merge pull request #1469 
9e4b3724 simplewallet: add pending/pool/failed in the show_transfers help (moneromooo-monero)
 2016-12-20 17:45:47 +02:00
Riccardo Spagni 233ba51ad9
Merge pull request #1468 
9a2cd722 wallet2_api: add an API to the OpenAlias resolver (moneromooo-monero)
 2016-12-20 17:45:13 +02:00
Riccardo Spagni f5176cb6e8
Merge pull request #1467 
55fa0479 rpc: new function and RPC to get alternative chain info (moneromooo-monero)
 2016-12-20 17:44:47 +02:00
Riccardo Spagni 1551ce98f2
Merge pull request #1466 
c367d7df README: add note about the donate command (anonimal)
b9a28677 simplewallet: add return type for donate function (anonimal)
d36669fd simplewallet: hardcode Monero's donation address (anonimal)
 2016-12-20 17:43:38 +02:00
Riccardo Spagni b9b9028e50
Merge pull request #1462 
07b9138c support importing unportable outputs (kenshi84)
2ac80075 also use portable serializer for boost_serialization_helper.h and net_node.inl, completely adandon boost/archive/binary_oarchive.hpp (kenshi84)
d1d6e27a moved boost cpp into hpp since they're supposed to be header only (kenshi84)
66e6af89 added experimental boost::archive::portable_binary_{i|o}archive (kenshi84)
 2016-12-20 17:40:11 +02:00
kenshi84 07b9138cad support importing unportable outputs 2016-12-20 13:26:39 +09:00
kenshi84 2ac8007544 also use portable serializer for boost_serialization_helper.h and net_node.inl, completely adandon boost/archive/binary_oarchive.hpp 2016-12-20 13:04:19 +09:00
kenshi84 d1d6e27ab6 moved boost cpp into hpp since they're supposed to be header only 2016-12-20 12:27:23 +09:00
Lee Clagett 81702b5451 Fixes for google test < 1.8 2016-12-19 20:48:11 -05:00
Lee Clagett 2bddb8ebee Refactored password prompting for wallets 2016-12-19 20:00:43 -05:00
Jaquee fc40b3e732
Lower connection timeout in check_connection() 2016-12-19 21:19:02 +01:00
Riccardo Spagni 5fcf7c1c18
Merge pull request #1464 
427054c3 Enabled HTTP auth support for monero-wallet-rpc (Lee Clagett)
 2016-12-19 22:16:22 +02:00
Lee Clagett e3639f5cc3 Removed unused functions 2016-12-19 14:47:26 -05:00
moneromooo-monero 9e4b3724c7
simplewallet: add pending/pool/failed in the show_transfers help 
reported by nioc
 2016-12-17 19:51:09 +00:00
moneromooo-monero 9a2cd72257
wallet2_api: add an API to the OpenAlias resolver 2016-12-17 13:05:17 +00:00
moneromooo-monero 55fa0479a0
rpc: new function and RPC to get alternative chain info 2016-12-17 11:28:49 +00:00
Lee Clagett 427054c3d5 Enabled HTTP auth support for monero-wallet-rpc 2016-12-16 23:59:46 -05:00
anonimal c367d7df31
README: add note about the donate command 
References #1447
 2016-12-17 03:49:52 +00:00
anonimal b9a28677e2
simplewallet: add return type for donate function 
Resolves -Wreturn-type

References #1447 #1451
 2016-12-17 03:37:20 +00:00
anonimal d36669fd75
simplewallet: hardcode Monero's donation address 
Closes #1447
References #1451
 2016-12-17 02:52:09 +00:00
kenshi84 66e6af89ce added experimental boost::archive::portable_binary_{i|o}archive 2016-12-16 23:46:24 +09:00
Riccardo Spagni 29735c8f8f
Merge pull request #1459 
b00da61e Preliminary support for DragonFly BSD (Antonio Huete Jimenez)
 2016-12-15 14:36:35 +02:00
Riccardo Spagni 527aa3e604
Merge pull request #1458 
f7e551d0 Dockerfile : use libssl1.0 (MoroccanMalinois)
 2016-12-15 14:36:11 +02:00
Riccardo Spagni 73e50749e2
Merge pull request #1455 
4bb0bff2 AddressBook: use unsigned type for row ID's (anonimal)
 2016-12-15 14:35:47 +02:00
Riccardo Spagni c6f26ecae2
Merge pull request #1449 
374b58d1 fix MGs json (moneroexamples)
 2016-12-15 14:29:40 +02:00
Riccardo Spagni 1e8920c225
Merge pull request #1454 
515a2d9f Update info on libzlma and BerkeleyDB in README.md (NanoAkron)
 2016-12-15 14:29:18 +02:00
Riccardo Spagni 18c36561f6
Merge pull request #1453 
1a2284de Spelling error (Bitcoin Error Log)
 2016-12-15 14:28:40 +02:00
Riccardo Spagni 00898fe750
Merge pull request #1452 
944b6079 Wallet API: Do not refresh while daemon is syncing + fixed fast refresh when creating wallet offline + improved close wallet logic (make sure refresh thread is stopped) (Jaquee)
 2016-12-15 14:28:15 +02:00
Riccardo Spagni 5f5cfdfa77
Merge pull request #1451 
2506d51d wallet cli: donate command (Kenshi Takayama)
 2016-12-15 14:27:02 +02:00
Riccardo Spagni aa47ea41a7
Merge pull request #1444 
bdc3d749 Adding HTTP Digest Auth (but not yet enabled) (Lee Clagett)
 2016-12-15 14:25:49 +02:00
Jaquee 944b6079d9
Wallet API: Do not refresh while daemon is syncing 
+ fixed fast refresh when creating wallet offline
+ improved close wallet logic (make sure refresh thread is stopped)
 2016-12-15 12:31:09 +01:00