fix(swaps): validate Raiden's resolve request #1172
Conversation
|
Please open an issue on raiden side for the crash @erkarl |
b18dcaa to
bd57361
Compare
There already is: ExchangeUnion/raiden#1 |
I successfully tested this branch on native simnet, which since #1080 changed the behaviour of the XUD resolver when it gets an unfamiliar rHash and caused raiden to crash. With this branch, this is handled gracefully and raiden doesn't crash. |
lib/raidenclient/types.ts
Outdated
| @@ -68,6 +68,7 @@ export type RaidenResolveRequest = { | |||
| reveal_timeout: number; | |||
There was a problem hiding this comment.
Should we be removing reveal and settle timeout as part of this PR? Or are you planning to do this separately? I'm thinking if it's done together this can be marked as closing #1149.
If so, you can also remove the commented out "unused" fields below.
lib/http/HttpServer.ts
Outdated
| if (err.code === errorCodes.INVALID_ARGUMENT) { | ||
| if ( | ||
| err.code === errorCodes.INVALID_ARGUMENT || | ||
| err.code === swapErrorCodes.INVALID_RESOLVE_REQUEST |
There was a problem hiding this comment.
I'm thinking I should've made this a switch statement when I wrote this originally, but now I think it's even more clearly the nicer choice. Would you mind rewriting these if/elses as a switch?
There was a problem hiding this comment.
Rewrote this as switch - looks much better now, thanks.
bd57361 to
801a4dc
Compare
c904006 to
e98de8f
Compare
|
@erkarl @sangaman could you please revisit this PR and merge it asap? The raiden in my local simnet instance is crashing a lot which causes some issues with the balancing of the initial deposit. |
In this commit we validate Raiden's resolve request to make sure the
payment we're receiving has the previously agreed upon `deal.makerCltvDelta` as the
minimum duration of the lock.
In addition we change the error handling to return a status code 400
(Bad Request) to prevent Raiden from crashing. Previously we returned a
status code of 200 with the response `{ secret: 'error message' }`.
85bf023 to
6d525a7
Compare
In this commit we validate Raiden's resolve request to make sure the
payment we're receiving has the previously agreed upon
deal.makerCltvDeltaas theminimum duration of the lock.
In addition we change the error handling to return a status code 400
(Bad Request) to prevent Raiden from crashing. Previously we returned a
status code of 200 with the response of
{ secret: 'error message' }.Closes: #1149