This commit fixes an issue where BIP86 addresses were not being discovered during wallet recovery/rescan operations. The root cause was that init_txfilter() only populated the transaction filter with BIP32-derived keys, preventing lightningd from recognizing BIP86 UTXOs during blockchain scans. Now both BIP32 and BIP86 derived scripts are included in the filter when BIP86 derivation is enabled. This ensures that wallets restored from BIP39 mnemonics can properly discover and display previously funded BIP86 addresses without requiring manual address generation first. [ We also move the slightly-lost comment about libbacktrace so it is where we actually include <backtrace.h> --RR ]
236 lines
5.3 KiB
C
236 lines
5.3 KiB
C
#include "config.h"
|
|
#include <assert.h>
|
|
/*~ This is Ian Lance Taylor's libbacktrace. It turns out that it's
|
|
* horrifically difficult to obtain a decent backtrace in C; the standard
|
|
* backtrace function is useless in most programs. */
|
|
#include <backtrace-supported.h>
|
|
#include <backtrace.h>
|
|
#include <ccan/err/err.h>
|
|
#include <ccan/io/io.h>
|
|
#include <ccan/tal/str/str.h>
|
|
#include <common/daemon.h>
|
|
#include <common/memleak.h>
|
|
#include <common/setup.h>
|
|
#include <common/utils.h>
|
|
#include <common/version.h>
|
|
#include <signal.h>
|
|
|
|
#if BACKTRACE_SUPPORTED
|
|
static void (*bt_print)(const char *fmt, ...) PRINTF_FMT(1,2);
|
|
static void (*bt_exit)(void);
|
|
|
|
static int backtrace_status(void *unused UNUSED, uintptr_t pc,
|
|
const char *filename, int lineno,
|
|
const char *function)
|
|
{
|
|
bt_print("backtrace: %s:%d (%s) %p",
|
|
filename, lineno, function, (void *)pc);
|
|
return 0;
|
|
}
|
|
|
|
void send_backtrace(const char *why)
|
|
{
|
|
/* We do stderr first, since it's most reliable. */
|
|
warnx("%s (version %s)", why, version());
|
|
if (backtrace_state)
|
|
backtrace_print(backtrace_state, 0, stderr);
|
|
|
|
if (!bt_print)
|
|
return;
|
|
|
|
/* Now send to parent. */
|
|
bt_print("%s (version %s)", why, version());
|
|
if (backtrace_state)
|
|
backtrace_full(backtrace_state, 0, backtrace_status, NULL, NULL);
|
|
}
|
|
|
|
static void extract_symname(void *data, uintptr_t pc,
|
|
const char *symname,
|
|
uintptr_t symval,
|
|
uintptr_t symsize)
|
|
{
|
|
const char **ret = data;
|
|
|
|
/* ret is context to alloc off, and value to set */
|
|
if (symname)
|
|
*ret = tal_strdup(*ret, symname);
|
|
else
|
|
*ret = NULL;
|
|
}
|
|
|
|
const char *backtrace_symname(const tal_t *ctx, const void *addr)
|
|
{
|
|
const char *ret = ctx;
|
|
if (!backtrace_state)
|
|
return tal_fmt(ctx, "%p (backtrace disabled)", addr);
|
|
|
|
if (!backtrace_syminfo(backtrace_state, (uintptr_t)addr,
|
|
extract_symname, NULL, &ret))
|
|
ret = NULL;
|
|
|
|
if (ret)
|
|
return ret;
|
|
return tal_fmt(ctx, "%p", addr);
|
|
}
|
|
|
|
static void crashdump(int sig)
|
|
{
|
|
char why[100];
|
|
|
|
snprintf(why, 100, "FATAL SIGNAL %d", sig);
|
|
send_backtrace(why);
|
|
|
|
/* Probably shouldn't return. */
|
|
if (bt_exit)
|
|
bt_exit();
|
|
|
|
/* This time it will kill us instantly. */
|
|
kill(getpid(), sig);
|
|
}
|
|
|
|
static void crashlog_activate(void)
|
|
{
|
|
struct sigaction sa;
|
|
|
|
sa.sa_handler = crashdump;
|
|
sigemptyset(&sa.sa_mask);
|
|
|
|
/* We want to fall through to default handler */
|
|
sa.sa_flags = SA_RESETHAND;
|
|
sigaction(SIGILL, &sa, NULL);
|
|
sigaction(SIGABRT, &sa, NULL);
|
|
sigaction(SIGFPE, &sa, NULL);
|
|
sigaction(SIGSEGV, &sa, NULL);
|
|
sigaction(SIGBUS, &sa, NULL);
|
|
}
|
|
|
|
static void steal_notify(tal_t *child, enum tal_notify_type n, tal_t *newparent)
|
|
{
|
|
tal_t *p = newparent;
|
|
|
|
assert(tal_parent(child) == newparent);
|
|
while ((p = tal_parent(p)) != NULL)
|
|
assert(p != child);
|
|
}
|
|
|
|
static void add_steal_notifier(tal_t *parent UNUSED,
|
|
enum tal_notify_type type UNNEEDED,
|
|
void *child)
|
|
{
|
|
tal_add_notifier(child, TAL_NOTIFY_ADD_CHILD, add_steal_notifier);
|
|
tal_add_notifier(child, TAL_NOTIFY_STEAL, steal_notify);
|
|
}
|
|
|
|
static void add_steal_notifiers(const tal_t *root)
|
|
{
|
|
tal_add_notifier(root, TAL_NOTIFY_ADD_CHILD, add_steal_notifier);
|
|
|
|
for (const tal_t *i = tal_first(root); i; i = tal_next(i))
|
|
add_steal_notifiers(i);
|
|
}
|
|
|
|
static void remove_steal_notifiers(void)
|
|
{
|
|
/* We remove this from root, assuming everything else freed. */
|
|
tal_del_notifier(NULL, add_steal_notifier);
|
|
}
|
|
#else
|
|
void send_backtrace(const char *why)
|
|
{
|
|
}
|
|
|
|
const char *backtrace_symname(const tal_t *ctx, const void *addr)
|
|
{
|
|
return "unknown (backtrace unsupported)";
|
|
}
|
|
|
|
static void add_steal_notifiers(const tal_t *root)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
int daemon_poll(struct pollfd *fds, nfds_t nfds, int timeout)
|
|
{
|
|
const char *t;
|
|
|
|
t = taken_any();
|
|
if (t)
|
|
errx(1, "Outstanding taken pointers: %s", t);
|
|
|
|
if (wally_tal_ctx)
|
|
errx(1, "Outstanding tal_wally_start!");
|
|
|
|
clean_tmpctx();
|
|
|
|
return poll(fds, nfds, timeout);
|
|
}
|
|
|
|
void daemon_setup(const char *argv0,
|
|
void (*backtrace_print)(const char *fmt, ...),
|
|
void (*backtrace_exit)(void))
|
|
{
|
|
common_setup(argv0);
|
|
#if BACKTRACE_SUPPORTED
|
|
bt_print = backtrace_print;
|
|
bt_exit = backtrace_exit;
|
|
|
|
/* Suppresses backtrace (breaks valgrind) */
|
|
if (!getenv("LIGHTNINGD_DEV_NO_BACKTRACE"))
|
|
backtrace_state = backtrace_create_state(argv0, 0, NULL, NULL);
|
|
crashlog_activate();
|
|
#endif
|
|
|
|
memleak_init();
|
|
|
|
/* We handle write returning errors! */
|
|
signal(SIGPIPE, SIG_IGN);
|
|
|
|
io_poll_override(daemon_poll);
|
|
}
|
|
|
|
void daemon_shutdown(void)
|
|
{
|
|
common_shutdown();
|
|
|
|
#if BACKTRACE_SUPPORTED
|
|
/* Harmless if it wasn't applied */
|
|
remove_steal_notifiers();
|
|
#endif
|
|
}
|
|
|
|
bool daemon_developer_mode(char *argv[])
|
|
{
|
|
bool developer = false, debug = false;
|
|
|
|
for (int i = 1; argv[i]; i++) {
|
|
if (streq(argv[i], "--dev-debug-self"))
|
|
debug = true;
|
|
else if (streq(argv[i], "--developer"))
|
|
developer = true;
|
|
}
|
|
|
|
if (!developer)
|
|
return false;
|
|
|
|
if (debug) {
|
|
/* Don't let this mess up stdout, so redir to /dev/null */
|
|
char *cmd = tal_fmt(NULL, "${DEBUG_TERM:-gnome-terminal --} gdb -ex 'attach %u' %s >/dev/null &", getpid(), argv[0]);
|
|
fprintf(stderr, "Running %s\n", cmd);
|
|
/* warn_unused_result is fascist bullshit.
|
|
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 */
|
|
if (system(cmd))
|
|
;
|
|
tal_free(cmd);
|
|
/* Continue in the debugger. */
|
|
kill(getpid(), SIGSTOP);
|
|
}
|
|
|
|
/* This checks for any tal_steal loops, but it's not free:
|
|
* only use if we're already using the fairly heavy memleak
|
|
* detection. */
|
|
if (getenv("LIGHTNINGD_DEV_MEMLEAK"))
|
|
add_steal_notifiers(NULL);
|
|
|
|
return true;
|
|
}
|