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
7016 commits 9 branches 69 tags 319 MiB
Commit graph

7016 commits

This branch
This branch
All branches
Author SHA1 Message Date
moneromooo-monero
5776829080
tests: fix cnv4-jit-test link on mac 2019-03-06 15:30:27 +00:00
Riccardo Spagni
48f721748a
Merge pull request #5215 
fcb524be wallet2: fix incorrect patch for determining fork rules (moneromooo-monero)
 2019-03-04 17:18:35 +02:00
Riccardo Spagni
15e0b28348
Merge pull request #5225 
8f0318d7 hardfork: fix fork determination for historical heights (moneromooo)
 2019-03-04 13:36:45 +02:00
moneromooo
8f0318d790
hardfork: fix fork determination for historical heights 2019-03-04 11:19:47 +00:00
Riccardo Spagni
43d03c1050
Merge pull request #5223 
cc618f2f blockchain: fix off by one brought by the regtest mode fix (moneromooo-monero)
 2019-03-04 11:39:16 +02:00
moneromooo-monero
cc618f2fe4
blockchain: fix off by one brought by the regtest mode fix 2019-03-04 09:31:06 +00:00
Riccardo Spagni
5941a47819
Merge pull request #5218 
84c76cbf update version to 0.14.0.1 (Riccardo Spagni)
 2019-03-03 22:45:10 +02:00
Riccardo Spagni
84c76cbfcd
update version to 0.14.0.1 2019-03-03 21:50:29 +02:00
Riccardo Spagni
587a295389
Merge pull request #5216 
b2b71d3a wallet2: fix mishandling rct outputs in coinbase tx (moneromooo-monero)
 2019-03-03 21:44:15 +02:00
moneromooo-monero
b2b71d3ad2
wallet2: fix mishandling rct outputs in coinbase tx 
Reported by cutcoin
 2019-03-03 18:54:59 +00:00
Riccardo Spagni
b8af6ee471
Merge pull request #5210 
997830f3 disable asm w/ x64 instructions set on i386 (naughtyfox)
 2019-03-03 18:34:48 +02:00
Riccardo Spagni
5aac057dc6
Merge pull request #5205 
49896e5c blockchain: fix long term block weight for regtest mode (moneromooo-monero)
 2019-03-03 18:34:08 +02:00
moneromooo-monero
fcb524bea6
wallet2: fix incorrect patch for determining fork rules 
Half of the patch was correct, but half was introducing another bug,
where a wallet asking for a fork that the daemon does not know about
yet would decide to use those rules.
 2019-03-03 12:38:45 +00:00
naughtyfox
997830f31b disable asm w/ x64 instructions set on i386 2019-02-28 14:28:24 +03:00
moneromooo-monero
49896e5c63
blockchain: fix long term block weight for regtest mode 2019-02-27 19:49:11 +00:00
Riccardo Spagni
7c863a9fa5
Merge pull request #5184 
0ec360b4 CryptonightR: define out i386/x86_64 specific code on other archs (moneromooo-monero)
773509dd slow-hash: fix build on arm (moneromooo-monero)
0cb6a763 cmake: ARCH_ID fixes for cross compilation (TheCharlatan)
 2019-02-27 14:44:59 +02:00
Riccardo Spagni
685259082a
Merge pull request #5194 
348320a3 wallet api/device: set estimated restore height if none is provided (selsta)
3c1c2499 wallet api: don't truncate address in subaddress_account (selsta)
 2019-02-27 14:36:23 +02:00
Riccardo Spagni
2e5ac23e2a
Merge pull request #5193 
3dfef479 core: fix adding new pre-hoh block when a tx is already in the pool (moneromooo-monero)
 2019-02-27 14:32:41 +02:00
moneromooo-monero
0ec360b41d
CryptonightR: define out i386/x86_64 specific code on other archs 2019-02-26 18:30:58 +00:00
selsta
348320a3d4 wallet api/device: set estimated restore height if none is provided 2019-02-24 20:13:24 +01:00
selsta
3c1c249922 wallet api: don't truncate address in subaddress_account 
Same behaviour as subaddress.cpp now.
 2019-02-24 20:12:19 +01:00
moneromooo-monero
3dfef479d8
core: fix adding new pre-hoh block when a tx is already in the pool 2019-02-24 15:58:30 +00:00
moneromooo-monero
773509ddd8
slow-hash: fix build on arm 2019-02-22 15:51:07 +00:00
TheCharlatan
0cb6a763c1
cmake: ARCH_ID fixes for cross compilation 2019-02-22 15:51:04 +00:00
Riccardo Spagni
f96e431a15
Merge pull request #5170 
8bf9243b update readme wording to more accurately reflect PoW (Riccardo Spagni)
dd0e1d22 bump version, update readme to reflect, update checkpoints (Riccardo Spagni)
392f0858 update quick sync checkpoints and hash (Riccardo Spagni)
 2019-02-20 23:29:15 +02:00
Riccardo Spagni
8bf9243b05
update readme wording to more accurately reflect PoW 2019-02-20 23:15:06 +02:00
Riccardo Spagni
dd0e1d22fa
bump version, update readme to reflect, update checkpoints 2019-02-20 18:30:13 +02:00
Riccardo Spagni
392f0858c6
update quick sync checkpoints and hash 2019-02-20 18:17:07 +02:00
Riccardo Spagni
f8aa6ff46c
Merge pull request #5169 
3233fdea wallet: fix payment ID decryption for construction data (Dusan Klinec)
 2019-02-20 16:20:47 +02:00
