feat: ios return list of node details from array of pubkeys

Jasonvdb · Jasonvdb · commit 9c7139e03208 · 2022-12-02T13:21:56.000+02:00
diff --git a/example/App.tsx b/example/App.tsx
@@ -405,16 +405,15 @@ const App = (): ReactElement => {
 								return setMessage(decode.error.message);
 							}
 
-							const { recover_payee_pub_key, amount_satoshis } = decode.value;
+							const { recover_payee_pub_key, amount_satoshis, description } =
+								decode.value;
 
 							const ownAmountSats = 1000;
 							Alert.alert(
 								amount_satoshis
 									? `Pay ${amount_satoshis ?? 0}`
 									: 'Zero sat invoice found',
-								amount_satoshis
-									? `To pubkey: ${recover_payee_pub_key}`
-									: `Send ${ownAmountSats} sats (Our chosen amount) to send over?`,
+								description,
 								[
 									{
 										text: 'Cancel',
@@ -444,24 +443,29 @@ const App = (): ReactElement => {
 					<Button
 						title={'Get network graph'}
 						onPress={async (): Promise<void> => {
-							const nodesRes = await ldk.completeGraphNodes();
+							const nodesRes = await ldk.networkGraphListNodeIds();
 							if (nodesRes.isErr()) {
 								return setMessage(nodesRes.error.message);
 							}
 
-							const channelRes = await ldk.completeGraphChannels();
-							if (channelRes.isErr()) {
-								return setMessage(channelRes.error.message);
+							let msg = 'Nodes: \n\n';
+
+							for (let index = 0; index < nodesRes.value.length; index++) {
+								const id = nodesRes.value[index];
+
+								const nodes = await ldk.networkGraphNodes([id]);
+								if (nodes.isOk()) {
+									msg += `${JSON.stringify(nodes.value)}`;
+								}
 							}
 
-							const nodes = `Nodes:\n\n${nodesRes.value.map(
-								(node) => `\n${JSON.stringify(node)}`,
-							)}`;
-							const channels = `Channels:\n\n${channelRes.value.map(
-								(channel) => `\n${JSON.stringify(channel)}`,
-							)}`;
+							// const nodes = `Nodes:\n\n${nodesRes.value.map(async (id) => {
+							// 	const res = await ldk.networkGraphNodes([id]);
+							// 	const node = res.isOk() ? res.value : [];
+							// 	return `\n${JSON.stringify(id)}\n${JSON.stringify(node[0])}\n`;
+							// })}`;
 
-							setMessage(`${nodes}\n${channels}`);
+							setMessage(`${msg}`);
 						}}
 					/>
 
diff --git a/lib/ios/Helpers.swift b/lib/ios/Helpers.swift
@@ -116,10 +116,12 @@ extension ChannelInfo {
 
 //Nodes in our network graph
 extension NodeInfo {
-    var asJson: Any {
+    var asJson: [String: Any] {
         return [
             "shortChannelIds": get_channels().map({ String($0) }),
-            //TODO gathering other details results in EXC_BAD_ACCESS. Test with next version of LDK.
+            "lowest_inbound_channel_fees_base_msat": get_lowest_inbound_channel_fees().get_base_msat(),
+            "lowest_inbound_channel_fees_proportional_millionths": get_lowest_inbound_channel_fees().get_proportional_millionths(),
+            "announcement_info_last_update": get_announcement_info().get_last_update()
         ]
     }
 }
diff --git a/lib/ios/Ldk.m b/lib/ios/Ldk.m
@@ -86,14 +86,14 @@ @interface RCT_EXTERN_MODULE(Ldk, NSObject)
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(listChannelFiles:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(networkGraphListNodes:(RCTPromiseResolveBlock)resolve
+RCT_EXTERN_METHOD(networkGraphListNodeIds:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(networkGraphListChannels:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(networkGraphChannel:(NSString *)shortChannelId
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(networkGraphNode:(NSString *)nodeId
+RCT_EXTERN_METHOD(networkGraphNodes:(NSArray *)nodeIds
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(claimableBalances:(BOOL *)ignoreOpenChannels
diff --git a/lib/ios/Ldk.swift b/lib/ios/Ldk.swift
@@ -250,13 +250,14 @@ class Ldk: NSObject {
             if read.isOk() {
                 networkGraph = read.getValue()
                 LdkEventEmitter.shared.send(withEvent: .native_log, body: "Loaded network graph from file")
-
             }
         } catch {
             networkGraph = NetworkGraph(genesis_hash: String(genesisHash).hexaBytes, logger: logger)
             LdkEventEmitter.shared.send(withEvent: .native_log, body: "Failed to load cached network graph from disk. Will sync from scratch. \(error.localizedDescription)")
         }
         
+        print("rapidGossipSyncUrl: \(rapidGossipSyncUrl)")
+        
         //Download url passed, enable rapid gossip sync
         if rapidGossipSyncUrl != "" {
             do {
@@ -377,6 +378,8 @@ class Ldk: NSObject {
             channelMonitorsSerialized.append([UInt8](try! Data(contentsOf: channelFile.standardizedFileURL)))
         }
         
+        print("enableP2PGossip \(enableP2PGossip)")
+        
         do {
             //Only restore a node if we have existing channel monitors to restore. Else we lose our UserConfig settings when restoring.
             if let channelManagerSerialized = storedChannelManager, channelMonitorsSerialized.count > 0 {
@@ -430,6 +433,10 @@ class Ldk: NSObject {
         peerHandler = channelManagerConstructor!.getTCPPeerHandler()
         invoicePayer = channelManagerConstructor!.payer
         
+        if enableP2PGossip {
+            self.networkGraph = channelManagerConstructor!.net_graph
+        }
+        
         return handleResolve(resolve, .channel_manager_init_success)
     }
     
@@ -819,7 +826,7 @@ class Ldk: NSObject {
     }
     
     @objc
-    func networkGraphListNodes(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    func networkGraphListNodeIds(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard let networkGraph = networkGraph?.read_only() else {
             return handleReject(reject, .init_network_graph)
         }
@@ -833,20 +840,29 @@ class Ldk: NSObject {
     }
     
     @objc
-    func networkGraphNode(_ nodeId: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    func networkGraphNodes(_ nodeIds: NSArray, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard let networkGraph = networkGraph?.read_only() else {
             return handleReject(reject, .init_network_graph)
         }
+        
+        //Filter out nodes we don't know about as querying unknown nodes will cause a crash
+        let includedList = nodeIds.map({ $0 as! String }).filter { id in
+            return networkGraph.list_nodes().contains { id == Data($0.as_slice()).hexEncodedString() }
+        }
                 
-        return resolve(networkGraph.node(node_id: NodeId(pubkey: String(nodeId).hexaBytes)).asJson)
+        return resolve(includedList.map({ id in
+            var info = networkGraph.node(node_id: NodeId(pubkey: id.hexaBytes)).asJson
+            info["id"] = id
+            return info
+        }))
     }
     
     @objc
     func networkGraphListChannels(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard let networkGraph = networkGraph?.read_only() else {
             return handleReject(reject, .init_network_graph)
         }
-        
+                
         let total = networkGraph.list_channels().count
         if total > 100 {
             return handleReject(reject, .data_too_large_for_rn, nil, "Too many channels to return (\(total))")
@@ -861,7 +877,14 @@ class Ldk: NSObject {
             return handleReject(reject, .init_network_graph)
         }
         
-        return resolve(networkGraph.channel(short_channel_id: UInt64(shortChannelId as String)!).asJson)
+        let channelId = String(shortChannelId)
+        
+        let channels = networkGraph.list_channels()
+        if !channels.contains{ channelId == String($0) } {
+            return handleReject(reject, .init_network_graph)
+        }
+        
+        return resolve(networkGraph.channel(short_channel_id: UInt64(channelId)!).asJson)
     }
     
     @objc
diff --git a/lib/src/ldk.ts b/lib/src/ldk.ts
@@ -520,16 +520,9 @@ class LDK {
 				}
 
 				//Check if node is in our network graph
-				const graphRes = await this.networkGraphListNodes();
+				const graphRes = await this.networkGraphNodes([recover_payee_pub_key]);
 				if (graphRes.isOk()) {
-					let nodeInNetworkGraph = false;
-					graphRes.value.forEach((node) => {
-						if (node === recover_payee_pub_key) {
-							nodeInNetworkGraph = true;
-						}
-					});
-
-					if (!nodeInNetworkGraph) {
+					if (graphRes.value.length === 0) {
 						useFullMessage = `${useFullMessage} Node not found in network graph.`;
 					}
 				}
@@ -666,31 +659,31 @@ class LDK {
 	}
 
 	/**
-	 * Fetches list of node IDs in network graph
+	 * Fetches list of all node IDs in network graph
 	 * https://docs.rs/lightning/latest/lightning/routing/gossip/struct.ReadOnlyNetworkGraph.html#method.nodes
 	 * @returns {Promise<Ok<Ok<string[]> | Err<string[]>> | Err<unknown>>}
 	 */
-	async networkGraphListNodes(): Promise<Result<string[]>> {
+	async networkGraphListNodeIds(): Promise<Result<string[]>> {
 		try {
-			const res = await NativeLDK.networkGraphListNodes();
+			const res = await NativeLDK.networkGraphListNodeIds();
 			return ok(res);
 		} catch (e) {
 			return err(e);
 		}
 	}
 
 	/**
-	 * Fetches node details from network graph
+	 * Fetches array of node details from network graph
 	 * https://docs.rs/lightning/latest/lightning/routing/gossip/struct.ChannelInfo.html
-	 * @param shortChannelId
+	 * @param nodeIds string[]
 	 * @returns {Promise<Ok<Ok<string> | Err<string>> | Err<unknown>>}
 	 */
-	async networkGraphNode(
-		nodeId: string,
-	): Promise<Result<TNetworkGraphNodeInfo>> {
+	async networkGraphNodes(
+		nodeIds: string[],
+	): Promise<Result<TNetworkGraphNodeInfo[]>> {
 		try {
-			const res = await NativeLDK.networkGraphNode(nodeId);
-			return ok({ ...res, nodeId });
+			const res = await NativeLDK.networkGraphNodes(nodeIds);
+			return ok(res);
 		} catch (e) {
 			return err(e);
 		}
@@ -703,29 +696,28 @@ class LDK {
 	 */
 	async completeGraphNodes(): Promise<Result<TNetworkGraphNodeInfo[]>> {
 		try {
-			const res = await this.networkGraphListNodes();
-			let nodes: TNetworkGraphNodeInfo[] = [];
+			const res = await this.networkGraphListNodeIds();
 			if (res.isErr()) {
 				return err(res.error);
 			}
 
-			for (let index = 0; index < res.value.length; index++) {
-				const nodeRes = await this.networkGraphNode(res.value[index]);
-				if (nodeRes.isErr()) {
-					return err(nodeRes.error);
-				}
+			if (res.value.length > 100) {
+				return err(`Too many nodes to query (${res.value.length})`);
+			}
 
-				nodes.push(nodeRes.value);
+			const nodeRes = await this.networkGraphNodes(res.value);
+			if (nodeRes.isErr()) {
+				return err(nodeRes.error);
 			}
 
-			return ok(nodes);
+			return ok(nodeRes.value);
 		} catch (e) {
 			return err(e);
 		}
 	}
 
 	/**
-	 * Fetches list of short channel IDs in network graph
+	 * Fetches list of all short channel IDs in network graph
 	 * https://docs.rs/lightning/latest/lightning/routing/gossip/struct.ReadOnlyNetworkGraph.html#method.channels
 	 * @returns {Promise<Ok<string[]>> | Err<unknown>>}
 	 */
diff --git a/lib/src/utils/types.ts b/lib/src/utils/types.ts
@@ -30,11 +30,13 @@ export enum EEventTypes {
 
 //LDK event responses
 export type TRegisterTxEvent = { txid: string; script_pubkey: string };
+
 export type TRegisterOutputEvent = {
 	block_hash: string;
 	index: number;
 	script_pubkey: string;
 };
+
 export type TBroadcastTransactionEvent = { tx: string };
 
 //LDK channel manager event responses
@@ -44,26 +46,30 @@ export type TChannelManagerFundingGenerationReady = {
 	user_channel_id: number;
 	value_satoshis: number;
 };
+
 export type TChannelManagerPayment = {
 	payment_hash: string;
 	amount_sat: number;
 	payment_preimage: string;
 	payment_secret: string;
 	spontaneous_payment_preimage: string;
 };
+
 export type TChannelManagerPaymentSent = {
 	payment_id: string;
 	payment_preimage: string;
 	payment_hash: string;
 	fee_paid_sat: number;
 };
+
 export type TChannelManagerOpenChannelRequest = {
 	temp_channel_id: string;
 	counterparty_node_id: string;
 	push_sat: number;
 	funding_satoshis: number;
 	channel_type: string;
 };
+
 export type TChannelUpdate = {
 	channel_id: string;
 	counterparty_node_id: string;
@@ -81,6 +87,7 @@ export type TChannelManagerPaymentPathSuccessful = {
 	payment_hash: string;
 	path: TPath[];
 };
+
 export type TChannelManagerPaymentPathFailed = {
 	payment_id: string;
 	payment_hash: string;
@@ -89,21 +96,26 @@ export type TChannelManagerPaymentPathFailed = {
 	path: TPath[];
 	network_update: string;
 };
+
 export type TChannelManagerPaymentFailed = {
 	payment_id: string;
 	payment_hash: string;
 };
+
 export type TChannelManagerPendingHtlcsForwardable = {
 	time_forwardable: number;
 };
+
 export type TChannelManagerSpendableOutputs = {
 	outputsSerialized: string[];
 };
+
 export type TChannelManagerChannelClosed = {
 	user_channel_id: number;
 	channel_id: string;
 	reason: string;
 };
+
 export type TChannelManagerDiscardFunding = {
 	channel_id: string;
 	tx: string;
@@ -151,8 +163,11 @@ export type TNetworkGraphChannelInfo = {
 };
 
 export type TNetworkGraphNodeInfo = {
-	nodeId: string;
+	id: string;
 	shortChannelIds: string[];
+	lowest_inbound_channel_fees_base_msat: number;
+	lowest_inbound_channel_fees_proportional_millionths: number;
+	announcement_info_last_update: number;
 };
 
 export type TInvoice = {

Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,12 @@ extension ChannelInfo {`
`116`	`116`
`117`	`117`	`//Nodes in our network graph`
`118`	`118`	`extension NodeInfo {`
`119`		`- var asJson: Any {`
	`119`	`+ var asJson: [String: Any] {`
`120`	`120`	`return [`
`121`	`121`	`"shortChannelIds": get_channels().map({ String($0) }),`
`122`		`- //TODO gathering other details results in EXC_BAD_ACCESS. Test with next version of LDK.`
	`122`	`+ "lowest_inbound_channel_fees_base_msat": get_lowest_inbound_channel_fees().get_base_msat(),`
	`123`	`+ "lowest_inbound_channel_fees_proportional_millionths": get_lowest_inbound_channel_fees().get_proportional_millionths(),`
	`124`	`+ "announcement_info_last_update": get_announcement_info().get_last_update()`
`123`	`125`	`]`
`124`	`126`	`}`
`125`	`127`	`}`