Get ILP Address from Parent node #276

gakonst · 2019-09-05T16:56:44Z

Closes #186.
Closes #248.
Closes #285

This PR modifies the address assignment procedure for nodes which get added as Children to a node.

IldcpAccount is merged with Account
When an account is added as Child, instead of using their provided ILP Address, we append their username to our node's ilp address.
When an account is added as Parent (only 1 parent is allowed for now) the API:
1. Performs an ILDCP Request to Parent. The Parent responds with the ILP Address they have assigned the node, and the store's address is updated to that value. This is done so that any subsequent account insertions will take into account the node's updated ilp address
2. Sends a RouteControlRequest to the Parent, the Parent responds with a RouteUpdateRequest
  which has all the routes. This is done because when a node is started with a non-routable address, it rejects all incoming routing messages. This required to modify the CCP Service so that it's able to read the store's ILP Address on each broadcast loop, and update its self.global_prefix.
3. Updates all Child accounts on the node to use the update node's address. This can be an expensive operation, but we assume that a node operator will not change their parent node's address often.
When an account is added, if it has a BTP Url configured, it'll try to connect to that account's BTP Server

crates/interledger-ildcp/src/server.rs

crates/interledger-service/src/lib.rs

crates/interledger-store-redis/src/store.rs

crates/interledger-store-redis/tests/accounts_test.rs

crates/interledger-stream/Cargo.toml

crates/interledger-stream/src/server.rs

crates/interledger/src/main.rs

crates/interledger-settlement-engines/tests/eth_ledger_settlement.rs

crates/interledger-store-redis/src/account.rs

crates/interledger-store-redis/src/store.rs

crates/interledger-store-redis/tests/accounts_test.rs

crates/interledger/src/node.rs

gakonst · 2019-09-23T11:07:44Z

This started failing for no reason, the commit after which the CI started failing just modified a test. I cannot reproduce on my local machine.

emschwartz

Couple of comments but overall this looks great!

crates/interledger-api/src/lib.rs

crates/interledger-api/src/routes/accounts.rs

crates/interledger-btp/src/client.rs

emschwartz · 2019-09-23T16:02:28Z

crates/interledger-api/src/routes/accounts.rs

