Define NetworkGraph Trait for Flexible Routing
#24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit introduces a `NetworkGraph` trait in `barq-common`, to allow for more flexibility in routing algorithms by supporting various graph structures. The `NetworkGraph` trait includes methods to handle network graphs with channels, nodes, and peer-to-peer information. This update includes: - Defining a `NetworkGraph` trait with methods to get channels, nodes, individual nodes and channels by ID, and to check for peer-to-peer information. - Renaming `Edge` to `Channel` to better reflect its role in the network graph. - Adding a `strategy` field to `BarqPayRequest` and `BarqRouteInfoRequest` to specify routing strategies. Signed-off-by: Tarek <[email protected]>
…ources
- Introduce two modules in `barq-plugin` to manage network graph data:
- `methods::graph::cln`: Uses information from CLN's `listchannels`.
- `methods::graph::p2p`: Uses data from the gossip map.
- Each module exposes a function to return the respective graph.
- Update `barq-plugin` commands (`pay` and `routeinfo`) to select the appropriate graph source based on the specified strategy:
- If the strategy is "probabilistic", use the `p2p` graph for routing with LDK.
- Otherwise, use the `cln` graph based on CLN's `listchannels`.
- Default to the "direct" routing strategy if the user does not specify a strategy.
Signed-off-by: Tarek <[email protected]>
|
Should also fix #10 |
vincenzopalazzo
requested changes
Jul 25, 2024
| #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)] | ||
| pub struct Edge { | ||
| pub struct Channel { |
There was a problem hiding this comment.
I like to call this edge, then in the lightning network is a channel, but in a graph is always an edge
barq-common/src/graph.rs
Outdated
| assert!(graph.get_edge("channel1").is_some()); | ||
| assert_eq!(graph.get_node("node1").unwrap().channels.len(), 1); | ||
| } | ||
| /// Whether or not the network graph has peer-to-peer information (e.g., gossip map). |
There was a problem hiding this comment.
graph has peer-to-peer network information
barq-common/src/strategy.rs
Outdated
| // If no strategy can be applied, return None | ||
| Ok(None) | ||
| // For now, we will just use the direct strategy | ||
| Ok(Some(Box::new(Direct::new()))) |
There was a problem hiding this comment.
Can you use the Arc::new()? Arch it is a little bit better to pass around
Comment on lines
+16
to
+17
| nodes: HashMap<String, Node>, | ||
| channels: HashMap<String, Channel>, |
There was a problem hiding this comment.
ok but I think this si still slow, but in this case we can't do better
| @@ -31,7 +31,7 @@ def test_pay_amounts(node_factory): | |||
| l1.rpc.call("barqpay", {"bolt11_invoice": inv}) | |||
|
|
|||
| invoice = only_one(l2.rpc.listinvoices('test_pay_amounts')['invoices']) | |||
| assert invoice['amount_received_msat'] >= Millisatoshi(123000) | |||
| assert invoice['amount_msat'] >= Millisatoshi(123000) | |||
There was a problem hiding this comment.
you need to explain in the commit body why, also for me that I am a contributor of core lightning, this does not make any sense
Signed-off-by: Tarek <[email protected]>
Signed-off-by: Tarek <[email protected]>
Signed-off-by: Vincenzo Palazzo <[email protected]>
vincenzopalazzo
force-pushed
the
graph_trait
branch
from
4ae2529 to
49731b6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pull request defines the
NetworkGraphtrait inbarq-common, to enhance routing flexibilityKey Changes:
Define
NetworkGraphTraitEdgetoChannelstrategyfield toBarqPayRequestandBarqRouteInfoRequest.Introduce Modules for Handling Different Network Graph Sources
barq-plugin:methods::graph::cln: Uses information from CLN'slistchannels.methods::graph::p2p: Uses data from the gossip map.payandrouteinfocommands to choose the appropriate graph source based on the specified strategy, defaulting to "direct" if not specified.Fix Tests
amount_received_msattoamount_msatFor more detailed information, please refer to the individual commit messages and bodies.