diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-05-30 21:13:47 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-05-30 21:13:47 +0200 |
| commit | 1555e7673d994cacd3f845cc923db40795a26219 (patch) | |
| tree | b88ccc83db3bc1918e8a390543134a027e5392a9 /src/wallet/node_rpc_proxy.cpp | |
| parent | 40eb22aeb475cfe5a5967c0f60964e39030afe74 (diff) | |
| parent | 0a182576d0e07550e21bbd9aeea6ef1e192ebccc (diff) | |
| download | monzero-core-1555e7673d994cacd3f845cc923db40795a26219.tar.gz monzero-core-1555e7673d994cacd3f845cc923db40795a26219.tar.xz monzero-core-1555e7673d994cacd3f845cc923db40795a26219.zip | |
Merge pull request #2017
0a182576 node_rpc_proxy: fix earliest fork height query for unknown forks (moneromooo-monero)
391c918d wallet2: fix sweep_unmixable assuming wrong minimum mixin at v5 (moneromooo-monero)
Diffstat (limited to 'src/wallet/node_rpc_proxy.cpp')
| -rw-r--r-- | src/wallet/node_rpc_proxy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/node_rpc_proxy.cpp b/src/wallet/node_rpc_proxy.cpp index 03e1bbd98..1143a89d7 100644 --- a/src/wallet/node_rpc_proxy.cpp +++ b/src/wallet/node_rpc_proxy.cpp @@ -127,7 +127,7 @@ boost::optional<std::string> NodeRPCProxy::get_earliest_height(uint8_t version, CHECK_AND_ASSERT_MES(r, std::string(), "Failed to connect to daemon"); CHECK_AND_ASSERT_MES(resp_t.result.status != CORE_RPC_STATUS_BUSY, resp_t.result.status, "Failed to connect to daemon"); CHECK_AND_ASSERT_MES(resp_t.result.status == CORE_RPC_STATUS_OK, resp_t.result.status, "Failed to get hard fork status"); - m_earliest_height[version] = resp_t.result.earliest_height; + m_earliest_height[version] = resp_t.result.enabled ? resp_t.result.earliest_height : std::numeric_limits<uint64_t>::max(); } earliest_height = m_earliest_height[version]; |