From a9e71d76b54701616562ed0fa4d6e276f8ca89e2 Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Mon, 22 Apr 2019 15:10:17 +0200 Subject: [PATCH] update libwally to latest version 0.6.9 Also removes a workaround caused by bug in libwally (!95) which has been fixed. Signed-off-by: Lawrence Nahum --- channeld/test/run-full_channel.c | 3 +-- common/daemon.c | 3 +-- common/test/run-bolt11.c | 3 +-- common/test/run-derive_basepoints.c | 3 +-- common/test/run-features.c | 3 +-- external/libwally-core | 2 +- wallet/test/run-wallet.c | 3 +-- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/channeld/test/run-full_channel.c b/channeld/test/run-full_channel.c index e7534474a..6b7e2bda9 100644 --- a/channeld/test/run-full_channel.c +++ b/channeld/test/run-full_channel.c @@ -345,8 +345,7 @@ int main(void) const struct chainparams *chainparams = chainparams_for_network("bitcoin"); wally_init(0); - /* FIXME: https://github.com/ElementsProject/libwally-core/issues/95 */ - secp256k1_ctx = (secp256k1_context *)wally_get_secp_context(); + secp256k1_ctx = wally_get_secp_context(); setup_tmpctx(); feerate_per_kw = tal_arr(tmpctx, u32, NUM_SIDES); diff --git a/common/daemon.c b/common/daemon.c index 194c15c1f..fc93c1793 100644 --- a/common/daemon.c +++ b/common/daemon.c @@ -149,8 +149,7 @@ void daemon_setup(const char *argv0, /* We handle write returning errors! */ signal(SIGPIPE, SIG_IGN); wally_init(0); - /* FIXME: https://github.com/ElementsProject/libwally-core/issues/95 */ - secp256k1_ctx = (secp256k1_context *)wally_get_secp_context(); + secp256k1_ctx = wally_get_secp_context(); setup_tmpctx(); io_poll_override(daemon_poll); diff --git a/common/test/run-bolt11.c b/common/test/run-bolt11.c index 992fffbcf..97ecfe971 100644 --- a/common/test/run-bolt11.c +++ b/common/test/run-bolt11.c @@ -130,8 +130,7 @@ int main(void) const char *badstr; wally_init(0); - /* FIXME: https://github.com/ElementsProject/libwally-core/issues/95 */ - secp256k1_ctx = (secp256k1_context *)wally_get_secp_context(); + secp256k1_ctx = wally_get_secp_context(); setup_tmpctx(); /* BOLT #11: diff --git a/common/test/run-derive_basepoints.c b/common/test/run-derive_basepoints.c index 7de3a119f..0a4d8a0b3 100644 --- a/common/test/run-derive_basepoints.c +++ b/common/test/run-derive_basepoints.c @@ -55,8 +55,7 @@ int main(void) struct info *baseline, *info; wally_init(0); - /* FIXME: https://github.com/ElementsProject/libwally-core/issues/95 */ - secp256k1_ctx = (secp256k1_context *)wally_get_secp_context(); + secp256k1_ctx = wally_get_secp_context(); baseline = new_info(ctx); assert(derive_basepoints(&baseline->seed, &baseline->funding_pubkey, &baseline->basepoints, diff --git a/common/test/run-features.c b/common/test/run-features.c index 16330fa90..8c33f4b80 100644 --- a/common/test/run-features.c +++ b/common/test/run-features.c @@ -15,8 +15,7 @@ int main(void) setup_locale(); wally_init(0); - /* FIXME: https://github.com/ElementsProject/libwally-core/issues/95 */ - secp256k1_ctx = (secp256k1_context *)wally_get_secp_context(); + secp256k1_ctx = wally_get_secp_context(); setup_tmpctx(); bits = tal_arr(tmpctx, u8, 0); diff --git a/external/libwally-core b/external/libwally-core index f27740564..1b7ce30c8 160000 --- a/external/libwally-core +++ b/external/libwally-core @@ -1 +1 @@ -Subproject commit f27740564955e9a63d2946bdb0099622c0977b6e +Subproject commit 1b7ce30c8ceb9e95820486dbc1015b04f5f8b683 diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c index 117cdc2f4..2bc1c855d 100644 --- a/wallet/test/run-wallet.c +++ b/wallet/test/run-wallet.c @@ -1187,8 +1187,7 @@ int main(void) setup_tmpctx(); wally_init(0); - /* FIXME: https://github.com/ElementsProject/libwally-core/issues/95 */ - secp256k1_ctx = (secp256k1_context *)wally_get_secp_context(); + secp256k1_ctx = wally_get_secp_context(); ld = tal(tmpctx, struct lightningd); ld->config = test_config;