add --block-notify to monerod and --tx-notify to monero-wallet-{cli,rpc}
Those take a command line of the form "A [B]", with A being the name (and optional path, if not in the caller's CWD, but fully qualified path is recommended, avoids possible security issues) to a program, and optional arguments. Any occurence of the two character string "%s" will be replaced by the hash of the block or transaction which triggered the notification. Tokenization is barebones. If you want things like pipes, calls to paths with spaces, etc, then use a script (though exec time will suffer). block-notify is called when a new block is added onto the chain. tx-notify is called when a new transaction happens with the wallet as source and/or destination. It is the notification program's responsibility to determine what to do in those cases. Note that this is asynchronous, so it is very possible that: - the notification programs will be run out of order - several events happen before the notification for the first one A Windows port would be nice if someone wants to make one.
This commit is contained in:
parent
8bf5a00564
commit
7340300460
|
@ -34,9 +34,11 @@ set(common_sources
|
||||||
dns_utils.cpp
|
dns_utils.cpp
|
||||||
download.cpp
|
download.cpp
|
||||||
error.cpp
|
error.cpp
|
||||||
|
exec.cpp
|
||||||
expect.cpp
|
expect.cpp
|
||||||
util.cpp
|
util.cpp
|
||||||
i18n.cpp
|
i18n.cpp
|
||||||
|
notify.cpp
|
||||||
password.cpp
|
password.cpp
|
||||||
perf_timer.cpp
|
perf_timer.cpp
|
||||||
threadpool.cpp
|
threadpool.cpp
|
||||||
|
@ -58,9 +60,11 @@ set(common_private_headers
|
||||||
dns_utils.h
|
dns_utils.h
|
||||||
download.h
|
download.h
|
||||||
error.h
|
error.h
|
||||||
|
exec.h
|
||||||
expect.h
|
expect.h
|
||||||
http_connection.h
|
http_connection.h
|
||||||
int-util.h
|
int-util.h
|
||||||
|
notify.h
|
||||||
pod-class.h
|
pod-class.h
|
||||||
rpc_client.h
|
rpc_client.h
|
||||||
scoped_message_writer.h
|
scoped_message_writer.h
|
||||||
|
|
|
@ -0,0 +1,88 @@
|
||||||
|
// Copyright (c) 2018, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
|
||||||
|
#include "misc_log_ex.h"
|
||||||
|
#include "exec.h"
|
||||||
|
|
||||||
|
namespace tools
|
||||||
|
{
|
||||||
|
|
||||||
|
int exec(const char *filename, char * const argv[], bool wait)
|
||||||
|
{
|
||||||
|
pid_t pid = fork();
|
||||||
|
if (pid < 0)
|
||||||
|
{
|
||||||
|
MERROR("Error forking: " << strerror(errno));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// child
|
||||||
|
if (pid == 0)
|
||||||
|
{
|
||||||
|
char *envp[] = {NULL};
|
||||||
|
execve(filename, argv, envp);
|
||||||
|
MERROR("Failed to execve: " << strerror(errno));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// parent
|
||||||
|
if (pid > 0)
|
||||||
|
{
|
||||||
|
if (!wait)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
while (1)
|
||||||
|
{
|
||||||
|
int wstatus = 0;
|
||||||
|
pid_t w = waitpid(pid, &wstatus, WUNTRACED | WCONTINUED);
|
||||||
|
if (w < 0) {
|
||||||
|
MERROR("Error waiting for child: " << strerror(errno));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (WIFEXITED(wstatus))
|
||||||
|
{
|
||||||
|
MINFO("Child exited with " << WEXITSTATUS(wstatus));
|
||||||
|
return WEXITSTATUS(wstatus);
|
||||||
|
}
|
||||||
|
if (WIFSIGNALED(wstatus))
|
||||||
|
{
|
||||||
|
MINFO("Child killed by " << WEXITSTATUS(wstatus));
|
||||||
|
return WEXITSTATUS(wstatus);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
MERROR("Secret passage found");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,36 @@
|
||||||
|
// Copyright (c) 2018, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace tools
|
||||||
|
{
|
||||||
|
|
||||||
|
int exec(const char *filename, char * const argv[], bool wait);
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,61 @@
|
||||||
|
// Copyright (c) 2018, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
#include <boost/algorithm/string.hpp>
|
||||||
|
#include "misc_log_ex.h"
|
||||||
|
#include "file_io_utils.h"
|
||||||
|
#include "exec.h"
|
||||||
|
#include "notify.h"
|
||||||
|
|
||||||
|
namespace tools
|
||||||
|
{
|
||||||
|
|
||||||
|
Notify::Notify(const char *spec)
|
||||||
|
{
|
||||||
|
CHECK_AND_ASSERT_THROW_MES(spec, "Null spec");
|
||||||
|
|
||||||
|
boost::split(args, spec, boost::is_any_of(" "));
|
||||||
|
CHECK_AND_ASSERT_THROW_MES(args.size() > 0, "Failed to parse spec");
|
||||||
|
filename = args[0];
|
||||||
|
CHECK_AND_ASSERT_THROW_MES(epee::file_io_utils::is_file_exist(filename), "File not found: " << filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
int Notify::notify(const char *parameter)
|
||||||
|
{
|
||||||
|
std::vector<std::string> margs = args;
|
||||||
|
for (std::string &s: margs)
|
||||||
|
boost::replace_all(s, "%s", parameter);
|
||||||
|
|
||||||
|
char **cargs = (char**)alloca(sizeof(char*) * (margs.size() + 1));
|
||||||
|
for (size_t n = 0; n < margs.size(); ++n)
|
||||||
|
cargs[n] = (char*)margs[n].c_str();
|
||||||
|
cargs[margs.size()] = NULL;
|
||||||
|
return tools::exec(filename.c_str(), cargs, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,49 @@
|
||||||
|
// Copyright (c) 2018, The Monero Project
|
||||||
|
//
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without modification, are
|
||||||
|
// permitted provided that the following conditions are met:
|
||||||
|
//
|
||||||
|
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||||
|
// conditions and the following disclaimer.
|
||||||
|
//
|
||||||
|
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||||
|
// of conditions and the following disclaimer in the documentation and/or other
|
||||||
|
// materials provided with the distribution.
|
||||||
|
//
|
||||||
|
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||||
|
// used to endorse or promote products derived from this software without specific
|
||||||
|
// prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||||
|
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||||
|
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||||
|
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace tools
|
||||||
|
{
|
||||||
|
|
||||||
|
class Notify
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
Notify(const char *spec);
|
||||||
|
|
||||||
|
int notify(const char *parameter);
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string filename;
|
||||||
|
std::vector<std::string> args;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
|
@ -52,6 +52,7 @@
|
||||||
#include "cryptonote_core.h"
|
#include "cryptonote_core.h"
|
||||||
#include "ringct/rctSigs.h"
|
#include "ringct/rctSigs.h"
|
||||||
#include "common/perf_timer.h"
|
#include "common/perf_timer.h"
|
||||||
|
#include "common/notify.h"
|
||||||
#if defined(PER_BLOCK_CHECKPOINT)
|
#if defined(PER_BLOCK_CHECKPOINT)
|
||||||
#include "blocks/blocks.h"
|
#include "blocks/blocks.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -3552,6 +3553,10 @@ leave:
|
||||||
get_difficulty_for_next_block(); // just to cache it
|
get_difficulty_for_next_block(); // just to cache it
|
||||||
invalidate_block_template_cache();
|
invalidate_block_template_cache();
|
||||||
|
|
||||||
|
std::shared_ptr<tools::Notify> block_notify = m_block_notify;
|
||||||
|
if (block_notify)
|
||||||
|
block_notify->notify(epee::string_tools::pod_to_hex(id).c_str());
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------
|
//------------------------------------------------------------------
|
||||||
|
|
|
@ -55,6 +55,8 @@
|
||||||
#include "cryptonote_basic/hardfork.h"
|
#include "cryptonote_basic/hardfork.h"
|
||||||
#include "blockchain_db/blockchain_db.h"
|
#include "blockchain_db/blockchain_db.h"
|
||||||
|
|
||||||
|
namespace tools { class Notify; }
|
||||||
|
|
||||||
namespace cryptonote
|
namespace cryptonote
|
||||||
{
|
{
|
||||||
class tx_memory_pool;
|
class tx_memory_pool;
|
||||||
|
@ -705,6 +707,13 @@ namespace cryptonote
|
||||||
void set_user_options(uint64_t maxthreads, bool sync_on_blocks, uint64_t sync_threshold,
|
void set_user_options(uint64_t maxthreads, bool sync_on_blocks, uint64_t sync_threshold,
|
||||||
blockchain_db_sync_mode sync_mode, bool fast_sync);
|
blockchain_db_sync_mode sync_mode, bool fast_sync);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief sets a block notify object to call for every new block
|
||||||
|
*
|
||||||
|
* @param notify the notify object to cal at every new block
|
||||||
|
*/
|
||||||
|
void set_block_notify(const std::shared_ptr<tools::Notify> ¬ify) { m_block_notify = notify; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Put DB in safe sync mode
|
* @brief Put DB in safe sync mode
|
||||||
*/
|
*/
|
||||||
|
@ -1032,6 +1041,8 @@ namespace cryptonote
|
||||||
uint64_t m_btc_expected_reward;
|
uint64_t m_btc_expected_reward;
|
||||||
bool m_btc_valid;
|
bool m_btc_valid;
|
||||||
|
|
||||||
|
std::shared_ptr<tools::Notify> m_block_notify;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief collects the keys for all outputs being "spent" as an input
|
* @brief collects the keys for all outputs being "spent" as an input
|
||||||
*
|
*
|
||||||
|
|
|
@ -53,6 +53,7 @@ using namespace epee;
|
||||||
#include "ringct/rctTypes.h"
|
#include "ringct/rctTypes.h"
|
||||||
#include "blockchain_db/blockchain_db.h"
|
#include "blockchain_db/blockchain_db.h"
|
||||||
#include "ringct/rctSigs.h"
|
#include "ringct/rctSigs.h"
|
||||||
|
#include "common/notify.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
#undef MONERO_DEFAULT_LOG_CATEGORY
|
#undef MONERO_DEFAULT_LOG_CATEGORY
|
||||||
|
@ -167,6 +168,11 @@ namespace cryptonote
|
||||||
, "Set maximum txpool weight in bytes."
|
, "Set maximum txpool weight in bytes."
|
||||||
, DEFAULT_TXPOOL_MAX_WEIGHT
|
, DEFAULT_TXPOOL_MAX_WEIGHT
|
||||||
};
|
};
|
||||||
|
static const command_line::arg_descriptor<std::string> arg_block_notify = {
|
||||||
|
"block-notify"
|
||||||
|
, "Run a program for each new block, '%s' will be replaced by the block hash"
|
||||||
|
, ""
|
||||||
|
};
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------------------------
|
||||||
core::core(i_cryptonote_protocol* pprotocol):
|
core::core(i_cryptonote_protocol* pprotocol):
|
||||||
|
@ -276,6 +282,7 @@ namespace cryptonote
|
||||||
command_line::add_arg(desc, arg_offline);
|
command_line::add_arg(desc, arg_offline);
|
||||||
command_line::add_arg(desc, arg_disable_dns_checkpoints);
|
command_line::add_arg(desc, arg_disable_dns_checkpoints);
|
||||||
command_line::add_arg(desc, arg_max_txpool_weight);
|
command_line::add_arg(desc, arg_max_txpool_weight);
|
||||||
|
command_line::add_arg(desc, arg_block_notify);
|
||||||
|
|
||||||
miner::init_options(desc);
|
miner::init_options(desc);
|
||||||
BlockchainDB::init_options(desc);
|
BlockchainDB::init_options(desc);
|
||||||
|
@ -545,6 +552,16 @@ namespace cryptonote
|
||||||
m_blockchain_storage.set_user_options(blocks_threads,
|
m_blockchain_storage.set_user_options(blocks_threads,
|
||||||
sync_on_blocks, sync_threshold, sync_mode, fast_sync);
|
sync_on_blocks, sync_threshold, sync_mode, fast_sync);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!command_line::is_arg_defaulted(vm, arg_block_notify))
|
||||||
|
m_blockchain_storage.set_block_notify(std::shared_ptr<tools::Notify>(new tools::Notify(command_line::get_arg(vm, arg_block_notify).c_str())));
|
||||||
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
MERROR("Failed to parse block notify spec");
|
||||||
|
}
|
||||||
|
|
||||||
const std::pair<uint8_t, uint64_t> regtest_hard_forks[3] = {std::make_pair(1, 0), std::make_pair(Blockchain::get_hard_fork_heights(MAINNET).back().version, 1), std::make_pair(0, 0)};
|
const std::pair<uint8_t, uint64_t> regtest_hard_forks[3] = {std::make_pair(1, 0), std::make_pair(Blockchain::get_hard_fork_heights(MAINNET).back().version, 1), std::make_pair(0, 0)};
|
||||||
const cryptonote::test_options regtest_test_options = {
|
const cryptonote::test_options regtest_test_options = {
|
||||||
regtest_hard_forks
|
regtest_hard_forks
|
||||||
|
|
|
@ -66,6 +66,7 @@ using namespace epee;
|
||||||
#include "memwipe.h"
|
#include "memwipe.h"
|
||||||
#include "common/base58.h"
|
#include "common/base58.h"
|
||||||
#include "common/dns_utils.h"
|
#include "common/dns_utils.h"
|
||||||
|
#include "common/notify.h"
|
||||||
#include "ringct/rctSigs.h"
|
#include "ringct/rctSigs.h"
|
||||||
#include "ringdb.h"
|
#include "ringdb.h"
|
||||||
|
|
||||||
|
@ -162,6 +163,7 @@ struct options {
|
||||||
};
|
};
|
||||||
const command_line::arg_descriptor<uint64_t> kdf_rounds = {"kdf-rounds", tools::wallet2::tr("Number of rounds for the key derivation function"), 1};
|
const command_line::arg_descriptor<uint64_t> kdf_rounds = {"kdf-rounds", tools::wallet2::tr("Number of rounds for the key derivation function"), 1};
|
||||||
const command_line::arg_descriptor<std::string> hw_device = {"hw-device", tools::wallet2::tr("HW device to use"), ""};
|
const command_line::arg_descriptor<std::string> hw_device = {"hw-device", tools::wallet2::tr("HW device to use"), ""};
|
||||||
|
const command_line::arg_descriptor<std::string> tx_notify = { "tx-notify" , "Run a program for each new incoming transaction, '%s' will be replaced by the transaction hash" , "" };
|
||||||
};
|
};
|
||||||
|
|
||||||
void do_prepare_file_names(const std::string& file_path, std::string& keys_file, std::string& wallet_file)
|
void do_prepare_file_names(const std::string& file_path, std::string& keys_file, std::string& wallet_file)
|
||||||
|
@ -268,6 +270,17 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl
|
||||||
boost::filesystem::path ringdb_path = command_line::get_arg(vm, opts.shared_ringdb_dir);
|
boost::filesystem::path ringdb_path = command_line::get_arg(vm, opts.shared_ringdb_dir);
|
||||||
wallet->set_ring_database(ringdb_path.string());
|
wallet->set_ring_database(ringdb_path.string());
|
||||||
wallet->device_name(device_name);
|
wallet->device_name(device_name);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!command_line::is_arg_defaulted(vm, opts.tx_notify))
|
||||||
|
wallet->set_tx_notify(std::shared_ptr<tools::Notify>(new tools::Notify(command_line::get_arg(vm, opts.tx_notify).c_str())));
|
||||||
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
MERROR("Failed to parse tx notify spec");
|
||||||
|
}
|
||||||
|
|
||||||
return wallet;
|
return wallet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -838,6 +851,7 @@ void wallet2::init_options(boost::program_options::options_description& desc_par
|
||||||
command_line::add_arg(desc_params, opts.shared_ringdb_dir);
|
command_line::add_arg(desc_params, opts.shared_ringdb_dir);
|
||||||
command_line::add_arg(desc_params, opts.kdf_rounds);
|
command_line::add_arg(desc_params, opts.kdf_rounds);
|
||||||
command_line::add_arg(desc_params, opts.hw_device);
|
command_line::add_arg(desc_params, opts.hw_device);
|
||||||
|
command_line::add_arg(desc_params, opts.tx_notify);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<wallet2> wallet2::make_from_json(const boost::program_options::variables_map& vm, bool unattended, const std::string& json_file, const std::function<boost::optional<tools::password_container>(const char *, bool)> &password_prompter)
|
std::unique_ptr<wallet2> wallet2::make_from_json(const boost::program_options::variables_map& vm, bool unattended, const std::string& json_file, const std::function<boost::optional<tools::password_container>(const char *, bool)> &password_prompter)
|
||||||
|
@ -1328,6 +1342,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
|
||||||
std::vector<size_t> outs;
|
std::vector<size_t> outs;
|
||||||
std::unordered_map<cryptonote::subaddress_index, uint64_t> tx_money_got_in_outs; // per receiving subaddress index
|
std::unordered_map<cryptonote::subaddress_index, uint64_t> tx_money_got_in_outs; // per receiving subaddress index
|
||||||
crypto::public_key tx_pub_key = null_pkey;
|
crypto::public_key tx_pub_key = null_pkey;
|
||||||
|
bool notify = false;
|
||||||
|
|
||||||
std::vector<tx_extra_field> local_tx_extra_fields;
|
std::vector<tx_extra_field> local_tx_extra_fields;
|
||||||
if (tx_cache_data.tx_extra_fields.empty())
|
if (tx_cache_data.tx_extra_fields.empty())
|
||||||
|
@ -1567,6 +1582,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
|
||||||
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index);
|
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index);
|
||||||
}
|
}
|
||||||
total_received_1 += amount;
|
total_received_1 += amount;
|
||||||
|
notify = true;
|
||||||
}
|
}
|
||||||
else if (m_transfers[kit->second].m_spent || m_transfers[kit->second].amount() >= tx_scan_info[o].amount)
|
else if (m_transfers[kit->second].m_spent || m_transfers[kit->second].amount() >= tx_scan_info[o].amount)
|
||||||
{
|
{
|
||||||
|
@ -1634,6 +1650,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
|
||||||
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index);
|
m_callback->on_money_received(height, txid, tx, td.m_amount, td.m_subaddr_index);
|
||||||
}
|
}
|
||||||
total_received_1 += extra_amount;
|
total_received_1 += extra_amount;
|
||||||
|
notify = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1790,6 +1807,13 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
|
||||||
LOG_PRINT_L2("Payment found in " << (pool ? "pool" : "block") << ": " << payment_id << " / " << payment.m_tx_hash << " / " << payment.m_amount);
|
LOG_PRINT_L2("Payment found in " << (pool ? "pool" : "block") << ": " << payment_id << " / " << payment.m_tx_hash << " / " << payment.m_amount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (notify)
|
||||||
|
{
|
||||||
|
std::shared_ptr<tools::Notify> tx_notify = m_tx_notify;
|
||||||
|
if (tx_notify)
|
||||||
|
tx_notify->notify(epee::string_tools::pod_to_hex(txid).c_str());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
void wallet2::process_unconfirmed(const crypto::hash &txid, const cryptonote::transaction& tx, uint64_t height)
|
void wallet2::process_unconfirmed(const crypto::hash &txid, const cryptonote::transaction& tx, uint64_t height)
|
||||||
|
|
|
@ -68,6 +68,7 @@ namespace tools
|
||||||
{
|
{
|
||||||
class ringdb;
|
class ringdb;
|
||||||
class wallet2;
|
class wallet2;
|
||||||
|
class Notify;
|
||||||
|
|
||||||
class wallet_keys_unlocker
|
class wallet_keys_unlocker
|
||||||
{
|
{
|
||||||
|
@ -1176,6 +1177,8 @@ namespace tools
|
||||||
|
|
||||||
void change_password(const std::string &filename, const epee::wipeable_string &original_password, const epee::wipeable_string &new_password);
|
void change_password(const std::string &filename, const epee::wipeable_string &original_password, const epee::wipeable_string &new_password);
|
||||||
|
|
||||||
|
void set_tx_notify(const std::shared_ptr<tools::Notify> ¬ify) { m_tx_notify = notify; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/*!
|
/*!
|
||||||
* \brief Stores wallet information to wallet file.
|
* \brief Stores wallet information to wallet file.
|
||||||
|
@ -1353,6 +1356,8 @@ namespace tools
|
||||||
boost::optional<epee::wipeable_string> m_encrypt_keys_after_refresh;
|
boost::optional<epee::wipeable_string> m_encrypt_keys_after_refresh;
|
||||||
|
|
||||||
bool m_unattended;
|
bool m_unattended;
|
||||||
|
|
||||||
|
std::shared_ptr<tools::Notify> m_tx_notify;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
BOOST_CLASS_VERSION(tools::wallet2, 25)
|
BOOST_CLASS_VERSION(tools::wallet2, 25)
|
||||||
|
|
Loading…
Reference in New Issue