Code

Upstream merge 1#30

Code

Merged

aeonix merged 122 commits intoaeonix:masteraeonix/aeon:masterfrom stoffu:aeon-upstream-1stoffu/monero:aeon-upstream-1Copy head branch name to clipboardAug 10, 2018

+3,888-16,257

Commits

Commits on Jun 19, 2018

• Revert "Merge pull request monero-project#3775" /monero#3841

  Show description for 956fc94
  

  fluffypony

  authored and

  stoffu

  committed
  956fc94

  Copy full SHA for 956fc94

• daemon: request unpruned transactions for print_tx /monero#3830

  Show description for 88bad86
  

  moneromooo-monero

  authored and

  stoffu

  committed
  88bad86

  Copy full SHA for 88bad86

• speed up get_output_distribution (and precalc common case) /monero#3814

  

  moneromooo-monero

  authored and

  stoffu

  committed
  de99081

  Copy full SHA for de99081

• Fix output shuffling for multisig /monero#3832

  stoffu

  committed
  9da6834

  Copy full SHA for 9da6834

• ITS#8831 move flag init into readhdr /monero#3782

  Show description for aeed943
  

  hyc

  authored and

  stoffu

  committed
  aeed943

  Copy full SHA for aeed943

• Fix mdb_load append option /monero#3782

  Show description for 56f9f86
  

  hyc

  authored and

  stoffu

  committed
  56f9f86

  Copy full SHA for 56f9f86

• blockchain: invalidate misc caches when popping blocks /monero#3787

  Show description for 31c03be
  

  moneromooo-monero

  authored and

  stoffu

  committed
  31c03be

  Copy full SHA for 31c03be

• unit_tests: fix build after get_output_didstribution signature change /monero#3842

  

  moneromooo-monero

  authored and

  stoffu

  committed
  d678016

  Copy full SHA for d678016

• crypto: more places needing fixing for GCC 8.1 /monero#3800

  

  moneroexamples

  authored and

  stoffu

  committed
  3bbb918

  Copy full SHA for 3bbb918

• wallet2: Update function parameter documentation /monero#3405

  Show description for 1cacac2
  

  leonklingele

  authored and

  stoffu

  committed
  1cacac2

  Copy full SHA for 1cacac2

• blockchain: cache difficulty for next block /monero#3420

  Show description for b318bbc
  

  moneromooo-monero

  authored and

  stoffu

  committed
  b318bbc

  Copy full SHA for b318bbc

• tx_pool: remove old comment from fill_block_template() /monero#3446

  stoffu

  committed
  46b2abc

  Copy full SHA for 46b2abc

• don't show error twice when starting simplewallet /monero#3470

  

  cryptochangements34

  authored and

  stoffu

  committed
  9a7b6fd

  Copy full SHA for 9a7b6fd

• simplewallet: add --untrusted-daemon option /monero#3477

  

  moneromooo-monero

  authored and

  stoffu

  committed
  462579d

  Copy full SHA for 462579d

• db_lmdb: save pruned and prunable tx data separately /monero#3251

  Show description for 361a148
  

  moneromooo-monero

  authored and

  stoffu

  committed
  361a148

  Copy full SHA for 361a148

• core: fix automatic safe db sync mode switching /monero#3876

  

  moneromooo-monero

  authored and

  stoffu

  committed
  ba96fab

  Copy full SHA for ba96fab

• protocol: do not switch to unsafe sync mode for just a few blocks /monero#3876

  

  moneromooo-monero

  authored and

  stoffu

  committed
  e75c3c7

  Copy full SHA for e75c3c7

• fix sha256sum check, which requires two spaces. added set -ex to catch this, and other, errors in the future. /monero#3433

  

  cornfeedhobo

  authored and

  stoffu

  committed
  a88f1b5

  Copy full SHA for a88f1b5

• Updates italian localizations. /monero#3442

  

  hrumag

  authored and

  stoffu

  committed
  8b81145

  Copy full SHA for 8b81145

