summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6579v0.16.0.0luigi11112020-05-211-1/+1
|\ | | | | | | f50a6c5 version: update name (selsta)
| * version: update nameselsta2020-05-211-1/+1
|/
* Merge pull request #6575luigi11112020-05-212-0/+12
|\ | | | | | | ada8172 rpc: lock access to the rpc payment object (moneromooo-monero)
| * rpc: lock access to the rpc payment objectmoneromooo-monero2020-05-202-0/+12
| |
* | Merge pull request #6577luigi11112020-05-212-6/+46
|\ \ | | | | | | | | | 0d92fe5 rpc: add a sanity limit to a few RPC in restricted mode (moneromooo-monero)
| * | rpc: add a sanity limit to a few RPC in restricted modemoneromooo-monero2020-05-202-6/+46
| |/
* | Merge pull request #6572luigi11112020-05-212-1/+27
|\ \ | | | | | | | | | 438b846 ByteSlice: Fix persisting ptr to std::moved SSO buffer (Doy-lee)
| * | ByteSlice: Fix persisting ptr to std::moved SSO bufferDoyle2020-05-202-1/+27
| | | | | | | | | | | | | | | | | | | | | The Bug: 1. Construct `byte_slice.portion_` with `epee::span(buffer)` which copies a pointer to the SSO buffer to `byte_slice.portion_` 2. It constructs `byte_slice.storage_` with `std::move(buffer)` (normally this swap pointers, but SSO means a memcpy and clear on the original SSO buffer) 3. `slice.data()` returns a pointer from `slice.portion_` that points to the original SSO cleared buffer, `slice.storage_` has the actual string.
* | | Merge pull request #6569luigi11112020-05-212-36/+0
|\ \ \ | | | | | | | | | | | | 99d702e cryptonote_core: remove 'We are most likely forked' message (moneromooo-monero)
| * | | cryptonote_core: remove "We are most likely forked" messagemoneromooo-monero2020-05-192-36/+0
| | |/ | |/| | | | | | | It's time based and we don't have forks every 6 months anymore
* | | Merge pull request #6548luigi11112020-05-214-27/+124
|\ \ \ | |_|/ |/| | | | | c5c8592 [release-v0.16] MMS: New 'config_checksum' subcommand (rbrunner7)
| * | [release-v0.16] MMS: New 'config_checksum' subcommandrbrunner72020-05-204-27/+124
|/ /
* | Merge pull request #6554luigi11112020-05-192-1/+22
|\ \ | | | | | | | | | | | | f01d529 cryptonote_protocol: reject requests/notifications before handshake (moneromooo-monero) bbab044 cryptonote_protocol: stricter limit to number of objects requested (moneromooo-monero)
| * | cryptonote_protocol: stricter limit to number of objects requestedmoneromooo-monero2020-05-191-1/+2
| | | | | | | | | | | | Reported by xnbya
| * | cryptonote_protocol: reject requests/notifications before handshakemoneromooo-monero2020-05-191-0/+20
| |/ | | | | | | Reported by xnbya
* | Merge pull request #6567luigi11112020-05-191-2/+2
|\ \ | | | | | | | | | cef39dc protocol: move the 'peer claims higher version' warning to debug (moneromooo-monero)
| * | protocol: move the "peer claims higher version" warning to debugmoneromooo-monero2020-05-191-2/+2
| |/ | | | | | | | | Because there's a neverending supply of cunts claiming a wrong version just to say "look at me" I guess
* | Merge pull request #6562luigi11112020-05-191-1/+1
|\ \ | | | | | | | | | 705c78b wallet2: fix multisig data clearing stomping on a vector (moneromooo-monero)
| * | wallet2: fix multisig data clearing stomping on a vectormoneromooo-monero2020-05-191-1/+1
| |/
* | Merge pull request #6560luigi11112020-05-191-1/+1
|\ \ | | | | | | | | | 4291344 serialization: fix bad rapidjson api usage (moneromooo-monero)
| * | serialization: fix bad rapidjson api usagemoneromooo-monero2020-05-191-1/+1
| |/
* | Merge pull request #6545luigi11112020-05-191-5/+72
|\ \ | | | | | | | | | bb4d95c blockchain: detect and log bad difficulty calculations (moneromooo-monero)
| * | blockchain: detect and log bad difficulty calculationsmoneromooo-monero2020-05-171-5/+72
| |/
* | Merge pull request #6543luigi11112020-05-191-1/+0
|\ \ | | | | | | | | | 44e3782 protocol: don't drop a connection if we can't get a compatible chain (moneromooo-monero)
| * | protocol: don't drop a connection if we can't get a compatible chainmoneromooo-monero2020-05-161-1/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | This can now happen if: - we have a pruned db - we have not connected to the monero network for a while - we connect to a node - that node asks us for history - we only have a pruned version of the most recent common block In that case, it's better to not reply but keep the connection alive, so we can sync off it.
* | Merge pull request #6541luigi11112020-05-194-49/+15
|\ \ | | | | | | | | | | | | 4a9c3a Revert 'simplewallet: noob-friendly help menu' (selsta) 7633ba0 simplewallet: help_advanced -> help (selsta)
| * | simplewallet: help_advanced -> helpselsta2020-05-161-1/+1
| | |
| * | Revert "simplewallet: noob-friendly help menu"selsta2020-05-164-48/+14
| | | | | | | | | | | | This reverts commit 67b4a19edf7b9d6a407a79eca5c57819863bfd71.
* | | Merge pull request #6540luigi11112020-05-191-6/+6
|\ \ \ | | | | | | | | | | | | 7209db8 epee: use memwipe rather than memset for md5 secrets (moneromooo-monero)
| * | | epee: use memwipe rather than memset for md5 secretsmoneromooo-monero2020-05-161-6/+6
| | |/ | |/| | | | | | | That's used by HTTP auth now
* | | Merge pull request #6532luigi11112020-05-195-11/+11
|\ \ \ | | | | | | | | | | | | f35ced6 build: fix boost 1.73 compatibility (selsta)
| * | | build: fix boost 1.73 compatibilityselsta2020-05-145-11/+11
| | | |
* | | | Merge pull request #6551luigi11112020-05-194-71/+216
|\ \ \ \ | |_|_|/ |/| | | | | | | f526977 easylogging++: sanitize log payload (moneromooo-monero)
| * | | easylogging++: sanitize log payloadmoneromooo-monero2020-05-194-71/+216
| | |/ | |/| | | | | | | | | | | | | Some of it might be coming from untrusted sources Reported by itsunixiknowthis
* | | Merge pull request #6527luigi11112020-05-145-7/+22
|\ \ \ | | | | | | | | | | | | 1b48f32 simplewallet: don't complain about incoming payment ids on change (moneromooo-monero)
| * | | simplewallet: don't complain about incoming payment ids on changemoneromooo-monero2020-05-135-7/+22
| |/ /
* | | Merge pull request #6524luigi11112020-05-142-9/+48
|\ \ \ | | | | | | | | | | | | cc40ce1 Fixed bugs for take_slice and byte_stream->byte_slice (vtnerd)
| * | | Fixed bugs for take_slice and byte_stream->byte_sliceLee Clagett2020-05-122-9/+48
| | |/ | |/|
* | | Merge pull request #6520luigi11112020-05-141-1/+3
|\ \ \ | | | | | | | | | | | | ab44293 trezor: add new firmware version support (ph4r05)
| * | | trezor: add new firmware version supportDusan Klinec2020-05-121-1/+3
| |/ /
* | | Merge pull request #6518luigi11112020-05-145-5/+5
|\ \ \ | |_|/ |/| | | | | 82afc5f [release-v0.16]: Update gitian yml files (iDunk5400)
| * | [release-v0.16]: Update gitian yml filesiDunk54002020-05-125-5/+5
|/ /
* | Merge pull request #6515luigi11112020-05-116-9/+11
|\ \ | |/ |/| | | 08a45c5 build: prepare v0.16.0.0 release (selsta)
| * build: prepare v0.16.0.0 releaseselsta2020-05-096-9/+11
|/
* Merge pull request #6510luigi11112020-05-071-2/+0
|\ | | | | | | 70609d7 cryptonote_core: take out the time based upgrade warning (moneromooo-monero)
| * cryptonote_core: take out the time based upgrade warningmoneromooo-monero2020-05-061-2/+0
| | | | | | | | It doesn't really work anymore since we don't have a fork soon
* | Merge pull request #6506luigi11112020-05-071-7/+1
|\ \ | | | | | | | | | 42e1484 wallet2: fix keys file deserialization exception handling (xiphon)
| * | wallet2: fix keys file deserialization exception handlingxiphon2020-05-051-7/+1
| | |
* | | Merge pull request #6503luigi11112020-05-061-1/+6
|\ \ \ | | | | | | | | | | | | f80ab3e cryptonote_protocol: do not request pruned borromean sig txes (moneromooo-monero)
| * | | cryptonote_protocol: do not request pruned borromean sig txesmoneromooo-monero2020-05-061-1/+6
| | |/ | |/| | | | | | | | | | We don't have a function to calculate their weight from a pruned version (yet).