Dusan Klinec
3233fdea02
wallet: fix payment ID decryption for construction data 2019-02-20 11:47:34 +01:00
Riccardo Spagni
d7e3262f8a
Merge pull request #5163 
395eb921 blockchain: remove buggy long term block weight cache (moneromooo-monero)
 2019-02-19 21:53:20 +02:00
moneromooo-monero
395eb9217a
blockchain: remove buggy long term block weight cache 
It seems to be buggy on reorgs, and prevents the use of
a blockchain with two nodes.
We'll speed this up again if/when the need arises.
 2019-02-19 15:21:57 +00:00
Riccardo Spagni
7fcfacc17c
Merge pull request #5161 
0c0f6034 blockchain: fix block template creation race (moneromooo-monero)
 2019-02-18 22:56:23 +02:00
moneromooo-monero
0c0f6034c0
blockchain: fix block template creation race 
If two create_block_template are called at nearly the same time,
and a block is added at nearly the same time, this could happen:

- the blockchain top block is B0
- thread 1 enters create_block_template, takes blockchain lock
- thread 1 creates a fresh block referencing prev block B0
- thread 1 releases blockchain lock
- thread 0 adds a new block
- thread 0 enters create_block_template
- thread 0 updates block template
- thread 1 takes txpool lock and continues creating block template
- thread 1 overwrites block template with previous data
 2019-02-18 15:43:08 +00:00
Riccardo Spagni
e81829bb52
Merge pull request #5159 
1d628550 blockchain: fix long term weight addition on pop/init (moneromooo-monero)
 2019-02-18 17:08:09 +02:00
Riccardo Spagni
35616a71da
Merge pull request #5158 
993a1994 tests: add a CNv4 JIT test (moneromooo-monero)
736f2579 crypto: plug CNv4 JIT into cn_slow_hash (moneromooo-monero)
2e9b988a crypto: clear cache after generating random program (moneromooo-monero)
683c3d13 performance_tests: add tests for new Cryptonight variants (moneromooo-monero)
 2019-02-18 17:07:50 +02:00
Riccardo Spagni
09bbfa805d
Merge pull request #5157 
3b7967c6 rpc: fix wrongly formatted JSON for pruned tx (stoffu)
 2019-02-18 17:07:25 +02:00
moneromooo-monero
993a1994fa
tests: add a CNv4 JIT test 2019-02-18 13:14:15 +00:00
moneromooo-monero
1d62855044
blockchain: fix long term weight addition on pop/init 2019-02-18 12:46:32 +00:00
moneromooo-monero
736f25795c
crypto: plug CNv4 JIT into cn_slow_hash 
Enabled by setting the MONERO_USE_CNV4_JIT env var to 1
 2019-02-18 10:37:06 +00:00
moneromooo-monero
2e9b988adf
crypto: clear cache after generating random program 2019-02-18 10:37:02 +00:00
moneromooo-monero
683c3d134d
performance_tests: add tests for new Cryptonight variants 2019-02-18 10:36:59 +00:00
Riccardo Spagni
a8e752d383
Merge pull request #5155 
2c0fc8b4 db_lmdb: fix missing mdb_dbi_close in migration (moneromooo-monero)
 2019-02-18 11:15:05 +02:00
Riccardo Spagni
1a0fa56189
Merge pull request #5153 
32ebc95d CMakeLists.txt: detect and use -pthread compiler flag (moneromooo-monero)
be2d061b miner: fix build with boost 1.69 (moneromooo-monero)
1de62cb1 mlocker: fix access to global lock map after dtor on exit (moneromooo-monero)
5544bb83 mlocker: fix dtor ordering problem (moneromooo-monero)
 2019-02-18 11:14:50 +02:00
Riccardo Spagni
fe1ccd8d13
Merge pull request #5151 
4b32859d CNv4 JIT compiler for x86-64 and tests (SChernykh)
 2019-02-18 11:14:26 +02:00
stoffu
3b7967c660
rpc: fix wrongly formatted JSON for pruned tx 
Fix for #4399.
Also unifies code for serializing pruned tx to binary/json into one.

(Cherry-picked from #4586)
 2019-02-18 15:24:00 +09:00
SChernykh
4b32859d2f CNv4 JIT compiler for x86-64 and tests 
Minimalistic JIT code generator for random math sequence in CryptonightR.

Usage:
- Allocate writable and executable memory
- Call v4_generate_JIT_code with "buf" pointed to memory allocated on the previous step
- Call the generated code instead of "v4_random_math(code, r)", omit the "code" parameter
 2019-02-17 23:56:23 +01:00
moneromooo-monero
2c0fc8b466
db_lmdb: fix missing mdb_dbi_close in migration 
Fixed by hyc
 2019-02-17 22:15:29 +00:00
moneromooo-monero
32ebc95df7
CMakeLists.txt: detect and use -pthread compiler flag 
The cmake thread detection just ain't enough to always work
 2019-02-17 10:54:43 +00:00
moneromooo-monero
be2d061b94
miner: fix build with boost 1.69 2019-02-17 10:52:54 +00:00