• exit if specified wallet file doesn't exist /monero#3491

  

  cryptochangements34

  authored and

  stoffu

  committed
  6004539

  Copy full SHA for 6004539

• performance_tests: fix subaddress expansion test not expanding /monero#3504

  

  moneromooo-monero

  authored and

  stoffu

  committed
  84470e3

  Copy full SHA for 84470e3

• Add key for Sarang Noether /monero#3522

  

  SarangNoether

  authored and

  stoffu

  committed
  d35a0dd

  Copy full SHA for d35a0dd

• rpc: fix get_output_distribution cache for the cumulative case /monero#3882

  Show description for 77791e4
  

  moneromooo-monero

  authored and

  stoffu

  committed
  77791e4

  Copy full SHA for 77791e4

• wallet: fix shared ring db path /monero#3499

  stoffu

  committed
  618f480

  Copy full SHA for 618f480

• Refactored: work with wallet api statuses to make setting and getting operations atomic along with error strings /monero#3489

  Show description for b57f3b2
  

  naughtyfox

  authored and

  stoffu

  committed
  b57f3b2

  Copy full SHA for b57f3b2

• WalletApi: getMultisigInfo entry for gui wallets /monero#3489

  Show description for ef4e4ce
  

  naughtyfox

  authored and

  stoffu

  committed
  ef4e4ce

  Copy full SHA for ef4e4ce

• blockchain_usage: don't divide by 0 when there is nothing to process /monero#3543

  Show description for 55dcf6f
  

  moneromooo-monero

  authored and

  stoffu

  committed
  55dcf6f

  Copy full SHA for 55dcf6f

• Core RPC: optionally add POW hash to block_header_response /monero#3561

  stoffu

  committed
  dd37f1d

  Copy full SHA for dd37f1d

• Add a space in mining to testnet/stagenet string /monero#3583

  

  cryptochangements34

  authored and

  stoffu

  committed
  e1a4b8f

  Copy full SHA for e1a4b8f

• crypto: fix initialization order issue with random mutex /monero#3592

  

  moneromooo-monero

  authored and

  stoffu

  committed
  dc3259d

  Copy full SHA for dc3259d

• unit_tests: add ringdb unit tests /monero#3592

  

  moneromooo-monero

  authored and

  stoffu

  committed
  235e911

  Copy full SHA for 235e911

• wallet_rpc_server: add a get_version RPC /monero#3635

  

  moneromooo-monero

  authored and

  stoffu

  committed
  85b8a0b

  Copy full SHA for 85b8a0b

• wallet cli/rpc: terminate execution with code 0 when --help or --version is given /monero#3640

  stoffu

  committed
  8d6be00

  Copy full SHA for 8d6be00

• console_handler: fix start_default_console use of prompt parameter /monero#3866

  Show description for 9084ee9
  

  moneromooo-monero

  authored and

  stoffu

  committed
  9084ee9

  Copy full SHA for 9084ee9

• http_protocol_handler: speedup newline discarding /monero#3866

  

  moneromooo-monero

  authored and

  stoffu

  committed
  cbadd7b

  Copy full SHA for cbadd7b

• abstract_tcp_server2: timeout on RPC connections /monero#3866

  

  moneromooo-monero

  authored and

  stoffu

  committed
  6b647c1

  Copy full SHA for 6b647c1

• http_protocol_handler: limit the number of starting newlines /monero#3866

  

  moneromooo-monero

  authored and

  stoffu

  committed
  59e96e3

  Copy full SHA for 59e96e3

• rapidjson: remove outdated in-tree, use submodule /monero#3857

  Show description for b43b230
  

  anonimal

  authored and

  stoffu

  committed
  b43b230

  Copy full SHA for b43b230

• wallet2: don't ask for pruned txes yet, we still parse the entire tx /monero#3890

  

  moneromooo-monero

  authored and

  stoffu

  committed
  a44c458

  Copy full SHA for a44c458

• rpc: the cache is still for non cumulative on that branch /monero#3899

  

  moneromooo-monero

  authored and

  stoffu

  committed
  65ddf89

  Copy full SHA for 65ddf89

