Commit graph

2702 commits

Author SHA1 Message Date
Riccardo Spagni
f00c2dc1ec Merge branch 'NanoAkron-armv8-march-crypto' 2016-09-18 20:24:32 +02:00
Riccardo Spagni
da6f7d99f8
fix conflict 2016-09-18 20:22:43 +02:00
Riccardo Spagni
952030831b
Merge pull request #1100
d0fa9e7 gpg_keys: update my keys' expiration dates (moneromooo-monero)
2016-09-18 20:20:39 +02:00
moneromooo-monero
d0fa9e74fb
gpg_keys: update my keys' expiration dates 2016-09-18 19:17:47 +01:00
Riccardo Spagni
c2faab5e1a
fix v5 height 2016-09-18 20:13:47 +02:00
Riccardo Spagni
70bd7d8871
remove dead backup seed nodes, add new ones 2016-09-18 20:10:46 +02:00
Riccardo Spagni
cebbcf0f64
fix v5 fork date description 2016-09-18 19:35:36 +02:00
Riccardo Spagni
eb60fa2cff
update version 2016-09-18 19:20:29 +02:00
Riccardo Spagni
c41098aacf
updated fork heights for v4 and v5 2016-09-18 19:18:16 +02:00
Riccardo Spagni
c69b8a188b
update block headers 2016-09-18 19:05:47 +02:00
Riccardo Spagni
f148af235a
add checkpoints 2016-09-18 18:40:43 +02:00
Riccardo Spagni
6b744c349f
Merge pull request #1098
1dd5b0b wallet: keep change dest separate from other dests (moneromooo-monero)
2016-09-18 17:42:32 +02:00
Riccardo Spagni
a6914c140c
Merge pull request #1097
5f5d727 wallet: fix empty tx in corner case sending nothing (moneromooo-monero)
2016-09-18 17:42:10 +02:00
Riccardo Spagni
85220103e8
Merge pull request #1096
c2491b9 README: make TORSOCKS_ALLOW_INBOUND optional (moneromooo-monero)
2016-09-18 17:41:47 +02:00
Riccardo Spagni
0a0e801f49 Merge branch 'master' of https://github.com/fluffypony/monero 2016-09-18 17:37:56 +02:00
Riccardo Spagni
8a274eab3f switch wallet API from std thread/mutex to boost 2016-09-18 17:37:47 +02:00
Riccardo Spagni
c15da0e708
switch wallet API from std thread/mutex to boost 2016-09-18 17:36:40 +02:00
moneromooo-monero
1dd5b0b7df
wallet: keep change dest separate from other dests
This fixes misreporting of amount/fee in rct txes, as the rct
tx construction code was lumping all dests (whether change or
not) in the same dests vector, while the pre-rct code was
keeping it separate.
2016-09-18 12:04:23 +01:00
Riccardo Spagni
c45595a02e
Merge pull request #1095
f06882f README: mention --max-concurrency 1 for Mac (moneromooo-monero)
2016-09-18 11:45:35 +02:00
moneromooo-monero
5f5d7279b6
wallet: fix empty tx in corner case sending nothing 2016-09-18 10:44:32 +01:00
Riccardo Spagni
4a03a8a1da
Merge pull request #1094
06bb692 cmake: support BUILD_SHARED_LIBS built-in option (redfish)
e1c7af3 cmake: transitive deps and remove deprecated LINK_* (redfish)
54010b9 crypto: armv7: slow-hash: remove redundant source include (redfish)
2016-09-18 11:44:08 +02:00
Riccardo Spagni
14f88f6b98
Merge pull request #1093
e86c5b9 miner: do not try to save config if the path isn't set (moneromooo-monero)
2016-09-18 11:40:52 +02:00
Riccardo Spagni
788b23d13c
Merge pull request #1092
98b8043 readme: deps: fix libunwind Debian/Ubuntu package name (redfish)
2016-09-18 11:40:08 +02:00
Riccardo Spagni
35cdbe2eb2
Merge pull request #1089
368485d simplewallet: do not expose the details of tx splitting to the user (moneromooo-monero)
2016-09-18 11:36:30 +02:00
Riccardo Spagni
1db3be3e90
Merge pull request #1086
c791040 cmake: quotes around ARCH_ID string (redfish)
2016-09-18 11:36:05 +02:00
moneromooo-monero
c2491b91c0
README: make TORSOCKS_ALLOW_INBOUND optional 2016-09-18 10:34:45 +01:00
Riccardo Spagni
2c57885225
Merge pull request #1085
9250863 simplewallet: fix wrong amount in show_transfers for pending transactions (moneromooo-monero)
2016-09-18 11:32:59 +02:00
moneromooo-monero
f06882f1bc
README: mention --max-concurrency 1 for Mac 2016-09-18 10:23:02 +01:00
moneromooo-monero
e86c5b9b53
miner: do not try to save config if the path isn't set
This saves on an exception dump when trying to write to /
after finding a block.
2016-09-18 09:57:42 +01:00
redfish
06bb6923c3 cmake: support BUILD_SHARED_LIBS built-in option
Support building internal libraries as shared. This reduces
development time by eliminating the need to re-link all
binaries every time non-interface code in the library changes.
Instead, can hack on libxyz, then `make libxyz`, and re-run
monerod.

