monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6885 commits 9 branches 69 tags 319 MiB
Commit graph

6885 commits

This branch
This branch
All branches
Author SHA1 Message Date
Riccardo Spagni
b66c523046
Merge pull request #4596 
e3e1f836 tx_pool: store hex string instead of raw binary to tx_blob of get_transaction_pool RPC (stoffu)
 2018-10-15 13:56:18 +02:00
Riccardo Spagni
5f4e1fcc90
Merge pull request #4584 
26e0cecb Dockerfile: init and update submodules (Tyler Baker)
 2018-10-15 13:56:05 +02:00
Riccardo Spagni
5f1e62115c
Merge pull request #4590 
82037f23 build: use ARCH 'native' by default, allow to configure and override it (xiphon)
 2018-10-15 13:51:08 +02:00
Riccardo Spagni
6834ce6de2
Merge pull request #4574 
a04d68f6 SOFTWARE is the default wallet device (m2049r)
 2018-10-15 13:50:21 +02:00
Riccardo Spagni
8beb3cd2a1
Merge pull request #4569 
e25d21a7 simplewallet: mark default-ring-size setting as obsolete (moneromooo-monero)
 2018-10-15 13:49:58 +02:00
Riccardo Spagni
dc24639e64
Merge pull request #4579 
d7f3805d Revert "p2p: connect via the bound ip, if any" (moneromooo-monero)
 2018-10-15 13:49:32 +02:00
Riccardo Spagni
92f42b1e81
Merge pull request #4570 
3b04e2e3 daemon: do not run complex code in a signal handler (moneromooo-monero)
 2018-10-15 13:49:05 +02:00
Riccardo Spagni
29d7ef0fe0
Merge pull request #4568 
2509717b simplewallet: fix view key parsing in --generate-from-view-key (moneromooo-monero)
 2018-10-15 13:48:21 +02:00
Riccardo Spagni
a9504f7001
Merge pull request #4587 
067e232b password: fix secure input with echo on windows (moneromooo-monero)
 2018-10-15 13:47:54 +02:00
Riccardo Spagni
3c36a6a227
Merge pull request #4588 
b215ea9f password: fix backspace outputting ^? on linux on echoing secure input (moneromooo-monero)
 2018-10-15 13:47:27 +02:00
stoffu
e3e1f83694
tx_pool: store hex string instead of raw binary to tx_blob of get_transaction_pool RPC 
Inspired by https://github.com/masari-project/masari/issues/93
 2018-10-15 20:09:32 +09:00
xiphon
82037f2365 build: use ARCH 'native' by default, allow to configure and override it 2018-10-14 23:24:54 +03:00
Tyler Baker
26e0cecb95
Dockerfile: init and update submodules 
The Docker image is failing to build, as the submodules are not being
explicitly initialized and updated.

Fixes: https://github.com/monero-project/monero/issues/4582

Signed-off-by: Tyler Baker <tyler@foundries.io>
 2018-10-14 07:59:18 -07:00
moneromooo-monero
b215ea9f56
password: fix backspace outputting ^? on linux on echoing secure input 2018-10-14 10:39:40 +00:00
moneromooo-monero
067e232b19
password: fix secure input with echo on windows 
Thanks to iDunk for the testing back and forth
 2018-10-14 10:38:11 +00:00
moneromooo-monero
d7f3805d2e
Revert "p2p: connect via the bound ip, if any" 
This reverts commit 909398efc7.

It looks like it's causing trouble with tor on some setups
 2018-10-13 10:20:15 +00:00
m2049r
a04d68f698
SOFTWARE is the default wallet device 2018-10-12 23:15:02 +02:00
moneromooo-monero
3b04e2e3d4
daemon: do not run complex code in a signal handler 
instead, delegate the work to a one off thread
and notify it from the signal handler
 2018-10-12 19:17:55 +00:00
moneromooo-monero
e25d21a788
simplewallet: mark default-ring-size setting as obsolete 2018-10-12 13:01:00 +00:00
moneromooo-monero
2509717b11
simplewallet: fix view key parsing in --generate-from-view-key 2018-10-12 12:55:57 +00:00
Riccardo Spagni
77ef8c1839
Merge pull request #4544 
e0f4606a remove -release from the version string (Riccardo Spagni)
d7d6d238 update version for release (Riccardo Spagni)
 2018-10-09 23:04:07 +02:00
Riccardo Spagni
e0f4606a72
remove -release from the version string 2018-10-09 22:57:15 +02:00
Riccardo Spagni
d7d6d23867
update version for release 2018-10-09 22:37:21 +02:00
Riccardo Spagni
1b9e6861b7
Merge pull request #4540 
8833aec0 wallet2: fix cold signing using non padded bulletproofs (moneromooo-monero)
 2018-10-09 16:44:51 +02:00
Riccardo Spagni
cc33d3b2de
Merge pull request #4517 
02c2b43a Utils: Add Dockerfile for android 64-bit build (Gregory Lemercier)
 2018-10-09 16:44:10 +02:00
Riccardo Spagni
d8f95843c4
Merge pull request #4535 
c716a331 device: increase ledger timeout to 2 minutes (selsta)
 2018-10-09 16:44:05 +02:00