• blockchain: demote a hash-of-hashes validation warning to debug /monero#3911

  Show description for 5f1fbb2
  

  moneromooo-monero

  authored and

  stoffu

  committed
  5f1fbb2

  Copy full SHA for 5f1fbb2

• blockchain: fix deadlock with the difficulty cache /monero#3940

  

  moneromooo-monero

  authored and

  stoffu

  committed
  7d990bf

  Copy full SHA for 7d990bf

• rpc: convert distribution to cumulative after caching /monero#3892

  Show description for b7d24ed
  

  moneromooo-monero

  authored and

  stoffu

  committed
  b7d24ed

  Copy full SHA for b7d24ed

• protocol: drop (and increase fails) if most blocks hashes are invalid /monero#3910

  

  moneromooo-monero

  authored and

  stoffu

  committed
  8cbae93

  Copy full SHA for 8cbae93

• blockchain_utilities: do not link against unneeded p2p lib /monero#3428

  

  moneromooo-monero

  authored and

  stoffu

  committed
  db120bf

  Copy full SHA for db120bf

• blockchain_blackball: add incremental mode /monero#3428

  

  moneromooo-monero

  authored and

  stoffu

  committed
  44b48f9

  Copy full SHA for 44b48f9

• blockchain_blackball: also blackball N N-sized duplicate rings /monero#3428

  Show description for 951d5af
  

  moneromooo-monero

  authored and

  stoffu

  committed
  951d5af

  Copy full SHA for 951d5af

• Incorporate Window debug build targets /monero#3887

  

  philkode

  authored and

  stoffu

  committed
  7247a9a

  Copy full SHA for 7247a9a

• Wallet: added methods to sign and verify arbitrary message with multisig public signer's key (libwallet & wallet api) /monero#3598

  

  naughtyfox

  authored and

  stoffu

  committed
  111ae79

  Copy full SHA for 111ae79

• WalletApi: publicMultisigSignerKey method /monero#3599

  

  naughtyfox

  authored and

  stoffu

  committed
  7aa46c9

  Copy full SHA for 7aa46c9

• db_lmdb: warn about slowness when running off a spinning disk /monero#3340

  

  moneromooo-monero

  authored and

  stoffu

  committed
  8cbc1e1

  Copy full SHA for 8cbc1e1

• handle improper log levels /monero#3643

  

  cryptochangements34

  authored and

  stoffu

  committed
  eabdb48

  Copy full SHA for eabdb48

• Improve 'show_transfers' date formatting /monero#3648

  Show description for ddb1cfb
  

  ryan-ronnander

  authored and

  stoffu

  committed
  ddb1cfb

  Copy full SHA for ddb1cfb

• blockchain: log in DEBUG when a block is found, and where /monero#3687

  Show description for 5a98a98
  

  moneromooo-monero

  authored and

  stoffu

  committed
  5a98a98

  Copy full SHA for 5a98a98

• mnemonics: add some logs to help debug failures /monero#3700

  

  moneromooo-monero

  authored and

  stoffu

  committed
  8bbd1b9

  Copy full SHA for 8bbd1b9

• cn_deserialize: dump additional tx pubkeys /monero#3701

  

  moneromooo-monero

  authored and

  stoffu

  committed
  7a345c2

  Copy full SHA for 7a345c2

• simplewallet: set_ring can now take a file with rings /monero#3538

  

  moneromooo-monero

  authored and

  stoffu

  committed
  f8e63c4

  Copy full SHA for f8e63c4

• wallet-rpc: added IPs to error logging in simple_http_connection_handler /monero#3652

  

  jcktm

  authored and

  stoffu

  committed
  d416e00

  Copy full SHA for d416e00

• connection_context: remove "state_" prefix from state names /monero#3725

  Show description for 2952984
  

  moneromooo-monero

  authored and

  stoffu

  committed
  2952984

  Copy full SHA for 2952984

• daemon: print peer state in sync_info /monero#3725

  Show description for f91dd54
  

  moneromooo-monero

  authored and

  stoffu

  committed
  f91dd54

  Copy full SHA for f91dd54

