summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1445v0.10.1Riccardo Spagni2016-12-131-1/+1
|\ | | | | | | 95b9e85e rename cn_deserialize (Riccardo Spagni)
| * rename cn_deserializeRiccardo Spagni2016-12-131-1/+1
| |
* | Merge pull request #1446Riccardo Spagni2016-12-1317-155/+183
|\ \ | |/ |/| | | b2adfa8c Bitmonero namespace renamed Monero. Bitmonero namespace alias added so that third party uses of the wallet api can transition. (Randi Joseph)
| * Bitmonero namespace renamed Monero. Bitmonero namespace alias added so that ↵Randi Joseph2016-12-1317-155/+183
| | | | | | | | third party uses of the wallet api can transition.
* | Merge pull request #1437Riccardo Spagni2016-12-133-1/+4
|\ \ | | | | | | | | | | | | | | | 655eafd1 bump version (Riccardo Spagni) 117194a3 update checkpoints (Riccardo Spagni) 39a9db9e update checkpoints (Riccardo Spagni)
| * | bump versionRiccardo Spagni2016-12-131-1/+1
| | |
| * | update checkpointsRiccardo Spagni2016-12-131-0/+0
| | |
| * | update checkpointsRiccardo Spagni2016-12-131-0/+3
| |/
* | Merge pull request #1442Riccardo Spagni2016-12-131-0/+3
|\ \ | | | | | | | | | dd144b14 blockchain: fix reorganizations past a hard fork boundary (moneromooo-monero)
| * | blockchain: fix reorganizations past a hard fork boundarymoneromooo-monero2016-12-131-0/+3
| |/ | | | | | | | | | | | | After popping blocks from the old chain, the hard fork object's notion of the current version was not in line with the new height, causing the first blocks from the new chain to be rejected due to a false expection of a newer version.
* | Merge pull request #1441Riccardo Spagni2016-12-133-15/+17
|\ \ | | | | | | | | | 0fb5dc87 monero-wallet-cli wording changes 'n' stuff (luigi1111)
| * | monero-wallet-cli wording changes 'n' stuffluigi11112016-12-123-15/+17
| |/ | | | | | | Possibly other pedantry. Pedants are people too.
* | Merge pull request #1439Riccardo Spagni2016-12-131-1/+1
|\ \ | | | | | | | | | 4299bdf6 Improve language of 'node ahead by' message (NanoAkron)
| * | Improve language of 'node ahead by' messageNanoAkron2016-12-121-1/+1
| | |
* | | Merge pull request #1438Riccardo Spagni2016-12-131-5/+5
|\ \ \ | |_|/ |/| | | | | 9d906159 Tx verification failing is not an error (luigi1111)
| * | Tx verification failing is not an errorluigi11112016-12-121-5/+5
|/ / | | | | | | And rangeProofs are on outputs...
* | Merge pull request #1436Riccardo Spagni2016-12-125-25/+40
|\ \ | |/ |/| | | 3b4539ee addressbook updates (Jaquee)
| * addressbook updatesJaquee2016-12-125-25/+40
|/
* Merge pull request #1424Riccardo Spagni2016-12-121-2/+2
|\ | | | | | | aeb13289 Update cryptonote_protocol_handler.inl (Gingeropolous)
| * Update cryptonote_protocol_handler.inlGingeropolous2016-12-101-2/+2
| | | | | | Per discussion of #1359, the wording has changed to indicate that no assessment of the blocks validity is made.
* | Merge pull request #1434Riccardo Spagni2016-12-129-7/+307
|\ \ | | | | | | | | | 5df92877 GUI address book (Jaquee)
| * | GUI address bookJaquee2016-12-129-7/+307
| |/
* | Merge pull request #1433Riccardo Spagni2016-12-121-2/+2
|\ \ | | | | | | | | | 66dc23c4 modded minimum and recommended monero versions (Gingeropolous)
| * | modded minimum and recommended monero versionsGingeropolous2016-12-111-2/+2
| |/ | | | | modified all min and rec versions to v0.10.1 for v4 and v5 forks
* | Merge pull request #1431Riccardo Spagni2016-12-121-2/+0
|\ \ | | | | | | | | | 81c6bb9a thread_group: fix build on older GCC (moneromooo-monero)
| * | thread_group: fix build on older GCCmoneromooo-monero2016-12-111-2/+0
| |/ | | | | | | vtnerd (original author) confirmed this is the Right Way.
* | Merge pull request #1425Riccardo Spagni2016-12-121-1/+1
|\ \ | | | | | | | | | c5c45ca6 wallet: bring forward use of the dynamic fee (moneromooo-monero)
| * | wallet: bring forward use of the dynamic feemoneromooo-monero2016-12-101-1/+1
| |/ | | | | | | | | | | It was 14 days after v4, it is now one day after it. luigi1111's suggestion
* | Merge pull request #1423Riccardo Spagni2016-12-122-0/+9
|\ \ | |/ |/| | | | | 19585d49 mnemonics: fix misc STL containers leak (moneromooo-monero) f6fcf0ef oaes_lib: fix a leak on OOM error path (moneromooo-monero)
| * mnemonics: fix misc STL containers leakmoneromooo-monero2016-12-101-0/+6
| | | | | | | | found by coverity
| * oaes_lib: fix a leak on OOM error pathmoneromooo-monero2016-12-101-0/+3
|/ | | | found by coverity
* Merge pull request #1422Riccardo Spagni2016-12-101-1/+1
|\ | | | | | | 9b00d80f wallet2: pass by const ref where possible (moneromooo-monero)
| * wallet2: pass by const ref where possiblemoneromooo-monero2016-12-101-1/+1
| | | | | | | | Reported by kenshi84
* | Merge pull request #1419Riccardo Spagni2016-12-104-13/+34
|\ \ | | | | | | | | | f4a3ce15 Fix sending outputs from a tx with more than one pubkey (moneromooo-monero)
| * | Fix sending outputs from a tx with more than one pubkeymoneromooo-monero2016-12-094-13/+34
| |/ | | | | | | | | | | A bug in cold signing caused a spurious pubkey to be included in transactions, so we need to ensure we use the correct one when sending outputs from one of those.
* | Merge pull request #1418Riccardo Spagni2016-12-101-4/+4
|\ \ | | | | | | | | | dfbb85b6 blockchain: fix setting non trovial alternate chain as invalid (moneromooo-monero)
| * | blockchain: fix setting non trovial alternate chain as invalidmoneromooo-monero2016-12-081-4/+4
| |/ | | | | | | | | | | The wrong iterator was being used. Also preincrement iterators to avoid possibly invalidating them, I'm not sure this is necessary, but let's be safe.
* | Merge pull request #1408Riccardo Spagni2016-12-101-1/+0
|\ \ | | | | | | | | | b9c5f29d Revert forcing -fPIC for all ARMv8 builds (NanoAkron)
| * | Revert forcing -fPIC for all ARMv8 buildsNanoAkron2016-12-091-1/+0
| |/
* | Merge pull request #1417Riccardo Spagni2016-12-081-0/+43
|\ \ | | | | | | | | | 0b91d825 simplewallet: restore automatically setting trusted local daemon (moneromooo-monero)
| * | simplewallet: restore automatically setting trusted local daemonmoneromooo-monero2016-12-081-0/+43
| |/
* | Merge pull request #1415Riccardo Spagni2016-12-081-3/+13
|\ \ | | | | | | | | | 6c44f5c6 wallet: send 0 change to a random address where necessary with rct (moneromooo-monero)
| * | wallet: send 0 change to a random address where necessary with rctmoneromooo-monero2016-12-071-3/+13
| |/ | | | | | | | | | | | | | | | | | | | | If a rct transaction would cause no change to be generated, a zero change output is added, and sent to a randomly generated address. This ensures that no transaction will be sent with just one output, which could cause the receiver to be able to determine which of the inputs in the sent rings is the real one. This is very rare, since it requires the sum of outputs to be equal to the sum of outputs plus the fee, which is now a function of the last few blocks.
* | Merge pull request #1414Riccardo Spagni2016-12-081-0/+19
|\ \ | | | | | | | | | | | | 3b005275 ringct: add sc_check calls in MLSAG_Ver for ss and cc (moneromooo-monero) 2f1732a7 ringct: guard against bad data exceptions in worker threads (moneromooo-monero)
| * | ringct: add sc_check calls in MLSAG_Ver for ss and ccmoneromooo-monero2016-12-071-0/+5
| | | | | | | | | | | | luigi1111's recommendation
| * | ringct: guard against bad data exceptions in worker threadsmoneromooo-monero2016-12-071-0/+14
| |/ | | | | | | | | | | If purported pubkeys aren't actually valid pubkeys, exceptions will fly. These will terminate if thrown in a worker thread. Guard against this.
* | Merge pull request #1413Riccardo Spagni2016-12-089-162/+114
|\ \ | | | | | | | | | | | | | | | 648ea6be blockchain: bring the v4 fork height one block forward (luigi1111) 46a0dcc1 ringct: luigi1111's changes to fix and speedup Borromean sigs (luigi1111) 76958fc7 ringct: switch to Borromean signatures (Shen Noether)
| * | blockchain: bring the v4 fork height one block forwardluigi11112016-12-061-3/+3
| | | | | | | | | | | | | | | This will ensure the early 0.10 daemons will barf at the fork height, and not a bit later, which could be confusing.
| * | ringct: luigi1111's changes to fix and speedup Borromean sigsluigi11112016-12-042-24/+19
| | |
| * | ringct: switch to Borromean signaturesShen Noether2016-12-048-152/+109
| |/