Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loki Merge Upstream until 2018-11-07 #8534f71 #304

Merged
merged 218 commits into from
Nov 12, 2018

Conversation

Doy-lee
Copy link
Collaborator

@Doy-lee Doy-lee commented Oct 31, 2018

No description provided.

moneromooo-monero and others added 30 commits June 9, 2018 12:38
This would make monerod use 100% CPU when running with torsocks
without Tor running
The warning threshold is set to allow a false positive every
ten days on average.
This removes some small amount of fingerprinting entropy.
There is no consensus rule to require this since this field
is technically free form, and a transaction is free to have
custom data in it.
The gitian environment does not treat whitespaces in configure lines,
like most other systems. The solution is to just remove them.
This adds a build script to run gitian builds for linux.
The build script was copied from bitcoin and then adapted for monero.
Build step documentation is outlined in the README in the contrib/gitian
directory.
The signature prepare tool and the gitian-builder git repo should be
checked for their content. For this purpose, checkout the gitian-builder
repo at a specific commit and take the sha256sum of the osslsigncode
tool.
for unsigned tx sets using a view only wallet
Windows is built with a seperate descriptor to handle additional changes
that need to be done to the end binary. Consolidate the gitian-build
script for this change.
Co-authored-by: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
It happens when readline displays a prompt just before switching
to a shorter one
The cmake thread detection just ain't enough to always work
Depends can now be compiled with `make depends target=$triple`, where
$triple is one of the supported build targets.

Adapt the Makefile for this change, remove not needed windows deps from
depends setup description.
fluffypony and others added 27 commits November 6, 2018 14:50
07c6280 epee: some minor speedup in parsing (moneromooo-monero)
c4fbfd7 Small function declaration cleanup in slow-hash.c (Pol Mauri)
5f614ba simplewallet: print the number of show/all transfers (moneromooo-monero)
8d71b2b wallet2: only export necessary outputs and key images (moneromooo-monero)
769ae42 wallet2: faster output and key image import/export (moneromooo-monero)
8a512b1 Minor wording changes; added research repository links (Sarang Noether)
e9fc9ff Added research information to main readme (Sarang Noether)
91eaea9 mnemonics: fix words_to_bytes on big endian (moneromooo-monero)
1f35de2 simplewallet: display locked/unlocked state in show_transfers (moneromooo-monero)
e86af52 wallet2: rewrite keys file in a safer manner (Nathan Dorfman)
dff0adf cmake: fix readline detection when the readline library is not found (moneromooo-monero)
f26ce08 wallet: add a non destructive blockchain rescan (moneromooo-monero)
3a056b7 performance_tests: add ge_p3_tobytes (moneromooo-monero)
30f728e performance_tests: measure ge_frombytes_vartime only (moneromooo-monero)
b306796 cryptonote_core: avoid gratuitous recalculations in check_block_rate() (xiphon)
73e504c rpc: adjust ring size error message now that too high is also possible (moneromooo-monero)
a5ca7f4 core: fix unmixable special case allowing ring size below 11 (moneromooo-monero)
107f339 wallet2: fix ring reuse breaking when using histogram (moneromooo-monero)
9c1c92d tests: fix MSYS2 gcc 7.3.0 warning -Wtype-limits (xiphon)
f067bb0 tests: fix MSYS2 warning 'MONERO_DEFAULT_LOG_CATEGORY redefined' (xiphon)
0a95cda blockchain_utilities: fix logs and cout output colliding (moneromooo-monero)
9335d5a wallet2: save ring in the ringdb once a tx is created (moneromooo-monero)
b3e8677 cryptonote: use logging functions for errors, not std::cout (moneromooo-monero)
2587aec easylogging++: update to latest upstream (v9.96.5) (moneromooo-monero)
1fd017c Fix build of monero-gui by adding device_trezor to wallet_merged (buricl)
ba2055a api/wallet: fix compile errors made in monero-project#4720 (stoffu)
840bf15 build: fix Ubuntu 16.04 (GCC 5.4.0) compilation (xiphon)
@Doy-lee Doy-lee changed the title Loki Merge Upstream until 2018-11-05 #7e2483e Loki Merge Upstream until 2018-11-05 #8534f71 Nov 12, 2018
@Doy-lee Doy-lee changed the title Loki Merge Upstream until 2018-11-05 #8534f71 Loki Merge Upstream until 2018-11-07 #8534f71 Nov 12, 2018
@Doy-lee Doy-lee merged commit 6553e4d into oxen-io:dev Nov 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.