• blockchain: avoid exception if asked for a block we do not have /monero#3726

  Show description for 69f0f8e
  

  moneromooo-monero

  authored and

  stoffu

  committed
  69f0f8e

  Copy full SHA for 69f0f8e

• p2p: fix fallback seed node usage /monero#3737

  Show description for f6ac4eb
  

  moneromooo-monero

  authored and

  stoffu

  committed
  f6ac4eb

  Copy full SHA for f6ac4eb

• Ensure m_timestamps has the correct number for computing difficulty. /monero#3732

  

  thaerkh

  authored and

  stoffu

  committed
  1a7ecbd

  Copy full SHA for 1a7ecbd

• add .load() to make Boost 1.67 happy with its new is_integral check /monero#3735

  

  teutone

  authored and

  stoffu

  committed
  cfe22a9

  Copy full SHA for cfe22a9

• check_spend_proof /monero#3762

  Show description for 939e609
  

  itssteven

  authored and

  stoffu

  committed
  939e609

  Copy full SHA for 939e609

• wallet-rpc: watch-only and cold wallet features added /monero#3780

  Show description for 15dce56
  

  ph4r05

  authored and

  stoffu

  committed
  15dce56

  Copy full SHA for 15dce56

• Fix Typo /monero#3798

  

  Rafficer

  authored and

  stoffu

  committed
  a0e0d73

  Copy full SHA for a0e0d73

• simple-wallet-cli: Add warnings about inaccurate balances to to watch-only wallet /monero#3804

  

  jcktm

  authored and

  stoffu

  committed
  e5341e3

  Copy full SHA for e5341e3

• threadpool: allow constructing an object, and misc tweaks /monero#3691

  Show description for 48d99bb
  

  moneromooo-monero

  authored and

  stoffu

  committed
  48d99bb

  Copy full SHA for 48d99bb

• core: remove threadpool dependency from header /monero#3691

  

  moneromooo-monero

  authored and

  stoffu

  committed
  98f2d90

  Copy full SHA for 98f2d90

• unit_tests: add threadpool unit test /monero#3691

  

  moneromooo-monero

  authored and

  stoffu

  committed
  2149537

  Copy full SHA for 2149537

Commits on Jun 26, 2018

• epee: log type name when a container size check fails /monero#3821

  

  moneromooo-monero

  authored and

  stoffu

  committed
  3c63f80

  Copy full SHA for 3c63f80

• object_sizes: add a few useful types /monero#3821

  

  moneromooo-monero

  authored and

  stoffu

  committed
  d7e138e

  Copy full SHA for d7e138e

• use deterministic viewkey if not supplied /monero#3829

  

  cryptochangements34

  authored and

  stoffu

  committed
  fe8eb7d

  Copy full SHA for fe8eb7d

• Fixed for compilation in big endian PPC. "Everything is broken thought due to little endian logic." /monero#3835

  

  nioroso-x3

  authored and

  stoffu

  committed
  89ade95

  Copy full SHA for 89ade95

• Fix PCSC compilation under windows /monero#3844

  Show description for 06cd28c
  

  cslashm

  authored and

  stoffu

  committed
  06cd28c

  Copy full SHA for 06cd28c

• Fix CMAKE config for PCSC in order to avoid msys DLL dependencies /monero#3844

  Show description for 479d295
  

  cslashm

  authored and

  stoffu

  committed
  479d295

  Copy full SHA for 479d295

• add disclaimer about 3rd party packages /monero#3852

  Show description for 57a69e9
  

  jtgrassie

  authored and

  stoffu

  committed
  57a69e9

  Copy full SHA for 57a69e9

• p2p: warn when no incoming connections are seen for a while /monero#3861

  

  moneromooo-monero

  authored and

  stoffu

  committed
  65eacd6

  Copy full SHA for 65eacd6

• disable file size sanity check when loading the wallet cache /monero#3878

  

  moneromooo-monero

  authored and

  stoffu

  committed
  375b78f

  Copy full SHA for 375b78f

