feat(raiden): add sendPayment support #874

erkarl · 2019-04-08T13:10:45Z

In this commit we're adding support for RaidenClient.sendPayment that
enables us to do a trusted swap.

closes #797

sangaman

Thanks, made some comments below.

sangaman · 2019-04-08T15:19:04Z

lib/Xud.ts

@@ -74,25 +75,30 @@ class Xud extends EventEmitter {
      this.db = new DB(loggers.db, this.config.dbpath);
      await this.db.init(this.config.initdb);

+      const swapClients: { [currency: string]: BaseClient | undefined } = {};


I'm thinking it actually might have made sense to do this earlier, but I'm thinking it might be cleaner to make this a Map<string, BaseClient> type. We're mapping currency to other values elsewhere in the codebase. But this change could also happen in a separate PR.

sangaman · 2019-04-08T15:22:10Z

lib/raidenclient/RaidenClient.ts

@@ -75,19 +78,23 @@ class RaidenClient extends BaseClient {
  public readonly type = SwapClient.Raiden;
  public readonly cltvDelta: number = 0;
  public address?: string;
+  public currencies: { [key: string]: string } = {};


This can be a Map type as well, and maybe it would make more sense to call this tokenAddresses since that's what the values are?

sangaman · 2019-04-08T15:36:34Z

lib/raidenclient/RaidenClient.ts

+        }
+      });
+    } catch (e) {
+      this.logger.error(`failed to set currencies for Raiden: ${e}`);


If you make this this.logger.error('failed to set currencies for Raiden', e); the error method will log the exception message and stack trace if applicable.

sangaman · 2019-04-08T15:38:55Z

lib/raidenclient/RaidenClient.ts

+    let tokenAddress = '';
+    if (deal.role === SwapRole.Maker) {
+      // we are the maker paying the taker
+      amount = deal.makerAmount;


I think this should be takerAmount as that's the amount the taker is expecting to receive.

sangaman · 2019-04-08T15:39:05Z

lib/raidenclient/RaidenClient.ts

+      tokenAddress = this.currencies[deal.takerCurrency];
+    } else {
+      // we are the taker paying the maker
+      amount = deal.takerAmount;


Should be makerAmount.

sangaman · 2019-04-08T15:43:11Z

lib/raidenclient/RaidenClient.ts

+    // TODO: Secret hash. Depending on sha256 <-> keccak256 problem:
+    // https://github.com/ExchangeUnion/xud/issues/870
+    const tokenPaymentResponse = await this.tokenPayment(tokenAddress, deal.destination!, amount);
+    console.log('tokenPaymentResponse is', tokenPaymentResponse);


Replace this with a debug statement? And JSON.stringify the response.

erkarl

@sangaman feedback applied. I've got the PR to the closest as I can to a real swap, but without being able to provide a custom sha256 hash for Raiden payments the swaps will not succeed.

I chose not to apply temporary code to support a "trusted" swap as there were too many places that required changes. However, it's still possible to test Raiden payments via xud:

Setup Raiden for xud A & B
Fund both Raiden accounts with ETH & WETH
Setup direct channels between A & B
(optional) test payment without xud

curl -i -X POST http://localhost:5001/api/v1/payments/0xc778417E063141139Fce010982780140Aa0cD5Ab/<receiverAddress> -H 'Content-Type: application/json' --data-raw '{"amount": 1234, "identifier": <randomInteger>}'

Add WETH currency to A & B - ./bin/xucli addcurrency WETH Raiden 18 0xc778417E063141139Fce010982780140Aa0cD5Ab
Add WETH pair to A & B - ./bin/xucli addpair WETH BTC
Execute buy WETH order on B
Execute sell WETH order on A

erkarl · 2019-04-11T09:05:42Z

lib/raidenclient/RaidenClient.ts

 /**
 * A class representing a client to interact with raiden.
 */
 class RaidenClient extends BaseClient {
  public readonly type = SwapClient.Raiden;
-  public readonly cltvDelta: number = 0;
+  public readonly cltvDelta: number = 1;


The reason for this change is that the SwapRequestPacket will not validate otherwise:
https://github.com/ExchangeUnion/xud/blob/master/lib/p2p/packets/types/SwapRequestPacket.ts#L37

erkarl · 2019-04-11T09:06:29Z

lib/swaps/Swaps.ts

@@ -426,7 +433,7 @@ class Swaps extends EventEmitter {
    }

    const responseBody: packets.SwapAcceptedPacketBody = {
-      makerCltvDelta: deal.makerCltvDelta || 0,
+      makerCltvDelta: deal.makerCltvDelta || 1,


The reason for this change is that the SwapAcceptedPacket will not validate otherwise:
https://github.com/ExchangeUnion/xud/blob/master/lib/p2p/packets/types/SwapAcceptedPacket.ts#L36

sangaman

Awesome, thank you. Looks like about as close as we can get it without the hashes matching up.

ghost assigned erkarl Apr 8, 2019

ghost added the in progress label Apr 8, 2019

erkarl added raiden swaps labels Apr 8, 2019

sangaman reviewed Apr 8, 2019

View reviewed changes

erkarl force-pushed the feat/raiden-sendpayment branch 5 times, most recently from e45c6e0 to dd1ed2e Compare April 11, 2019 09:02

erkarl changed the title ~~[WIP] feat(raiden): add sendPayment support~~ feat(raiden): add sendPayment support Apr 11, 2019

erkarl commented Apr 11, 2019

View reviewed changes

sangaman approved these changes Apr 15, 2019

View reviewed changes

feat(raiden): add sendPayment support

e07f606

erkarl force-pushed the feat/raiden-sendpayment branch from dd1ed2e to e07f606 Compare April 16, 2019 07:32

erkarl merged commit ed0afb2 into master Apr 16, 2019

ghost removed the in progress label Apr 16, 2019

erkarl deleted the feat/raiden-sendpayment branch April 16, 2019 07:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(raiden): add sendPayment support #874

feat(raiden): add sendPayment support #874

erkarl commented Apr 8, 2019 •

edited

sangaman left a comment

sangaman Apr 8, 2019

sangaman Apr 8, 2019

sangaman Apr 8, 2019

sangaman Apr 8, 2019

sangaman Apr 8, 2019

sangaman Apr 8, 2019

erkarl left a comment •

edited

erkarl Apr 11, 2019

erkarl Apr 11, 2019

sangaman left a comment

feat(raiden): add sendPayment support #874

feat(raiden): add sendPayment support #874

Conversation

erkarl commented Apr 8, 2019 • edited

sangaman 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

Choose a reason for hiding this comment

erkarl left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sangaman left a comment

Choose a reason for hiding this comment

erkarl commented Apr 8, 2019 •

edited

erkarl left a comment •

edited