Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: alias missing in streamorders (#1725) #1962

Merged
merged 2 commits into from
Nov 8, 2020
Merged

Conversation

rsercano
Copy link
Collaborator

@rsercano rsercano commented Oct 27, 2020

resolves #1725

image

@rsercano rsercano added the bug Something isn't working label Oct 27, 2020
@rsercano rsercano self-assigned this Oct 27, 2020
raladev
raladev previously approved these changes Oct 27, 2020
@raladev raladev requested a review from a user October 30, 2020 12:17
Copy link
Collaborator

@sangaman sangaman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for reusing existing logic for this fix. I also don't think the current implementation would set aliases on newly added orders after the subscription has been created.

lib/service/Service.ts Outdated Show resolved Hide resolved
raladev
raladev previously approved these changes Nov 3, 2020
Copy link
Contributor

@raladev raladev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works

Successfully connected, subscribing for orders
Order added: {"price":0.02751644,"quantity":1410750000,"pairId":"ETH/BTC","id":"261f1141-1dd2-11eb-b5b4-63796ea33ed7","nodeIdentifier":{"nodePubKey":"03df4f36fa35bd242263e8d09d6b422108dab1f08d91237bb3aa2dad957cf08a71","alias":"SheriffSolution"},"localId":"","createdAt":1604407802678,"side":0,"isOwnOrder":false,"hold":0}
Order added: {"price":0.02850492,"quantity":1321787337,"pairId":"ETH/BTC","id":"675bc750-1dbb-11eb-b5b4-63796ea33ed7","nodeIdentifier":{"nodePubKey":"03df4f36fa35bd242263e8d09d6b422108dab1f08d91237bb3aa2dad957cf08a71","alias":"SheriffSolution"},"localId":"","createdAt":1604407802680,"side":1,"isOwnOrder":false,"hold":0}
Order added: {"price":0.004,"quantity":1000000000,"pairId":"LTC/BTC","id":"ee8518e0-12b6-11eb-b3e8-7f316282c8c8","nodeIdentifier":{"nodePubKey":"03ece33a30db1dbce4b62fa96a5e9541138a24997ef5672eebed2d332270e39542","alias":"OzoneYellow"},"localId":"","createdAt":1604407802517,"side":0,"isOwnOrder":false,"hold":0}
Order added: {"price":0.0042,"quantity":990000000,"pairId":"LTC/BTC","id":"f8e13a30-12b6-11eb-b3e8-7f316282c8c8","nodeIdentifier":{"nodePubKey":"03ece33a30db1dbce4b62fa96a5e9541138a24997ef5672eebed2d332270e39542","alias":"OzoneYellow"},"localId":"","createdAt":1604407802519,"side":1,"isOwnOrder":false,"hold":0}
Order added: {"price":4,"quantity":200000000,"pairId":"USDT/DAI","id":"6ed43cc0-1dd3-11eb-84f1-87162f5eadf7","localId":"1","createdAt":1604407949964,"side":0,"isOwnOrder":true,"hold":0}
Order removed: {"quantity":1000000000,"pairId":"LTC/BTC","orderId":"ee8518e0-12b6-11eb-b3e8-7f316282c8c8","localId":"","isOwnOrder":false}
Order removed: {"quantity":990000000,"pairId":"LTC/BTC","orderId":"f8e13a30-12b6-11eb-b3e8-7f316282c8c8","localId":"","isOwnOrder":false}
Order added: {"price":0.004,"quantity":1000000000,"pairId":"LTC/BTC","id":"ee8518e0-12b6-11eb-b3e8-7f316282c8c8","nodeIdentifier":{"nodePubKey":"03ece33a30db1dbce4b62fa96a5e9541138a24997ef5672eebed2d332270e39542","alias":"OzoneYellow"},"localId":"","createdAt":1604407994753,"side":0,"isOwnOrder":false,"hold":0}
Order added: {"price":0.0042,"quantity":990000000,"pairId":"LTC/BTC","id":"f8e13a30-12b6-11eb-b3e8-7f316282c8c8","nodeIdentifier":{"nodePubKey":"03ece33a30db1dbce4b62fa96a5e9541138a24997ef5672eebed2d332270e39542","alias":"OzoneYellow"},"localId":"","createdAt":1604407994758,"side":1,"isOwnOrder":false,"hold":0}

ghost
ghost previously approved these changes Nov 6, 2020
Copy link
Collaborator

@sangaman sangaman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last small thing to prevent duplicate code/methods.

lib/grpc/GrpcService.ts Outdated Show resolved Hide resolved
lib/grpc/GrpcService.ts Outdated Show resolved Hide resolved
@rsercano rsercano dismissed stale reviews from ghost and raladev via 2d5ec84 November 6, 2020 13:57
@rsercano rsercano requested review from sangaman, a user and raladev November 6, 2020 13:57
@rsercano
Copy link
Collaborator Author

rsercano commented Nov 6, 2020

Yes sorry I overlooked it @sangaman

Copy link
Collaborator

@sangaman sangaman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for seeing this through!

@kilrau
Copy link
Contributor

kilrau commented Nov 6, 2020

Test and merge honor is with you @raladev

@raladev raladev merged commit d537206 into master Nov 8, 2020
raladev added a commit that referenced this pull request Nov 19, 2020
* feat: removeorder output changed to a more meaningful message (#1526)

* fix(p2p): don't reconnect peers when pool closed (#1965)

This ensures that we don't attempt to reconnect to peers that have
disconnected from us after we have started closing the p2p pool. This
may help prevent scenarios where we unintentionally attempt to
reconnect to peers after shutting down xud.

> Should be tested against [#1668 (comment)](#1668 (comment)) @raladev

re-connection after shutdown is disappeared, but my xud still can not be gracefully  terminated, it waits something:

```
28/10/2020 05:17:43.164 [CONNEXT] trace: sending request to /balance/0x69C3d485623bA3f382Fc0FB6756c4574d43C1618
^C28/10/2020 05:17:44.087 [GLOBAL] info: XUD is shutting down
28/10/2020 05:17:44.088 [LND-BTC] info: new status: Disconnected
28/10/2020 05:17:44.089 [LND-LTC] info: new status: Disconnected
28/10/2020 05:17:44.090 [CONNEXT] info: new status: Disconnected
28/10/2020 05:17:44.093 [P2P] debug: Peer 03ece33a30db1dbce4b62fa96a5e9541138a24997ef5672eebed2d332270e39542 (OzoneYellow): closing socket. reason: Shutdown
28/10/2020 05:17:44.095 [HTTP] info: http server has closed
28/10/2020 05:17:44.096 [RPC] info: gRPC server completed shutdown
28/10/2020 05:17:44.097 [P2P] trace: Sent Disconnecting packet to 03ece33a30db1dbce4b62fa96a5e9541138a24997ef5672eebed2d332270e39542 (OzoneYellow): "{\"body\":{\"reason\":9},\"header\":{\"id\":\"95133be0-1917-11eb-b75b-73d0f0278756\"}}"
28/10/2020 05:17:44.109 [ORDERBOOK] debug: removed all orders for peer 03ece33a30db1dbce4b62fa96a5e9541138a24997ef5672eebed2d332270e39542 (OzoneYellow)
28/10/2020 05:17:44.118 [GLOBAL] info: XUD shutdown gracefully
```

* feat(lnd): change gRPC client options

* fix(connext): not enough balance for closechannel (#1963)

This introduces better error handling for Connext when using
`closeChannel` to remove funds from a Connext channel and specifying an
amount to remove that is greater than the available balance.

* feat: reserved capacity checks on PlaceOrder (#1949)

This rejects orders that would put our total reserved balance over our
total capacity for either the outbound or inbound currency. The sum of
the inbound & outbound amounts for a newly placed order are added to
the amounts reserved by open orders, and if either of these amounts
exceed the corresponding capacity then the request to place the order is
rejected.

An exception to this are inbound limits for Connext currencies, since we
have the ability to dynamically request additional inbound collateral
via our "lazy collateral" approach.

It is still possible for market orders to cause our open orders to
exceed our capacity. This is a difficult problem to avoid entirely, as
the price that market orders will execute at is unknown until the
execution is complete. Even if we simulate the matching routine, we
won't know which matches will succeed until we attempt a swap.

Instead, we generously assume that market orders will execute at the
best quoted price for purposes of these capacity checks. For users that
simultaneously place limit orders and market orders for the same
currencies, it should be made clear that market orders may use up their
available balance needed for their limit orders to succeed.

Closes #1947.

* fix(cli): openchannel assertion error for string amount (#1950)

Fixes #1643.

* feat(swapclient): auto init wallets on xud unlock (#1973)

This adds a new feature to xud to automatically attempt to create a
wallet for any new swap client configured after an xud node has been
created. Effectively this only changes the behavior for lnd clients, as
this is already the existing behavior for Connext. The process for
initializing has now been standardized instead of the ad hoc approach
used previously.

If xud tries to unlock an lnd node and gets an error message indicating
that the wallet has not been created, then it will generate a client &
currency specific seed mnemonic using seedutil and call `InitWallet`
with that seed and the existing xud password, such that the wallet
funds and node identity for the new lnd client can be unlocked and
restored along with the rest of lnd.

Closes #1929.

* feat(rpc): runtime addcurrency for lnd & connext (#1746)

Co-authored-by: Le Premier Homme <interjoint1@gmail.com>

* refactor(rpc): rename reserved TradingLimits fields

This renames the `reservedOutbound` and `reservedInbound` fields on the
`TradingLimits` call to `reservedSell` and `reservedBuy` respectively.

* fix(rpc): no success if no channels to close (#1689) (#1942)

Co-authored-by: rsercano <ozdemirsercan27@gmail.com>
Co-authored-by: Daniel McNally <mcnallydp@gmail.com>

* fix: tls certificate check on startup (#1510)

* fix: alias missing in streamorders (#1725) (#1962)

* fix(lnd): handling hold invoice check errors (#1969)

This adds better error handling for when the test calls to verify lnd
hold invoices are available fail due to connectivity reasons. Previously
any error that occurred at this step would cause us to set lnd's status
to `NoHoldInvoiceSupport` including connection issues. There was also a
bug that caused us to try to set the status to connected even when a
hold invoice status check failed.

This could result in the unusual behavior of status going to
`Disconnected` upon a call failing due to the grpc `UNAVAILABLE` error
status, then being set to `NoHoldInvoiceSupport` and then to
`ConnectionVerified`. Now we only set `NoHoldInvoiceSupport` when the
test calls fail for a reason other than `UNAVAILABLE`, and we only set
the status to `ConnectionVerified` when the hold invoice calls succeed.

Closes #1968.

* feat(lnd): SendPaymentV2

This migrates the call we use to send payments with lnd from the
deprecated `SendPaymentSync` to `SendPaymentV2` which allows for multi
path payments, among other improvements. As part of this change, the
lnd proto files have been updated to their v0.11.x versions and the
version of lnd used in simulation tests has been updated to v0.11.1 as
well.

Closes #1590.

* Revert "feat: removeorder output changed to a more meaningful message (#1526)"

* fix: use regtest instead of regnet arg

This fixes a bug where the xud flag to set the network was incorrectly
configured as `regnet` when it should be `regtest` to match what xud
expects.

* fix(lnd): don't calculate negative capacities

This fixes a bug in the logic for calculating the inbound & outbound
amount/capacity totals. We subtract the channel reserve amounts from the
balances when determining how large a payment the channel could support,
however we should not end up with a negative number.

* feat: new grpc call for subscribring alerts such as low balance (#864)

* fix: changes removeorder output to a more meaningful message (#1526) (#1986)

Co-authored-by: rsercano <ozdemirsercan27@gmail.com>
Co-authored-by: Daniel McNally <mcnallydp@gmail.com>
Co-authored-by: Karl Ranna <karl@karlranna.com>
Co-authored-by: Le Premier Homme <interjoint1@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No alias in streamorders stream messages
4 participants