+        .and_then(move |ilp_address| store.set_ilp_address(ilp_address))
+        .and_then(move |_| {
+            // Get the parent's routes for us
+            let prepare = RouteControlRequest {


Instead of constructing a RouteControlRequest here, what do you think about having a handle to the CcpServer to trigger it to send the request? If that's a lot more complicated, we can keep this as is

We could but I'd prefer not. CcpRouteManager is generic over Incoming, Outgoing services and a Store, and that'd require adding extra generic parameters on the API.

The 'benefit" would be being more explicit on the types of outgoing requests that we can make. I don't think that's really beneficial, since in the future we might want to perform other actions and send other types of requests, than just CCP requests via the outgoing handler.

Sounds good for now. Mind adding a TODO to make a note about this?

Suggested change

let prepare = RouteControlRequest {

// TODO we may want to make this trigger the CcpRouteManager to request

// routes instead of sending a RouteControlRequest here

let prepare = RouteControlRequest {

crates/interledger-store-redis/src/store.rs

crates/interledger/src/node.rs

crates/interledger/tests/exchange_rates.rs

emschwartz

Couple of minor things but looks good to merge once they're addressed and the tests are passing

emschwartz · 2019-09-24T13:13:54Z

crates/interledger-api/src/routes/accounts.rs

+        .and_then(move |ilp_address| store.set_ilp_address(ilp_address))
+        .and_then(move |_| {
+            // Get the parent's routes for us
+            let prepare = RouteControlRequest {


Sounds good for now. Mind adding a TODO to make a note about this?

Suggested change

let prepare = RouteControlRequest {

// TODO we may want to make this trigger the CcpRouteManager to request

// routes instead of sending a RouteControlRequest here

let prepare = RouteControlRequest {

emschwartz · 2019-09-24T13:14:38Z

crates/interledger-api/src/routes/accounts.rs

+        .and_then(move |_| Ok(()))
+}
+
+fn connect_to_external_services<S, A, T, B>(


This is a very generic sounding name. It would be good to be more specific to what it's doing and/or put a comment explaining it

emschwartz · 2019-09-24T13:17:00Z

crates/interledger-btp/src/client.rs

+    let service = BtpOutgoingService::new(ilp_address, next_outgoing);
+    let mut connect_btp = Vec::new();
+    for account in accounts {
+        // Can we make this take a reference to a service?


We use a lot of Arcs and clones because futures 0.1 don't play nicely with references. We may be able to use a lot more references once we switch to futures 0.3 and async/await

emschwartz · 2019-09-24T13:20:39Z

crates/interledger-btp/src/client.rs

+                .to_bytes(),
+            );
+
+            connection


Suggested change

connection

// TODO check that the response is a success before proceeding

// (right now we just assume they'll close the connection if the auth didn't work)

connection

emschwartz · 2019-09-24T13:25:20Z

crates/interledger-store-redis/src/account.rs

+        let ilp_address = match details.ilp_address {
+            Some(a) => a,
+            None => {
+                // if parent address ends with username, do not suffix


I don't think it makes sense to have this. If you request your address using ILDCP, the parent will always append some segment that represents you. If you add a child account that you want to make your main receiving account, you want to differentiate the parent account on your own node (e.g. example.parent.your-username) from the child account (e.g. example.parent.your-username.your-username) to make sure packets go to the right account.

This will be used when inserting accounts which do not include an ILP Address. Their address will be our node's ilp address, followed by their username.

If an account is inserted without an , then 2 things can happen: 1. If their username is the same as the store's last segment, then their address is the same as the store. This allows to insert ourselves' account without having to specify our address 2. Otherwise, their address is created by appending their username to the store's ilp address Also adjust redis tests for new functionality. When the redis store is launched, it checks if the address is set and uses that, otherwise uses the default store address

This fixes the three_nodes test. Previously, the global_prefix would not get adjusted after our store had its ilp address updated. This resulted in _filter_routes_ and _update_best_routes_ to misbehave. By updating the ccp service's ilp address and global prefix before making any route broadcasts/receivals, we ensure that we always use the most up to date store address. Can this result in performance penalties, since we're performing an extra write? Probably not, since everything is done in memory

When a parent account is added, we must update our ILP Address in the store, so that the addresses of children accounts we add are calculated properly in the future. This is done via an ILDCP Request to the parent. We also need the parent's routes which we may care about, hence we send a RouteControlRequest as well.

Closes #285

Performed actions: 1. Connect to their BTP socket 2. Update our addresses if they were promoted to a parent 3. Connect to their settlement engine if one was added The helper function is now also called when updating an account's information.

emschwartz requested changes Sep 5, 2019

View reviewed changes

gakonst mentioned this pull request Sep 9, 2019

Connect to BTP server when account is added with a btp_uri field #285

Closed

gakonst force-pushed the ildcp-parent branch 2 times, most recently from 87ce8c6 to 47c5f4c Compare September 15, 2019 10:44

gakonst marked this pull request as ready for review September 15, 2019 11:33

gakonst requested a review from emschwartz September 15, 2019 11:33

gakonst force-pushed the ildcp-parent branch 2 times, most recently from e601182 to 88c87e9 Compare September 16, 2019 12:11

emschwartz requested changes Sep 16, 2019

View reviewed changes

gakonst force-pushed the ildcp-parent branch 5 times, most recently from 81c2ffd to a6efec7 Compare September 22, 2019 07:07

gakonst requested a review from emschwartz September 22, 2019 07:11

emschwartz reviewed Sep 23, 2019

View reviewed changes

emschwartz mentioned this pull request Sep 23, 2019

Switch BTP to warp #318

Merged

emschwartz approved these changes Sep 24, 2019

View reviewed changes

gakonst added 8 commits September 24, 2019 23:25

feat(ildcp): Combine IldcpAccount and Account traits

bdfdeaa

feat(redis): Add ilp address to the store

d99bee1

This will be used when inserting accounts which do not include an ILP Address. Their address will be our node's ilp address, followed by their username.

feat(api-btp): Connect to BTP when adding new account

74668ad

Closes #285

test(engines): fix tests to match updated logic

cb2e471

test(interledger): Make HTTP requests to create accounts

e0acaef

gakonst added 12 commits September 24, 2019 23:25

test: increase delay so that the rate is always updated on the node

5ab7b95

feat(redis): Update children addresses on parent address change

739463c

chore: add comment about improving child address generation

3cb3486

test(redis): make single parent test more explicit

84ffa9e

refactor(btp): combine the connect client functions

20c06f6

chore(api): join_all to improve performance when changing a parent

8cea39e

fix(ccp): only acquire the write lock if the ilp address changed

be684f3

chore: s/configured_ilp_address/ilp_address

a53706a

fix(redis): Update children routes after updating the node's address

c89ca1d

chore: address review comments

87a885e

fix(redis): Default account routing relation must be NonRoutingAccount

fe386fe

gakonst force-pushed the ildcp-parent branch from fded56d to fe386fe Compare September 24, 2019 14:28

gakonst merged commit 2a12b20 into master Sep 24, 2019

bstrie added a commit that referenced this pull request Sep 24, 2019

Note ilp_address as optional now that #276 has landed

bd42278

emschwartz mentioned this pull request Sep 25, 2019

Make ilp_address optional in the node configuration #329

Merged

emschwartz deleted the ildcp-parent branch October 7, 2019 14:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Get ILP Address from Parent node #276

Get ILP Address from Parent node #276

gakonst commented Sep 5, 2019 •

edited

Loading

gakonst commented Sep 23, 2019

emschwartz left a comment

emschwartz Sep 23, 2019

gakonst Sep 24, 2019

emschwartz Sep 24, 2019

emschwartz left a comment

emschwartz Sep 24, 2019

emschwartz Sep 24, 2019

emschwartz Sep 24, 2019

emschwartz Sep 24, 2019

emschwartz Sep 24, 2019

Get ILP Address from Parent node #276

Get ILP Address from Parent node #276

Conversation

gakonst commented Sep 5, 2019 • edited Loading

gakonst commented Sep 23, 2019

emschwartz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emschwartz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gakonst commented Sep 5, 2019 •

edited

Loading