Monero DevLog: Code merges for 2018-06-28

The site is still undergoing some design work.

Submitted by aerbax on Thu, 06/28/2018 - 17:40

Overview:

  • Nothing of major note today.  A lot of general bug fixes.

 

Code merges/updates:


Merge pull request #4067
2018-06-28T02:28:34Z (GMT)

  • Merge pull request #4067
    
    9a39b7d wallet2: fix build for windows (std::max again) (moneromooo-monero)

Merge pull request #4069
2018-06-28T02:25:00Z (GMT)

  • Merge pull request #4069
    
    49dc78d util: fix mistakes made in #3994 (stoffu)

Merge pull request #4068
2018-06-28T02:23:50Z (GMT)

  • Merge pull request #4068
    
    29254fc api/wallet: add missing arg to wallet2::refresh() (stoffu)

util: fix mistakes made in #3994
2018-06-28T01:39:04Z (GMT)

  • util: fix mistakes made in #3994

api/wallet: add missing arg to wallet2::refresh()
2018-06-28T01:24:05Z (GMT)

  • api/wallet: add missing arg to wallet2::refresh()

Merge pull request #4000
2018-06-28T01:18:41Z (GMT)

  • Merge pull request #4000
    
    4510f41 Wallet API: add some missing override keyword (stoffu)

Merge pull request #3994
2018-06-28T01:17:25Z (GMT)

  • Merge pull request #3994
    
    1d17647 epee.string_tools: add conversion between UTF-8 and UTF-16 (stoffu)
    59de6f8 util: add file_locker class (stoffu)
    3d623a8 wallet: prevent the same wallet file from being opened by multiple processes (stoffu)

Merge pull request #4066
2018-06-28T01:15:10Z (GMT)

  • Merge pull request #4066
    
    84d9e7f blockchain: fix build after waiter::wait prototype change (moneromooo-monero)

Merge pull request #4065
2018-06-28T01:13:38Z (GMT)

  • Merge pull request #4065
    
    9b38551 wallet_rpc_server: fix build - forgot to build rpc version (moneromooo-monero)

Wallet API: add some missing override keyword
2018-06-28T00:59:09Z (GMT)

  • Wallet API: add some missing override keyword
    
    Also remove dust() from UnsignedTransactionImpl (already in PendingTransactionImpl)

wallet: prevent the same wallet file from being opened by multiple pr
2018-06-28T00:41:43Z (GMT)

  • wallet: prevent the same wallet file from being opened by multiple processes

util: add file_locker class
2018-06-28T00:40:31Z (GMT)

  • util: add file_locker class

epee.string_tools: add conversion between UTF-8 and UTF-16
2018-06-28T00:40:26Z (GMT)

  • epee.string_tools: add conversion between UTF-8 and UTF-16

wallet2: fix build for windows (std::max again)
2018-06-27T23:47:48Z (GMT)

  • wallet2: fix build for windows (std::max again)

blockchain: fix build after waiter::wait prototype change
2018-06-27T23:24:39Z (GMT)

  • blockchain: fix build after waiter::wait prototype change

wallet_rpc_server: fix build - forgot to build rpc version
2018-06-27T22:34:02Z (GMT)

  • wallet_rpc_server: fix build - forgot to build rpc version

Merge pull request #3907
2018-06-27T21:32:33Z (GMT)

  • Merge pull request #3907
    
    dcbc17e wallet: include a suggested number of confirmations based on amount (moneromooo-monero)

Merge pull request #3998
2018-06-27T21:30:38Z (GMT)

  • Merge pull request #3998
    
    8db23df wallet: on first refresh, start off with a quantized height (moneromooo-monero)

Merge pull request #3995
2018-06-27T21:28:57Z (GMT)

  • Merge pull request #3995
    
    0a5292c wallet2: use decoded amount when reporting repeated output key (stoffu)

Merge pull request #3992
2018-06-27T21:26:23Z (GMT)

  • Merge pull request #3992
    
    25c15dc wallet2: use correct fee for split txes (stoffu)