From ce9155a6bf785e2500c3ab1331d397d2f583513e Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 28 Jun 2021 11:46:35 +1000 Subject: [PATCH] fix refresh random snode pool after getting new guardNodes --- config/default.json | 6 +++--- ts/session/onions/onionPath.ts | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/config/default.json b/config/default.json index ecceca01e..878249fcd 100644 --- a/config/default.json +++ b/config/default.json @@ -5,15 +5,15 @@ "contentProxyUrl": "", "seedNodeList": [ { - "ip_url": "http://116.203.53.213:4433/", + "ip_url": "https://116.203.53.213:4433/", "url": "https://storage.seed1.loki.network:4433/" }, { - "ip_url": "http://212.199.114.66:4433/", + "ip_url": "https://212.199.114.66:4433/", "url": "https://storage.seed3.loki.network:4433/" }, { - "ip_url": "http://144.76.164.202:4433/", + "ip_url": "https://144.76.164.202:4433/", "url": "https://public.loki.foundation:4433/" } ], diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index 1154ca408..d80ab3ffd 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -342,7 +342,7 @@ export async function selectGuardNodes(): Promise> { async function buildNewOnionPathsWorker() { window?.log?.info('LokiSnodeAPI::buildNewOnionPaths - building new onion paths...'); - const allNodes = await SnodePool.getRandomSnodePool(); + let allNodes = await SnodePool.getRandomSnodePool(); if (guardNodes.length === 0) { // Not cached, load from DB @@ -369,7 +369,8 @@ async function buildNewOnionPathsWorker() { // TODO: don't throw away potentially good guard nodes guardNodes = await exports.selectGuardNodes(); } - + // be sure to fetch again as that list might have been refreshed by selectGuardNodes + allNodes = await SnodePool.getRandomSnodePool(); // TODO: select one guard node and 2 other nodes randomly let otherNodes = _.differenceBy(allNodes, guardNodes, 'pubkey_ed25519'); if (otherNodes.length < 2) {