By default BUILD_SHARED_LIBS is OFF in release build type,
and ON in debug build type, but can be overriden with -D.
2016-09-18 02:56:26 -04:00
redfish
e1c7af35d4 cmake: transitive deps and remove deprecated LINK_*
Keep the immediate direct deps at the library that depends on them,
declare deps as PUBLIC so that targets that link against that library
get the library's deps as transitive deps.

Break dep cycle between blockchain_db <-> crytonote_core.
No code refactoring, just hide cycle from cmake so that
it doesn't complain (cycles are allowed only between
static libs, not shared libs).

This is in preparation for supproting BUILD_SHARED_LIBS cmake
built-in option for building internal libs as shared.
2016-09-18 02:56:26 -04:00
redfish
54010b97b4 crypto: armv7: slow-hash: remove redundant source include
aesb.c is already present in libcrypto as a standalone object.
Tested: builds and runs fine on armv7, static and dynamic.
2016-09-18 02:56:26 -04:00
redfish
98b8043f4c readme: deps: fix libunwind Debian/Ubuntu package name 2016-09-18 02:50:09 -04:00
NanoAkron
7f00a4abf4 +crypto for ARMv8 now tests and modifies ${ARCH$ 2016-09-18 03:26:18 +01:00
NanoAkron
fd82635396 Updated +crypto option for ARMv8 to modify ${ARCH} instead 2016-09-18 03:23:15 +01:00
moneromooo-monero
368485d518
simplewallet: do not expose the details of tx splitting to the user
They're confusing, as people think it reports their balance.
2016-09-17 22:23:03 +01:00
NanoAkron
d76aec6121 Add +crypto flag for ARMv8-a 2016-09-17 22:13:39 +01:00
redfish
c79104086c cmake: quotes around ARCH_ID string
It's only blank only if somebody running cmake in MSYS/MinGW (Windows)
manually forgets to add -D ARCH, but when it is blank, without quotes
those lines are invalid cmake syntax.
2016-09-17 15:36:15 -04:00
moneromooo-monero
925086346a
simplewallet: fix wrong amount in show_transfers for pending transactions
Change was not taken into consideration
2016-09-17 17:18:24 +01:00
Riccardo Spagni
77224bbf48
Merge pull request #1084
5850122 remove errant target_link_libraries (Riccardo Spagni)
58abc09 don't build any miniupnpc executables (Riccardo Spagni)
114e368 don't build miniupnpc test executables (Riccardo Spagni)
bb69371 updated miniupnp (Riccardo Spagni)
f62ebc5 update rapidjson (Riccardo Spagni)
2016-09-17 17:39:06 +02:00
Riccardo Spagni
198de8e3ec
Merge pull request #1083
297e583 README: mention rlwrap pitfall when inputting seed and private keys (moneromooo-monero)
2016-09-17 17:01:18 +02:00
moneromooo-monero
297e5836ca
README: mention rlwrap pitfall when inputting seed and private keys 2016-09-17 15:55:27 +01:00
Riccardo Spagni
58501229e3
remove errant target_link_libraries 2016-09-17 10:47:50 +02:00
Riccardo Spagni
58abc096f4
don't build any miniupnpc executables 2016-09-17 10:42:35 +02:00
Riccardo Spagni
114e36888b
don't build miniupnpc test executables 2016-09-17 10:37:48 +02:00
Riccardo Spagni
bb69371f66
updated miniupnp 2016-09-17 10:11:02 +02:00
Riccardo Spagni
f62ebc5c81
update rapidjson 2016-09-17 09:35:49 +02:00
Riccardo Spagni
2846d0850d
Merge pull request #1081
aa9a645 cmake: remove redundant checks around CMAKE_{AR,RANLIB} (redfish)
2016-09-17 07:49:03 +02:00
Riccardo Spagni
a1e6fb8243
Merge pull request #1080
423776f daemon: log version when starting (moneromooo-monero)
2016-09-17 07:48:46 +02:00
Riccardo Spagni
0edcbf6716
Merge pull request #1079
9c7b0cb wallet: change priority/fee to ArticMine's recommendation (moneromooo-monero)
2016-09-17 07:48:22 +02:00