• easylogging++: cached allowed categories /monero#3702

  Show description for 191af85
  

  moneromooo-monero

  authored and

  stoffu

  committed
  191af85

  Copy full SHA for 191af85

• adding win building details. /monero#3880

  Show description for 0178a04
  

  kinghat

  authored and

  stoffu

  committed
  0178a04

  Copy full SHA for 0178a04

• handle optional miner params better /monero#3757

  

  cryptochangements34

  authored and

  stoffu

  committed
  c5b1704

  Copy full SHA for c5b1704

• daemon: fix readline interfering with std::cerr usage /monero#3888

  Show description for 172223e
  

  moneromooo-monero

  authored and

  stoffu

  committed
  172223e

  Copy full SHA for 172223e

• simplewallet.sign_transfer: rename export to export_raw, add help message /monero#3896

  stoffu

  committed
  d94f848

  Copy full SHA for d94f848

• mlog: --max-log-files to set the max number of rotated log files /monero#3897

  stoffu

  committed
  811f685

  Copy full SHA for 811f685

• epee: fix detection of 172.16.0.0/172.31.255.255 local IP range /monero#3902

  

  moneromooo-monero

  authored and

  stoffu

  committed
  ce92b9e

  Copy full SHA for ce92b9e

• unit_tests: add tests for local IP range detection /monero#3902

  

  moneromooo-monero

  authored and

  stoffu

  committed
  fde68c3

  Copy full SHA for fde68c3

• tx_pool: hold off parsing a tx blob till we actually need it /monero#3903

  

  moneromooo-monero

  authored and

  stoffu

  committed
  cb6f6e9

  Copy full SHA for cb6f6e9

• blockchain: return error when requesting non existent output /monero#3904

  Show description for 21e8387
  

  moneromooo-monero

  authored and

  stoffu

  committed
  21e8387

  Copy full SHA for 21e8387

• blockchain: pop forked blocks only when DB is not read-only /monero#3919

  stoffu

  committed
  8a6bc37

  Copy full SHA for 8a6bc37

• Fixes monero-project#3645: error on freebsd lambda return values forced to std::string /monero#3924

  

  rockhouse

  authored and

  stoffu

  committed
  7624563

  Copy full SHA for 7624563

• Update Readme to indicate recommended version /monero#3927

  Show description for f0aeb10
  

  Gingeropolous

  authored and

  stoffu

  committed
  f0aeb10

  Copy full SHA for f0aeb10

• simplewallet: add optional trusted/untrusted argument to set_daemon /monero#3932

  Show description for e98b3d7
  

  moneromooo-monero

  authored and

  stoffu

  committed
  e98b3d7

  Copy full SHA for e98b3d7

• util: consider Tor/I2P addresses to be non local /monero#3932

  

  moneromooo-monero

  authored and

  stoffu

  committed
  fd7869d

  Copy full SHA for fd7869d

• README: mention --untrusted-daemon /monero#3932

  Show description for e9f999e
  

  moneromooo-monero

  authored and

  stoffu

  committed
  e9f999e

  Copy full SHA for e9f999e

• readme - explain building master vs. release /monero#3933

  Show description for 0fdaf1f
  

  Gingeropolous

  authored and

  stoffu

  committed
  0fdaf1f

  Copy full SHA for 0fdaf1f

• ringct: remove an unnecessary scalarmultBase in zeroCommit /monero#3938

  

  moneromooo-monero

  authored and

  stoffu

  committed
  b4eed66

  Copy full SHA for b4eed66

• wallet: do not log by default if we're not asked to log to console /monero#3939

  Show description for f7a60db
  

  moneromooo-monero

  authored and

  stoffu

  committed
  f7a60db

  Copy full SHA for f7a60db

• don't limit miner threads in wallet /monero#3784

  

  cryptochangements34

  authored and

  stoffu

  committed
  4eeffc4

  Copy full SHA for 4eeffc4

• fix string handling for donation message /monero#3407

  

  cryptochangements34

  authored and

  stoffu

  committed
  5670a31

  Copy full SHA for 5670a31

