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.

Sign up for GitHub

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

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

Merged
merged 13 commits into from
Nov 5, 2020
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ab03e59
feat(rpc): runtime addcurrency for lnd & connext
sangaman Jul 23, 2020
0c60419
log remove order error
sangaman Jul 24, 2020
4b11341
Merge branch 'master' into addcurrency-runtime
Oct 6, 2020
afcc0fc
Merge fix: remove raiden
Oct 6, 2020
f6d1b6c
Fix: don't re-create lnd swap client instance
Oct 7, 2020
728fd9c
Fix: add/remove pair to trigger checkPeerCurrencies/verifyPeerPairs f…
Oct 19, 2020
07922b7
Fix: remove currency to not remove the active swap client
Oct 19, 2020
815df36
Fix: connextUpdate event to not update the faulty pubkey string
Oct 19, 2020
767f3d6
feat(rpc): runtime addcurrency for lnd & connext
sangaman Oct 19, 2020
29a1869
simtest: add scenario, refactoring
Oct 21, 2020
c289b5b
Merge remote-tracking branch 'origin/addcurrency-runtime' into addcur…
Oct 21, 2020
84ccbf2
typo fix
Oct 21, 2020
e52ba4f
removePeerPair to support non-existing pair
Nov 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/orderbook/OrderBook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,13 @@ class OrderBook extends EventEmitter {
if (this.currencyInstances.has(currency.id)) {
throw errors.CURRENCY_ALREADY_EXISTS(currency.id);
}
if (currency.swapClient === SwapClientType.Raiden && !currency.tokenAddress) {
if ((currency.swapClient === SwapClientType.Raiden || currency.swapClient === SwapClientType.Connext)
&& !currency.tokenAddress) {
throw errors.CURRENCY_MISSING_ETHEREUM_CONTRACT_ADDRESS(currency.id);
}
const currencyInstance = await this.repository.addCurrency({ ...currency, decimalPlaces: currency.decimalPlaces || 8 });
this.currencyInstances.set(currencyInstance.id, currencyInstance);
this.swaps.swapClientManager.add(currencyInstance);
await this.swaps.swapClientManager.add(currencyInstance);
}

public removeCurrency = async (currencyId: string) => {
Expand Down Expand Up @@ -968,8 +969,8 @@ class OrderBook extends EventEmitter {
try {
const removeResult = this.removePeerOrder(oi.id, oi.pairId, peerPubKey, oi.quantity);
this.emit('peerOrder.invalidation', removeResult.order);
} catch {
this.logger.error(`failed to remove order (${oi.id}) of peer ${peerPubKey} (${pubKeyToAlias(peerPubKey)})`);
} catch (err) {
this.logger.error(`failed to remove order (${oi.id}) of peer ${peerPubKey} (${pubKeyToAlias(peerPubKey)})`, err);
// TODO: Penalize peer
}
}
Expand Down
41 changes: 27 additions & 14 deletions lib/swaps/SwapClientManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,25 +330,38 @@ class SwapClientManager extends EventEmitter {
* @param currency a currency that should be linked with a swap client.
* @returns Nothing upon success, throws otherwise.
*/
public add = (currency: Currency): void => {
if (currency.swapClient === SwapClientType.Raiden && currency.tokenAddress && this.raidenClient) {
this.swapClients.set(currency.id, this.raidenClient);
this.raidenClient.tokenAddresses.set(currency.id, currency.tokenAddress);
this.emit('raidenUpdate', this.raidenClient.tokenAddresses, this.raidenClient.address);
public add = async (currency: Currency) => {
if (currency.tokenAddress) {
if (currency.swapClient === SwapClientType.Connext) {
if (!this.connextClient) {
throw errors.SWAP_CLIENT_NOT_CONFIGURED(currency.id);
}
this.swapClients.set(currency.id, this.connextClient);
this.connextClient.tokenAddresses.set(currency.id, currency.tokenAddress);
this.emit('connextUpdate', this.connextClient.tokenAddresses, this.connextClient.address);
} else if (currency.swapClient === SwapClientType.Raiden) {
Copy link

Choose a reason for hiding this comment

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

Maybe we should remove the raiden part since it's never going to be used and it would make the function more readable?

Copy link
Contributor

Choose a reason for hiding this comment

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

Fixed in 4b11341#diff-8aac1fd5a8463c73f6951a8eb02f5f15.

if (!this.raidenClient) {
throw errors.SWAP_CLIENT_NOT_CONFIGURED(currency.id);
}
this.swapClients.set(currency.id, this.raidenClient);
this.raidenClient.tokenAddresses.set(currency.id, currency.tokenAddress);
this.emit('raidenUpdate', this.raidenClient.tokenAddresses, this.raidenClient.address);
}
} else if (currency.swapClient === SwapClientType.Lnd) {
// in case of lnd we check if the configuration includes swap client
// for the specified currency
let isCurrencyConfigured = false;
for (const lndCurrency in this.config.lnd) {
if (lndCurrency === currency.id) {
isCurrencyConfigured = true;
break;
}
}
// adding a new lnd client at runtime is currently not supported
if (!isCurrencyConfigured) {
const config = this.config.lnd[currency.id];
if (!config) {
throw errors.SWAP_CLIENT_NOT_CONFIGURED(currency.id);
}

const lndClient = new LndClient({
config,
logger: this.loggers.lnd.createSubLogger(currency.id),
currency: currency.id,
});
this.swapClients.set(currency.id, lndClient);
await lndClient.init();
}
}

Expand Down