summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5218v0.14.0.1Riccardo Spagni2019-03-032-5/+5
|\ | | | | | | 84c76cbf update version to 0.14.0.1 (Riccardo Spagni)
| * update version to 0.14.0.1Riccardo Spagni2019-03-032-5/+5
|/
* Merge pull request #5216Riccardo Spagni2019-03-032-7/+13
|\ | | | | | | b2b71d3a wallet2: fix mishandling rct outputs in coinbase tx (moneromooo-monero)
| * wallet2: fix mishandling rct outputs in coinbase txmoneromooo-monero2019-03-032-7/+13
| | | | | | | | Reported by cutcoin
* | Merge pull request #5210Riccardo Spagni2019-03-033-5/+5
|\ \ | | | | | | | | | 997830f3 disable asm w/ x64 instructions set on i386 (naughtyfox)
| * | disable asm w/ x64 instructions set on i386naughtyfox2019-02-283-5/+5
| | |
* | | Merge pull request #5205Riccardo Spagni2019-03-031-7/+15
|\ \ \ | |/ / |/| | | | | 49896e5c blockchain: fix long term block weight for regtest mode (moneromooo-monero)
| * | blockchain: fix long term block weight for regtest modemoneromooo-monero2019-02-271-7/+15
| |/
* | Merge pull request #5184Riccardo Spagni2019-02-277-27/+60
|\ \ | | | | | | | | | | | | | | | 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)
| * | CryptonightR: define out i386/x86_64 specific code on other archsmoneromooo-monero2019-02-262-0/+8
| | |
| * | slow-hash: fix build on armmoneromooo-monero2019-02-224-27/+42
| | |
| * | cmake: ARCH_ID fixes for cross compilationTheCharlatan2019-02-222-0/+10
| |/
* | Merge pull request #5194Riccardo Spagni2019-02-275-1/+16
|\ \ | | | | | | | | | | | | 348320a3 wallet api/device: set estimated restore height if none is provided (selsta) 3c1c2499 wallet api: don't truncate address in subaddress_account (selsta)
| * | wallet api/device: set estimated restore height if none is providedselsta2019-02-244-0/+15
| | |
| * | wallet api: don't truncate address in subaddress_accountselsta2019-02-241-1/+1
| | | | | | | | | | | | Same behaviour as subaddress.cpp now.
* | | Merge pull request #5193Riccardo Spagni2019-02-271-5/+4
|\ \ \ | |_|/ |/| | | | | 3dfef479 core: fix adding new pre-hoh block when a tx is already in the pool (moneromooo-monero)
| * | core: fix adding new pre-hoh block when a tx is already in the poolmoneromooo-monero2019-02-241-5/+4
|/ /
* | Merge pull request #5170v0.14.0.0Riccardo Spagni2019-02-205-8/+10
|\ \ | | | | | | | | | | | | | | | 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)
| * | update readme wording to more accurately reflect PoWRiccardo Spagni2019-02-201-1/+1
| | |
| * | bump version, update readme to reflect, update checkpointsRiccardo Spagni2019-02-203-7/+9
| | |
| * | update quick sync checkpoints and hashRiccardo Spagni2019-02-202-1/+1
|/ /
* | Merge pull request #5169Riccardo Spagni2019-02-201-7/+6
|\ \ | | | | | | | | | 3233fdea wallet: fix payment ID decryption for construction data (Dusan Klinec)
| * | wallet: fix payment ID decryption for construction dataDusan Klinec2019-02-201-7/+6
|/ /
* | Merge pull request #5163Riccardo Spagni2019-02-193-79/+39
|\ \ | | | | | | | | | 395eb921 blockchain: remove buggy long term block weight cache (moneromooo-monero)
| * | blockchain: remove buggy long term block weight cachemoneromooo-monero2019-02-193-79/+39
|/ / | | | | | | | | | | 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.
* | Merge pull request #5161Riccardo Spagni2019-02-181-5/+5
|\ \ | | | | | | | | | 0c0f6034 blockchain: fix block template creation race (moneromooo-monero)
| * | blockchain: fix block template creation racemoneromooo-monero2019-02-181-5/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge pull request #5159Riccardo Spagni2019-02-182-10/+5
|\ \ | | | | | | | | | 1d628550 blockchain: fix long term weight addition on pop/init (moneromooo-monero)
| * | blockchain: fix long term weight addition on pop/initmoneromooo-monero2019-02-182-10/+5
| | |
* | | Merge pull request #5158Riccardo Spagni2019-02-188-13/+249
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | tests: add a CNv4 JIT testmoneromooo-monero2019-02-183-7/+141
| | | |
| * | | crypto: plug CNv4 JIT into cn_slow_hashmoneromooo-monero2019-02-183-3/+102
| | | | | | | | | | | | | | | | Enabled by setting the MONERO_USE_CNV4_JIT env var to 1
| * | | crypto: clear cache after generating random programmoneromooo-monero2019-02-181-0/+3
| | | |
| * | | performance_tests: add tests for new Cryptonight variantsmoneromooo-monero2019-02-182-10/+10
| |/ /
* | | Merge pull request #5157Riccardo Spagni2019-02-181-19/+12
|\ \ \ | |/ / |/| | | | | 3b7967c6 rpc: fix wrongly formatted JSON for pruned tx (stoffu)
| * | rpc: fix wrongly formatted JSON for pruned txstoffu2019-02-181-19/+12
| | | | | | | | | | | | | | | | | | | | | Fix for #4399. Also unifies code for serializing pruned tx to binary/json into one. (Cherry-picked from #4586)
* | | Merge pull request #5155Riccardo Spagni2019-02-181-0/+2
|\ \ \ | | | | | | | | | | | | 2c0fc8b4 db_lmdb: fix missing mdb_dbi_close in migration (moneromooo-monero)
| * | | db_lmdb: fix missing mdb_dbi_close in migrationmoneromooo-monero2019-02-171-0/+2
| |/ / | | | | | | | | | Fixed by hyc
* | | Merge pull request #5153Riccardo Spagni2019-02-183-5/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | CMakeLists.txt: detect and use -pthread compiler flagmoneromooo-monero2019-02-171-0/+2
| | | | | | | | | | | | | | | | The cmake thread detection just ain't enough to always work
| * | | miner: fix build with boost 1.69moneromooo-monero2019-02-171-1/+1
| | | |
| * | | mlocker: fix access to global lock map after dtor on exitmoneromooo-monero2019-02-171-2/+2
| | | | | | | | | | | | | | | | as the lock, it now leaks
| * | | mlocker: fix dtor ordering problemmoneromooo-monero2019-02-171-2/+2
| |/ / | | | | | | | | | leak the mutex instead, it's a one off
* | | Merge pull request #5151Riccardo Spagni2019-02-184-0/+2746
|\ \ \ | |/ / |/| | | | | 4b32859d CNv4 JIT compiler for x86-64 and tests (SChernykh)
| * | CNv4 JIT compiler for x86-64 and testsSChernykh2019-02-174-0/+2746
|/ / | | | | | | | | | | | | | | | | 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
* | Merge pull request #5149Riccardo Spagni2019-02-151-6/+13
|\ \ | | | | | | | | | 7aa0cc58 blockchain: fix m_long_term_block_weight_height initialization (moneromooo-monero)
| * | blockchain: fix m_long_term_block_weight_height initializationmoneromooo-monero2019-02-151-6/+13
|/ / | | | | | | Also check return of that function, it can now return error
* | Merge pull request #5148Riccardo Spagni2019-02-151-1/+18
|\ \ | | | | | | | | | bd7f8251 blockchain: forbid older BP rct versions from v11 (moneromooo-monero)
| * | blockchain: forbid older BP rct versions from v11moneromooo-monero2019-02-151-1/+18
|/ /
* | Merge pull request #5147Riccardo Spagni2019-02-152-2/+8
|\ \ | | | | | | | | | f9d820ad Fix v3/v4 db conversion (moneromooo-monero)