• fix typos in language files and rpc_args.cpp /monero#3677

  

  ordtrogen

  authored and

  stoffu

  committed
  2c2a69c

  Copy full SHA for 2c2a69c

• wallet2: lower default for subaddress lookahead when restoring with hardware /monero#3921

  stoffu

  committed
  6bf96e7

  Copy full SHA for 6bf96e7

• Move parse_subaddress_lookahead() from simplewallet.cpp to util.cpp /monero#3921

  stoffu

  committed
  e446510

  Copy full SHA for e446510

• Wallet API: add support for wallet creation from hardware device /monero#3921

  stoffu

  committed
  72b2d56

  Copy full SHA for 72b2d56

• tx_pool: initialize bitflags padding since it gets written to storage /monero#3936

  Show description for adda1fe
  

  moneromooo-monero

  authored and

  stoffu

  committed
  adda1fe

  Copy full SHA for adda1fe

• snap: strip metadata from icon.png /monero#3947

  Show description for b3eae8f
  

  moneromooo-monero

  authored and

  stoffu

  committed
  b3eae8f

  Copy full SHA for b3eae8f

• blockchain_import: warn+delay about using --dangerous-unverified-import /monero#3948

  Show description for d6b4036
  

  moneromooo-monero

  authored and

  stoffu

  committed
  d6b4036

  Copy full SHA for d6b4036

• wallet2: fix bulletproof cold signing /monero#3955

  Show description for caac113
  

  moneromooo-monero

  authored and

  stoffu

  committed
  caac113

  Copy full SHA for caac113

• password: flush cout when prompting for password without newline /monero#3957

  

  moneromooo-monero

  authored and

  stoffu

  committed
  aa58177

  Copy full SHA for aa58177

• epee: adaptive connection timeout system /monero#3962

  Show description for 84ac252
  

  moneromooo-monero

  authored and

  stoffu

  committed
  84ac252

  Copy full SHA for 84ac252

• Update readme to include pcslite dependency /monero#3963

  Show description for 6ecd57e
  

  Gingeropolous

  authored and

  stoffu

  committed
  6ecd57e

  Copy full SHA for 6ecd57e

• simplewallet: grammar fix in warning message /monero#3966

  

  moneromooo-monero

  authored and

  stoffu

  committed
  af45893

  Copy full SHA for af45893

• epee: fix include for ofstream /monero#3971

  

  moneromooo-monero

  authored and

  stoffu

  committed
  4bedb5b

  Copy full SHA for 4bedb5b

• epee: fallback to a counter if gmtime fails when rotating logs /monero#3972

  

  moneromooo-monero

  authored and

  stoffu

  committed
  5fd78f7

  Copy full SHA for 5fd78f7

• cryptonote_protocol_handler: log when dropping a peer /monero#3974

  

  moneromooo-monero

  authored and

  stoffu

  committed
  d2f3d2b

  Copy full SHA for d2f3d2b

• blockchain: avoid duplicate db query for height /monero#3975

  

  moneromooo-monero

  authored and

  stoffu

  committed
  6822414

  Copy full SHA for 6822414

• device_ledger: fix bad memory access on connect error /monero#3977

  

  moneromooo-monero

  authored and

  stoffu

  committed
  1472103

  Copy full SHA for 1472103

Commits on Aug 8, 2018

• abstract_tcp_server2: restart async accept on error /monero#3997

  

  moneromooo-monero

  authored and

  stoffu

  committed
  9549fef

  Copy full SHA for 9549fef

• add and use constant time 32 byte equality function /monero#3999

  

  moneromooo-monero

  authored and

  stoffu

  committed
  ddf1521

  Copy full SHA for ddf1521

• abstract_tcp_server2: fix use after free /monero#4080

  

  moneromooo-monero

  authored and

  stoffu

  committed
  736e622

  Copy full SHA for 736e622

• abstract_tcp_server2: fix race on shutdown /monero#4130

  

  moneromooo-monero

  authored and

  stoffu

  committed
  5cf169c

  Copy full SHA for 5cf169c