Riccardo Spagni
e16982617b
Merge pull request #4538 
bd7b800f device_io_hid: fix DEFAULT_* type (too short) and init time (moneromooo-monero)
 2018-10-09 16:44:01 +02:00
Riccardo Spagni
eca27122df
Merge pull request #4532 
8f22e808 device: destroy device objects on exit (moneromooo-monero)
 2018-10-09 16:43:55 +02:00
Riccardo Spagni
4b609dede3
Merge pull request #4530 
77471e23 blockchain_blackball: fix stray ! (moneromooo-monero)
 2018-10-08 22:07:34 +02:00
Riccardo Spagni
5209bbd0c5
Merge pull request #4529 
c95a1408 CMakeLists.txt: Fix typo (erciccione)
 2018-10-08 22:07:30 +02:00
Riccardo Spagni
161fd13768
Merge pull request #4527 
c5a97315 Remove last traces of libpcsc-lite (moneromooo-monero)
 2018-10-08 22:07:27 +02:00
Riccardo Spagni
49c11b2248
Merge pull request #4519 
17701864 Depends: build hidapi with -fPIC (iDunk5400)
 2018-10-08 22:07:23 +02:00
Riccardo Spagni
f5df0e272e
Revert "Merge pull request #4472" 
This reverts commit b26ab0b580.
 2018-10-08 21:42:38 +02:00
Riccardo Spagni
34da7d852b
Merge pull request #4514 
85e58cb2 blockchain_blackball: fix stats double counting (moneromooo-monero)
 2018-10-08 13:03:11 +02:00
Riccardo Spagni
84cc3b916e
Merge pull request #4036 
9acf42d3 Multisig M/N functionality core tests added (naughtyfox)
9f3963e8 Arbitrary M/N multisig schemes: * support in wallet2 * support in monero-wallet-cli * support in monero-wallet-rpc * support in wallet api * support in monero-gen-trusted-multisig * unit tests for multisig wallets creation (naughtyfox)
 2018-10-07 20:04:10 +02:00
Riccardo Spagni
24e519b9b6
Merge pull request #4510 
21a624af Consolidate HID depends makefiles into single recipe (TheCharlatan)
 2018-10-07 20:04:10 +02:00
Riccardo Spagni
3512eb5e68
Merge pull request #4511 
f9485a36 tests: update crypto tests data file after PRNG changes (moneromooo-monero)
 2018-10-07 20:04:10 +02:00
Riccardo Spagni
42545e9adc
Merge pull request #4509 
0656050f README: update MSYS2 dependencies for Ledger (Lafudoci)
 2018-10-07 20:04:10 +02:00
Riccardo Spagni
9d97ffb804
Merge pull request #4508 
3d722db4 wallet-cli: Update French translation (Guillaume LE VAILLANT)
 2018-10-07 20:04:09 +02:00
Riccardo Spagni
71b9dd96ca
Merge pull request #4506 
cbdd6b91 Linux: Fix building of static binaries with hw device support (iDunk5400)
 2018-10-07 20:04:09 +02:00
Riccardo Spagni
b63f1ea637
Merge pull request #4505 
977df631 Fix some calls to the translation function (Guillaume LE VAILLANT)
 2018-10-07 20:04:09 +02:00
Riccardo Spagni
5f83ec59ca
Merge pull request #4501 
fb3593c2 Add check if submodules need to be updated (TheCharlatan)
 2018-10-07 20:04:09 +02:00
Riccardo Spagni
b26ab0b580
Merge pull request #4472 
02d3ef7b blocks: use auto-generated .c files instead of 'LD -r -b binary' (xiphon)
 2018-10-06 11:15:43 +02:00
Riccardo Spagni
17ab6fdd5a
Merge pull request #4495 
34a85e0c wallet2: disable height based segregation (moneromooo-monero)
 2018-10-06 11:15:43 +02:00
Riccardo Spagni
a2cd4f2cc7
Merge pull request #4499 
c5928bde wallet2_api: fix build with C++14 (moneromooo-monero)
 2018-10-06 11:15:43 +02:00
Riccardo Spagni
9556ba0d66
Merge pull request #4390 
a0613532 secure_pwd_reader: Add proper Unicode handling [Ryo contribution] (fireice-uk)
579383c2 simplewallet: Add Unicode input_line [Ryo backport] (fireice-uk)
 2018-10-06 11:15:43 +02:00
Riccardo Spagni
b8cee6bf9e
Merge pull request #4492 
7f2ad1a7 functional_tests: fix linking on Windows (iDunk5400)
 2018-10-06 11:15:43 +02:00
Riccardo Spagni
5adbede27f
Merge pull request #4487 
7c790f11 Fix rtxn usage in BlockchainLMDB::get_estimated_batch_size (Howard Chu)
 2018-10-06 11:15:39 +02:00
Riccardo Spagni
735a33e8d8
Merge pull request #4485 
5ec929fb daemon: do not display uptime when not known (moneromooo-monero)
 2018-10-02 22:45:52 +02:00
Riccardo Spagni
e037534f44
Merge pull request #4490 
bccd88dd wallet2: clear found out for every tx key (doy-lee)
 2018-10-02 22:45:50 +02:00