fix: compilation with monero

devel
moneroexamples 5 years ago
parent cbbf1f9270
commit 1db298bc0b

@ -1,4 +1,4 @@
# Generated by YCM Generator at 2019-02-04 16:43:28.957650
# Generated by YCM Generator at 2019-10-03 15:56:37.946820
# This file is NOT licensed under the GPLv3, which is the license for the rest
# of YouCompleteMe.
@ -36,28 +36,18 @@ import ycm_core
flags = [
'-x',
'c++',
'-DASIO_STANDALONE=YES',
'-DBUILD_SSL=TRUE',
'-I/home/mwo2/monero/build',
'-I/home/mwo2/monero/contrib/epee/include',
'-I/home/mwo2/monero/external',
'-I/home/mwo2/monero/external/db_drivers/liblmdb',
'-I/home/mwo2/monero/external/easylogging++',
'-I/home/mwo2/monero/src',
'-I/home/mwo2/openmonero/ext/restbed/source',
'-I/home/mwo2/openmonero/src/xmregcore',
'-I/tmp/tmpK6lVvg/distribution/include',
'-I/tmp/tmpK6lVvg/gen',
'-I/usr/include/mysql',
'-I/usr/local/include',
'-I/usr/local/include/mysql',
'-I/usr/local/opt/openssl/include',
'-Wall',
'-Weffc++',
'-Wextra',
'-Wno-unknown-pragmas',
'-std=c++14',
'-I/usr/include/mysql++',
'-std=gnu++14',
'-isystem', '/home/mwo2/openmonero/ext/restbed/dependency/asio/asio/include',
'-isystem', '/home/mwo2/openmonero/ext/restbed/dependency/kashmir',
'-isystem', '/home/mwo2/monero/build',
'-isystem', '/home/mwo2/monero/contrib/epee/include',
'-isystem', '/home/mwo2/monero/external',
'-isystem', '/home/mwo2/monero/external/db_drivers/liblmdb',
'-isystem', '/home/mwo2/monero/external/easylogging++',
'-isystem', '/home/mwo2/monero/src',
]

@ -1710,9 +1710,19 @@ OpenMoneroRequests::get_tx(
if (current_bc_status->get_xmr_address_viewkey(
xmr_address, address_info, viewkey))
{
auto coreacc = make_account(xmr_address, view_key);
if (!coreacc)
{
// if creation failed, just close the session
session_close(session, j_response, UNPROCESSABLE_ENTITY,
"Cant create coreacc for " + xmr_address);
return;
}
auto identifier = make_identifier(tx,
make_unique<Output>(&address_info, &viewkey));
auto identifier = make_identifier(
tx,
make_unique<Output>(coreacc.get()));
identifier.identify();
@ -1739,6 +1749,7 @@ OpenMoneroRequests::get_tx(
// a placeholder for exciting or new account data
XmrAccount acc;
// select this account if its existing one
if (xmr_accounts->select(xmr_address, acc))
{
@ -1819,7 +1830,7 @@ OpenMoneroRequests::get_tx(
// and inputs in a given tx.
auto identifier = make_identifier(tx,
make_unique<Input>(&address_info, &viewkey,
make_unique<Input>(coreacc.get(),
&known_outputs_keys,
&mcore_addapter));
identifier.identify();

@ -1 +1 @@
Subproject commit 4356c9892b9903da4410f773ea36a6e4c799be5a
Subproject commit 284f7b679262323835fe7bb83b02fd269a4500f1
Loading…
Cancel
Save