keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

fix testnet

Browse Source
pull/2290/head
Audric Ackermann 3 years ago
parent d948045e6a
commit 9bd8b73a0c
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
15 changed files with 138 additions and 141 deletions
Show Stats Download Patch File Download Diff File

12
preload.js
Unescape Escape View File

@ -212,15 +212,9 @@ window.ReactDOM = require('react-dom');
window.clipboard = clipboard;
window.getSeedNodeList = () => [
{
url: 'https://storage.seed1.loki.network:4433/',
},
{
url: 'https://storage.seed3.loki.network:4433/',
},
{
url: 'https://public.loki.foundation:4433/',
},
'https://storage.seed1.loki.network:4433/',
'https://storage.seed3.loki.network:4433/',
'https://public.loki.foundation:4433/',
];
const { locale: localFromEnv } = config;

6
ts/models/conversation.ts
Unescape Escape View File

@ -1250,7 +1250,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
public async setIsApproved(value: boolean, shouldCommit: boolean = true) {
if (value !== this.isApproved()) {
window?.log?.info(`Setting ${this.attributes.profileName} isApproved to:: ${value}`);
window?.log?.info(`Setting ${ed25519Str(this.attributes.id)} isApproved to: ${value}`);
this.set({
isApproved: value,
});
@ -1263,7 +1263,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
public async setDidApproveMe(value: boolean, shouldCommit: boolean = true) {
if (value !== this.didApproveMe()) {
window?.log?.info(`Setting ${this.attributes.profileName} didApproveMe to:: ${value}`);
window?.log?.info(`Setting ${ed25519Str(this.attributes.id)} didApproveMe to: ${value}`);
this.set({
didApproveMe: value,
});
@ -1751,7 +1751,7 @@ const trotthledAllConversationsDispatch = _.debounce(
updatesToDispatch.clear();
},
2000,
{ maxWait: 5000, trailing: true }
{ maxWait: 2000, trailing: true, leading: true }
);
const updatesToDispatch: Map<string, ReduxConversationType> = new Map();

15
ts/node/sql.ts
Unescape Escape View File

@ -1181,6 +1181,7 @@ function updateToLokiSchemaVersion17(currentVersion: number, db: BetterSqlite3.D
}
function dropFtsAndTriggers(db: BetterSqlite3.Database) {
console.info('dropping fts5 table');
db.exec(`
DROP TRIGGER IF EXISTS messages_on_insert;
DROP TRIGGER IF EXISTS messages_on_delete;
@ -1190,6 +1191,7 @@ function dropFtsAndTriggers(db: BetterSqlite3.Database) {
}
function rebuildFtsTable(db: BetterSqlite3.Database) {
console.info('rebuildFtsTable');
db.exec(`
-- Then we create our full-text search table and populate it
CREATE VIRTUAL TABLE ${MESSAGES_FTS_TABLE}
@ -1220,6 +1222,7 @@ function rebuildFtsTable(db: BetterSqlite3.Database) {
);
END;
`);
console.info('rebuildFtsTable built');
}
function updateToLokiSchemaVersion18(currentVersion: number, db: BetterSqlite3.Database) {
@ -1380,10 +1383,7 @@ function updateToLokiSchemaVersion23(currentVersion: number, db: BetterSqlite3.D
expiresAt INTEGER,
namespace INTEGER NOT NULL DEFAULT 0,
PRIMARY KEY (id, snode, namespace)
);
`
);`
);
db.exec(
@ -2891,7 +2891,6 @@ function removeAllAttachmentDownloadJobs() {
function removeAll() {
assertGlobalInstance().exec(`
DELETE FROM ${IDENTITY_KEYS_TABLE};
DELETE FROM ${ITEMS_TABLE};
DELETE FROM unprocessed;
DELETE FROM ${LAST_HASHES_TABLE};
@ -3417,6 +3416,7 @@ function cleanUpOldOpengroups() {
// first remove very old messages for each opengroups
assertGlobalInstance().transaction(() => {
dropFtsAndTriggers(assertGlobalInstance());
v2Convos.forEach(convo => {
const convoId = convo.id;
@ -3486,7 +3486,9 @@ function cleanUpOldOpengroups() {
const chunks = chunk(allInactiveAndWithoutMessagesConvo, 500);
chunks.forEach(ch => {
assertGlobalInstance()
.prepare(`DELETE FROM ${CONVERSATIONS_TABLE} WHERE id IN (${ch.map(() => '?').join(',')});`)
.prepare(
`DELETE FROM ${CONVERSATIONS_TABLE} WHERE id IN (${ch.map(() => '?').join(',')});`
)
.run(ch);
});
@ -3500,6 +3502,7 @@ function cleanUpOldOpengroups() {
cleanUpMessagesJson();
rebuildFtsTable(assertGlobalInstance());
});
}
// tslint:disable: binary-expression-operand-order insecure-random

20
ts/session/apis/seed_node_api/SeedNodeAPI.ts
Unescape Escape View File

@ -14,17 +14,13 @@ import { ipcRenderer } from 'electron';
// tslint:disable: function-name
export type SeedNode = {
url: string;
};
/**
* Fetch all snodes from seed nodes.
* Exported only for tests. This is not to be used by the app directly
* @param seedNodes the seednodes to use to fetch snodes details
*/
export async function fetchSnodePoolFromSeedNodeWithRetries(
seedNodes: Array<SeedNode>
seedNodes: Array<string>
): Promise<Array<Data.Snode>> {
try {
window?.log?.info(`fetchSnodePoolFromSeedNode with seedNodes.length ${seedNodes.length}`);
@ -148,7 +144,7 @@ export interface SnodeFromSeed {
* If all attempts fails, this function will throw the last error.
* The returned list is not shuffled when returned.
*/
async function getSnodeListFromSeednode(seedNodes: Array<SeedNode>): Promise<Array<SnodeFromSeed>> {
async function getSnodeListFromSeednode(seedNodes: Array<string>): Promise<Array<SnodeFromSeed>> {
const SEED_NODE_RETRIES = 4;
return pRetry(
@ -185,7 +181,7 @@ export function getMinTimeout() {
* This function is to be used with a pRetry caller
*/
export async function TEST_fetchSnodePoolFromSeedNodeRetryable(
seedNodes: Array<SeedNode>
seedNodes: Array<string>
): Promise<Array<SnodeFromSeed>> {
window?.log?.info('fetchSnodePoolFromSeedNodeRetryable starting...');
@ -194,8 +190,8 @@ export async function TEST_fetchSnodePoolFromSeedNodeRetryable(
throw new Error('fetchSnodePoolFromSeedNodeRetryable: Seed nodes are empty');
}
const seedNode = _.sample(seedNodes);
if (!seedNode) {
const seedNodeUrl = _.sample(seedNodes);
if (!seedNodeUrl) {
window?.log?.warn(
'loki_snode_api::fetchSnodePoolFromSeedNodeRetryable - Could not select random snodes from',
seedNodes
@ -203,14 +199,14 @@ export async function TEST_fetchSnodePoolFromSeedNodeRetryable(
throw new Error('fetchSnodePoolFromSeedNodeRetryable: Seed nodes are empty #2');
}
const tryUrl = new URL(seedNode.url);
const tryUrl = new URL(seedNodeUrl);
const snodes = await getSnodesFromSeedUrl(tryUrl);
if (snodes.length === 0) {
window?.log?.warn(
`loki_snode_api::fetchSnodePoolFromSeedNodeRetryable - ${seedNode.url} did not return any snodes`
`loki_snode_api::fetchSnodePoolFromSeedNodeRetryable - ${seedNodeUrl} did not return any snodes`
);
throw new Error(`Failed to contact seed node: ${seedNode.url}`);
throw new Error(`Failed to contact seed node: ${seedNodeUrl}`);
}
return snodes;

6
ts/session/apis/snode_api/SNodeAPI.ts
Unescape Escape View File

@ -66,6 +66,7 @@ export type SendParams = {
data: string;
isSyncMessage?: boolean;
messageId?: string;
namespace: number;
};
/**
@ -438,6 +439,7 @@ export async function storeOnNode(
try {
const parsed = JSON.parse(result.body);
handleTimestampOffset('store', parsed.t);
await handleHardforkResult(parsed);
const messageHash = parsed.hash;
if (messageHash) {
@ -505,12 +507,12 @@ export async function retrieveNextMessages(
targetNode: Snode,
lastHash: string,
associatedWith: string,
namespace: number
namespace?: number
): Promise<Array<any>> {
const params: RetrieveRequestParams = {
pubKey: associatedWith,
lastHash: lastHash || '',
namespace: namespace || 0,
namespace,
};
const signatureParams = (await getRetrieveSignatureParams(params)) || {};

4
ts/session/apis/snode_api/snodePool.ts
Unescape Escape View File

@ -9,6 +9,7 @@ import { ed25519Str } from '../../onions/onionPath';
import { OnionPaths } from '../../onions';
import { Onions, SnodePool } from '.';
import { SeedNodeAPI } from '../seed_node_api';
import { useTestNet } from '../../types';
/**
* If we get less than this snode in a swarm, we fetch new snodes for this pubkey
*/
@ -179,7 +180,8 @@ export async function getRandomSnodePool(): Promise<Array<Data.Snode>> {
*/
// tslint:disable: function-name
export async function TEST_fetchFromSeedWithRetriesAndWriteToDb() {
const seedNodes = window.getSeedNodeList();
// tslint:disable-next-line: no-http-string
const seedNodes = useTestNet ? ['http://public.loki.foundation:38157'] : window.getSeedNodeList();
if (!seedNodes || !seedNodes.length) {
window?.log?.error(

18
ts/session/apis/snode_api/swarmPolling.ts
Unescape Escape View File

@ -163,17 +163,16 @@ export class SwarmPolling {
?.idForLogging() || group.pubkey.key;
if (diff >= convoPollingTimeout) {
window?.log?.info(
`Polling for ${loggingId}; timeout: ${convoPollingTimeout} ; diff: ${diff}`
);
const hardfork190Happened = await getHasSeenHF190();
const hardfork191Happened = await getHasSeenHF191();
window?.log?.info(
`Polling for ${loggingId}; timeout: ${convoPollingTimeout}; diff: ${diff} ; hardfork190Happened: ${hardfork190Happened}; hardfork191Happened: ${hardfork191Happened} `
);
if (hardfork190Happened && !hardfork191Happened) {
// during the transition period, we poll from both namespaces (0 and -10) for groups
return Promise.all([
this.pollOnceForKey(group.pubkey, true, 0),
this.pollOnceForKey(group.pubkey, true, undefined),
this.pollOnceForKey(group.pubkey, true, -10),
]).then(() => undefined);
}
@ -184,7 +183,6 @@ export class SwarmPolling {
}
// before any of those hardforks, we just poll from the default namespace being 0
console.warn('before any of those hardforks');
return this.pollOnceForKey(group.pubkey, true, 0);
}
window?.log?.info(
@ -206,7 +204,7 @@ export class SwarmPolling {
/**
* Only exposed as public for testing
*/
public async pollOnceForKey(pubkey: PubKey, isGroup: boolean, namespace: number) {
public async pollOnceForKey(pubkey: PubKey, isGroup: boolean, namespace?: number) {
const pkStr = pubkey.key;
const swarmSnodes = await snodePool.getSwarmFor(pkStr);
@ -290,7 +288,7 @@ export class SwarmPolling {
private async pollNodeForKey(
node: Snode,
pubkey: PubKey,
namespace: number
namespace?: number
): Promise<Array<any> | null> {
const edkey = node.pubkey_ed25519;
@ -299,7 +297,7 @@ export class SwarmPolling {
try {
return await pRetry(
async () => {
const prevHash = await this.getLastHash(edkey, pkStr, namespace);
const prevHash = await this.getLastHash(edkey, pkStr, namespace || 0);
const messages = await retrieveNextMessages(node, prevHash, pkStr, namespace);
if (!messages.length) {
return [];
@ -310,7 +308,7 @@ export class SwarmPolling {
await this.updateLastHash({
edkey: edkey,
pubkey,
namespace,
namespace: namespace || 0,
hash: lastMessage.hash,
expiration: lastMessage.expiration,
});

4
ts/session/onions/onionPath.ts
Unescape Escape View File

@ -276,7 +276,7 @@ async function internalUpdateGuardNodes(updatedGuardNodes: Array<Data.Snode>) {
await Data.updateGuardNodes(edKeys);
}
export async function TEST_testGuardNode(snode: Data.Snode) {
export async function testGuardNode(snode: Data.Snode) {
window?.log?.info(`Testing a candidate guard node ${ed25519Str(snode.pubkey_ed25519)}`);
// Send a post request and make sure it is OK
@ -381,7 +381,7 @@ export async function selectGuardNodes(): Promise<Array<Data.Snode>> {
// Test all three nodes at once, wait for all to resolve or reject
// eslint-disable-next-line no-await-in-loop
const idxOk = (
await Promise.allSettled(candidateNodes.map(OnionPaths.TEST_testGuardNode))
await Promise.allSettled(candidateNodes.map(OnionPaths.testGuardNode))
).flatMap(p => (p.status === 'fulfilled' ? p.value : null));
const goodNodes = _.zip(idxOk, candidateNodes)

25
ts/session/sending/MessageSender.ts
Unescape Escape View File

@ -22,6 +22,7 @@ import { getConversationController } from '../conversations';
import { ed25519Str } from '../onions/onionPath';
import { EmptySwarmError } from '../utils/errors';
import ByteBuffer from 'bytebuffer';
import { getHasSeenHF190, getHasSeenHF191 } from '../apis/snode_api/hfHandling';
const DEFAULT_CONNECTIONS = 1;
@ -137,29 +138,34 @@ export async function sendMessageToSnode(
const data64 = ByteBuffer.wrap(data).toString('base64');
const swarm = await getSwarmFor(pubKey);
const conversation = getConversationController().get(pubKey);
const isClosedGroup = conversation?.isClosedGroup();
const hardfork190Happened = await getHasSeenHF190();
const hardfork191Happened = await getHasSeenHF191();
const namespace = isClosedGroup ? -10 : 0;
window?.log?.debug(
'Sending envelope with timestamp: ',
timestamp,
' to ',
ed25519Str(pubKey),
' size base64:',
`Sending envelope with timestamp: ${timestamp} to ${ed25519Str(pubKey)} size base64: ${
data64.length
}; hardfork190Happened:${hardfork190Happened}; hardfork191Happened:${hardfork191Happened} to namespace:${namespace}`
);
// send parameters
const params = {
pubKey,
ttl: `${ttl}`,
timestamp: `${timestamp}`,
data: data64,
isSyncMessage,
messageId,
isSyncMessage, // I don't think that's of any use
messageId, // I don't think that's of any use
namespace,
};
const usedNodes = _.slice(swarm, 0, DEFAULT_CONNECTIONS);
let successfulSendHash: any;
const promises = usedNodes.map(async usedNode => {
// TODO: Revert back to using snode address instead of IP
// No pRetry here as if this is a bad path it will be handled and retried in lokiOnionFetch.
// the only case we could care about a retry would be when the usedNode is not correct,
// but considering we trigger this request with a few snode in //, this should be fine.
@ -189,9 +195,6 @@ export async function sendMessageToSnode(
throw new EmptySwarmError(pubKey, 'Ran out of swarm nodes to query');
}
const conversation = getConversationController().get(pubKey);
const isClosedGroup = conversation?.isClosedGroup();
// If message also has a sync message, save that hash. Otherwise save the hash from the regular message send i.e. only closed groups in this case.
if (messageId && (isSyncMessage || isClosedGroup)) {
const message = await getMessageById(messageId);

5
ts/session/types/PubKey.ts
Unescape Escape View File

@ -1,7 +1,8 @@
import { fromHexToArray } from '../utils/String';
export const getStoragePubKey = (key: string) =>
window.isDev?.() || false ? key.substring(2) : key;
export const useTestNet = process.env.NODE_APP_INSTANCE?.includes('testnet');
export const getStoragePubKey = (key: string) => (useTestNet ? key.substring(2) : key);
export class PubKey {
public static readonly PUBKEY_LEN = 66;

6
ts/test/session/unit/onion/GuardNodes_test.ts
Unescape Escape View File

@ -63,7 +63,7 @@ describe('GuardNodes', () => {
SnodePool,
'TEST_fetchFromSeedWithRetriesAndWriteToDb'
).resolves();
const testGuardNode = Sinon.stub(OnionPaths, 'TEST_testGuardNode').resolves(true);
const testGuardNode = Sinon.stub(OnionPaths, 'testGuardNode').resolves(true);
Sinon.stub(Data, 'updateGuardNodes').resolves();
// run the command
@ -98,7 +98,7 @@ describe('GuardNodes', () => {
SnodePool,
'TEST_fetchFromSeedWithRetriesAndWriteToDb'
).resolves();
const testGuardNode = Sinon.stub(OnionPaths, 'TEST_testGuardNode').resolves(false);
const testGuardNode = Sinon.stub(OnionPaths, 'testGuardNode').resolves(false);
Sinon.stub(Data, 'updateGuardNodes').resolves();
// run the command
@ -154,7 +154,7 @@ describe('GuardNodes', () => {
const invalidSndodePool = fakeSnodePool.slice(0, 11);
Sinon.stub(Data, 'getSnodePoolFromDb').resolves(invalidSndodePool);
TestUtils.stubWindow('getSeedNodeList', () => [{ url: 'whatever' }]);
const testGuardNode = Sinon.stub(OnionPaths, 'TEST_testGuardNode').resolves(true);
const testGuardNode = Sinon.stub(OnionPaths, 'testGuardNode').resolves(true);
getSnodePoolFromDBOrFetchFromSeed = Sinon.stub(
SnodePool,

4
ts/test/session/unit/onion/SeedNodeAPI_test.ts
Unescape Escape View File

@ -74,9 +74,7 @@ describe('SeedNodeAPI', () => {
Sinon.stub(SeedNodeAPI, 'getMinTimeout').returns(20);
// run the command
const fetched = await SeedNodeAPI.fetchSnodePoolFromSeedNodeWithRetries([
{ url: 'seednode1' },
]);
const fetched = await SeedNodeAPI.fetchSnodePoolFromSeedNodeWithRetries(['seednode1']);
const sortedFetch = fetched.sort((a, b) => (a.pubkey_ed25519 > b.pubkey_ed25519 ? -1 : 1));
const sortedFakeSnodePool = fakeSnodePool.sort((a, b) =>

2
ts/test/session/unit/swarm_polling/SwarmPolling_test.ts
Unescape Escape View File

@ -231,7 +231,7 @@ describe('SwarmPolling', () => {
// our pubkey will be polled for, hence the 2
expect(pollOnceForKeySpy.callCount).to.eq(3);
expect(pollOnceForKeySpy.firstCall.args).to.deep.eq([ourPubkey, false, 0]);
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, 0]);
expect(pollOnceForKeySpy.secondCall.args).to.deep.eq([groupConvoPubkey, true, undefined]);
expect(pollOnceForKeySpy.thirdCall.args).to.deep.eq([groupConvoPubkey, true, -10]);
getItemByIdStub.restore();
getItemByIdStub = TestUtils.stubDataItem('getItemById');

6
ts/util/crypto/attachmentsEncrypter.ts
Unescape Escape View File

@ -5,7 +5,7 @@
async function sign(key: any, data: any) {
return crypto.subtle
.importKey('raw', key, { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign'])
.then(async function(secondKey: any) {
.then(async function(secondKey) {
return crypto.subtle.sign({ name: 'HMAC', hash: 'SHA-256' }, secondKey, data);
});
}
@ -13,14 +13,14 @@ async function sign(key: any, data: any) {
async function encrypt(key: any, data: any, iv: any) {
return crypto.subtle
.importKey('raw', key, { name: 'AES-CBC' }, false, ['encrypt'])
.then(async function(secondKey: any) {
.then(async function(secondKey) {
return crypto.subtle.encrypt({ name: 'AES-CBC', iv: new Uint8Array(iv) }, secondKey, data);
});
}
async function decrypt(key: any, data: any, iv: any) {
return crypto.subtle
.importKey('raw', key, { name: 'AES-CBC' }, false, ['decrypt'])
.then(async function(secondKey: any) {
.then(async function(secondKey) {
return crypto.subtle.decrypt({ name: 'AES-CBC', iv: new Uint8Array(iv) }, secondKey, data);
});
}

2
ts/window.d.ts vendored
Unescape Escape View File

@ -42,7 +42,7 @@ declare global {
onLogin: any;
persistStore?: Persistor;
restart: any;
getSeedNodeList: () => Array<any> | undefined;
getSeedNodeList: () => Array<string> | undefined;
setPassword: any;
storage: any;
isOnline: boolean;

Write Preview
Loading…
Cancel
Save