aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-10 17:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

gossmap: move gossmap_guess_node_id to pay plugin.

Browse Source 
This removes a point32 dependency.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-10-17 11:07:05 +10:30
parent 7745513c51
commit 82d98e4b96
8 changed files with 104 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Makefile
View File

@@ -1,4 +1,5 @@
PLUGIN_PAY_SRC := plugins/pay.c
PLUGIN_PAY_SRC := plugins/pay.c plugins/pay_point32.c
PLUGIN_PAY_HEADER := plugins/pay_point32.h
PLUGIN_PAY_OBJS := $(PLUGIN_PAY_SRC:.c=.o)
PLUGIN_AUTOCLEAN_SRC := plugins/autoclean.c
@@ -76,6 +77,7 @@ PLUGIN_ALL_SRC := \
$(PLUGIN_SPENDER_SRC)
PLUGIN_ALL_HEADER := \
$(PLUGIN_PAY_HEADER) \
$(PLUGIN_LIB_HEADER) \
$(PLUGIN_FUNDER_HEADER) \
$(PLUGIN_PAY_LIB_HEADER) \

1
plugins/pay.c
View File

@@ -15,6 +15,7 @@
#include <common/memleak.h>
#include <common/pseudorand.h>
#include <common/type_to_string.h>
#include <plugins/pay_point32.h>
#include <plugins/libplugin-pay.h>
#include <stdio.h>

20
plugins/pay_point32.c Normal file
View File

@@ -0,0 +1,20 @@
#include <bitcoin/pubkey.h>
#include <common/gossmap.h>
#include <common/node_id.h>
#include <plugins/pay_point32.h>
/* There are two 33-byte pubkeys possible: choose the one which appears
* in the graph (otherwise payment will fail anyway). */
void gossmap_guess_node_id(const struct gossmap *map,
const struct point32 *point32,
struct node_id *id)
{
struct pubkey pk;
pk.pubkey = point32->pubkey;
node_id_from_pubkey(id, &pk);
/* If we don't find this, let's assume it's the alternate. */
if (!gossmap_find_node(map, id))
id->k[0] |= 1;
}

12
plugins/pay_point32.h Normal file
View File

@@ -0,0 +1,12 @@
#ifndef LIGHTNING_PLUGINS_PAY_POINT32_H
#define LIGHTNING_PLUGINS_PAY_POINT32_H
struct gossmap;
struct point32;
struct node_id;
void gossmap_guess_node_id(const struct gossmap *map,
const struct point32 *point32,
struct node_id *id);
#endif /* LIGHTNING_PLUGINS_PAY_POINT32_H */

68
plugins/test/run-gossmap_guess_node_id.c Normal file
View File

@@ -0,0 +1,68 @@
/* Test conversion assumptions used by gossmap_guess_node_id */
#include "config.h"
#include <assert.h>
#include <bitcoin/privkey.h>
#include <common/amount.h>
#include <common/bigsize.h>
#include <common/channel_id.h>
#include <common/setup.h>
#include <stdio.h>
#include <wire/wire.h>
#include "../pay_point32.c"
/* AUTOGENERATED MOCKS START */
/* Generated stub for fromwire_bigsize */
bigsize_t fromwire_bigsize(const u8 **cursor UNNEEDED, size_t *max UNNEEDED)
{ fprintf(stderr, "fromwire_bigsize called!\n"); abort(); }
/* Generated stub for fromwire_channel_id */
bool fromwire_channel_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED,
struct channel_id *channel_id UNNEEDED)
{ fprintf(stderr, "fromwire_channel_id called!\n"); abort(); }
/* Generated stub for fromwire_node_id */
void fromwire_node_id(const u8 **cursor UNNEEDED, size_t *max UNNEEDED, struct node_id *id UNNEEDED)
{ fprintf(stderr, "fromwire_node_id called!\n"); abort(); }
/* Generated stub for gossmap_find_node */
struct gossmap_node *gossmap_find_node(const struct gossmap *map UNNEEDED,
const struct node_id *id UNNEEDED)
{ fprintf(stderr, "gossmap_find_node called!\n"); abort(); }
/* Generated stub for node_id_from_pubkey */
void node_id_from_pubkey(struct node_id *id UNNEEDED, const struct pubkey *key UNNEEDED)
{ fprintf(stderr, "node_id_from_pubkey called!\n"); abort(); }
/* Generated stub for towire_bigsize */
void towire_bigsize(u8 **pptr UNNEEDED, const bigsize_t val UNNEEDED)
{ fprintf(stderr, "towire_bigsize called!\n"); abort(); }
/* Generated stub for towire_channel_id */
void towire_channel_id(u8 **pptr UNNEEDED, const struct channel_id *channel_id UNNEEDED)
{ fprintf(stderr, "towire_channel_id called!\n"); abort(); }
/* Generated stub for towire_node_id */
void towire_node_id(u8 **pptr UNNEEDED, const struct node_id *id UNNEEDED)
{ fprintf(stderr, "towire_node_id called!\n"); abort(); }
/* AUTOGENERATED MOCKS END */
int main(int argc, char *argv[])
{
common_setup(argv[0]);
for (size_t i = 1; i < 255; i++) {
struct privkey priv;
secp256k1_keypair keypair;
secp256k1_pubkey pubkey;
secp256k1_xonly_pubkey xpubkey;
u8 output32[32];
u8 output33[33];
size_t len = sizeof(output33);
memset(&priv, i, sizeof(priv));
assert(secp256k1_keypair_create(secp256k1_ctx, &keypair, priv.secret.data) == 1);
assert(secp256k1_keypair_pub(secp256k1_ctx, &pubkey, &keypair) == 1);
assert(secp256k1_keypair_xonly_pub(secp256k1_ctx, &xpubkey, NULL, &keypair) == 1);
assert(secp256k1_xonly_pubkey_serialize(secp256k1_ctx, output32, &xpubkey) == 1);
assert(secp256k1_ec_pubkey_serialize(secp256k1_ctx, output33, &len, &pubkey, SECP256K1_EC_COMPRESSED) == 1);
assert(memcmp(output32, output33 + 1, sizeof(output32)) == 0);
assert(output33[0] == SECP256K1_TAG_PUBKEY_EVEN
|| output33[0] == SECP256K1_TAG_PUBKEY_ODD);
}
common_shutdown();
}