[legal] Update trademark policy and guidelines, fix license text

2022-08-12 13:46:55 +09:00
354 changed files with 2915 additions and 18772 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: ['mempool'] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://mempool.space/sponsor'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,10 +42,8 @@ jobs:
        run: npm run lint
        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend

-      - name: Unit Tests
-        if: ${{ matrix.flavor == 'dev'}}
-        run: npm run test
-        working-directory: ${{ matrix.node }}/${{ matrix.flavor }}/backend
+      #  - name: Test
+      #    run: npm run test

      - name: Build
        run: npm run build
--- a/.github/workflows/on-tag.yml
+++ b/.github/workflows/on-tag.yml
@@ -1,7 +1,7 @@
 name: Docker build on tag
 env:
  DOCKER_CLI_EXPERIMENTAL: enabled
-  TAG_FMT: "^refs/tags/(((.?[0-9]+){3,4}))$"
+  TAG_FMT: '^refs/tags/(((.?[0-9]+){3,4}))$'
  DOCKER_BUILDKIT: 0
  COMPOSE_DOCKER_CLI_BUILD: 0

@@ -21,46 +21,16 @@ jobs:
        service:
          - frontend
          - backend
-    runs-on: ubuntu-latest
-    timeout-minutes: 120
+    runs-on: ubuntu-18.04
    name: Build and push to DockerHub
    steps:
-      # Workaround based on JonasAlfredsson/docker-on-tmpfs@v1.0.1
-      - name: Replace the current swap file
-        shell: bash
-        run: |
-          sudo swapoff /mnt/swapfile
-          sudo rm -v /mnt/swapfile
-          sudo fallocate -l 10G /mnt/swapfile
-          sudo chmod 600 /mnt/swapfile
-          sudo mkswap /mnt/swapfile
-          sudo swapon /mnt/swapfile
-
-      - name: Show current memory and swap status
-        shell: bash
-        run: |
-          sudo free -h
-          echo
-          sudo swapon --show
-
-      - name: Mount a tmpfs over /var/lib/docker
-        shell: bash
-        run: |
-          if [ ! -d "/var/lib/docker" ]; then
-            echo "Directory '/var/lib/docker' not found"
-            exit 1
-          fi
-          sudo mount -t tmpfs -o size=10G tmpfs /var/lib/docker
-          sudo systemctl restart docker
-          sudo df -h | grep docker
-
      - name: Set env variables
        run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV

      - name: Show set environment variables
        run: |
          printf "      TAG: %s\n"  "$TAG"
-
+      
      - name: Add SHORT_SHA env property with commit short sha
        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV

--- a/23
+++ b/23
@@ -1,5 +1,5 @@
-The Mempool Open Source Project
-Copyright (c) 2019-2022 The Mempool Open Source Project Developers
+The Mempool Open Source Project™
+Copyright (c) 2019-2022 Mempool Space K.K. and other shadowy super-coders

 This program is free software; you can redistribute it and/or modify it under
 the terms of (at your option) either:
@@ -12,13 +12,18 @@ the terms of (at your option) either:
 Foundation, either version 3 of the License or any later version approved by a
 proxy statement published on <https://mempool.space/about>.

-However, this copyright license does not include an implied right or license to
-use our trademarks: The Mempool Open Source Project™, mempool.space™, the
-mempool Logo™, the mempool.space Vertical Logo™, the mempool.space Horizontal
-Logo™, the mempool Square Logo™, and the mempool Blocks logo™ are registered
-trademarks or trademarks of Mempool Space K.K in Japan, the United States,
-and/or other countries. See our full Trademark Policy and Guidelines for more
-details, published on <https://mempool.space/trademark-policy>.
+However, the above copyright licenses do not include an implied right or license
+to use any trademarks, service marks, logos, or trade names of Mempool Space K.K.
+or any other contributor to The Mempool Open Source Project.
+
+The Mempool Open Source Project™, Mempool Accelerator™, mempool.space™,
+the mempool Logo, the mempool Square logo, the mempool Blocks logo,
+the mempool.space Vertical Logo, and the mempool.space Horizontal logo
+are registered trademarks or trademarks of Mempool Space K.K in Japan,
+the United States, and/or other countries.
+
+See our full Trademark Policy and Guidelines for more details, published on
+<https://mempool.space/trademark-policy>.

 This program is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--- a/backend/.eslintrc
+++ b/backend/.eslintrc
@@ -31,7 +31,6 @@
    "prefer-const": 1,
    "prefer-rest-params": 1,
    "quotes": [1, "single", { "allowTemplateLiterals": true }],
-    "semi": 1,
-    "eqeqeq": 1
+    "semi": 1
  }
 }
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -1,8 +1,7 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.

 # production config and external assets
-!mempool-config.template.json
-!mempool-config.sample.json
+
 mempool-config.json
 pools.json
 icons.json
--- a/backend/README.md
+++ b/backend/README.md
@@ -110,11 +110,6 @@ Run the Mempool backend:

 ```
 npm run start
-
-```
-You can also set env var `MEMPOOL_CONFIG_FILE` to specify a custom config file location:
-```
-MEMPOOL_CONFIG_FILE=/path/to/mempool-config.json npm run start
 ```

 When it's running, you should see output like this:
--- a/backend/jest.config.ts
+++ b/backend/jest.config.ts
@@ -1,20 +0,0 @@
-import type { Config } from "@jest/types"
-
-const config: Config.InitialOptions = {
-  preset: "ts-jest",
-  testEnvironment: "node",
-  verbose: true,
-  automock: false,
-  collectCoverage: true,
-  collectCoverageFrom: ["./src/**/**.ts"],
-  coverageProvider: "babel",
-  coverageThreshold: {
-    global: {
-      lines: 1
-    }
-  },
-  setupFiles: [
-    "./testSetup.ts",
-  ],
-}
-export default config;
--- a/backend/mempool-config.sample.json
+++ b/backend/mempool-config.sample.json
@@ -77,19 +77,13 @@
  },
  "LIGHTNING": {
    "ENABLED": false,
-    "BACKEND": "lnd",
-    "STATS_REFRESH_INTERVAL": 600,
-    "GRAPH_REFRESH_INTERVAL": 600,
-    "LOGGER_UPDATE_INTERVAL": 30
+    "BACKEND": "lnd"
  },
  "LND": {
    "TLS_CERT_PATH": "tls.cert",
    "MACAROON_PATH": "readonly.macaroon",
    "REST_API_URL": "https://localhost:8080"
  },
-  "CLIGHTNING": {
-    "SOCKET": "lightning-rpc"
-  },
  "SOCKS5PROXY": {
    "ENABLED": false,
    "USE_ONION": true,
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
--- a/backend/package.json
+++ b/backend/package.json
@@ -21,26 +21,23 @@
  ],
  "main": "index.ts",
  "scripts": {
-    "tsc": "./node_modules/typescript/bin/tsc -p tsconfig.build.json",
-    "build": "npm run tsc && npm run create-resources",
-    "create-resources": "cp ./src/tasks/price-feeds/mtgox-weekly.json ./dist/tasks && node dist/api/fetch-version.js",
-    "package": "npm run build && rm -rf package && mv dist package && mv node_modules package && npm run package-rm-build-deps",
-    "package-rm-build-deps": "(cd package/node_modules; rm -r typescript @typescript-eslint)",
+    "tsc": "./node_modules/typescript/bin/tsc",
+    "build": "npm run tsc",
    "start": "node --max-old-space-size=2048 dist/index.js",
    "start-production": "node --max-old-space-size=4096 dist/index.js",
-    "test": "./node_modules/.bin/jest --coverage",
+    "test": "echo \"Error: no test specified\" && exit 1",
    "lint": "./node_modules/.bin/eslint . --ext .ts",
    "lint:fix": "./node_modules/.bin/eslint . --ext .ts --fix",
    "prettier": "./node_modules/.bin/prettier --write \"src/**/*.{js,ts}\""
  },
  "dependencies": {
-    "@babel/core": "^7.18.6",
    "@mempool/electrum-client": "^1.1.7",
    "@types/node": "^16.11.41",
    "axios": "~0.27.2",
-    "bitcoinjs-lib": "6.0.2",
+    "bitcoinjs-lib": "6.0.1",
    "crypto-js": "^4.0.0",
    "express": "^4.18.0",
+    "fast-xml-parser": "^4.0.9",
    "maxmind": "^4.3.6",
    "mysql2": "2.3.3",
    "node-worker-threads-pool": "^1.5.1",
@@ -49,20 +46,14 @@
    "ws": "~8.8.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.18.6",
-    "@babel/code-frame": "^7.18.6",
    "@types/compression": "^1.7.2",
    "@types/crypto-js": "^4.1.1",
    "@types/express": "^4.17.13",
-    "@types/jest": "^28.1.4",
    "@types/ws": "~8.5.3",
    "@typescript-eslint/eslint-plugin": "^5.30.5",
    "@typescript-eslint/parser": "^5.30.5",
    "eslint": "^8.19.0",
    "eslint-config-prettier": "^8.5.0",
-    "jest": "^28.1.2",
-    "prettier": "^2.7.1",
-    "ts-jest": "^28.0.5",
-    "ts-node": "^10.8.2"
+    "prettier": "^2.7.1"
  }
 }
--- a/backend/src/fixtures/mempool-config.template.json
+++ b/backend/src/fixtures/mempool-config.template.json
@@ -1,108 +0,0 @@
-{
-  "MEMPOOL": {
-    "NETWORK": "__MEMPOOL_NETWORK__",
-    "BACKEND": "__MEMPOOL_BACKEND__",
-    "BLOCKS_SUMMARIES_INDEXING": true,
-    "HTTP_PORT": 1,
-    "SPAWN_CLUSTER_PROCS": 2,
-    "API_URL_PREFIX": "__MEMPOOL_API_URL_PREFIX__",
-    "AUTOMATIC_BLOCK_REINDEXING": true,
-    "POLL_RATE_MS": 3,
-    "CACHE_DIR": "__MEMPOOL_CACHE_DIR__",
-    "CLEAR_PROTECTION_MINUTES": 4,
-    "RECOMMENDED_FEE_PERCENTILE": 5,
-    "BLOCK_WEIGHT_UNITS": 6,
-    "INITIAL_BLOCKS_AMOUNT": 7,
-    "MEMPOOL_BLOCKS_AMOUNT": 8,
-    "PRICE_FEED_UPDATE_INTERVAL": 9,
-    "USE_SECOND_NODE_FOR_MINFEE": 10,
-    "EXTERNAL_ASSETS": 11,
-    "EXTERNAL_MAX_RETRY": 12,
-    "EXTERNAL_RETRY_INTERVAL": 13,
-    "USER_AGENT": "__MEMPOOL_USER_AGENT__",
-    "STDOUT_LOG_MIN_PRIORITY": "__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__",
-    "INDEXING_BLOCKS_AMOUNT": 14,
-    "POOLS_JSON_TREE_URL": "__POOLS_JSON_TREE_URL__",
-    "POOLS_JSON_URL": "__POOLS_JSON_URL__"
-  },
-  "CORE_RPC": {
-    "HOST": "__CORE_RPC_HOST__",
-    "PORT": 15,
-    "USERNAME": "__CORE_RPC_USERNAME__",
-    "PASSWORD": "__CORE_RPC_PASSWORD__"
-  },
-  "ELECTRUM": {
-    "HOST": "__ELECTRUM_HOST__",
-    "PORT": 16,
-    "TLS_ENABLED": true
-  },
-  "ESPLORA": {
-    "REST_API_URL": "__ESPLORA_REST_API_URL__"
-  },
-  "SECOND_CORE_RPC": {
-    "HOST": "__SECOND_CORE_RPC_HOST__",
-    "PORT": 17,
-    "USERNAME": "__SECOND_CORE_RPC_USERNAME__",
-    "PASSWORD": "__SECOND_CORE_RPC_PASSWORD__"
-  },
-  "DATABASE": {
-    "ENABLED": false,
-    "HOST": "__DATABASE_HOST__",
-    "SOCKET": "__DATABASE_SOCKET__",
-    "PORT": 18,
-    "DATABASE": "__DATABASE_DATABASE__",
-    "USERNAME": "__DATABASE_USERNAME__",
-    "PASSWORD": "__DATABASE_PASSWORD__"
-  },
-  "SYSLOG": {
-    "ENABLED": false,
-    "HOST": "__SYSLOG_HOST__",
-    "PORT": 19,
-    "MIN_PRIORITY": "__SYSLOG_MIN_PRIORITY__",
-    "FACILITY": "__SYSLOG_FACILITY__"
-  },
-  "STATISTICS": {
-    "ENABLED": false,
-    "TX_PER_SECOND_SAMPLE_PERIOD": 20
-  },
-  "BISQ": {
-    "ENABLED": true,
-    "DATA_PATH": "__BISQ_DATA_PATH__"
-  },
-  "SOCKS5PROXY": {
-    "ENABLED": true,
-    "USE_ONION": true,
-    "HOST": "__SOCKS5PROXY_HOST__",
-    "PORT": "__SOCKS5PROXY_PORT__",
-    "USERNAME": "__SOCKS5PROXY_USERNAME__",
-    "PASSWORD": "__SOCKS5PROXY_PASSWORD__"
-  },
-  "PRICE_DATA_SERVER": {
-    "TOR_URL": "__PRICE_DATA_SERVER_TOR_URL__",
-    "CLEARNET_URL": "__PRICE_DATA_SERVER_CLEARNET_URL__"
-  },
-  "EXTERNAL_DATA_SERVER": {
-    "MEMPOOL_API": "__EXTERNAL_DATA_SERVER_MEMPOOL_API__",
-    "MEMPOOL_ONION": "__EXTERNAL_DATA_SERVER_MEMPOOL_ONION__",
-    "LIQUID_API": "__EXTERNAL_DATA_SERVER_LIQUID_API__",
-    "LIQUID_ONION": "__EXTERNAL_DATA_SERVER_LIQUID_ONION__",
-    "BISQ_URL": "__EXTERNAL_DATA_SERVER_BISQ_URL__",
-    "BISQ_ONION": "__EXTERNAL_DATA_SERVER_BISQ_ONION__"
-  },
-  "LIGHTNING": {
-    "ENABLED": "__LIGHTNING_ENABLED__",
-    "BACKEND": "__LIGHTNING_BACKEND__",
-    "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__",
-    "STATS_REFRESH_INTERVAL": 600,
-    "GRAPH_REFRESH_INTERVAL": 600,
-    "LOGGER_UPDATE_INTERVAL": 30
-  },
-  "LND": {
-    "TLS_CERT_PATH": "",
-    "MACAROON_PATH": "",
-    "REST_API_URL": "https://localhost:8080"
-  },
-  "CLIGHTNING": {
-    "SOCKET": "__CLIGHTNING_SOCKET__"
-  }
-}
--- a/backend/src/tests/api/difficulty-adjustment.test.ts
+++ b/backend/src/tests/api/difficulty-adjustment.test.ts
@@ -1,62 +0,0 @@
-import { calcDifficultyAdjustment, DifficultyAdjustment } from '../../api/difficulty-adjustment';
-
-describe('Mempool Difficulty Adjustment', () => {
-  test('should calculate Difficulty Adjustments properly', () => {
-    const dt = (dtString) => {
-      return Math.floor(new Date(dtString).getTime() / 1000);
-    };
-
-    const vectors = [
-      [ // Vector 1
-        [ // Inputs
-          dt('2022-08-18T11:07:00.000Z'), // Last DA time (in seconds)
-          dt('2022-08-19T14:03:53.000Z'), // Current time (now) (in seconds)
-          750134,                         // Current block height
-          0.6280047707459726,             // Previous retarget % (Passed through)
-          'mainnet',                      // Network (if testnet, next value is non-zero)
-          0,                              // If not testnet, not used
-        ],
-        { // Expected Result
-          progressPercent: 9.027777777777777,
-          difficultyChange: 12.562233927411782,
-          estimatedRetargetDate: 1661895424692,
-          remainingBlocks: 1834,
-          remainingTime: 977591692,
-          previousRetarget: 0.6280047707459726,
-          nextRetargetHeight: 751968,
-          timeAvg: 533038,
-          timeOffset: 0,
-        },
-      ],
-      [ // Vector 2 (testnet)
-        [ // Inputs
-          dt('2022-08-18T11:07:00.000Z'), // Last DA time (in seconds)
-          dt('2022-08-19T14:03:53.000Z'), // Current time (now) (in seconds)
-          750134,                         // Current block height
-          0.6280047707459726,             // Previous retarget % (Passed through)
-          'testnet',                      // Network
-          dt('2022-08-19T13:52:46.000Z'), // Latest block timestamp in seconds
-        ],
-        { // Expected Result is same other than timeOffset
-          progressPercent: 9.027777777777777,
-          difficultyChange: 12.562233927411782,
-          estimatedRetargetDate: 1661895424692,
-          remainingBlocks: 1834,
-          remainingTime: 977591692,
-          previousRetarget: 0.6280047707459726,
-          nextRetargetHeight: 751968,
-          timeAvg: 533038,
-          timeOffset: -667000, // 11 min 7 seconds since last block (testnet only)
-          // If we add time avg to abs(timeOffset) it makes exactly 1200000 ms, or 20 minutes
-        },
-      ],
-    ] as [[number, number, number, number, string, number], DifficultyAdjustment][];
-
-    for (const vector of vectors) {
-      const result = calcDifficultyAdjustment(...vector[0]);
-      // previousRetarget is passed through untouched
-      expect(result.previousRetarget).toStrictEqual(vector[0][3]);
-      expect(result).toStrictEqual(vector[1]);
-    }
-  });
-});
--- a/backend/src/tests/config.test.ts
+++ b/backend/src/tests/config.test.ts
@@ -1,139 +0,0 @@
-import * as fs from 'fs';
-
-describe('Mempool Backend Config', () => {
-  beforeEach(() => {
-    jest.resetAllMocks();
-    jest.resetModules();
-  });
-
-  test('should return defaults when no file is present', () => {
-    jest.isolateModules(() => {
-      jest.mock('../../mempool-config.json', () => ({}), { virtual: true });
-
-      const config = jest.requireActual('../config').default;
-
-      expect(config.MEMPOOL).toStrictEqual({
-        NETWORK: 'mainnet',
-        BACKEND: 'none',
-        BLOCKS_SUMMARIES_INDEXING: false,
-        HTTP_PORT: 8999,
-        SPAWN_CLUSTER_PROCS: 0,
-        API_URL_PREFIX: '/api/v1/',
-        AUTOMATIC_BLOCK_REINDEXING: false,
-        POLL_RATE_MS: 2000,
-        CACHE_DIR: './cache',
-        CLEAR_PROTECTION_MINUTES: 20,
-        RECOMMENDED_FEE_PERCENTILE: 50,
-        BLOCK_WEIGHT_UNITS: 4000000,
-        INITIAL_BLOCKS_AMOUNT: 8,
-        MEMPOOL_BLOCKS_AMOUNT: 8,
-        INDEXING_BLOCKS_AMOUNT: 11000,
-        PRICE_FEED_UPDATE_INTERVAL: 600,
-        USE_SECOND_NODE_FOR_MINFEE: false,
-        EXTERNAL_ASSETS: [],
-        EXTERNAL_MAX_RETRY: 1,
-        EXTERNAL_RETRY_INTERVAL: 0,
-        USER_AGENT: 'mempool',
-        STDOUT_LOG_MIN_PRIORITY: 'debug',
-        POOLS_JSON_TREE_URL: 'https://api.github.com/repos/mempool/mining-pools/git/trees/master',
-        POOLS_JSON_URL: 'https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json'
-      });
-
-      expect(config.ELECTRUM).toStrictEqual({ HOST: '127.0.0.1', PORT: 3306, TLS_ENABLED: true });
-
-      expect(config.ESPLORA).toStrictEqual({ REST_API_URL: 'http://127.0.0.1:3000' });
-
-      expect(config.CORE_RPC).toStrictEqual({
-        HOST: '127.0.0.1',
-        PORT: 8332,
-        USERNAME: 'mempool',
-        PASSWORD: 'mempool'
-      });
-
-      expect(config.SECOND_CORE_RPC).toStrictEqual({
-        HOST: '127.0.0.1',
-        PORT: 8332,
-        USERNAME: 'mempool',
-        PASSWORD: 'mempool'
-      });
-
-      expect(config.DATABASE).toStrictEqual({
-        ENABLED: true,
-        HOST: '127.0.0.1',
-        SOCKET: '',
-        PORT: 3306,
-        DATABASE: 'mempool',
-        USERNAME: 'mempool',
-        PASSWORD: 'mempool'
-      });
-
-      expect(config.SYSLOG).toStrictEqual({
-        ENABLED: true,
-        HOST: '127.0.0.1',
-        PORT: 514,
-        MIN_PRIORITY: 'info',
-        FACILITY: 'local7'
-      });
-
-      expect(config.STATISTICS).toStrictEqual({ ENABLED: true, TX_PER_SECOND_SAMPLE_PERIOD: 150 });
-
-      expect(config.BISQ).toStrictEqual({ ENABLED: false, DATA_PATH: '/bisq/statsnode-data/btc_mainnet/db' });
-
-      expect(config.SOCKS5PROXY).toStrictEqual({
-        ENABLED: false,
-        USE_ONION: true,
-        HOST: '127.0.0.1',
-        PORT: 9050,
-        USERNAME: '',
-        PASSWORD: ''
-      });
-
-      expect(config.PRICE_DATA_SERVER).toStrictEqual({
-        TOR_URL: 'http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices',
-        CLEARNET_URL: 'https://price.bisq.wiz.biz/getAllMarketPrices'
-      });
-
-      expect(config.EXTERNAL_DATA_SERVER).toStrictEqual({
-        MEMPOOL_API: 'https://mempool.space/api/v1',
-        MEMPOOL_ONION: 'http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1',
-        LIQUID_API: 'https://liquid.network/api/v1',
-        LIQUID_ONION: 'http://liquidmom47f6s3m53ebfxn47p76a6tlnxib3wp6deux7wuzotdr6cyd.onion/api/v1',
-        BISQ_URL: 'https://bisq.markets/api',
-        BISQ_ONION: 'http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api'
-      });
-    });
-  });
-
-  test('should override the default values with the passed values', () => {
-    jest.isolateModules(() => {
-      const fixture = JSON.parse(fs.readFileSync(`${__dirname}/../__fixtures__/mempool-config.template.json`, 'utf8'));
-      jest.mock('../../mempool-config.json', () => (fixture), { virtual: true });
-
-      const config = jest.requireActual('../config').default;
-
-      expect(config.MEMPOOL).toStrictEqual(fixture.MEMPOOL);
-
-      expect(config.ELECTRUM).toStrictEqual(fixture.ELECTRUM);
-
-      expect(config.ESPLORA).toStrictEqual(fixture.ESPLORA);
-
-      expect(config.CORE_RPC).toStrictEqual(fixture.CORE_RPC);
-
-      expect(config.SECOND_CORE_RPC).toStrictEqual(fixture.SECOND_CORE_RPC);
-
-      expect(config.DATABASE).toStrictEqual(fixture.DATABASE);
-
-      expect(config.SYSLOG).toStrictEqual(fixture.SYSLOG);
-
-      expect(config.STATISTICS).toStrictEqual(fixture.STATISTICS);
-
-      expect(config.BISQ).toStrictEqual(fixture.BISQ);
-
-      expect(config.SOCKS5PROXY).toStrictEqual(fixture.SOCKS5PROXY);
-
-      expect(config.PRICE_DATA_SERVER).toStrictEqual(fixture.PRICE_DATA_SERVER);
-
-      expect(config.EXTERNAL_DATA_SERVER).toStrictEqual(fixture.EXTERNAL_DATA_SERVER);
-    });
-  });
-});
--- a/backend/src/api/backend-info.ts
+++ b/backend/src/api/backend-info.ts
@@ -1,37 +1,60 @@
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
+import * as fs from 'fs';
+import * as os from 'os';
+import logger from '../logger';
 import { IBackendInfo } from '../mempool.interfaces';
+const { spawnSync } = require('child_process');

 class BackendInfo {
-  private backendInfo: IBackendInfo;
+  private gitCommitHash = '';
+  private hostname = '';
+  private version = '';

  constructor() {
-    // This file is created by ./fetch-version.ts during building
-    const versionFile = path.join(__dirname, 'version.json')
-    var versionInfo;
-    if (fs.existsSync(versionFile)) {
-      versionInfo = JSON.parse(fs.readFileSync(versionFile).toString());
-    } else {
-      // Use dummy values if `versionFile` doesn't exist (e.g., during testing)
-      versionInfo = {
-        version: '?',
-        gitCommit: '?'
-      };
-    }
-    this.backendInfo = {
-      hostname: os.hostname(),
-      version: versionInfo.version,
-      gitCommit: versionInfo.gitCommit
-    };
+    this.setLatestCommitHash();
+    this.setVersion();
+    this.hostname = os.hostname();
  }

  public getBackendInfo(): IBackendInfo {
-    return this.backendInfo;
+    return {
+      hostname: this.hostname,
+      gitCommit: this.gitCommitHash,
+      version: this.version,
+    };
  }

  public getShortCommitHash() {
-    return this.backendInfo.gitCommit.slice(0, 7);
+    return this.gitCommitHash.slice(0, 7);
+  }
+
+  private setLatestCommitHash(): void {
+    //TODO: share this logic with `generate-config.js`
+    if (process.env.DOCKER_COMMIT_HASH) {
+      this.gitCommitHash = process.env.DOCKER_COMMIT_HASH;
+    } else {
+      try {
+        const gitRevParse = spawnSync('git', ['rev-parse', '--short', 'HEAD']);
+        if (!gitRevParse.error) {
+          const output = gitRevParse.stdout.toString('utf-8').replace(/[\n\r\s]+$/, '');
+          this.gitCommitHash = output ? output : '?';
+        } else if (gitRevParse.error.code === 'ENOENT') {
+          console.log('git not found, cannot parse git hash');
+          this.gitCommitHash = '?';
+        }
+      } catch (e: any) {
+        console.log('Could not load git commit info: ' + e.message);
+        this.gitCommitHash = '?';
+      }
+    }
+  }
+
+  private setVersion(): void {
+    try {
+      const packageJson = fs.readFileSync('package.json').toString();
+      this.version = JSON.parse(packageJson).version;
+    } catch (e) {
+      throw new Error(e instanceof Error ? e.message : 'Error');
+    }
  }
 }

--- a/backend/src/api/bitcoin/bitcoin.routes.ts
+++ b/backend/src/api/bitcoin/bitcoin.routes.ts
@@ -510,12 +510,7 @@ class BitcoinRoutes {

  private getDifficultyChange(req: Request, res: Response) {
    try {
-      const da = difficultyAdjustment.getDifficultyAdjustment();
-      if (da) {
-        res.json(da);
-      } else {
-        res.status(503).send(`Service Temporarily Unavailable`);
-      }
+      res.json(difficultyAdjustment.getDifficultyAdjustment());
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -1,7 +1,5 @@
 import { CpfpInfo, TransactionExtended, TransactionStripped } from '../mempool.interfaces';
 import config from '../config';
-import { NodeSocket } from '../repositories/NodesSocketsRepository';
-import { isIP } from 'net';
 export class Common {
  static nativeAssetId = config.MEMPOOL.NETWORK === 'liquidtestnet' ?
    '144c654344aa716d6f3abcc1ca90e5641e4e2a7f633bc09fe3baf64585819a49'
@@ -207,10 +205,6 @@ export class Common {

  /** Decodes a channel id returned by lnd as uint64 to a short channel id */
  static channelIntegerIdToShortId(id: string): string {
-    if (id.indexOf('/') !== -1) {
-      id = id.slice(0, -2);
-    }
-    
    if (id.indexOf('x') !== -1) { // Already a short id
      return id;
    }
@@ -227,76 +221,4 @@ export class Common {
    const d = new Date((date || 0) * 1000);
    return d.toISOString().split('T')[0] + ' ' + d.toTimeString().split(' ')[0];
  }
-
-  static findSocketNetwork(addr: string): {network: string | null, url: string} {
-    let network: string | null = null;
-    let url = addr.split('://')[1];
-
-    if (!url) {
-      return {
-        network: null,
-        url: addr,
-      };
-    }
-
-    if (addr.indexOf('onion') !== -1) {
-      if (url.split('.')[0].length >= 56) {
-        network = 'torv3';
-      } else {
-        network = 'torv2';
-      }
-    } else if (addr.indexOf('i2p') !== -1) {
-      network = 'i2p';
-    } else if (addr.indexOf('ipv4') !== -1) {
-      const ipv = isIP(url.split(':')[0]);
-      if (ipv === 4) {
-        network = 'ipv4';
-      } else {
-        return {
-          network: null,
-          url: addr,
-        };
-      }
-    } else if (addr.indexOf('ipv6') !== -1) {
-      url = url.split('[')[1].split(']')[0];
-      const ipv = isIP(url);
-      if (ipv === 6) {
-        const parts = addr.split(':');
-        network = 'ipv6';
-        url = `[${url}]:${parts[parts.length - 1]}`;
-      } else {
-        return {
-          network: null,
-          url: addr,
-        };
-      }
-    } else {
-      return {
-        network: null,
-        url: addr,
-      };
-    }
-
-    return {
-      network: network,
-      url: url,
-    };
-  }
-
-  static formatSocket(publicKey: string, socket: {network: string, addr: string}): NodeSocket {
-    if (config.LIGHTNING.BACKEND === 'cln') {
-      return {
-        publicKey: publicKey,
-        network: socket.network,
-        addr: socket.addr,
-      };
-    } else /* if (config.LIGHTNING.BACKEND === 'lnd') */ {
-      const formatted = this.findSocketNetwork(socket.addr);
-      return {
-        publicKey: publicKey,
-        network: formatted.network,
-        addr: formatted.url,
-      };
-    }
-  }
 }
--- a/backend/src/api/database-migration.ts
+++ b/backend/src/api/database-migration.ts
@@ -4,7 +4,7 @@ import logger from '../logger';
 import { Common } from './common';

 class DatabaseMigration {
-  private static currentVersion = 40;
+  private static currentVersion = 36;
  private queryTimeout = 120000;
  private statisticsAddedIndexed = false;
  private uniqueLogs: string[] = [];
@@ -248,6 +248,7 @@ class DatabaseMigration {
    }

    if (databaseSchemaVersion < 25 && isBitcoin === true) {
+      await this.$executeQuery(`INSERT INTO state VALUES('last_node_stats', 0, '1970-01-01');`);
      await this.$executeQuery(this.getCreateLightningStatisticsQuery(), await this.$checkIfTableExists('lightning_stats'));
      await this.$executeQuery(this.getCreateNodesQuery(), await this.$checkIfTableExists('nodes'));
      await this.$executeQuery(this.getCreateChannelsQuery(), await this.$checkIfTableExists('channels'));
@@ -323,31 +324,6 @@ class DatabaseMigration {
    if (databaseSchemaVersion < 36 && isBitcoin == true) {
      await this.$executeQuery('ALTER TABLE `nodes` ADD status TINYINT NOT NULL DEFAULT "1"');
    }
-
-    if (databaseSchemaVersion < 37 && isBitcoin == true) {
-      await this.$executeQuery(this.getCreateLNNodesSocketsTableQuery(), await this.$checkIfTableExists('nodes_sockets'));
-    }
-
-    if (databaseSchemaVersion < 38 && isBitcoin == true) {
-      if (config.LIGHTNING.ENABLED) {
-        this.uniqueLog(logger.notice, `'lightning_stats' and 'node_stats' tables have been truncated.`);
-      }
-      await this.$executeQuery(`TRUNCATE lightning_stats`);
-      await this.$executeQuery(`TRUNCATE node_stats`);
-      await this.$executeQuery('ALTER TABLE `lightning_stats` CHANGE `added` `added` timestamp NULL');
-      await this.$executeQuery('ALTER TABLE `node_stats` CHANGE `added` `added` timestamp NULL');
-    }
-
-    if (databaseSchemaVersion < 39 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `nodes` ADD alias_search TEXT NULL DEFAULT NULL AFTER `alias`');
-      await this.$executeQuery('ALTER TABLE nodes ADD FULLTEXT(alias_search)');
-    }
-
-    if (databaseSchemaVersion < 40 && isBitcoin === true) {
-      await this.$executeQuery('ALTER TABLE `nodes` ADD capacity bigint(20) unsigned DEFAULT NULL');
-      await this.$executeQuery('ALTER TABLE `nodes` ADD channels int(11) unsigned DEFAULT NULL');
-      await this.$executeQuery('ALTER TABLE `nodes` ADD INDEX `capacity` (`capacity`);');
-    }
  }

  /**
@@ -761,7 +737,7 @@ class DatabaseMigration {
      names text DEFAULT NULL,
      UNIQUE KEY id (id,type),
      KEY id_2 (id)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`
  }

  private getCreateBlocksPricesTableQuery(): string {
@@ -773,16 +749,6 @@ class DatabaseMigration {
    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
  }

-  private getCreateLNNodesSocketsTableQuery(): string {
-    return `CREATE TABLE IF NOT EXISTS nodes_sockets (
-      public_key varchar(66) NOT NULL,
-      socket varchar(100) NOT NULL,
-      type enum('ipv4', 'ipv6', 'torv2', 'torv3', 'i2p', 'dns', 'websocket') NULL,
-      UNIQUE KEY public_key_socket (public_key, socket),
-      INDEX (public_key)
-    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;`;
-  }
-
  public async $truncateIndexedData(tables: string[]) {
    const allowedTables = ['blocks', 'hashrates', 'prices'];

--- a/backend/src/api/difficulty-adjustment.ts
+++ b/backend/src/api/difficulty-adjustment.ts
@@ -2,100 +2,65 @@ import config from '../config';
 import { IDifficultyAdjustment } from '../mempool.interfaces';
 import blocks from './blocks';

-export interface DifficultyAdjustment {
-  progressPercent: number;       // Percent: 0 to 100
-  difficultyChange: number;      // Percent: -75 to 300
-  estimatedRetargetDate: number; // Unix time in ms
-  remainingBlocks: number;       // Block count
-  remainingTime: number;         // Duration of time in ms
-  previousRetarget: number;      // Percent: -75 to 300
-  nextRetargetHeight: number;    // Block Height
-  timeAvg: number;               // Duration of time in ms
-  timeOffset: number;            // (Testnet) Time since last block (cap @ 20min) in ms
-}
-
-export function calcDifficultyAdjustment(
-  DATime: number,
-  nowSeconds: number,
-  blockHeight: number,
-  previousRetarget: number,
-  network: string,
-  latestBlockTimestamp: number,
-): DifficultyAdjustment {
-  const ESTIMATE_LAG_BLOCKS = 146; // For first 7.2% of epoch, don't estimate.
-  const EPOCH_BLOCK_LENGTH = 2016; // Bitcoin mainnet
-  const BLOCK_SECONDS_TARGET = 600; // Bitcoin mainnet
-  const TESTNET_MAX_BLOCK_SECONDS = 1200; // Bitcoin testnet
-
-  const diffSeconds = nowSeconds - DATime;
-  const blocksInEpoch = (blockHeight >= 0) ? blockHeight % EPOCH_BLOCK_LENGTH : 0;
-  const progressPercent = (blockHeight >= 0) ? blocksInEpoch / EPOCH_BLOCK_LENGTH * 100 : 100;
-  const remainingBlocks = EPOCH_BLOCK_LENGTH - blocksInEpoch;
-  const nextRetargetHeight = (blockHeight >= 0) ? blockHeight + remainingBlocks : 0;
-
-  let difficultyChange = 0;
-  let timeAvgSecs = BLOCK_SECONDS_TARGET;
-  // Only calculate the estimate once we have 7.2% of blocks in current epoch
-  if (blocksInEpoch >= ESTIMATE_LAG_BLOCKS) {
-    timeAvgSecs = diffSeconds / blocksInEpoch;
-    difficultyChange = (BLOCK_SECONDS_TARGET / timeAvgSecs - 1) * 100;
-    // Max increase is x4 (+300%)
-    if (difficultyChange > 300) {
-      difficultyChange = 300;
-    }
-    // Max decrease is /4 (-75%)
-    if (difficultyChange < -75) {
-      difficultyChange = -75;
-    }
-  }
-
-  // Testnet difficulty is set to 1 after 20 minutes of no blocks,
-  // therefore the time between blocks will always be below 20 minutes (1200s).
-  let timeOffset = 0;
-  if (network === 'testnet') {
-    if (timeAvgSecs > TESTNET_MAX_BLOCK_SECONDS) {
-      timeAvgSecs = TESTNET_MAX_BLOCK_SECONDS;
-    }
-
-    const secondsSinceLastBlock = nowSeconds - latestBlockTimestamp;
-    if (secondsSinceLastBlock + timeAvgSecs > TESTNET_MAX_BLOCK_SECONDS) {
-      timeOffset = -Math.min(secondsSinceLastBlock, TESTNET_MAX_BLOCK_SECONDS) * 1000;
-    }
-  }
-
-  const timeAvg = Math.floor(timeAvgSecs * 1000);
-  const remainingTime = remainingBlocks * timeAvg;
-  const estimatedRetargetDate = remainingTime + nowSeconds * 1000;
-
-  return {
-    progressPercent,
-    difficultyChange,
-    estimatedRetargetDate,
-    remainingBlocks,
-    remainingTime,
-    previousRetarget,
-    nextRetargetHeight,
-    timeAvg,
-    timeOffset,
-  };
-}
-
 class DifficultyAdjustmentApi {
-  public getDifficultyAdjustment(): IDifficultyAdjustment | null {
+  constructor() { }
+
+  public getDifficultyAdjustment(): IDifficultyAdjustment {
    const DATime = blocks.getLastDifficultyAdjustmentTime();
    const previousRetarget = blocks.getPreviousDifficultyRetarget();
    const blockHeight = blocks.getCurrentBlockHeight();
    const blocksCache = blocks.getBlocks();
    const latestBlock = blocksCache[blocksCache.length - 1];
-    if (!latestBlock) {
-      return null;
-    }
-    const nowSeconds = Math.floor(new Date().getTime() / 1000);

-    return calcDifficultyAdjustment(
-      DATime, nowSeconds, blockHeight, previousRetarget,
-      config.MEMPOOL.NETWORK, latestBlock.timestamp
-    );
+    const now = new Date().getTime() / 1000;
+    const diff = now - DATime;
+    const blocksInEpoch = blockHeight % 2016;
+    const progressPercent = (blocksInEpoch >= 0) ? blocksInEpoch / 2016 * 100 : 100;
+    const remainingBlocks = 2016 - blocksInEpoch;
+    const nextRetargetHeight = blockHeight + remainingBlocks;
+
+    let difficultyChange = 0;
+    if (remainingBlocks < 1870) {
+      if (blocksInEpoch > 0) {
+        difficultyChange = (600 / (diff / blocksInEpoch) - 1) * 100;
+      }
+      if (difficultyChange > 300) {
+        difficultyChange = 300;
+      }
+      if (difficultyChange < -75) {
+        difficultyChange = -75;
+      }
+    }
+
+    let timeAvgMins = blocksInEpoch && blocksInEpoch > 146 ? diff / blocksInEpoch / 60 : 10;
+
+    // Testnet difficulty is set to 1 after 20 minutes of no blocks,
+    // therefore the time between blocks will always be below 20 minutes (1200s).
+    let timeOffset = 0;
+    if (config.MEMPOOL.NETWORK === 'testnet') {
+      if (timeAvgMins > 20) {
+        timeAvgMins = 20;
+      }
+      if (now - latestBlock.timestamp + timeAvgMins * 60 > 1200) {
+        timeOffset = -Math.min(now - latestBlock.timestamp, 1200) * 1000;
+      }
+    }
+
+    const timeAvg = timeAvgMins * 60 * 1000 ;
+    const remainingTime = (remainingBlocks * timeAvg) + (now * 1000);
+    const estimatedRetargetDate = remainingTime + now;
+
+    return {
+      progressPercent,
+      difficultyChange,
+      estimatedRetargetDate,
+      remainingBlocks,
+      remainingTime,
+      previousRetarget,
+      nextRetargetHeight,
+      timeAvg,
+      timeOffset,
+    };
  }
 }

--- a/backend/src/api/explorer/channels.api.ts
+++ b/backend/src/api/explorer/channels.api.ts
@@ -17,61 +17,32 @@ class ChannelsApi {
    }
  }

-  public async $getAllChannelsGeo(publicKey?: string, style?: string): Promise<any[]> {
+  public async $getAllChannelsGeo(publicKey?: string): Promise<any[]> {
    try {
-      let select: string;
-      if (style === 'widget') {
-        select = `
-          nodes_1.latitude AS node1_latitude, nodes_1.longitude AS node1_longitude,
-          nodes_2.latitude AS node2_latitude, nodes_2.longitude AS node2_longitude
-        `;
-      } else {
-        select = `
-          nodes_1.public_key as node1_public_key, nodes_1.alias AS node1_alias,
-          nodes_1.latitude AS node1_latitude, nodes_1.longitude AS node1_longitude,
-          nodes_2.public_key as node2_public_key, nodes_2.alias AS node2_alias,
-          nodes_2.latitude AS node2_latitude, nodes_2.longitude AS node2_longitude
-        `;
-      }
-
      const params: string[] = [];
-      let query = `SELECT ${select}
-        FROM channels
-        JOIN nodes AS nodes_1 on nodes_1.public_key = channels.node1_public_key
-        JOIN nodes AS nodes_2 on nodes_2.public_key = channels.node2_public_key
-        WHERE channels.status = 1
-          AND nodes_1.latitude IS NOT NULL AND nodes_1.longitude IS NOT NULL
-          AND nodes_2.latitude IS NOT NULL AND nodes_2.longitude IS NOT NULL
+      let query = `SELECT nodes_1.public_key as node1_public_key, nodes_1.alias AS node1_alias,
+        nodes_1.latitude AS node1_latitude, nodes_1.longitude AS node1_longitude,
+        nodes_2.public_key as node2_public_key, nodes_2.alias AS node2_alias,
+        nodes_2.latitude AS node2_latitude, nodes_2.longitude AS node2_longitude,
+        channels.capacity
+      FROM channels
+      JOIN nodes AS nodes_1 on nodes_1.public_key = channels.node1_public_key
+      JOIN nodes AS nodes_2 on nodes_2.public_key = channels.node2_public_key
+      WHERE nodes_1.latitude IS NOT NULL AND nodes_1.longitude IS NOT NULL
+        AND nodes_2.latitude IS NOT NULL AND nodes_2.longitude IS NOT NULL
      `;

      if (publicKey !== undefined) {
        query += ' AND (nodes_1.public_key = ? OR nodes_2.public_key = ?)';
        params.push(publicKey);
        params.push(publicKey);
-      } else {
-        query += ` AND channels.capacity > 1000000
-          GROUP BY nodes_1.public_key, nodes_2.public_key
-          ORDER BY channels.capacity DESC
-          LIMIT 10000
-        `;        
      }

      const [rows]: any = await DB.query(query, params);
-      return rows.map((row) => {
-        if (style === 'widget') {
-          return [
-            row.node1_longitude, row.node1_latitude,
-            row.node2_longitude, row.node2_latitude,
-          ];
-        } else {
-          return [
-            row.node1_public_key, row.node1_alias,
-            row.node1_longitude, row.node1_latitude,
-            row.node2_public_key, row.node2_alias,
-            row.node2_longitude, row.node2_latitude,
-          ];
-        }
-      });
+      return rows.map((row) => [
+        row.node1_public_key, row.node1_alias, row.node1_longitude, row.node1_latitude,
+        row.node2_public_key, row.node2_alias, row.node2_longitude, row.node2_latitude,
+        row.capacity]);
    } catch (e) {
      logger.err('$getAllChannelsGeo error: ' + (e instanceof Error ? e.message : e));
      throw e;
@@ -81,7 +52,7 @@ class ChannelsApi {
  public async $searchChannelsById(search: string): Promise<any[]> {
    try {
      const searchStripped = search.replace('%', '') + '%';
-      const query = `SELECT id, short_id, capacity, status FROM channels WHERE id LIKE ? OR short_id LIKE ? LIMIT 10`;
+      const query = `SELECT id, short_id, capacity FROM channels WHERE id LIKE ? OR short_id LIKE ? LIMIT 10`;
      const [rows]: any = await DB.query(query, [searchStripped, searchStripped]);
      return rows;
    } catch (e) {
@@ -90,14 +61,9 @@ class ChannelsApi {
    }
  }

-  public async $getChannelsByStatus(status: number | number[]): Promise<any[]> {
+  public async $getChannelsByStatus(status: number): Promise<any[]> {
    try {
-      let query: string;
-      if (Array.isArray(status)) {
-        query = `SELECT * FROM channels WHERE status IN (${status.join(',')})`;
-      } else {
-        query = `SELECT * FROM channels WHERE status = ?`;
-      }
+      const query = `SELECT * FROM channels WHERE status = ?`;
      const [rows]: any = await DB.query(query, [status]);
      return rows;
    } catch (e) {
@@ -230,14 +196,9 @@ class ChannelsApi {

  public async $getChannelsByTransactionId(transactionIds: string[]): Promise<any[]> {
    try {
-      const query = `
-        SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.*
-        FROM channels
-        LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key
-        LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key
-        WHERE channels.transaction_id IN ? OR channels.closing_transaction_id IN ?
-      `;
-      const [rows]: any = await DB.query(query, [[transactionIds], [transactionIds]]);
+      transactionIds = transactionIds.map((id) => '\'' + id + '\'');
+      const query = `SELECT n1.alias AS alias_left, n2.alias AS alias_right, channels.* FROM channels LEFT JOIN nodes AS n1 ON n1.public_key = channels.node1_public_key LEFT JOIN nodes AS n2 ON n2.public_key = channels.node2_public_key WHERE channels.transaction_id IN (${transactionIds.join(', ')}) OR channels.closing_transaction_id IN (${transactionIds.join(', ')})`;
+      const [rows]: any = await DB.query(query);
      const channels = rows.map((row) => this.convertChannel(row));
      return channels;
    } catch (e) {
@@ -251,90 +212,52 @@ class ChannelsApi {
      let channelStatusFilter;
      if (status === 'open') {
        channelStatusFilter = '< 2';
-      } else if (status === 'active') {
-        channelStatusFilter = '= 1';
      } else if (status === 'closed') {
        channelStatusFilter = '= 2';
-      } else {
-        throw new Error('getChannelsForNode: Invalid status requested');
      }

      // Channels originating from node
      let query = `
-        SELECT COALESCE(node2.alias, SUBSTRING(node2_public_key, 0, 20)) AS alias, COALESCE(node2.public_key, node2_public_key) AS public_key,
-          channels.status, channels.node1_fee_rate,
-          channels.capacity, channels.short_id, channels.id, channels.closing_reason,
-          UNIX_TIMESTAMP(closing_date) as closing_date, UNIX_TIMESTAMP(channels.updated_at) as updated_at
+        SELECT node2.alias, node2.public_key, channels.status, channels.node1_fee_rate,
+          channels.capacity, channels.short_id, channels.id
        FROM channels
-        LEFT JOIN nodes AS node2 ON node2.public_key = channels.node2_public_key
+        JOIN nodes AS node2 ON node2.public_key = channels.node2_public_key
        WHERE node1_public_key = ? AND channels.status ${channelStatusFilter}
      `;
-      const [channelsFromNode]: any = await DB.query(query, [public_key]);
+      const [channelsFromNode]: any = await DB.query(query, [public_key, index, length]);

      // Channels incoming to node
      query = `
-        SELECT COALESCE(node1.alias, SUBSTRING(node1_public_key, 0, 20)) AS alias, COALESCE(node1.public_key, node1_public_key) AS public_key,
-          channels.status, channels.node2_fee_rate,
-          channels.capacity, channels.short_id, channels.id, channels.closing_reason,
-          UNIX_TIMESTAMP(closing_date) as closing_date, UNIX_TIMESTAMP(channels.updated_at) as updated_at
+        SELECT node1.alias, node1.public_key, channels.status, channels.node2_fee_rate,
+          channels.capacity, channels.short_id, channels.id
        FROM channels
-        LEFT JOIN nodes AS node1 ON node1.public_key = channels.node1_public_key
+        JOIN nodes AS node1 ON node1.public_key = channels.node1_public_key
        WHERE node2_public_key = ? AND channels.status ${channelStatusFilter}
      `;
-      const [channelsToNode]: any = await DB.query(query, [public_key]);
+      const [channelsToNode]: any = await DB.query(query, [public_key, index, length]);

      let allChannels = channelsFromNode.concat(channelsToNode);
      allChannels.sort((a, b) => {
-        if (status === 'closed') {
-          if (!b.closing_date && !a.closing_date) {
-            return (b.updated_at ?? 0) - (a.updated_at ?? 0);
-          } else {
-            return (b.closing_date ?? 0) - (a.closing_date ?? 0);
-          }
-        } else {
-          return b.capacity - a.capacity;
-        }
+        return b.capacity - a.capacity;
      });
-
-      if (index >= 0) {
-        allChannels = allChannels.slice(index, index + length);
-      } else if (index === -1) { // Node channels tree chart
-        allChannels = allChannels.slice(0, 1000);
-      }
+      allChannels = allChannels.slice(index, index + length);

      const channels: any[] = []
      for (const row of allChannels) {
-        let channel;
-        if (index >= 0) {
-          const activeChannelsStats: any = await nodesApi.$getActiveChannelsStats(row.public_key);
-          channel = {
-            status: row.status,
-            closing_reason: row.closing_reason,
-            closing_date: row.closing_date,
-            capacity: row.capacity ?? 0,
-            short_id: row.short_id,
-            id: row.id,
-            fee_rate: row.node1_fee_rate ?? row.node2_fee_rate ?? 0,
-            node: {
-              alias: row.alias.length > 0 ? row.alias : row.public_key.slice(0, 20),
-              public_key: row.public_key,
-              channels: activeChannelsStats.active_channel_count ?? 0,
-              capacity: activeChannelsStats.capacity ?? 0,
-            }
-          };
-        } else if (index === -1) {
-          channel = {
-            capacity: row.capacity ?? 0,
-            short_id: row.short_id,
-            id: row.id,
-            node: {
-              alias: row.alias.length > 0 ? row.alias : row.public_key.slice(0, 20),
-              public_key: row.public_key,
-            }
-          };
-        }
-
-        channels.push(channel);
+        const activeChannelsStats: any = await nodesApi.$getActiveChannelsStats(row.public_key);
+        channels.push({
+          status: row.status,
+          capacity: row.capacity ?? 0,
+          short_id: row.short_id,
+          id: row.id,
+          fee_rate: row.node1_fee_rate ?? row.node2_fee_rate ?? 0,
+          node: {
+            alias: row.alias.length > 0 ? row.alias : row.public_key.slice(0, 20),
+            public_key: row.public_key,
+            channels: activeChannelsStats.active_channel_count ?? 0,
+            capacity: activeChannelsStats.capacity ?? 0,
+          }
+        });
      }

      return channels;
@@ -375,7 +298,6 @@ class ChannelsApi {
      'transaction_vout': channel.transaction_vout,
      'closing_transaction_id': channel.closing_transaction_id,
      'closing_reason': channel.closing_reason,
-      'closing_date': channel.closing_date,
      'updated_at': channel.updated_at,
      'created': channel.created,
      'status': channel.status,
@@ -415,7 +337,7 @@ class ChannelsApi {
  /**
   * Save or update a channel present in the graph
   */
-  public async $saveChannel(channel: ILightningApi.Channel, status = 1): Promise<void> {
+  public async $saveChannel(channel: ILightningApi.Channel): Promise<void> {
    const [ txid, vout ] = channel.chan_point.split(':');

    const policy1: Partial<ILightningApi.RoutingPolicy> = channel.node1_policy || {};
@@ -447,11 +369,11 @@ class ChannelsApi {
        node2_min_htlc_mtokens,
        node2_updated_at
      )
-      VALUES (?, ?, ?, ?, ?, ?, ${status}, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      VALUES (?, ?, ?, ?, ?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
      ON DUPLICATE KEY UPDATE
        capacity = ?,
        updated_at = ?,
-        status = ${status},
+        status = 1,
        node1_public_key = ?,
        node1_base_fee_mtokens = ?,
        node1_cltv_delta = ?,
@@ -540,23 +462,6 @@ class ChannelsApi {
      logger.err('$setChannelsInactive() error: ' + (e instanceof Error ? e.message : e));
    }
  }
-
-  public async $getLatestChannelUpdateForNode(publicKey: string): Promise<number> {
-    try {
-      const query = `
-        SELECT MAX(UNIX_TIMESTAMP(updated_at)) as updated_at
-        FROM channels
-        WHERE node1_public_key = ?
-      `;
-      const [rows]: any[] = await DB.query(query, [publicKey]);
-      if (rows.length > 0) {
-        return rows[0].updated_at;
-      }
-    } catch (e) {
-      logger.err(`Can't getLatestChannelUpdateForNode for ${publicKey}. Reason ${e instanceof Error ? e.message : e}`);
-    }
-    return 0;
-  }
 }

 export default new ChannelsApi();
--- a/backend/src/api/explorer/channels.routes.ts
+++ b/backend/src/api/explorer/channels.routes.ts
@@ -47,17 +47,8 @@ class ChannelsRoutes {
        res.status(400).send('Missing parameter: public_key');
        return;
      }
-
      const index = parseInt(typeof req.query.index === 'string' ? req.query.index : '0', 10) || 0;
      const status: string = typeof req.query.status === 'string' ? req.query.status : '';
-
-      if (index < -1) {
-        res.status(400).send('Invalid index');
-      }
-      if (['open', 'active', 'closed'].includes(status) === false) {
-        res.status(400).send('Invalid status');
-      }
-
      const channels = await channelsApi.$getChannelsForNode(req.query.public_key, index, 10, status);
      const channelsCount = await channelsApi.$getChannelsCountForNode(req.query.public_key, status);
      res.header('Pragma', 'public');
@@ -70,7 +61,7 @@ class ChannelsRoutes {
    }
  }

-  private async $getChannelsByTransactionIds(req: Request, res: Response): Promise<void> {
+  private async $getChannelsByTransactionIds(req: Request, res: Response) {
    try {
      if (!Array.isArray(req.query.txId)) {
        res.status(400).send('Not an array');
@@ -83,26 +74,27 @@ class ChannelsRoutes {
        }
      }
      const channels = await channelsApi.$getChannelsByTransactionId(txIds);
-      const result: any[] = [];
+      const inputs: any[] = [];
+      const outputs: any[] = [];
      for (const txid of txIds) {
-        const inputs: any = {};
-        const outputs: any = {};
-        // Assuming that we only have one lightning close input in each transaction. This may not be true in the future
-        const foundChannelsFromInput = channels.find((channel) => channel.closing_transaction_id === txid);
-        if (foundChannelsFromInput) {
-          inputs[0] = foundChannelsFromInput;
+        const foundChannelInputs = channels.find((channel) => channel.closing_transaction_id === txid);
+        if (foundChannelInputs) {
+          inputs.push(foundChannelInputs);
+        } else {
+          inputs.push(null);
        }
-        const foundChannelsFromOutputs = channels.filter((channel) => channel.transaction_id === txid);
-        for (const output of foundChannelsFromOutputs) {
-          outputs[output.transaction_vout] = output;
+        const foundChannelOutputs = channels.find((channel) => channel.transaction_id === txid);
+        if (foundChannelOutputs) {
+          outputs.push(foundChannelOutputs);
+        } else {
+          outputs.push(null);
        }
-        result.push({
-          inputs,
-          outputs,
-        });
      }

-      res.json(result);
+      res.json({
+        inputs: inputs,
+        outputs: outputs,
+      });
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
    }
@@ -110,11 +102,7 @@ class ChannelsRoutes {

  private async $getAllChannelsGeo(req: Request, res: Response) {
    try {
-      const style: string = typeof req.query.style === 'string' ? req.query.style : '';
-      const channels = await channelsApi.$getAllChannelsGeo(req.params?.publicKey, style);
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
+      const channels = await channelsApi.$getAllChannelsGeo(req.params?.publicKey);
      res.json(channels);
    } catch (e) {
      res.status(500).send(e instanceof Error ? e.message : e);
--- a/backend/src/api/explorer/nodes.api.ts
+++ b/backend/src/api/explorer/nodes.api.ts
@@ -2,61 +2,17 @@ import logger from '../../logger';
 import DB from '../../database';
 import { ResultSetHeader } from 'mysql2';
 import { ILightningApi } from '../lightning/lightning-api.interface';
-import { ITopNodesPerCapacity, ITopNodesPerChannels } from '../../mempool.interfaces';

 class NodesApi {
-  public async $getWorldNodes(): Promise<any> {
-    try {
-      let query = `
-        SELECT nodes.public_key as publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
-        CAST(COALESCE(nodes.capacity, 0) as INT) as capacity,
-        CAST(COALESCE(nodes.channels, 0) as INT) as channels,
-        nodes.longitude, nodes.latitude,
-        geo_names_country.names as country, geo_names_iso.names as isoCode
-        FROM nodes
-        LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
-        LEFT JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
-        WHERE status = 1 AND nodes.as_number IS NOT NULL
-        ORDER BY capacity
-      `;
-
-      const [nodes]: any[] = await DB.query(query);
-
-      for (let i = 0; i < nodes.length; ++i) {
-        nodes[i].country = JSON.parse(nodes[i].country);
-      }
-
-      query = `
-        SELECT MAX(nodes.capacity) as maxLiquidity, MAX(nodes.channels) as maxChannels
-        FROM nodes
-        WHERE status = 1 AND nodes.as_number IS NOT NULL
-      `;
-
-      const [maximums]: any[] = await DB.query(query);
-      
-      return {
-        maxLiquidity: maximums[0].maxLiquidity,
-        maxChannels: maximums[0].maxChannels,
-        nodes: nodes.map(node => [
-          node.longitude, node.latitude,
-          node.publicKey, node.alias, node.capacity, node.channels,
-          node.country, node.isoCode
-        ])
-      };
-    } catch (e) {
-      logger.err(`Can't get world nodes list. Reason: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
  public async $getNode(public_key: string): Promise<any> {
    try {
      // General info
      let query = `
        SELECT public_key, alias, UNIX_TIMESTAMP(first_seen) AS first_seen,
-          UNIX_TIMESTAMP(updated_at) AS updated_at, color, sockets as sockets,
-          as_number, city_id, country_id, subdivision_id, longitude, latitude,
-          geo_names_iso.names as iso_code, geo_names_as.names as as_organization, geo_names_city.names as city,
-          geo_names_country.names as country, geo_names_subdivision.names as subdivision
+        UNIX_TIMESTAMP(updated_at) AS updated_at, color, sockets as sockets,
+        as_number, city_id, country_id, subdivision_id, longitude, latitude,
+        geo_names_iso.names as iso_code, geo_names_as.names as as_organization, geo_names_city.names as city,
+        geo_names_country.names as country, geo_names_subdivision.names as subdivision
        FROM nodes
        LEFT JOIN geo_names geo_names_as on geo_names_as.id = as_number
        LEFT JOIN geo_names geo_names_city on geo_names_city.id = city_id
@@ -156,43 +112,20 @@ class NodesApi {
    }
  }

-  public async $getTopCapacityNodes(full: boolean): Promise<ITopNodesPerCapacity[]> {
+  public async $getTopCapacityNodes(): Promise<any> {
    try {
-      let rows: any;
-      let query: string;
-      if (full === false) {
-        query = `
-          SELECT nodes.public_key AS publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
-            nodes.capacity
-          FROM nodes
-          ORDER BY capacity DESC
-          LIMIT 100
-        `;
+      let [rows]: any[] = await DB.query('SELECT UNIX_TIMESTAMP(MAX(added)) as maxAdded FROM node_stats');
+      const latestDate = rows[0].maxAdded;

-        [rows] = await DB.query(query);
-      } else {
-        query = `
-          SELECT nodes.public_key AS publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
-            CAST(COALESCE(nodes.capacity, 0) as INT) as capacity,
-            CAST(COALESCE(nodes.channels, 0) as INT) as channels,
-            UNIX_TIMESTAMP(nodes.first_seen) as firstSeen, UNIX_TIMESTAMP(nodes.updated_at) as updatedAt,
-            geo_names_city.names as city, geo_names_country.names as country,
-            geo_names_iso.names as iso_code, geo_names_subdivision.names as subdivision
-          FROM nodes
-          LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
-          LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id AND geo_names_city.type = 'city'
-          LEFT JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
-          LEFT JOIN geo_names geo_names_subdivision on geo_names_subdivision.id = nodes.subdivision_id AND geo_names_subdivision.type = 'division'
-          ORDER BY capacity DESC
-          LIMIT 100
-        `;
-
-        [rows] = await DB.query(query);
-        for (let i = 0; i < rows.length; ++i) {
-          rows[i].country = JSON.parse(rows[i].country);
-          rows[i].city = JSON.parse(rows[i].city);
-        }
-      }
+      const query = `
+        SELECT nodes.public_key, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias, node_stats.capacity, node_stats.channels
+        FROM node_stats
+        JOIN nodes ON nodes.public_key = node_stats.public_key
+        WHERE added = FROM_UNIXTIME(${latestDate})
+        ORDER BY capacity DESC
+        LIMIT 10;
+      `;
+      [rows] = await DB.query(query);

      return rows;
    } catch (e) {
@@ -201,94 +134,20 @@ class NodesApi {
    }
  }

-  public async $getTopChannelsNodes(full: boolean): Promise<ITopNodesPerChannels[]> {
-    try {
-      let rows: any;
-      let query: string;
-      if (full === false) {
-        query = `
-          SELECT nodes.public_key as publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
-            nodes.channels
-          FROM nodes
-          ORDER BY channels DESC
-          LIMIT 100;
-        `;
-
-        [rows] = await DB.query(query);
-      } else {
-        query = `
-          SELECT nodes.public_key AS publicKey, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
-            CAST(COALESCE(nodes.channels, 0) as INT) as channels,
-            CAST(COALESCE(nodes.capacity, 0) as INT) as capacity,
-            UNIX_TIMESTAMP(nodes.first_seen) as firstSeen, UNIX_TIMESTAMP(nodes.updated_at) as updatedAt,
-            geo_names_city.names as city, geo_names_country.names as country,
-            geo_names_iso.names as iso_code, geo_names_subdivision.names as subdivision
-          FROM nodes
-          LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
-          LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id AND geo_names_city.type = 'city'
-          LEFT JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
-          LEFT JOIN geo_names geo_names_subdivision on geo_names_subdivision.id = nodes.subdivision_id AND geo_names_subdivision.type = 'division'
-          ORDER BY channels DESC
-          LIMIT 100
-        `;
-
-        [rows] = await DB.query(query);
-        for (let i = 0; i < rows.length; ++i) {
-          rows[i].country = JSON.parse(rows[i].country);
-          rows[i].city = JSON.parse(rows[i].city);
-        }
-      }
-
-      return rows;
-    } catch (e) {
-      logger.err('$getTopChannelsNodes error: ' + (e instanceof Error ? e.message : e));
-      throw e;
-    }
-  }
-
-  public async $getOldestNodes(full: boolean): Promise<ITopNodesPerChannels[]> {
+  public async $getTopChannelsNodes(): Promise<any> {
    try {
      let [rows]: any[] = await DB.query('SELECT UNIX_TIMESTAMP(MAX(added)) as maxAdded FROM node_stats');
      const latestDate = rows[0].maxAdded;

-      let query: string;
-      if (full === false) {
-        query = `
-          SELECT nodes.public_key, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias,
-            node_stats.channels
-          FROM node_stats
-          JOIN nodes ON nodes.public_key = node_stats.public_key
-          WHERE added = FROM_UNIXTIME(${latestDate})
-          ORDER BY first_seen
-          LIMIT 100;
-        `;
-
-        [rows] = await DB.query(query);
-      } else {
-        query = `
-          SELECT node_stats.public_key AS publicKey, IF(nodes.alias = '', SUBSTRING(node_stats.public_key, 1, 20), alias) as alias,
-            CAST(COALESCE(node_stats.channels, 0) as INT) as channels,
-            CAST(COALESCE(node_stats.capacity, 0) as INT) as capacity,
-            UNIX_TIMESTAMP(nodes.first_seen) as firstSeen, UNIX_TIMESTAMP(nodes.updated_at) as updatedAt,
-            geo_names_city.names as city, geo_names_country.names as country,
-            geo_names_iso.names as iso_code, geo_names_subdivision.names as subdivision
-          FROM node_stats
-          RIGHT JOIN nodes ON nodes.public_key = node_stats.public_key
-          LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
-          LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id AND geo_names_city.type = 'city'
-          LEFT JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
-          LEFT JOIN geo_names geo_names_subdivision on geo_names_subdivision.id = nodes.subdivision_id AND geo_names_subdivision.type = 'division'
-          WHERE added = FROM_UNIXTIME(${latestDate})
-          ORDER BY first_seen
-          LIMIT 100
-        `;
-
-        [rows] = await DB.query(query);
-        for (let i = 0; i < rows.length; ++i) {
-          rows[i].country = JSON.parse(rows[i].country);
-          rows[i].city = JSON.parse(rows[i].city);
-        }
-      }
+      const query = `
+        SELECT nodes.public_key, IF(nodes.alias = '', SUBSTRING(nodes.public_key, 1, 20), alias) as alias, node_stats.capacity, node_stats.channels
+        FROM node_stats
+        JOIN nodes ON nodes.public_key = node_stats.public_key
+        WHERE added = FROM_UNIXTIME(${latestDate})
+        ORDER BY channels DESC
+        LIMIT 10;
+      `;
+      [rows] = await DB.query(query);

      return rows;
    } catch (e) {
@@ -299,10 +158,9 @@ class NodesApi {

  public async $searchNodeByPublicKeyOrAlias(search: string) {
    try {
-      const publicKeySearch = search.replace('%', '') + '%';
-      const aliasSearch = search.replace(/[-_.]/g, ' ').replace(/[^a-zA-Z0-9 ]/g, '').split(' ').map((search) => '+' + search + '*').join(' ');
-      const query = `SELECT public_key, alias, capacity, channels, status FROM nodes WHERE public_key LIKE ? OR MATCH alias_search AGAINST (? IN BOOLEAN MODE) ORDER BY capacity DESC LIMIT 10`;
-      const [rows]: any = await DB.query(query, [publicKeySearch, aliasSearch]);
+      const searchStripped = search.replace('%', '') + '%';
+      const query = `SELECT nodes.public_key, nodes.alias, node_stats.capacity FROM nodes LEFT JOIN node_stats ON node_stats.public_key = nodes.public_key WHERE nodes.public_key LIKE ? OR nodes.alias LIKE ? GROUP BY nodes.public_key ORDER BY node_stats.capacity DESC LIMIT 10`;
+      const [rows]: any = await DB.query(query, [searchStripped, searchStripped]);
      return rows;
    } catch (e) {
      logger.err('$searchNodeByPublicKeyOrAlias error: ' + (e instanceof Error ? e.message : e));
@@ -310,120 +168,64 @@ class NodesApi {
    }
  }

-  public async $getNodesISPRanking() {
+  public async $getNodesISPRanking(groupBy: string, showTor: boolean) {
    try {
-      let query = '';
+      const orderBy = groupBy === 'capacity' ? `CAST(SUM(capacity) as INT)` : `COUNT(DISTINCT nodes.public_key)`;
+      
+      // Clearnet
+      let query = `SELECT GROUP_CONCAT(DISTINCT(nodes.as_number)) as ispId, geo_names.names as names,
+          COUNT(DISTINCT nodes.public_key) as nodesCount, CAST(SUM(capacity) as INT) as capacity
+        FROM nodes
+        JOIN geo_names ON geo_names.id = nodes.as_number
+        JOIN channels ON channels.node1_public_key = nodes.public_key OR channels.node2_public_key = nodes.public_key
+        GROUP BY geo_names.names
+        ORDER BY ${orderBy} DESC
+      `;      
+      const [nodesCountPerAS]: any = await DB.query(query);

-      // List all channels and the two linked ISP
-      query = `
-        SELECT short_id, channels.capacity,
-          channels.node1_public_key AS node1PublicKey, isp1.names AS isp1, isp1.id as isp1ID,
-          channels.node2_public_key AS node2PublicKey, isp2.names AS isp2, isp2.id as isp2ID
-        FROM channels
-        JOIN nodes node1 ON node1.public_key = channels.node1_public_key
-        JOIN nodes node2 ON node2.public_key = channels.node2_public_key
-        JOIN geo_names isp1 ON isp1.id = node1.as_number
-        JOIN geo_names isp2 ON isp2.id = node2.as_number
-        WHERE channels.status = 1
-        ORDER BY short_id DESC
-      `;
-      const [channelsIsp]: any = await DB.query(query);
+      let total = 0;
+      const nodesPerAs: any[] = [];

-      // Sum channels capacity and node count per ISP
-      const ispList = {};
-      for (const channel of channelsIsp) {
-        const isp1 = JSON.parse(channel.isp1);
-        const isp2 = JSON.parse(channel.isp2);
-
-        if (!ispList[isp1]) {
-          ispList[isp1] = {
-            id: channel.isp1ID.toString(),
-            capacity: 0,
-            channels: 0,
-            nodes: {},
-          };
-        } else if (ispList[isp1].id.indexOf(channel.isp1ID) === -1) {
-          ispList[isp1].id += ',' + channel.isp1ID.toString();
+      for (const asGroup of nodesCountPerAS) {
+        if (groupBy === 'capacity') {
+          total += asGroup.capacity;
+        } else {
+          total += asGroup.nodesCount;
        }
-
-        if (!ispList[isp2]) {
-          ispList[isp2] = {
-            id: channel.isp2ID.toString(),
-            capacity: 0,
-            channels: 0,
-            nodes: {},
-          };
-        } else if (ispList[isp2].id.indexOf(channel.isp2ID) === -1) {
-          ispList[isp2].id += ',' + channel.isp2ID.toString();
-        }
-        
-        ispList[isp1].capacity += channel.capacity;
-        ispList[isp1].channels += 1;
-        ispList[isp1].nodes[channel.node1PublicKey] = true;
-        ispList[isp2].capacity += channel.capacity;
-        ispList[isp2].channels += 1;
-        ispList[isp2].nodes[channel.node2PublicKey] = true;
      }

-      const ispRanking: any[] = [];
-      for (const isp of Object.keys(ispList)) {
-        ispRanking.push([
-          ispList[isp].id,
-          isp,
-          ispList[isp].capacity,
-          ispList[isp].channels,
-          Object.keys(ispList[isp].nodes).length,
-        ]);
+      // Tor
+      if (showTor) {
+        query = `SELECT COUNT(DISTINCT nodes.public_key) as nodesCount, CAST(SUM(capacity) as INT) as capacity
+          FROM nodes
+          JOIN channels ON channels.node1_public_key = nodes.public_key OR channels.node2_public_key = nodes.public_key
+          ORDER BY ${orderBy} DESC
+        `;      
+        const [nodesCountTor]: any = await DB.query(query);
+
+        total += groupBy === 'capacity' ? nodesCountTor[0].capacity : nodesCountTor[0].nodesCount;
+        nodesPerAs.push({
+          ispId: null,
+          name: 'Tor',
+          count: nodesCountTor[0].nodesCount,
+          share: Math.floor((groupBy === 'capacity' ? nodesCountTor[0].capacity : nodesCountTor[0].nodesCount) / total * 10000) / 100,
+          capacity: nodesCountTor[0].capacity,
+        });
      }

-      // Total active channels capacity
-      query = `SELECT SUM(capacity) AS capacity FROM channels WHERE status = 1`;
-      const [totalCapacity]: any = await DB.query(query);
+      for (const as of nodesCountPerAS) {
+        nodesPerAs.push({
+          ispId: as.ispId,
+          name: JSON.parse(as.names),
+          count: as.nodesCount,
+          share: Math.floor((groupBy === 'capacity' ? as.capacity : as.nodesCount) / total * 10000) / 100,
+          capacity: as.capacity,
+        });
+      }

-      // Get the total capacity of all channels which have at least one node on clearnet
-      query = `
-        SELECT SUM(capacity) as capacity
-        FROM (
-          SELECT capacity, GROUP_CONCAT(socket1.type, socket2.type) as networks
-          FROM channels
-          JOIN nodes_sockets socket1 ON node1_public_key = socket1.public_key
-          JOIN nodes_sockets socket2 ON node2_public_key = socket2.public_key
-          AND channels.status = 1
-          GROUP BY short_id
-        ) channels_tmp
-        WHERE channels_tmp.networks LIKE '%ipv%'
-      `;
-      const [clearnetCapacity]: any = await DB.query(query);
-
-      // Get the total capacity of all channels which have both nodes on Tor 
-      query = `
-        SELECT SUM(capacity) as capacity
-        FROM (
-          SELECT capacity, GROUP_CONCAT(socket1.type, socket2.type) as networks
-          FROM channels
-          JOIN nodes_sockets socket1 ON node1_public_key = socket1.public_key
-          JOIN nodes_sockets socket2 ON node2_public_key = socket2.public_key
-          AND channels.status = 1
-          GROUP BY short_id
-        ) channels_tmp
-        WHERE channels_tmp.networks NOT LIKE '%ipv%' AND
-          channels_tmp.networks NOT LIKE '%dns%' AND
-          channels_tmp.networks NOT LIKE '%websocket%'
-      `;
-      const [torCapacity]: any = await DB.query(query);
-
-      const clearnetCapacityValue = parseInt(clearnetCapacity[0].capacity, 10);
-      const torCapacityValue = parseInt(torCapacity[0].capacity, 10);
-      const unknownCapacityValue = parseInt(totalCapacity[0].capacity) - clearnetCapacityValue - torCapacityValue;
-
-      return {
-        clearnetCapacity: clearnetCapacityValue,
-        torCapacity: torCapacityValue,
-        unknownCapacity: unknownCapacityValue,
-        ispRanking: ispRanking,
-      };
+      return nodesPerAs;
    } catch (e) {
-      logger.err(`Cannot get LN ISP ranking. Reason: ${e instanceof Error ? e.message : e}`);
+      logger.err(`Cannot get nodes grouped by AS. Reason: ${e instanceof Error ? e.message : e}`);
      throw e;
    }
  }
@@ -431,27 +233,25 @@ class NodesApi {
  public async $getNodesPerCountry(countryId: string) {
    try {
      const query = `
-        SELECT nodes.public_key, CAST(COALESCE(nodes.capacity, 0) as INT) as capacity, CAST(COALESCE(nodes.channels, 0) as INT) as channels,
-          nodes.alias, UNIX_TIMESTAMP(nodes.first_seen) as first_seen, UNIX_TIMESTAMP(nodes.updated_at) as updated_at,
-          geo_names_city.names as city, geo_names_country.names as country,
-          geo_names_iso.names as iso_code, geo_names_subdivision.names as subdivision,
-          nodes.longitude, nodes.latitude, nodes.as_number, geo_names_isp.names as isp
-        FROM nodes
-        LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
+      SELECT nodes.public_key, CAST(COALESCE(node_stats.capacity, 0) as INT) as capacity, CAST(COALESCE(node_stats.channels, 0) as INT) as channels,
+      nodes.alias, UNIX_TIMESTAMP(nodes.first_seen) as first_seen, UNIX_TIMESTAMP(nodes.updated_at) as updated_at,
+          geo_names_city.names as city
+        FROM node_stats
+        JOIN (
+          SELECT public_key, MAX(added) as last_added
+          FROM node_stats
+          GROUP BY public_key
+        ) as b ON b.public_key = node_stats.public_key AND b.last_added = node_stats.added
+        RIGHT JOIN nodes ON nodes.public_key = node_stats.public_key
+        JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
        LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id AND geo_names_city.type = 'city'
-        LEFT JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
-        LEFT JOIN geo_names geo_names_subdivision on geo_names_subdivision.id = nodes.subdivision_id AND geo_names_subdivision.type = 'division'
-        LEFT JOIN geo_names geo_names_isp on geo_names_isp.id = nodes.as_number AND geo_names_isp.type = 'as_organization'
        WHERE geo_names_country.id = ?
        ORDER BY capacity DESC
      `;

      const [rows]: any = await DB.query(query, [countryId]);
      for (let i = 0; i < rows.length; ++i) {
-        rows[i].country = JSON.parse(rows[i].country);
        rows[i].city = JSON.parse(rows[i].city);
-        rows[i].subdivision = JSON.parse(rows[i].subdivision);
-        rows[i].isp = JSON.parse(rows[i].isp);
      }
      return rows;
    } catch (e) {
@@ -463,16 +263,18 @@ class NodesApi {
  public async $getNodesPerISP(ISPId: string) {
    try {
      const query = `
-        SELECT nodes.public_key, CAST(COALESCE(nodes.capacity, 0) as INT) as capacity, CAST(COALESCE(nodes.channels, 0) as INT) as channels,
+        SELECT nodes.public_key, CAST(COALESCE(node_stats.capacity, 0) as INT) as capacity, CAST(COALESCE(node_stats.channels, 0) as INT) as channels,
          nodes.alias, UNIX_TIMESTAMP(nodes.first_seen) as first_seen, UNIX_TIMESTAMP(nodes.updated_at) as updated_at,
-          geo_names_city.names as city, geo_names_country.names as country,
-          geo_names_iso.names as iso_code, geo_names_subdivision.names as subdivision,
-          nodes.longitude, nodes.latitude
-        FROM nodes
-        LEFT JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
+          geo_names_city.names as city, geo_names_country.names as country
+        FROM node_stats
+        JOIN (
+          SELECT public_key, MAX(added) as last_added
+          FROM node_stats
+          GROUP BY public_key
+        ) as b ON b.public_key = node_stats.public_key AND b.last_added = node_stats.added
+        RIGHT JOIN nodes ON nodes.public_key = node_stats.public_key
+        JOIN geo_names geo_names_country ON geo_names_country.id = nodes.country_id AND geo_names_country.type = 'country'
        LEFT JOIN geo_names geo_names_city ON geo_names_city.id = nodes.city_id AND geo_names_city.type = 'city'
-        LEFT JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
-        LEFT JOIN geo_names geo_names_subdivision on geo_names_subdivision.id = nodes.subdivision_id AND geo_names_subdivision.type = 'division'
        WHERE nodes.as_number IN (?)
        ORDER BY capacity DESC
      `;
@@ -481,7 +283,6 @@ class NodesApi {
      for (let i = 0; i < rows.length; ++i) {
        rows[i].country = JSON.parse(rows[i].country);
        rows[i].city = JSON.parse(rows[i].city);
-        rows[i].subdivision = JSON.parse(rows[i].subdivision);
      }
      return rows;
    } catch (e) {
@@ -496,6 +297,7 @@ class NodesApi {
        FROM nodes
        JOIN geo_names ON geo_names.id = nodes.country_id AND geo_names.type = 'country'
        JOIN geo_names geo_names_iso ON geo_names_iso.id = nodes.country_id AND geo_names_iso.type = 'country_iso_code'
+        JOIN channels ON channels.node1_public_key = nodes.public_key OR channels.node2_public_key = nodes.public_key
        GROUP BY country_id
        ORDER BY COUNT(DISTINCT nodes.public_key) DESC
      `;
@@ -533,24 +335,21 @@ class NodesApi {
          first_seen,
          updated_at,
          alias,
-          alias_search,
          color,
          sockets,
          status
        )
-        VALUES (?, NOW(), FROM_UNIXTIME(?), ?, ?, ?, ?, 1)
-        ON DUPLICATE KEY UPDATE updated_at = FROM_UNIXTIME(?), alias = ?, alias_search = ?, color = ?, sockets = ?, status = 1`;
+        VALUES (?, NOW(), FROM_UNIXTIME(?), ?, ?, ?, 1)
+        ON DUPLICATE KEY UPDATE updated_at = FROM_UNIXTIME(?), alias = ?, color = ?, sockets = ?, status = 1`;

      await DB.query(query, [
        node.pub_key,
        node.last_update,
        node.alias,
-        this.aliasToSearchText(node.alias),
        node.color,
        sockets,
        node.last_update,
        node.alias,
-        this.aliasToSearchText(node.alias),
        node.color,
        sockets,
      ]);
@@ -559,18 +358,6 @@ class NodesApi {
    }
  }

-  /**
-   * Update node sockets
-   */
-  public async $updateNodeSockets(publicKey: string, sockets: {network: string; addr: string}[]): Promise<void> {
-    const formattedSockets = (sockets.map(a => a.addr).join(',')) ?? '';
-    try {
-      await DB.query(`UPDATE nodes SET sockets = ? WHERE public_key = ?`, [formattedSockets, publicKey]);
-    } catch (e) {
-      logger.err(`Cannot update node sockets for ${publicKey}. Reason: ${e instanceof Error ? e.message : e}`);
-    }
-  }
-
  /**
   * Set all nodes not in `nodesPubkeys` as inactive (status = 0)
   */
@@ -596,10 +383,6 @@ class NodesApi {
      logger.err('$setNodesInactive() error: ' + (e instanceof Error ? e.message : e));
    }
  }
-
-  private aliasToSearchText(str: string): string {
-    return str.replace(/[-_.]/g, ' ').replace(/[^a-zA-Z0-9 ]/g, '');
-  }
 }

 export default new NodesApi();
--- a/backend/src/api/explorer/nodes.routes.ts
+++ b/backend/src/api/explorer/nodes.routes.ts
@@ -2,26 +2,20 @@ import config from '../../config';
 import { Application, Request, Response } from 'express';
 import nodesApi from './nodes.api';
 import DB from '../../database';
-import { INodesRanking } from '../../mempool.interfaces';

 class NodesRoutes {
  constructor() { }

  public initRoutes(app: Application) {
    app
-      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/world', this.$getWorldNodes)
      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/country/:country', this.$getNodesPerCountry)
      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/search/:search', this.$searchNode)
+      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/top', this.$getTopNodes)
      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/isp-ranking', this.$getISPRanking)
      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/isp/:isp', this.$getNodesPerISP)
      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/countries', this.$getNodesCountries)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/rankings', this.$getNodesRanking)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/rankings/liquidity', this.$getTopNodesByCapacity)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/rankings/connectivity', this.$getTopNodesByChannels)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/rankings/age', this.$getOldestNodes)
      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/:public_key/statistics', this.$getHistoricalNodeStats)
      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/:public_key', this.$getNode)
-      .get(config.MEMPOOL.API_URL_PREFIX + 'lightning/nodes/group/:name', this.$getNodeGroup)
    ;
  }

@@ -34,39 +28,6 @@ class NodesRoutes {
    }
  }

-  private async $getNodeGroup(req: Request, res: Response) {
-    try {
-      let nodesList;
-      let nodes: any[] = [];
-      switch (config.MEMPOOL.NETWORK) {
-        case 'testnet':
-          nodesList = ['032c7c7819276c4f706a04df1a0f1e10a5495994a7be4c1d3d28ca766e5a2b957b', '025a7e38c2834dd843591a4d23d5f09cdeb77ddca85f673c2d944a14220ff14cf7', '0395e2731a1673ef21d7a16a727c4fc4d4c35a861c428ce2c819c53d2b81c8bd55', '032ab2028c0b614c6d87824e2373529652fd7e4221b4c70cc4da7c7005c49afcf0', '029001b22fe70b48bee12d014df91982eb85ff1bd404ec772d5c83c4ee3e88d2c3', '0212e2848d79f928411da5f2ff0a8c95ec6ccb5a09d2031b6f71e91309dcde63af', '03e871a2229523d34f76e6311ff197cfe7f26c2fbec13554b93a46f4e710c47dab', '032202ec98d976b0e928bd1d91924e8bd3eab07231fc39feb3737b010071073df8', '02fa7c5a948d03d563a9f36940c2205a814e594d17c0042ced242c71a857d72605', '039c14fdec2d958e3d14cebf657451bbd9e039196615785e82c917f274e3fb2205', '033589bbcb233ffc416cefd5437c7f37e9d7cb7942d405e39e72c4c846d9b37f18', '029293110441c6e2eacb57e1255bf6ef05c41a6a676fe474922d33c19f98a7d584'];
-          break;
-        case 'signet':
-          nodesList = ['03ddab321b760433cbf561b615ef62ac7d318630c5f51d523aaf5395b90b751956', '033d92c7bfd213ef1b34c90e985fb5dc77f9ec2409d391492484e57a44c4aca1de', '02ad010dda54253c1eb9efe38b0760657a3b43ecad62198c359c051c9d99d45781', '025196512905b8a3f1597428b867bec63ec9a95e5089eb7dc7e63e2d2691669029', '027c625aa1fbe3768db68ebcb05b53b6dc0ce68b7b54b8900d326d167363e684fe', '03f1629af3101fcc56b7aac2667016be84e3defbf3d0c8719f836c9b41c9a57a43', '02dfb81e2f7a3c4c9e8a51b70ef82b4a24549cc2fab1f5b2fd636501774a918991', '02d01ccf832944c68f10d39006093769c5b8bda886d561b128534e313d729fdb34', '02499ed23027d4698a6904ff4ec1b6085a61f10b9a6937f90438f9947e38e8ea86', '038310e3a786340f2bd7770704c7ccfe560fd163d9a1c99d67894597419d12cbf7', '03e5e9d879b72c7d67ecd483bae023bd33e695bb32b981a4021260f7b9d62bc761', '028d16e1a0ace4c0c0a421536d8d32ce484dfe6e2f726b7b0e7c30f12a195f8cc7'];
-          break;
-        default:
-          nodesList = ['03fbc17549ec667bccf397ababbcb4cdc0e3394345e4773079ab2774612ec9be61', '03da9a8623241ccf95f19cd645c6cecd4019ac91570e976eb0a128bebbc4d8a437', '03ca5340cf85cb2e7cf076e489f785410838de174e40be62723e8a60972ad75144', '0238bd27f02d67d6c51e269692bc8c9a32357a00e7777cba7f4f1f18a2a700b108', '03f983dcabed6baa1eab5b56c8b2e8fdc846ab3fd931155377897335e85a9fa57c', '03e399589533581e48796e29a825839a010036a61b20744fda929d6709fcbffcc5', '021f5288b5f72c42cd0d8801086af7ce09a816d8ee9a4c47a4b436399b26cb601a', '032b01b7585f781420cd4148841a82831ba37fa952342052cec16750852d4f2dd9', '02848036488d4b8fb1f1c4064261ec36151f43b085f0b51bd239ade3ddfc940c34', '02b6b1640fe029e304c216951af9fbefdb23b0bdc9baaf327540d31b6107841fdf', '03694289827203a5b3156d753071ddd5bf92e371f5a462943f9555eef6d2d6606c', '0283d850db7c3e8ea7cc9c4abc7afaab12bbdf72b677dcba1d608350d2537d7d43'];
-      }
-
-      for (let pubKey of nodesList) {
-        try {
-          const node = await nodesApi.$getNode(pubKey);
-          if (node) {
-            nodes.push(node);
-          }
-        } catch (e) {}
-      }
-      
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(nodes);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
  private async $getNode(req: Request, res: Response) {
    try {
      const node = await nodesApi.$getNode(req.params.public_key);
@@ -95,14 +56,11 @@ class NodesRoutes {
    }
  }

-  private async $getNodesRanking(req: Request, res: Response): Promise<void> {
+  private async $getTopNodes(req: Request, res: Response) {
    try {
-      const topCapacityNodes = await nodesApi.$getTopCapacityNodes(false);
-      const topChannelsNodes = await nodesApi.$getTopChannelsNodes(false);
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(<INodesRanking>{
+      const topCapacityNodes = await nodesApi.$getTopCapacityNodes();
+      const topChannelsNodes = await nodesApi.$getTopChannelsNodes();
+      res.json({
        topByCapacity: topCapacityNodes,
        topByChannels: topChannelsNodes,
      });
@@ -111,45 +69,18 @@ class NodesRoutes {
    }
  }

-  private async $getTopNodesByCapacity(req: Request, res: Response): Promise<void> {
-    try {
-      const topCapacityNodes = await nodesApi.$getTopCapacityNodes(true);
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(topCapacityNodes);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getTopNodesByChannels(req: Request, res: Response): Promise<void> {
-    try {
-      const topCapacityNodes = await nodesApi.$getTopChannelsNodes(true);
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(topCapacityNodes);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
-  private async $getOldestNodes(req: Request, res: Response): Promise<void> {
-    try {
-      const topCapacityNodes = await nodesApi.$getOldestNodes(true);
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 60).toUTCString());
-      res.json(topCapacityNodes);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
  private async $getISPRanking(req: Request, res: Response): Promise<void> {
    try {
-      const nodesPerAs = await nodesApi.$getNodesISPRanking();
+      const groupBy = req.query.groupBy as string;
+      const showTor = req.query.showTor as string === 'true' ? true : false;
+
+      if (!['capacity', 'node-count'].includes(groupBy)) {
+        res.status(400).send(`groupBy must be one of 'capacity' or 'node-count'`);
+        return;
+      }
+
+      const nodesPerAs = await nodesApi.$getNodesISPRanking(groupBy, showTor);
+
      res.header('Pragma', 'public');
      res.header('Cache-control', 'public');
      res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
@@ -159,18 +90,6 @@ class NodesRoutes {
    }
  }

-  private async $getWorldNodes(req: Request, res: Response) {
-    try {
-      const worldNodes = await nodesApi.$getWorldNodes();
-      res.header('Pragma', 'public');
-      res.header('Cache-control', 'public');
-      res.setHeader('Expires', new Date(Date.now() + 1000 * 600).toUTCString());
-      res.json(worldNodes);
-    } catch (e) {
-      res.status(500).send(e instanceof Error ? e.message : e);
-    }
-  }
-
  private async $getNodesPerCountry(req: Request, res: Response) {
    try {
      const [country]: any[] = await DB.query(
--- a/backend/src/api/explorer/statistics.api.ts
+++ b/backend/src/api/explorer/statistics.api.ts
@@ -6,8 +6,7 @@ class StatisticsApi {
  public async $getStatistics(interval: string | null = null): Promise<any> {
    interval = Common.getSqlInterval(interval);

-    let query = `SELECT UNIX_TIMESTAMP(added) AS added, channel_count, total_capacity,
-      tor_nodes, clearnet_nodes, unannounced_nodes, clearnet_tor_nodes
+    let query = `SELECT UNIX_TIMESTAMP(added) AS added, channel_count, total_capacity, tor_nodes, clearnet_nodes, unannounced_nodes
      FROM lightning_stats`;

    if (interval) {
@@ -28,7 +27,7 @@ class StatisticsApi {
  public async $getLatestStatistics(): Promise<any> {
    try {
      const [rows]: any = await DB.query(`SELECT * FROM lightning_stats ORDER BY added DESC LIMIT 1`);
-      const [rows2]: any = await DB.query(`SELECT * FROM lightning_stats WHERE DATE(added) = DATE(NOW() - INTERVAL 7 DAY)`);
+      const [rows2]: any = await DB.query(`SELECT * FROM lightning_stats ORDER BY added DESC LIMIT 1 OFFSET 7`);
      return {
        latest: rows[0],
        previous: rows2[0],
--- a/backend/src/api/fetch-version.ts
+++ b/backend/src/api/fetch-version.ts
@@ -1,37 +0,0 @@
-import fs from 'fs';
-import path from "path";
-const { spawnSync } = require('child_process');
-
-function getVersion(): string {
-  const packageJson = fs.readFileSync('package.json').toString();
-  return JSON.parse(packageJson).version;
-}
-
-function getGitCommit(): string {
-  if (process.env.MEMPOOL_COMMIT_HASH) {
-    return process.env.MEMPOOL_COMMIT_HASH;
-  } else {
-    const gitRevParse = spawnSync('git', ['rev-parse', '--short', 'HEAD']);
-    if (!gitRevParse.error) {
-      const output = gitRevParse.stdout.toString('utf-8').replace(/[\n\r\s]+$/, '');
-      if (output) {
-        return output;
-      } else {
-        console.log('Could not fetch git commit: No repo available');
-      }
-    } else if (gitRevParse.error.code === 'ENOENT') {
-      console.log('Could not fetch git commit: Command `git` is unavailable');
-    }
-  }
-  return '?';
-}
-
-const versionInfo = {
-  version: getVersion(),
-  gitCommit: getGitCommit()
-}
-
-fs.writeFileSync(
-  path.join(__dirname, 'version.json'),
-  JSON.stringify(versionInfo, null, 2) + "\n"
-);
--- a/backend/src/api/lightning/clightning/clightning-convert.ts
+++ b/backend/src/api/lightning/clightning/clightning-convert.ts
@@ -13,15 +13,11 @@ export function convertNode(clNode: any): ILightningApi.Node {
    features: [], // TODO parse and return clNode.feature
    pub_key: clNode.nodeid,
    addresses: clNode.addresses?.map((addr) => {
-      let address = addr.address;
-      if (addr.type === 'ipv6') {
-        address = `[${address}]`;
-      }
      return {
        network: addr.type,
-        addr: `${address}:${addr.port}`
+        addr: `${addr.address}:${addr.port}`
      };
-    }) ?? [],
+    }),
    last_update: clNode?.last_timestamp ?? 0,
  };
 }
@@ -124,7 +120,7 @@ async function buildIncompleteChannel(clChannel: any): Promise<ILightningApi.Cha
 */
 function convertPolicy(clChannel: any): ILightningApi.RoutingPolicy {
  return {
-    time_lock_delta: clChannel.delay,
+    time_lock_delta: 0, // TODO
    min_htlc: clChannel.htlc_minimum_msat.slice(0, -4),
    max_htlc_msat: clChannel.htlc_maximum_msat.slice(0, -4),
    fee_base_msat: clChannel.base_fee_millisatoshi,
--- a/backend/src/api/lightning/lightning-api.interface.ts
+++ b/backend/src/api/lightning/lightning-api.interface.ts
@@ -82,4 +82,4 @@ export namespace ILightningApi {
    is_required: boolean;
    is_known: boolean;
  }
-}
+}
--- a/backend/src/config.ts
+++ b/backend/src/config.ts
@@ -1,6 +1,4 @@
-const configFromFile = require(
-    process.env.MEMPOOL_CONFIG_FILE ? process.env.MEMPOOL_CONFIG_FILE : '../mempool-config.json'
-);
+const configFile = require('../mempool-config.json');

 interface IConfig {
  MEMPOOL: {
@@ -38,7 +36,6 @@ interface IConfig {
    TOPOLOGY_FOLDER: string;
    STATS_REFRESH_INTERVAL: number;
    GRAPH_REFRESH_INTERVAL: number;
-    LOGGER_UPDATE_INTERVAL: number;
  };
  LND: {
    TLS_CERT_PATH: string;
@@ -194,7 +191,6 @@ const defaults: IConfig = {
    'TOPOLOGY_FOLDER': '',
    'STATS_REFRESH_INTERVAL': 600,
    'GRAPH_REFRESH_INTERVAL': 600,
-    'LOGGER_UPDATE_INTERVAL': 30,
  },
  'LND': {
    'TLS_CERT_PATH': '',
@@ -251,7 +247,7 @@ class Config implements IConfig {
  MAXMIND: IConfig['MAXMIND'];

  constructor() {
-    const configs = this.merge(configFromFile, defaults);
+    const configs = this.merge(configFile, defaults);
    this.MEMPOOL = configs.MEMPOOL;
    this.ESPLORA = configs.ESPLORA;
    this.ELECTRUM = configs.ELECTRUM;
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -189,7 +189,7 @@ class Server {
      await networkSyncService.$startService();
      await lightningStatsUpdater.$startService();
    } catch(e) {
-      logger.err(`Nodejs lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
+      logger.err(`Lightning backend crashed. Restarting in 1 minute. Reason: ${(e instanceof Error ? e.message : e)}`);
      await Common.sleep$(1000 * 60);
      this.$runLightningBackend();
    };
--- a/backend/src/logger.ts
+++ b/backend/src/logger.ts
@@ -74,7 +74,7 @@ class Logger {

  private getNetwork(): string {
    if (config.LIGHTNING.ENABLED) {
-      return config.MEMPOOL.NETWORK === 'mainnet' ? 'lightning' : `${config.MEMPOOL.NETWORK}-lightning`; 
+      return 'lightning';
    }
    if (config.BISQ.ENABLED) {
      return 'bisq';
--- a/backend/src/mempool.interfaces.ts
+++ b/backend/src/mempool.interfaces.ts
@@ -251,41 +251,3 @@ export interface RewardStats {
  totalFee: number;
  totalTx: number;
 }
-
-export interface ITopNodesPerChannels {
-  publicKey: string,
-  alias: string,
-  channels?: number,
-  capacity: number,
-  firstSeen?: number,
-  updatedAt?: number,
-  city?: any,
-  country?: any,
-}
-
-export interface ITopNodesPerCapacity {
-  publicKey: string,
-  alias: string,
-  capacity: number,
-  channels?: number,
-  firstSeen?: number,
-  updatedAt?: number,
-  city?: any,
-  country?: any,
-}
-
-export interface INodesRanking {
-  topByCapacity: ITopNodesPerCapacity[];
-  topByChannels: ITopNodesPerChannels[];
-}
-
-export interface IOldestNodes {
-  publicKey: string,
-  alias: string,
-  firstSeen: number,
-  channels?: number,
-  capacity: number,
-  updatedAt?: number,
-  city?: any,
-  country?: any,
-}
--- a/backend/src/repositories/BlocksAuditsRepository.ts
+++ b/backend/src/repositories/BlocksAuditsRepository.ts
@@ -1,3 +1,4 @@
+import transactionUtils from '../api/transaction-utils';
 import DB from '../database';
 import logger from '../logger';
 import { BlockAudit } from '../mempool.interfaces';
--- a/backend/src/repositories/NodesSocketsRepository.ts
+++ b/backend/src/repositories/NodesSocketsRepository.ts
@@ -1,45 +0,0 @@
-import { ResultSetHeader } from 'mysql2';
-import DB from '../database';
-import logger from '../logger';
-
-export interface NodeSocket {
-  publicKey: string;
-  network: string | null;
-  addr: string;
-}
-
-class NodesSocketsRepository {
-  public async $saveSocket(socket: NodeSocket): Promise<void> {
-    try {
-      await DB.query(`
-        INSERT INTO nodes_sockets(public_key, socket, type)
-        VALUE (?, ?, ?)
-      `, [socket.publicKey, socket.addr, socket.network]);
-    } catch (e: any) {
-      if (e.errno !== 1062) { // ER_DUP_ENTRY - Not an issue, just ignore this
-        logger.err(`Cannot save node socket (${[socket.publicKey, socket.addr, socket.network]}) into db. Reason: ` + (e instanceof Error ? e.message : e));
-        // We don't throw, not a critical issue if we miss some nodes sockets
-      }
-    }
-   }
-
-   public async $deleteUnusedSockets(publicKey: string, addresses: string[]): Promise<number> {
-    if (addresses.length === 0) {
-      return 0;
-    }
-    try {
-      const query = `
-        DELETE FROM nodes_sockets
-        WHERE public_key = ?
-        AND socket NOT IN (${addresses.map(id => `"${id}"`).join(',')})
-      `;
-      const [result] = await DB.query<ResultSetHeader>(query, [publicKey]);
-      return result.affectedRows;
-    } catch (e) {
-      logger.err(`Cannot delete unused sockets for ${publicKey} from db. Reason: ` + (e instanceof Error ? e.message : e));
-      return 0;
-    }
-   }
-}
-
-export default new NodesSocketsRepository();
--- a/backend/src/tasks/lightning/network-sync.service.ts
+++ b/backend/src/tasks/lightning/network-sync.service.ts
@@ -10,13 +10,9 @@ import lightningApi from '../../api/lightning/lightning-api-factory';
 import nodesApi from '../../api/explorer/nodes.api';
 import { ResultSetHeader } from 'mysql2';
 import fundingTxFetcher from './sync-tasks/funding-tx-fetcher';
-import NodesSocketsRepository from '../../repositories/NodesSocketsRepository';
-import { Common } from '../../api/common';
-import blocks from '../../api/blocks';

 class NetworkSyncService {
  loggerTimer = 0;
-  closedChannelsScanBlock = 0;

  constructor() {}

@@ -62,12 +58,8 @@ class NetworkSyncService {
  private async $updateNodesList(nodes: ILightningApi.Node[]): Promise<void> {
    let progress = 0;

-    let deletedSockets = 0;
    const graphNodesPubkeys: string[] = [];
    for (const node of nodes) {
-      const latestUpdated = await channelsApi.$getLatestChannelUpdateForNode(node.pub_key);
-      node.last_update = Math.max(node.last_update, latestUpdated);
-
      await nodesApi.$saveNode(node);
      graphNodesPubkeys.push(node.pub_key);
      ++progress;
@@ -77,18 +69,11 @@ class NetworkSyncService {
        logger.info(`Updating node ${progress}/${nodes.length}`);
        this.loggerTimer = new Date().getTime() / 1000;
      }
-
-      const addresses: string[] = [];
-      for (const socket of node.addresses) {
-        await NodesSocketsRepository.$saveSocket(Common.formatSocket(node.pub_key, socket));
-        addresses.push(socket.addr);
-      }
-      deletedSockets += await NodesSocketsRepository.$deleteUnusedSockets(node.pub_key, addresses);
    }
-    logger.info(`${progress} nodes updated. ${deletedSockets} sockets deleted`);
+    logger.info(`${progress} nodes updated`);

    // If a channel if not present in the graph, mark it as inactive
-    await nodesApi.$setNodesInactive(graphNodesPubkeys);
+    nodesApi.$setNodesInactive(graphNodesPubkeys);

    if (config.MAXMIND.ENABLED) {
      $lookupNodeLocation();
@@ -100,19 +85,11 @@ class NetworkSyncService {
   */
  private async $updateChannelsList(channels: ILightningApi.Channel[]): Promise<void> {
    try {
-      const [closedChannelsRaw]: any[] = await DB.query(`SELECT id FROM channels WHERE status = 2`);
-      const closedChannels = {};
-      for (const closedChannel of closedChannelsRaw) {
-        closedChannels[closedChannel.id] = true;
-      }
-
      let progress = 0;

      const graphChannelsIds: string[] = [];
      for (const channel of channels) {
-        if (!closedChannels[channel.channel_id]) {
-          await channelsApi.$saveChannel(channel);
-        }
+        await channelsApi.$saveChannel(channel);
        graphChannelsIds.push(channel.channel_id);
        ++progress;

@@ -126,7 +103,7 @@ class NetworkSyncService {
      logger.info(`${progress} channels updated`);

      // If a channel if not present in the graph, mark it as inactive
-      await channelsApi.$setChannelsInactive(graphChannelsIds);
+      channelsApi.$setChannelsInactive(graphChannelsIds);
    } catch (e) {
      logger.err(`Cannot update channel list. Reason: ${(e instanceof Error ? e.message : e)}`);
    }
@@ -242,23 +219,11 @@ class NetworkSyncService {
  }

  private async $scanForClosedChannels(): Promise<void> {
-    if (this.closedChannelsScanBlock === blocks.getCurrentBlockHeight()) {
-      logger.debug(`We've already scan closed channels for this block, skipping.`);
-      return;
-    }
-
    let progress = 0;

    try {
-      let log = `Starting closed channels scan`;
-      if (this.closedChannelsScanBlock > 0) {
-        log += `. Last scan was at block ${this.closedChannelsScanBlock}`;
-      } else {
-        log += ` for the first time`;
-      }
-      logger.info(log);
-
-      const channels = await channelsApi.$getChannelsByStatus([0, 1]);
+      logger.info(`Starting closed channels scan...`);
+      const channels = await channelsApi.$getChannelsByStatus(0);
      for (const channel of channels) {
        const spendingTx = await bitcoinApi.$getOutspend(channel.transaction_id, channel.transaction_vout);
        if (spendingTx.spent === true && spendingTx.status?.confirmed === true) {
@@ -277,9 +242,7 @@ class NetworkSyncService {
          this.loggerTimer = new Date().getTime() / 1000;
        }
      }
-
-      this.closedChannelsScanBlock = blocks.getCurrentBlockHeight();
-      logger.info(`Closed channels scan completed at block ${this.closedChannelsScanBlock}`);
+      logger.info(`Closed channels scan complete.`);
    } catch (e) {
      logger.err('$scanForClosedChannels() error: ' + (e instanceof Error ? e.message : e));
    }
@@ -304,66 +267,44 @@ class NetworkSyncService {
      for (const channel of channels) {
        let reason = 0;
        // Only Esplora backend can retrieve spent transaction outputs
-        try {
-          let outspends: IEsploraApi.Outspend[] | undefined;
-          try {
-            outspends = await bitcoinApi.$getOutspends(channel.closing_transaction_id);
-          } catch (e) {
-            logger.err(`Failed to call ${config.ESPLORA.REST_API_URL + '/tx/' + channel.closing_transaction_id + '/outspends'}. Reason ${e instanceof Error ? e.message : e}`);
-            continue;
+        const outspends = await bitcoinApi.$getOutspends(channel.closing_transaction_id);
+        const lightningScriptReasons: number[] = [];
+        for (const outspend of outspends) {
+          if (outspend.spent && outspend.txid) {
+            const spendingTx = await bitcoinApi.$getRawTransaction(outspend.txid);
+            const lightningScript = this.findLightningScript(spendingTx.vin[outspend.vin || 0]);
+            lightningScriptReasons.push(lightningScript);
          }
-          const lightningScriptReasons: number[] = [];
-          for (const outspend of outspends) {
-            if (outspend.spent && outspend.txid) {
-              let spendingTx: IEsploraApi.Transaction | undefined;
-              try {
-                spendingTx = await bitcoinApi.$getRawTransaction(outspend.txid);
-              } catch (e) {
-                logger.err(`Failed to call ${config.ESPLORA.REST_API_URL + '/tx/' + outspend.txid}. Reason ${e instanceof Error ? e.message : e}`);
-                continue;
-              }
-              const lightningScript = this.findLightningScript(spendingTx.vin[outspend.vin || 0]);
-              lightningScriptReasons.push(lightningScript);
-            }
-          }
-          if (lightningScriptReasons.length === outspends.length
-            && lightningScriptReasons.filter((r) => r === 1).length === outspends.length) {
-            reason = 1;
-          } else {
-            const filteredReasons = lightningScriptReasons.filter((r) => r !== 1);
-            if (filteredReasons.length) {
-              if (filteredReasons.some((r) => r === 2 || r === 4)) {
-                reason = 3;
-              } else {
-                reason = 2;
-              }
+        }
+        if (lightningScriptReasons.length === outspends.length
+          && lightningScriptReasons.filter((r) => r === 1).length === outspends.length) {
+          reason = 1;
+        } else {
+          const filteredReasons = lightningScriptReasons.filter((r) => r !== 1);
+          if (filteredReasons.length) {
+            if (filteredReasons.some((r) => r === 2 || r === 4)) {
+              reason = 3;
            } else {
-              /*
-                We can detect a commitment transaction (force close) by reading Sequence and Locktime
-                https://github.com/lightning/bolts/blob/master/03-transactions.md#commitment-transaction
-              */
-              let closingTx: IEsploraApi.Transaction | undefined;
-              try {
-                closingTx = await bitcoinApi.$getRawTransaction(channel.closing_transaction_id);
-              } catch (e) {
-                logger.err(`Failed to call ${config.ESPLORA.REST_API_URL + '/tx/' + channel.closing_transaction_id}. Reason ${e instanceof Error ? e.message : e}`);
-                continue;
-              }
-              const sequenceHex: string = closingTx.vin[0].sequence.toString(16);
-              const locktimeHex: string = closingTx.locktime.toString(16);
-              if (sequenceHex.substring(0, 2) === '80' && locktimeHex.substring(0, 2) === '20') {
-                reason = 2; // Here we can't be sure if it's a penalty or not
-              } else {
-                reason = 1;
-              }
+              reason = 2;
+            }
+          } else {
+            /*
+              We can detect a commitment transaction (force close) by reading Sequence and Locktime
+              https://github.com/lightning/bolts/blob/master/03-transactions.md#commitment-transaction
+            */
+            const closingTx = await bitcoinApi.$getRawTransaction(channel.closing_transaction_id);
+            const sequenceHex: string = closingTx.vin[0].sequence.toString(16);
+            const locktimeHex: string = closingTx.locktime.toString(16);
+            if (sequenceHex.substring(0, 2) === '80' && locktimeHex.substring(0, 2) === '20') {
+              reason = 2; // Here we can't be sure if it's a penalty or not
+            } else {
+              reason = 1;
            }
          }
-          if (reason) {
-            logger.debug('Setting closing reason ' + reason + ' for channel: ' + channel.id + '.');
-            await DB.query(`UPDATE channels SET closing_reason = ? WHERE id = ?`, [reason, channel.id]);
-          }
-        } catch (e) {
-          logger.err(`$runClosedChannelsForensics() failed for channel ${channel.short_id}. Reason: ${e instanceof Error ? e.message : e}`);
+        }
+        if (reason) {
+          logger.debug('Setting closing reason ' + reason + ' for channel: ' + channel.id + '.');
+          await DB.query(`UPDATE channels SET closing_reason = ? WHERE id = ?`, [reason, channel.id]);
        }

        ++progress;
--- a/backend/src/tasks/lightning/sync-tasks/funding-tx-fetcher.ts
+++ b/backend/src/tasks/lightning/sync-tasks/funding-tx-fetcher.ts
@@ -71,7 +71,9 @@ class FundingTxFetcher {
  }
  
  public async $fetchChannelOpenTx(channelId: string): Promise<{timestamp: number, txid: string, value: number}> {
-    channelId = Common.channelIntegerIdToShortId(channelId);
+    if (channelId.indexOf('x') === -1) {
+      channelId = Common.channelIntegerIdToShortId(channelId);
+    }

    if (this.fundingTxCache[channelId]) {
      return this.fundingTxCache[channelId];
--- a/backend/src/tasks/lightning/sync-tasks/node-locations.ts
+++ b/backend/src/tasks/lightning/sync-tasks/node-locations.ts
@@ -4,14 +4,10 @@ import nodesApi from '../../../api/explorer/nodes.api';
 import config from '../../../config';
 import DB from '../../../database';
 import logger from '../../../logger';
-import { ResultSetHeader } from 'mysql2';
-import * as IPCheck from '../../../utils/ipcheck.js';

 export async function $lookupNodeLocation(): Promise<void> {
  let loggerTimer = new Date().getTime() / 1000;
  let progress = 0;
-  let nodesUpdated = 0;
-  let geoNamesInserted = 0;

  logger.info(`Running node location updater using Maxmind`);
  try {
@@ -31,26 +27,6 @@ export async function $lookupNodeLocation(): Promise<void> {
          const asn = lookupAsn.get(ip);
          const isp = lookupIsp.get(ip);

-          let asOverwrite: any | undefined;
-          if (asn && (IPCheck.match(ip, '170.75.160.0/20') || IPCheck.match(ip, '172.81.176.0/21'))) {
-            asOverwrite = {
-              asn: 394745,
-              name: 'Lunanode',
-            };
-          }
-          else if (asn && (IPCheck.match(ip, '50.7.0.0/16') || IPCheck.match(ip, '66.90.64.0/18'))) {
-            asOverwrite = {
-              asn: 30058,
-              name: 'FDCservers.net',
-            };
-          }
-          else if (asn && asn.autonomous_system_number === 174) {
-            asOverwrite = {
-              asn: 174,
-              name: 'Cogent Communications',
-            };
-          }
-
          if (city && (asn || isp)) {
            const query = `
              UPDATE nodes SET 
@@ -65,7 +41,7 @@ export async function $lookupNodeLocation(): Promise<void> {
            `;

            const params = [
-              asOverwrite?.asn ?? isp?.autonomous_system_number ?? asn?.autonomous_system_number,
+              isp?.autonomous_system_number ?? asn?.autonomous_system_number,
              city.city?.geoname_id,
              city.country?.geoname_id,
              city.subdivisions ? city.subdivisions[0].geoname_id : null,
@@ -74,72 +50,48 @@ export async function $lookupNodeLocation(): Promise<void> {
              city.location?.accuracy_radius,
              node.public_key
            ];
-            let result = await DB.query<ResultSetHeader>(query, params);
-            if (result[0].changedRows ?? 0 > 0) {
-              ++nodesUpdated;
-            }
+            await DB.query(query, params);

            // Store Continent
            if (city.continent?.geoname_id) {
-              result = await DB.query<ResultSetHeader>(
+              await DB.query(
                `INSERT IGNORE INTO geo_names (id, type, names) VALUES (?, 'continent', ?)`,
                [city.continent?.geoname_id, JSON.stringify(city.continent?.names)]);
-              if (result[0].changedRows ?? 0 > 0) {
-                ++geoNamesInserted;
-              }
            }

            // Store Country
            if (city.country?.geoname_id) {
-              result = await DB.query<ResultSetHeader>(
+              await DB.query(
                `INSERT IGNORE INTO geo_names (id, type, names) VALUES (?, 'country', ?)`,
                [city.country?.geoname_id, JSON.stringify(city.country?.names)]);
-              if (result[0].changedRows ?? 0 > 0) {
-                ++geoNamesInserted;
-              }
            }

            // Store Country ISO code
            if (city.country?.iso_code) {
-              result = await DB.query<ResultSetHeader>(
+              await DB.query(
                `INSERT IGNORE INTO geo_names (id, type, names) VALUES (?, 'country_iso_code', ?)`,
                [city.country?.geoname_id, city.country?.iso_code]);
-              if (result[0].changedRows ?? 0 > 0) {
-                ++geoNamesInserted;
-              }
            }

            // Store Division
            if (city.subdivisions && city.subdivisions[0]) {
-              result = await DB.query<ResultSetHeader>(
+              await DB.query(
                `INSERT IGNORE INTO geo_names (id, type, names) VALUES (?, 'division', ?)`,
                [city.subdivisions[0].geoname_id, JSON.stringify(city.subdivisions[0]?.names)]);
-              if (result[0].changedRows ?? 0 > 0) {
-                ++geoNamesInserted;
-              }
            }

            // Store City
            if (city.city?.geoname_id) {
-              result = await DB.query<ResultSetHeader>(
+              await DB.query(
                `INSERT IGNORE INTO geo_names (id, type, names) VALUES (?, 'city', ?)`,
                [city.city?.geoname_id, JSON.stringify(city.city?.names)]);
-              if (result[0].changedRows ?? 0 > 0) {
-                ++geoNamesInserted;
-              }
            }

            // Store AS name
            if (isp?.autonomous_system_organization ?? asn?.autonomous_system_organization) {
-              result = await DB.query<ResultSetHeader>(
+              await DB.query(
                `INSERT IGNORE INTO geo_names (id, type, names) VALUES (?, 'as_organization', ?)`,
-                [
-                  asOverwrite?.asn ?? isp?.autonomous_system_number ?? asn?.autonomous_system_number,
-                  JSON.stringify(asOverwrite?.name ?? isp?.isp ?? asn?.autonomous_system_organization)
-                ]);
-              if (result[0].changedRows ?? 0 > 0) {
-                ++geoNamesInserted;
-              }
+                [isp?.autonomous_system_number ?? asn?.autonomous_system_number, JSON.stringify(isp?.isp ?? asn?.autonomous_system_organization)]);
            }
          }

@@ -152,12 +104,7 @@ export async function $lookupNodeLocation(): Promise<void> {
        }
      }
    }
-
-    if (nodesUpdated > 0) {
-      logger.info(`${nodesUpdated} nodes maxmind data updated, ${geoNamesInserted} geo names inserted`);
-    } else {
-      logger.debug(`${nodesUpdated} nodes maxmind data updated, ${geoNamesInserted} geo names inserted`);
-    }
+    logger.info(`${progress} nodes location data updated`);
  } catch (e) {
    logger.err('$lookupNodeLocation() error: ' + (e instanceof Error ? e.message : e));
  }
--- a/backend/src/tasks/lightning/sync-tasks/stats-importer.ts
+++ b/backend/src/tasks/lightning/sync-tasks/stats-importer.ts
@@ -1,76 +1,68 @@
 import DB from '../../../database';
 import { promises } from 'fs';
+import { XMLParser } from 'fast-xml-parser';
 import logger from '../../../logger';
 import fundingTxFetcher from './funding-tx-fetcher';
 import config from '../../../config';
-import { ILightningApi } from '../../../api/lightning/lightning-api.interface';
-import { isIP } from 'net';
-import { Common } from '../../../api/common';
-import channelsApi from '../../../api/explorer/channels.api';
-import nodesApi from '../../../api/explorer/nodes.api';
-import { ResultSetHeader } from 'mysql2';

 const fsPromises = promises;

+interface Node {
+  id: string;
+  timestamp: number;
+  features: string;
+  rgb_color: string;
+  alias: string;
+  addresses: unknown[];
+  out_degree: number;
+  in_degree: number;
+}
+
+interface Channel {
+  channel_id: string;
+  node1_pub: string;
+  node2_pub: string;
+  timestamp: number;
+  features: string;
+  fee_base_msat: number;
+  fee_rate_milli_msat: number;
+  htlc_minimim_msat: number;
+  cltv_expiry_delta: number;
+  htlc_maximum_msat: number;
+}
+
 class LightningStatsImporter {
  topologiesFolder = config.LIGHTNING.TOPOLOGY_FOLDER;
+  parser = new XMLParser();

  async $run(): Promise<void> {
+    logger.info(`Importing historical lightning stats`);
+
    const [channels]: any[] = await DB.query('SELECT short_id from channels;');
    logger.info('Caching funding txs for currently existing channels');
    await fundingTxFetcher.$fetchChannelsFundingTxs(channels.map(channel => channel.short_id));

-    if (config.MEMPOOL.NETWORK !== 'mainnet' || config.DATABASE.ENABLED === false) {
-      return;
-    }
-
    await this.$importHistoricalLightningStats();
-    await this.$cleanupIncorrectSnapshot();
  }

  /**
   * Generate LN network stats for one day
   */
-  public async computeNetworkStats(timestamp: number,
-    networkGraph: ILightningApi.NetworkGraph, isHistorical: boolean = false): Promise<unknown> {
+  public async computeNetworkStats(timestamp: number, networkGraph): Promise<unknown> {
    // Node counts and network shares
    let clearnetNodes = 0;
    let torNodes = 0;
    let clearnetTorNodes = 0;
    let unannouncedNodes = 0;

-    const [nodesInDbRaw]: any[] = await DB.query(`SELECT public_key FROM nodes`);
-    const nodesInDb = {};
-    for (const node of nodesInDbRaw) {
-      nodesInDb[node.public_key] = node;
-    }
-
    for (const node of networkGraph.nodes) {
-      // If we don't know about this node, insert it in db
-      if (isHistorical === true && !nodesInDb[node.pub_key]) {
-        await nodesApi.$saveNode({
-          last_update: node.last_update,
-          pub_key: node.pub_key,
-          alias: node.alias,
-          addresses: node.addresses,
-          color: node.color,
-          features: node.features,
-        });
-        nodesInDb[node.pub_key] = node;
-      } else {
-        await nodesApi.$updateNodeSockets(node.pub_key, node.addresses);
-      }
-
      let hasOnion = false;
      let hasClearnet = false;
      let isUnnanounced = true;

      for (const socket of (node.addresses ?? [])) {
-        if (!socket.network?.length && !socket.addr?.length) {
-          continue;
-        }
-        hasOnion = hasOnion || ['torv2', 'torv3'].includes(socket.network) || socket.addr.indexOf('onion') !== -1 || socket.addr.indexOf('torv2') !== -1 || socket.addr.indexOf('torv3') !== -1;
-        hasClearnet = hasClearnet || ['ipv4', 'ipv6'].includes(socket.network) || [4, 6].includes(isIP(socket.addr.split(':')[0])) || socket.addr.indexOf('ipv4') !== -1 || socket.addr.indexOf('ipv6') !== -1;;
+        hasOnion = hasOnion || ['torv2', 'torv3'].includes(socket.network);
+        hasClearnet = hasClearnet || ['ipv4', 'ipv6'].includes(socket.network);
      }
      if (hasOnion && hasClearnet) {
        clearnetTorNodes++;
@@ -97,14 +89,11 @@ class LightningStatsImporter {
    const baseFees: number[] = [];
    const alreadyCountedChannels = {};
    
-    const [channelsInDbRaw]: any[] = await DB.query(`SELECT short_id FROM channels`);
-    const channelsInDb = {};
-    for (const channel of channelsInDbRaw) {
-      channelsInDb[channel.short_id] = channel;
-    }
-
    for (const channel of networkGraph.edges) {
-      const short_id = Common.channelIntegerIdToShortId(channel.channel_id);
+      let short_id = channel.channel_id;
+      if (short_id.indexOf('/') !== -1) {
+        short_id = short_id.slice(0, -2);
+      }

      const tx = await fundingTxFetcher.$fetchChannelOpenTx(short_id);
      if (!tx) {
@@ -112,21 +101,6 @@ class LightningStatsImporter {
        continue;
      }

-      // If we don't know about this channel, insert it in db
-      if (isHistorical === true && !channelsInDb[short_id]) {
-        await channelsApi.$saveChannel({
-          channel_id: short_id,
-          chan_point: `${tx.txid}:${short_id.split('x')[2]}`,
-          last_update: channel.last_update,
-          node1_pub: channel.node1_pub,
-          node2_pub: channel.node2_pub,
-          capacity: (tx.value * 100000000).toString(),
-          node1_policy: null,
-          node2_policy: null,
-        }, 0);
-        channelsInDb[channel.channel_id] = channel;
-      }
-
      if (!nodeStats[channel.node1_pub]) {
        nodeStats[channel.node1_pub] = {
          capacity: 0,
@@ -151,53 +125,35 @@ class LightningStatsImporter {
        nodeStats[channel.node2_pub].channels++;
      }

-      if (isHistorical === false) { // Coming from the node
+      if (channel.node1_policy !== undefined) { // Coming from the node
        for (const policy of [channel.node1_policy, channel.node2_policy]) {
-          if (policy && parseInt(policy.fee_rate_milli_msat, 10) < 5000) {
+          if (policy && policy.fee_rate_milli_msat < 5000) {
            avgFeeRate += parseInt(policy.fee_rate_milli_msat, 10);
            feeRates.push(parseInt(policy.fee_rate_milli_msat, 10));
          }  
-          if (policy && parseInt(policy.fee_base_msat, 10) < 5000) {
+          if (policy && policy.fee_base_msat < 5000) {
            avgBaseFee += parseInt(policy.fee_base_msat, 10);
            baseFees.push(parseInt(policy.fee_base_msat, 10));
          }
        }
-      } else {
-        // @ts-ignore
-        if (channel.node1_policy.fee_rate_milli_msat < 5000) {
-          // @ts-ignore
-          avgFeeRate += parseInt(channel.node1_policy.fee_rate_milli_msat, 10);
-          // @ts-ignore
-          feeRates.push(parseInt(channel.node1_policy.fee_rate_milli_msat), 10);
-        }
-        // @ts-ignore
-        if (channel.node1_policy.fee_base_msat < 5000) {
-          // @ts-ignore
-          avgBaseFee += parseInt(channel.node1_policy.fee_base_msat, 10);
-          // @ts-ignore
-          baseFees.push(parseInt(channel.node1_policy.fee_base_msat), 10);
+      } else { // Coming from the historical import
+        if (channel.fee_rate_milli_msat < 5000) {
+          avgFeeRate += parseInt(channel.fee_rate_milli_msat, 10);
+          feeRates.push(parseInt(channel.fee_rate_milli_msat), 10);
+        }  
+        if (channel.fee_base_msat < 5000) {
+          avgBaseFee += parseInt(channel.fee_base_msat, 10);
+          baseFees.push(parseInt(channel.fee_base_msat), 10);
        }
      }
    }

-    let medCapacity = 0;
-    let medFeeRate = 0;
-    let medBaseFee = 0;
-    let avgCapacity = 0;
-
    avgFeeRate /= Math.max(networkGraph.edges.length, 1);
    avgBaseFee /= Math.max(networkGraph.edges.length, 1);
-
-    if (capacities.length > 0) {
-      medCapacity = capacities.sort((a, b) => b - a)[Math.round(capacities.length / 2 - 1)];
-      avgCapacity = Math.round(capacity / Math.max(capacities.length, 1));
-    }
-    if (feeRates.length > 0) {
-      medFeeRate = feeRates.sort((a, b) => b - a)[Math.round(feeRates.length / 2 - 1)];
-    }
-    if (baseFees.length > 0) {
-      medBaseFee = baseFees.sort((a, b) => b - a)[Math.round(baseFees.length / 2 - 1)];
-    }
+    const medCapacity = capacities.sort((a, b) => b - a)[Math.round(capacities.length / 2 - 1)];
+    const medFeeRate = feeRates.sort((a, b) => b - a)[Math.round(feeRates.length / 2 - 1)];
+    const medBaseFee = baseFees.sort((a, b) => b - a)[Math.round(baseFees.length / 2 - 1)];
+    const avgCapacity = Math.round(capacity / Math.max(capacities.length, 1));

    let query = `INSERT INTO lightning_stats(
        added,
@@ -287,17 +243,6 @@ class LightningStatsImporter {
        nodeStats[public_key].capacity,
        nodeStats[public_key].channels,
      ]);
-
-      if (!isHistorical) {
-        await DB.query(
-          `UPDATE nodes SET capacity = ?, channels = ? WHERE public_key = ?`,
-          [
-            nodeStats[public_key].capacity,
-            nodeStats[public_key].channels,
-            public_key,
-          ]
-        );
-      }
    }

    return {
@@ -310,232 +255,156 @@ class LightningStatsImporter {
   * Import topology files LN historical data into the database
   */
  async $importHistoricalLightningStats(): Promise<void> {
-    logger.debug('Run the historical importer');
-    try {
-      let fileList: string[] = [];
-      try {
-        fileList = await fsPromises.readdir(this.topologiesFolder);
-      } catch (e) {
-        logger.err(`Unable to open topology folder at ${this.topologiesFolder}`);
-        throw e;
-      }
-      // Insert history from the most recent to the oldest
-      // This also put the .json cached files first
-      fileList.sort().reverse();
+    let latestNodeCount = 1;

-      const [rows]: any[] = await DB.query(`
-        SELECT UNIX_TIMESTAMP(added) AS added
-        FROM lightning_stats
-        ORDER BY added DESC
-      `);
-      const existingStatsTimestamps = {};
-      for (const row of rows) {
-        existingStatsTimestamps[row.added] = row;
+    const fileList = await fsPromises.readdir(this.topologiesFolder);
+    // Insert history from the most recent to the oldest
+    // This also put the .json cached files first
+    fileList.sort().reverse();
+
+    const [rows]: any[] = await DB.query(`
+      SELECT UNIX_TIMESTAMP(added) AS added, node_count
+      FROM lightning_stats
+      ORDER BY added DESC
+    `);
+    const existingStatsTimestamps = {};
+    for (const row of rows) {
+      existingStatsTimestamps[row.added] = row;
+    }
+
+    // For logging purpose
+    let processed = 10;
+    let totalProcessed = -1;
+
+    for (const filename of fileList) {
+      processed++;
+      totalProcessed++;
+
+      const timestamp = parseInt(filename.split('_')[1], 10);
+
+      // Stats exist already, don't calculate/insert them
+      if (existingStatsTimestamps[timestamp] !== undefined) {
+        latestNodeCount = existingStatsTimestamps[timestamp].node_count;
+        continue;
      }

-      // For logging purpose
-      let processed = 10;
-      let totalProcessed = 0;
-      let logStarted = false;
+      logger.debug(`Reading ${this.topologiesFolder}/${filename}`);
+      const fileContent = await fsPromises.readFile(`${this.topologiesFolder}/${filename}`, 'utf8');

-      for (const filename of fileList) {
-        processed++;
-
-        const timestamp = parseInt(filename.split('_')[1], 10);
-
-        // Stats exist already, don't calculate/insert them
-        if (existingStatsTimestamps[timestamp] !== undefined) {
-          totalProcessed++;
-          continue;
-        }
-
-        if (filename.indexOf('topology_') === -1) {
-          totalProcessed++;
-          continue;
-        }
-
-        logger.debug(`Reading ${this.topologiesFolder}/${filename}`);
-        let fileContent = '';
-        try {
-          fileContent = await fsPromises.readFile(`${this.topologiesFolder}/${filename}`, 'utf8');
-        } catch (e: any) {
-          if (e.errno == -1) { // EISDIR - Ignore directorie
-            totalProcessed++;
-            continue;
-          }
-          logger.err(`Unable to open ${this.topologiesFolder}/${filename}`);
-          totalProcessed++;
-          continue;
-        }
-
-        let graph;
+      let graph;
+      if (filename.indexOf('.json') !== -1) {
        try {
          graph = JSON.parse(fileContent);
-          graph = await this.cleanupTopology(graph);
        } catch (e) {
-          logger.debug(`Invalid topology file ${this.topologiesFolder}/${filename}, cannot parse the content. Reason: ${e instanceof Error ? e.message : e}`);
-          totalProcessed++;
+          logger.debug(`Invalid topology file ${this.topologiesFolder}/${filename}, cannot parse the content`);
          continue;
        }
-    
-        if (this.isIncorrectSnapshot(timestamp, graph)) {
-          logger.debug(`Ignoring ${this.topologiesFolder}/${filename}, because we defined it as an incorrect snapshot`);
-          ++totalProcessed;
+      } else {
+        graph = this.parseFile(fileContent);
+        if (!graph) {
+          logger.debug(`Invalid topology file ${this.topologiesFolder}/${filename}, cannot parse the content`);
          continue;
        }
-
-        if (!logStarted) {
-          logger.info(`Founds a topology file that we did not import. Importing historical lightning stats now.`);
-          logStarted = true;
-        }
-        
-        const datestr = `${new Date(timestamp * 1000).toUTCString()} (${timestamp})`;
-        logger.debug(`${datestr}: Found ${graph.nodes.length} nodes and ${graph.edges.length} channels`);
-
-        totalProcessed++;
-
-        if (processed > 10) {
-          logger.info(`Generating LN network stats for ${datestr}. Processed ${totalProcessed}/${fileList.length} files`);
-          processed = 0;
-        } else {
-          logger.debug(`Generating LN network stats for ${datestr}. Processed ${totalProcessed}/${fileList.length} files`);
-        }
-        await fundingTxFetcher.$fetchChannelsFundingTxs(graph.edges.map(channel => channel.channel_id.slice(0, -2)));
-        const stat = await this.computeNetworkStats(timestamp, graph, true);
-
-        existingStatsTimestamps[timestamp] = stat;
+        await fsPromises.writeFile(`${this.topologiesFolder}/${filename}.json`, JSON.stringify(graph));
      }

-      if (totalProcessed > 0) {
-        logger.info(`Lightning network stats historical import completed`);
+      if (timestamp > 1556316000) {
+        // "No, the reason most likely is just that I started collection in 2019,
+        // so what I had before that is just the survivors from before, which weren't that many"
+        const diffRatio = graph.nodes.length / latestNodeCount;
+        if (diffRatio < 0.9) {
+          // Ignore drop of more than 90% of the node count as it's probably a missing data point
+          logger.debug(`Nodes count diff ratio threshold reached, ignore the data for this day ${graph.nodes.length} nodes vs ${latestNodeCount}`);
+          continue;
+        }
      }
-    } catch (e) {
-      logger.err(`Lightning network stats historical failed. Reason: ${e instanceof Error ? e.message : e}`);
+      latestNodeCount = graph.nodes.length;
+
+      const datestr = `${new Date(timestamp * 1000).toUTCString()} (${timestamp})`;
+      logger.debug(`${datestr}: Found ${graph.nodes.length} nodes and ${graph.edges.length} channels`);
+
+      if (processed > 10) {
+        logger.info(`Generating LN network stats for ${datestr}. Processed ${totalProcessed}/${fileList.length} files`);
+        processed = 0;
+      } else {
+        logger.debug(`Generating LN network stats for ${datestr}. Processed ${totalProcessed}/${fileList.length} files`);
+      }
+      await fundingTxFetcher.$fetchChannelsFundingTxs(graph.edges.map(channel => channel.channel_id.slice(0, -2)));
+      const stat = await this.computeNetworkStats(timestamp, graph);
+
+      existingStatsTimestamps[timestamp] = stat;
    }
+
+    logger.info(`Lightning network stats historical import completed`);
  }

-  cleanupTopology(graph): ILightningApi.NetworkGraph {
-    const newGraph = {
-      nodes: <ILightningApi.Node[]>[],
-      edges: <ILightningApi.Channel[]>[],
-    };
+  /**
+   * Parse the file content into XML, and return a list of nodes and channels
+   */
+  private parseFile(fileContent): any {
+    const graph = this.parser.parse(fileContent);
+    if (Object.keys(graph).length === 0) {
+      return null;
+    }

-    for (const node of graph.nodes) {
-      const addressesParts = (node.addresses ?? '').split(',');
-      const addresses: any[] = [];
-      for (const address of addressesParts) {
-        const formatted = Common.findSocketNetwork(address);
+    const nodes: Node[] = [];
+    const channels: Channel[] = [];
+
+    // If there is only one entry, the parser does not return an array, so we override this
+    if (!Array.isArray(graph.graphml.graph.node)) {
+      graph.graphml.graph.node = [graph.graphml.graph.node];
+    }
+    if (!Array.isArray(graph.graphml.graph.edge)) {
+      graph.graphml.graph.edge = [graph.graphml.graph.edge];
+    }
+
+    for (const node of graph.graphml.graph.node) {
+      if (!node.data) {
+        continue;
+      }
+      const addresses: unknown[] = [];
+      const sockets = node.data[5].split(',');
+      for (const socket of sockets) {
+        const parts = socket.split('://');
        addresses.push({
-          network: formatted.network,
-          addr: formatted.url
+          network: parts[0],
+          addr: parts[1],
        });
      }
-
-      let rgb = node.rgb_color ?? '#000000';
-      if (rgb.indexOf('#') === -1) {
-        rgb = `#${rgb}`;
-      }
-      newGraph.nodes.push({
-        last_update: node.timestamp ?? 0,
-        pub_key: node.id ?? null,
-        alias: node.alias ?? node.id.slice(0, 20),
+      nodes.push({
+        id: node.data[0],
+        timestamp: node.data[1],
+        features: node.data[2],
+        rgb_color: node.data[3],
+        alias: node.data[4],
        addresses: addresses,
-        color: rgb,
-        features: {},
+        out_degree: node.data[6],
+        in_degree: node.data[7],
      });
    }

-    for (const adjacency of graph.adjacency) {
-      if (adjacency.length === 0) {
+    for (const channel of graph.graphml.graph.edge) {
+      if (!channel.data) {
        continue;
-      } else {
-        for (const edge of adjacency) {
-          newGraph.edges.push({
-            channel_id: edge.scid,
-            chan_point: '',
-            last_update: edge.timestamp,
-            node1_pub: edge.source ?? null,
-            node2_pub: edge.destination ?? null,
-            capacity: '0', // Will be fetch later
-            node1_policy: {
-              time_lock_delta: edge.cltv_expiry_delta,
-              min_htlc: edge.htlc_minimim_msat,
-              fee_base_msat: edge.fee_base_msat,
-              fee_rate_milli_msat: edge.fee_proportional_millionths,
-              max_htlc_msat: edge.htlc_maximum_msat,
-              last_update: edge.timestamp,
-              disabled: false,          
-            },
-            node2_policy: null,
-          });
-        }
      }
+      channels.push({
+        channel_id: channel.data[0],
+        node1_pub: channel.data[1],
+        node2_pub: channel.data[2],
+        timestamp: channel.data[3],
+        features: channel.data[4],
+        fee_base_msat: channel.data[5],
+        fee_rate_milli_msat: channel.data[6],
+        htlc_minimim_msat: channel.data[7],
+        cltv_expiry_delta: channel.data[8],
+        htlc_maximum_msat: channel.data[9],
+      });
    }

-    return newGraph;
-  }
-
-  private isIncorrectSnapshot(timestamp, graph): boolean {
-    if (timestamp >= 1549065600 /* 2019-02-02 */ && timestamp <= 1550620800 /* 2019-02-20 */ && graph.nodes.length < 2600) {
-        return true;
-    }
-    if (timestamp >= 1552953600 /* 2019-03-19 */ && timestamp <= 1556323200 /* 2019-05-27 */ && graph.nodes.length < 4000) {
-      return true;
-    }
-    if (timestamp >= 1557446400 /* 2019-05-10 */ && timestamp <= 1560470400 /* 2019-06-14 */ && graph.nodes.length < 4000) {
-      return true;
-    }
-    if (timestamp >= 1561680000 /* 2019-06-28 */ && timestamp <= 1563148800 /* 2019-07-15 */ && graph.nodes.length < 4000) {
-      return true;
-    }
-    if (timestamp >= 1571270400 /* 2019-11-17 */ && timestamp <= 1580601600 /* 2020-02-02 */ && graph.nodes.length < 4500) {
-      return true;
-    }
-    if (timestamp >= 1591142400 /* 2020-06-03 */ && timestamp <= 1592006400 /* 2020-06-13 */ && graph.nodes.length < 5500) {
-      return true;
-    }
-    if (timestamp >= 1632787200 /* 2021-09-28 */ && timestamp <= 1633564800 /* 2021-10-07 */ && graph.nodes.length < 13000) {
-      return true;
-    }
-    if (timestamp >= 1634256000 /* 2021-10-15 */ && timestamp <= 1645401600 /* 2022-02-21 */ && graph.nodes.length < 17000) {
-      return true;
-    }
-    if (timestamp >= 1654992000 /* 2022-06-12 */ && timestamp <= 1661472000 /* 2022-08-26 */ && graph.nodes.length < 14000) {
-      return true;
-    }
-
-    return false;
-  }
-
-  private async $cleanupIncorrectSnapshot(): Promise<void> {
-    // We do not run this one automatically because those stats are not supposed to be inserted in the first
-    // place, but I write them here to remind us we manually run those queries
-
-    // DELETE FROM lightning_stats
-    // WHERE (
-    //   UNIX_TIMESTAMP(added) >= 1549065600 AND UNIX_TIMESTAMP(added) <= 1550620800 AND node_count < 2600 OR
-    //   UNIX_TIMESTAMP(added) >= 1552953600 AND UNIX_TIMESTAMP(added) <= 1556323200 AND node_count < 4000 OR
-    //   UNIX_TIMESTAMP(added) >= 1557446400 AND UNIX_TIMESTAMP(added) <= 1560470400 AND node_count < 4000 OR
-    //   UNIX_TIMESTAMP(added) >= 1561680000 AND UNIX_TIMESTAMP(added) <= 1563148800 AND node_count < 4000 OR
-    //   UNIX_TIMESTAMP(added) >= 1571270400 AND UNIX_TIMESTAMP(added) <= 1580601600 AND node_count < 4500 OR
-    //   UNIX_TIMESTAMP(added) >= 1591142400 AND UNIX_TIMESTAMP(added) <= 1592006400 AND node_count < 5500 OR
-    //   UNIX_TIMESTAMP(added) >= 1632787200 AND UNIX_TIMESTAMP(added) <= 1633564800 AND node_count < 13000 OR
-    //   UNIX_TIMESTAMP(added) >= 1634256000 AND UNIX_TIMESTAMP(added) <= 1645401600 AND node_count < 17000 OR
-    //   UNIX_TIMESTAMP(added) >= 1654992000 AND UNIX_TIMESTAMP(added) <= 1661472000 AND node_count < 14000
-    // )
-
-    // DELETE FROM node_stats
-    // WHERE (
-    //   UNIX_TIMESTAMP(added) >= 1549065600 AND UNIX_TIMESTAMP(added) <= 1550620800 OR
-    //   UNIX_TIMESTAMP(added) >= 1552953600 AND UNIX_TIMESTAMP(added) <= 1556323200 OR
-    //   UNIX_TIMESTAMP(added) >= 1557446400 AND UNIX_TIMESTAMP(added) <= 1560470400 OR
-    //   UNIX_TIMESTAMP(added) >= 1561680000 AND UNIX_TIMESTAMP(added) <= 1563148800 OR
-    //   UNIX_TIMESTAMP(added) >= 1571270400 AND UNIX_TIMESTAMP(added) <= 1580601600 OR
-    //   UNIX_TIMESTAMP(added) >= 1591142400 AND UNIX_TIMESTAMP(added) <= 1592006400 OR
-    //   UNIX_TIMESTAMP(added) >= 1632787200 AND UNIX_TIMESTAMP(added) <= 1633564800 OR
-    //   UNIX_TIMESTAMP(added) >= 1634256000 AND UNIX_TIMESTAMP(added) <= 1645401600 OR
-    //   UNIX_TIMESTAMP(added) >= 1654992000 AND UNIX_TIMESTAMP(added) <= 1661472000 
-    // )
+    return {
+      nodes: nodes,
+      edges: channels,
+    };
  }
 }

--- a/backend/src/tasks/price-updater.ts
+++ b/backend/src/tasks/price-updater.ts
@@ -1,5 +1,4 @@
 import * as fs from 'fs';
-import path from "path";
 import { Common } from '../api/common';
 import config from '../config';
 import logger from '../logger';
@@ -160,7 +159,7 @@ class PriceUpdater {
    const existingPriceTimes = await PricesRepository.$getPricesTimes();

    // Insert MtGox weekly prices
-    const pricesJson: any[] = JSON.parse(fs.readFileSync(path.join(__dirname, 'mtgox-weekly.json')).toString());
+    const pricesJson: any[] = JSON.parse(fs.readFileSync('./src/tasks/price-feeds/mtgox-weekly.json').toString());
    const prices = this.getEmptyPricesObj();
    let insertedCount: number = 0;
    for (const price of pricesJson) {
--- a/backend/src/utils/ipcheck.js
+++ b/backend/src/utils/ipcheck.js
@@ -1,119 +0,0 @@
-var net = require('net');
-
-var IPCheck = module.exports = function(input) {
-  var self = this;
-
-  if (!(self instanceof IPCheck)) {
-    return new IPCheck(input);
-  }
-
-  self.input = input;
-  self.parse();
-};
-
-IPCheck.prototype.parse = function() {
-  var self = this;
-
-  if (!self.input || typeof self.input !== 'string') return self.valid = false;
-
-  var ip;
-
-  var pos = self.input.lastIndexOf('/');
-  if (pos !== -1) {
-    ip = self.input.substring(0, pos);
-    self.mask = +self.input.substring(pos + 1);
-  } else {
-    ip = self.input;
-    self.mask = null;
-  }
-
-  self.ipv = net.isIP(ip);
-  self.valid = !!self.ipv && !isNaN(self.mask);
-
-  if (!self.valid) return;
-
-  // default mask = 32 for ipv4 and 128 for ipv6
-  if (self.mask === null) self.mask = self.ipv === 4 ? 32 : 128;
-
-  if (self.ipv === 4) {
-    // difference between ipv4 and ipv6 masks
-    self.mask += 96;
-  }
-
-  if (self.mask < 0 || self.mask > 128) {
-    self.valid = false;
-    return;
-  }
-
-  self.address = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ];
-
-  if(self.ipv === 4){
-    self.parseIPv4(ip);
-  }else{
-    self.parseIPv6(ip);
-  }
-};
-
-IPCheck.prototype.parseIPv4 = function(ip) {
-  var self = this;
-
-  // ipv4 addresses live under ::ffff:0:0
-  self.address[10] = self.address[11] = 0xff;
-
-  var octets = ip.split('.');
-  for (var i = 0; i < 4; i++) {
-    self.address[i + 12] = parseInt(octets[i], 10);
-  }
-};
-
-
-var V6_TRANSITIONAL = /:(\d+\.\d+\.\d+\.\d+)$/;
-
-IPCheck.prototype.parseIPv6 = function(ip) {
-  var self = this;
-
-  var transitionalMatch = V6_TRANSITIONAL.exec(ip);
-  if(transitionalMatch){
-    self.parseIPv4(transitionalMatch[1]);
-    return;
-  }
-
-  var bits = ip.split(':');
-  if (bits.length < 8) {
-    ip = ip.replace('::', Array(11 - bits.length).join(':'));
-    bits = ip.split(':');
-  }
-
-  var j = 0;
-  for (var i = 0; i < bits.length; i += 1) {
-    var x = bits[i] ? parseInt(bits[i], 16) : 0;
-    self.address[j++] = x >> 8;
-    self.address[j++] = x & 0xff;
-  }
-};
-
-IPCheck.prototype.match = function(cidr) {
-  var self = this;
-
-  if (!(cidr instanceof IPCheck)) cidr = new IPCheck(cidr);
-  if (!self.valid || !cidr.valid) return false;
-
-  var mask = cidr.mask;
-  var i = 0;
-
-  while (mask >= 8) {
-    if (self.address[i] !== cidr.address[i]) return false;
-
-    i++;
-    mask -= 8;
-  }
-
-  var shift = 8 - mask;
-  return (self.address[i] >>> shift) === (cidr.address[i] >>> shift);
-};
-
-
-IPCheck.match = function(ip, cidr) {
-  ip = ip instanceof IPCheck ? ip : new IPCheck(ip);
-  return ip.match(cidr);
-};
--- a/backend/testSetup.ts
+++ b/backend/testSetup.ts
@@ -1,5 +0,0 @@
-jest.mock('./mempool-config.json', () => ({}), { virtual: true });
-jest.mock('./src/logger.ts', () => ({}), { virtual: true });
-jest.mock('./src/api/rbf-cache.ts', () => ({}), { virtual: true });
-jest.mock('./src/api/mempool.ts', () => ({}), { virtual: true });
-jest.mock('./src/api/memory-cache.ts', () => ({}), { virtual: true });
--- a/backend/tsconfig.build.json
+++ b/backend/tsconfig.build.json
@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig",
-  "exclude": ["**/*.test.*", "**/__mocks__/*", "**/__tests__/*"],
-  "compilerOptions": {
-    "types": ["node"]
-  },
-
-}
--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -1,8 +1,8 @@
 {
  "compilerOptions": {
+    "types": ["node"],
    "module": "commonjs",
    "target": "esnext",
-    "types": ["node", "jest"],
    "lib": ["es2019", "dom"],
    "strict": true,
    "noImplicitAny": false,
@@ -13,8 +13,7 @@
      "node_modules/@types"
    ],
    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "allowJs": true,
+    "esModuleInterop": true
  },
  "include": [
    "src/**/*.ts"
@@ -22,4 +21,4 @@
  "exclude": [
    "dist/**"
  ]
-}
+}
--- a/contributors/WesVleuten.txt
+++ b/contributors/WesVleuten.txt
@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of September 1, 2022.
-
-Signed: WesVleuten
--- a/contributors/junderw.txt
+++ b/contributors/junderw.txt
@@ -1,3 +0,0 @@
-I hereby accept the terms of the Contributor License Agreement in the CONTRIBUTING.md file of the mempool/mempool git repository as of August 19, 2022.
-
-Signed: junderw
--- a/docker/README.md
+++ b/docker/README.md
@@ -350,68 +350,3 @@ Corresponding `docker-compose.yml` overrides:
      PRICE_DATA_SERVER_CLEARNET_URL: ""
      ...
 ```
-
-<br/>
-
-`mempool-config.json`:
-```
-  "LIGHTNING": {
-    "ENABLED": false
-    "BACKEND": "lnd"
-    "TOPOLOGY_FOLDER": ""
-    "STATS_REFRESH_INTERVAL": 600
-    "GRAPH_REFRESH_INTERVAL": 600
-    "LOGGER_UPDATE_INTERVAL": 30
-  }
-```
-
-Corresponding `docker-compose.yml` overrides:
-```
-  api:
-    environment:
-      LIGHTNING_ENABLED: false
-      LIGHTNING_BACKEND: "lnd"
-      LIGHTNING_TOPOLOGY_FOLDER: ""
-      LIGHTNING_STATS_REFRESH_INTERVAL: 600
-      LIGHTNING_GRAPH_REFRESH_INTERVAL: 600
-      LIGHTNING_LOGGER_UPDATE_INTERVAL: 30
-      ...
-```
-
-<br/>
-
-`mempool-config.json`:
-```
-  "LND": {
-    "TLS_CERT_PATH": ""
-    "MACAROON_PATH": ""
-    "REST_API_URL": "https://localhost:8080"
-  }
-```
-
-Corresponding `docker-compose.yml` overrides:
-```
-  api:
-    environment:
-      LND_TLS_CERT_PATH: ""
-      LND_MACAROON_PATH: ""
-      LND_REST_API_URL: "https://localhost:8080"
-      ...
-```
-
-<br/>
-
-`mempool-config.json`:
-```
-  "CLIGHTNING": {
-    "SOCKET": ""
-  }
-```
-
-Corresponding `docker-compose.yml` overrides:
-```
-  api:
-    environment:
-      CLIGHTNING_SOCKET: ""
-      ...
-```
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:16.16.0-buster-slim AS builder

 ARG commitHash
-ENV MEMPOOL_COMMIT_HASH=${commitHash}
+ENV DOCKER_COMMIT_HASH=${commitHash}

 WORKDIR /build
 COPY . .
@@ -9,15 +9,18 @@ COPY . .
 RUN apt-get update
 RUN apt-get install -y build-essential python3 pkg-config
 RUN npm install --omit=dev --omit=optional
-RUN npm run package
+RUN npm run build

 FROM node:16.16.0-buster-slim

 WORKDIR /backend

-RUN chown 1000:1000 ./
-COPY --from=builder --chown=1000:1000 /build/package ./package/
-COPY --from=builder --chown=1000:1000 /build/mempool-config.json /build/start.sh /build/wait-for-it.sh ./
+COPY --from=builder /build/ .
+
+RUN chmod +x /backend/start.sh
+RUN chmod +x /backend/wait-for-it.sh
+
+RUN chown -R 1000:1000 /backend && chmod -R 755 /backend

 USER 1000

--- a/docker/backend/mempool-config.json
+++ b/docker/backend/mempool-config.json
@@ -67,22 +67,6 @@
    "ENABLED": __BISQ_ENABLED__,
    "DATA_PATH": "__BISQ_DATA_PATH__"
  },
-  "LIGHTNING": {
-    "ENABLED": __LIGHTNING_ENABLED__,
-    "BACKEND": "__LIGHTNING_BACKEND__",
-    "STATS_REFRESH_INTERVAL": __LIGHTNING_STATS_REFRESH_INTERVAL__,
-    "GRAPH_REFRESH_INTERVAL": __LIGHTNING_GRAPH_REFRESH_INTERVAL__,
-    "LOGGER_UPDATE_INTERVAL": __LIGHTNING_LOGGER_UPDATE_INTERVAL__,
-    "TOPOLOGY_FOLDER": "__LIGHTNING_TOPOLOGY_FOLDER__"
-  },
-  "LND": {
-    "TLS_CERT_PATH": "__LND_TLS_CERT_PATH__",
-    "MACAROON_PATH": "__LND_MACAROON_PATH__",
-    "REST_API_URL": "__LND_REST_API_URL__"
-  },
-  "CLIGHTNING": {
-    "SOCKET": "__CLIGHTNING_SOCKET__"
-  },
  "SOCKS5PROXY": {
    "ENABLED": __SOCKS5PROXY_ENABLED__,
    "USE_ONION": __SOCKS5PROXY_USE_ONION__,
--- a/docker/backend/start.sh
+++ b/docker/backend/start.sh
@@ -24,8 +24,8 @@ __MEMPOOL_USER_AGENT__=${MEMPOOL_USER_AGENT:=mempool}
 __MEMPOOL_STDOUT_LOG_MIN_PRIORITY__=${MEMPOOL_STDOUT_LOG_MIN_PRIORITY:=info}
 __MEMPOOL_INDEXING_BLOCKS_AMOUNT__=${MEMPOOL_INDEXING_BLOCKS_AMOUNT:=false}
 __MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__=${MEMPOOL_AUTOMATIC_BLOCK_REINDEXING:=false}
-__MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=https://raw.githubusercontent.com/mempool/mining-pools/master/pools.json}
-__MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=https://api.github.com/repos/mempool/mining-pools/git/trees/master}
+__MEMPOOL_POOLS_JSON_URL__=${MEMPOOL_POOLS_JSON_URL:=false}
+__MEMPOOL_POOLS_JSON_TREE_URL__=${MEMPOOL_POOLS_JSON_TREE_URL:=false}

 # CORE_RPC
 __CORE_RPC_HOST__=${CORE_RPC_HOST:=127.0.0.1}
@@ -91,22 +91,6 @@ __EXTERNAL_DATA_SERVER_LIQUID_ONION__=${EXTERNAL_DATA_SERVER_LIQUID_ONION:=http:
 __EXTERNAL_DATA_SERVER_BISQ_URL__=${EXTERNAL_DATA_SERVER_BISQ_URL:=https://bisq.markets/api}
 __EXTERNAL_DATA_SERVER_BISQ_ONION__=${EXTERNAL_DATA_SERVER_BISQ_ONION:=http://bisqmktse2cabavbr2xjq7xw3h6g5ottemo5rolfcwt6aly6tp5fdryd.onion/api}

-# LIGHTNING
-__LIGHTNING_ENABLED__=${LIGHTNING_ENABLED:=false}
-__LIGHTNING_BACKEND__=${LIGHTNING_BACKEND:="lnd"}
-__LIGHTNING_TOPOLOGY_FOLDER__=${LIGHTNING_TOPOLOGY_FOLDER:=""}
-__LIGHTNING_STATS_REFRESH_INTERVAL__=${LIGHTNING_STATS_REFRESH_INTERVAL:=600}
-__LIGHTNING_GRAPH_REFRESH_INTERVAL__=${LIGHTNING_GRAPH_REFRESH_INTERVAL:=600}
-__LIGHTNING_LOGGER_UPDATE_INTERVAL__=${LIGHTNING_LOGGER_UPDATE_INTERVAL:=30}
-
-# LND
-__LND_TLS_CERT_PATH__=${LND_TLS_CERT_PATH:=""}
-__LND_MACAROON_PATH__=${LND_MACAROON_PATH:=""}
-__LND_REST_API_URL__=${LND_REST_API_URL:="https://localhost:8080"}
-
-# CLN
-__CLIGHTNING_SOCKET__=${CLIGHTNING_SOCKET:=""}
-
 mkdir -p "${__MEMPOOL_CACHE_DIR__}"

 sed -i "s/__MEMPOOL_NETWORK__/${__MEMPOOL_NETWORK__}/g" mempool-config.json
@@ -132,8 +116,8 @@ sed -i "s!__MEMPOOL_USER_AGENT__!${__MEMPOOL_USER_AGENT__}!g" mempool-config.jso
 sed -i "s/__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__/${__MEMPOOL_STDOUT_LOG_MIN_PRIORITY__}/g" mempool-config.json
 sed -i "s/__MEMPOOL_INDEXING_BLOCKS_AMOUNT__/${__MEMPOOL_INDEXING_BLOCKS_AMOUNT__}/g" mempool-config.json
 sed -i "s/__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__/${__MEMPOOL_AUTOMATIC_BLOCK_REINDEXING__}/g" mempool-config.json
-sed -i "s!__MEMPOOL_POOLS_JSON_URL__!${__MEMPOOL_POOLS_JSON_URL__}!g" mempool-config.json
-sed -i "s!__MEMPOOL_POOLS_JSON_TREE_URL__!${__MEMPOOL_POOLS_JSON_TREE_URL__}!g" mempool-config.json
+sed -i "s/__MEMPOOL_POOLS_JSON_URL__/${__MEMPOOL_POOLS_JSON_URL__}/g" mempool-config.json
+sed -i "s/__MEMPOOL_POOLS_JSON_TREE_URL__/${__MEMPOOL_POOLS_JSON_TREE_URL__}/g" mempool-config.json

 sed -i "s/__CORE_RPC_HOST__/${__CORE_RPC_HOST__}/g" mempool-config.json
 sed -i "s/__CORE_RPC_PORT__/${__CORE_RPC_PORT__}/g" mempool-config.json
@@ -189,20 +173,4 @@ sed -i "s!__EXTERNAL_DATA_SERVER_LIQUID_ONION__!${__EXTERNAL_DATA_SERVER_LIQUID_
 sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_URL__!${__EXTERNAL_DATA_SERVER_BISQ_URL__}!g" mempool-config.json
 sed -i "s!__EXTERNAL_DATA_SERVER_BISQ_ONION__!${__EXTERNAL_DATA_SERVER_BISQ_ONION__}!g" mempool-config.json

-# LIGHTNING
-sed -i "s!__LIGHTNING_ENABLED__!${__LIGHTNING_ENABLED__}!g" mempool-config.json
-sed -i "s!__LIGHTNING_BACKEND__!${__LIGHTNING_BACKEND__}!g" mempool-config.json
-sed -i "s!__LIGHTNING_TOPOLOGY_FOLDER__!${__LIGHTNING_TOPOLOGY_FOLDER__}!g" mempool-config.json
-sed -i "s!__LIGHTNING_STATS_REFRESH_INTERVAL__!${__LIGHTNING_STATS_REFRESH_INTERVAL__}!g" mempool-config.json
-sed -i "s!__LIGHTNING_GRAPH_REFRESH_INTERVAL__!${__LIGHTNING_GRAPH_REFRESH_INTERVAL__}!g" mempool-config.json
-sed -i "s!__LIGHTNING_LOGGER_UPDATE_INTERVAL__!${__LIGHTNING_LOGGER_UPDATE_INTERVAL__}!g" mempool-config.json
-
-# LND
-sed -i "s!__LND_TLS_CERT_PATH__!${__LND_TLS_CERT_PATH__}!g" mempool-config.json
-sed -i "s!__LND_MACAROON_PATH__!${__LND_MACAROON_PATH__}!g" mempool-config.json
-sed -i "s!__LND_REST_API_URL__!${__LND_REST_API_URL__}!g" mempool-config.json
-
-# CLN
-sed -i "s!__CLIGHTNING_SOCKET__!${__CLIGHTNING_SOCKET__}!g" mempool-config.json
-
-node /backend/package/index.js
+node /backend/dist/index.js
--- a/docker/backend/wait-for-it.sh
+++ b/docker/backend/wait-for-it.sh
--- a/docker/init.sh
+++ b/docker/init.sh
@@ -1,7 +1,10 @@
 #!/bin/sh

 #backend
+gitMaster="\.\.\/\.git\/refs\/heads\/master"
+git ls-remote https://github.com/mempool/mempool.git "$1^{}" | awk '{ print $1}' > ./backend/master
 cp ./docker/backend/* ./backend/
+sed -i "s/${gitMaster}/master/g" ./backend/src/api/backend-info.ts

 #frontend
 localhostIP="127.0.0.1"
--- a/frontend/.eslintrc
+++ b/frontend/.eslintrc
@@ -32,7 +32,6 @@
    "prefer-const": 1,
    "prefer-rest-params": 1,
    "quotes": [1, "single", { "allowTemplateLiterals": true }],
-    "semi": 1,
-    "eqeqeq": 1
+    "semi": 1
  }
 }
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -170,10 +170,6 @@
          },
          "configurations": {
            "production": {
-              "assets": [
-                "src/favicon.ico",
-                "src/robots.txt"
-              ],
              "fileReplacements": [
                {
                  "replace": "src/environments/environment.ts",
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -34,8 +34,8 @@
    "start:local-staging": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c local-staging",
    "start:mixed": "npm run generate-config && npm run sync-assets-dev && npm run ng -- serve -c mixed",
    "build": "npm run generate-config && npm run ng -- build --configuration production --localize && npm run sync-assets && npm run build-mempool.js",
-    "sync-assets": "rsync -av ./src/resources ./dist/mempool/browser && node sync-assets.js 'dist/mempool/browser/resources/'",
-    "sync-assets-dev": "node sync-assets.js 'src/resources/'",
+    "sync-assets": "node sync-assets.js && rsync -av ./dist/mempool/browser/en-US/resources ./dist/mempool/browser/resources",
+    "sync-assets-dev": "node sync-assets.js dev",
    "generate-config": "node generate-config.js",
    "build-mempool.js": "npm run build-mempool-js && npm run build-mempool-liquid-js && npm run build-mempool-bisq-js",
    "build-mempool-js": "browserify -p tinyify ./node_modules/@mempool/mempool.js/lib/index.js --standalone mempoolJS > ./dist/mempool/browser/en-US/mempool.js",
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -1,18 +1,21 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { AppPreloadingStrategy } from './app.preloading-strategy'
+import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
 import { StartComponent } from './components/start/start.component';
 import { TransactionComponent } from './components/transaction/transaction.component';
 import { BlockComponent } from './components/block/block.component';
 import { BlockAuditComponent } from './components/block-audit/block-audit.component';
+import { BlockPreviewComponent } from './components/block/block-preview.component';
 import { AddressComponent } from './components/address/address.component';
+import { AddressPreviewComponent } from './components/address/address-preview.component';
 import { MasterPageComponent } from './components/master-page/master-page.component';
+import { MasterPagePreviewComponent } from './components/master-page-preview/master-page-preview.component';
 import { AboutComponent } from './components/about/about.component';
 import { StatusViewComponent } from './components/status-view/status-view.component';
 import { TermsOfServiceComponent } from './components/terms-of-service/terms-of-service.component';
 import { PrivacyPolicyComponent } from './components/privacy-policy/privacy-policy.component';
 import { TrademarkPolicyComponent } from './components/trademark-policy/trademark-policy.component';
 import { BisqMasterPageComponent } from './components/bisq-master-page/bisq-master-page.component';
+import { SponsorComponent } from './components/sponsor/sponsor.component';
 import { PushTransactionComponent } from './components/push-transaction/push-transaction.component';
 import { BlocksList } from './components/blocks-list/blocks-list.component';
 import { LiquidMasterPageComponent } from './components/liquid-master-page/liquid-master-page.component';
@@ -22,10 +25,6 @@ import { AssetsComponent } from './components/assets/assets.component';
 import { AssetComponent } from './components/asset/asset.component';
 import { AssetsNavComponent } from './components/assets/assets-nav/assets-nav.component';

-const browserWindow = window || {};
-// @ts-ignore
-const browserWindowEnv = browserWindow.__env || {};
-
 let routes: Routes = [
  {
    path: 'testnet',
@@ -33,8 +32,7 @@ let routes: Routes = [
      {
        path: '',
        pathMatch: 'full',
-        loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule),
-        data: { preload: true },
+        loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule)
      },
      {
        path: '',
@@ -111,8 +109,7 @@ let routes: Routes = [
          },
          {
            path: 'docs',
-            loadChildren: () => import('./docs/docs.module').then(m => m.DocsModule),
-            data: { preload: true },
+            loadChildren: () => import('./docs/docs.module').then(m => m.DocsModule)
          },
          {
            path: 'api',
@@ -120,8 +117,7 @@ let routes: Routes = [
          },
          {
            path: 'lightning',
-            loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule),
-            data: { preload: browserWindowEnv && browserWindowEnv.LIGHTNING === true },
+            loadChildren: () => import('./lightning/lightning.module').then(m => m.LightningModule)
          },
        ],
      },
@@ -342,18 +338,34 @@ let routes: Routes = [
  },
  {
    path: 'preview',
+    component: MasterPagePreviewComponent,
    children: [
      {
-        path: '',
-        loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
+        path: 'block/:id',
+        component: BlockPreviewComponent
      },
      {
-        path: 'testnet',
-        loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
+        path: 'testnet/block/:id',
+        component: BlockPreviewComponent
      },
      {
-        path: 'signet',
-        loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
+        path: 'signet/block/:id',
+        component: BlockPreviewComponent
+      },
+      {
+        path: 'address/:id',
+        children: [],
+        component: AddressPreviewComponent
+      },
+      {
+        path: 'testnet/address/:id',
+        children: [],
+        component: AddressPreviewComponent
+      },
+      {
+        path: 'signet/address/:id',
+        children: [],
+        component: AddressPreviewComponent
      },
    ],
  },
@@ -361,6 +373,10 @@ let routes: Routes = [
    path: 'status',
    component: StatusViewComponent
  },
+  {
+    path: 'sponsor',
+    component: SponsorComponent,
+  },
  {
    path: '',
    loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule)
@@ -371,6 +387,10 @@ let routes: Routes = [
  },
 ];

+const browserWindow = window || {};
+// @ts-ignore
+const browserWindowEnv = browserWindow.__env || {};
+
 if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'bisq') {
  routes = [{
    path: '',
@@ -596,14 +616,25 @@ if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
    },
    {
      path: 'preview',
+      component: MasterPagePreviewComponent,
      children: [
        {
-          path: '',
-          loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
+          path: 'block/:id',
+          component: BlockPreviewComponent
        },
        {
-          path: 'testnet',
-          loadChildren: () => import('./previews.module').then(m => m.PreviewsModule)
+          path: 'testnet/block/:id',
+          component: BlockPreviewComponent
+        },
+        {
+          path: 'address/:id',
+          children: [],
+          component: AddressPreviewComponent
+        },
+        {
+          path: 'testnet/address/:id',
+          children: [],
+          component: AddressPreviewComponent
        },
      ],
    },
@@ -611,6 +642,10 @@ if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
      path: 'status',
      component: StatusViewComponent
    },
+    {
+      path: 'sponsor',
+      component: SponsorComponent,
+    },
    {
      path: '',
      loadChildren: () => import('./graphs/graphs.module').then(m => m.GraphsModule)
@@ -627,7 +662,7 @@ if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
    initialNavigation: 'enabled',
    scrollPositionRestoration: 'enabled',
    anchorScrolling: 'enabled',
-    preloadingStrategy: AppPreloadingStrategy
+    preloadingStrategy: PreloadAllModules
  })],
 })
 export class AppRoutingModule { }
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { BrowserModule, BrowserTransferStateModule } from '@angular/platform-browser';
-import { ModuleWithProviders, NgModule } from '@angular/core';
+import { NgModule } from '@angular/core';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { AppRoutingModule } from './app-routing.module';
@@ -18,24 +18,6 @@ import { LanguageService } from './services/language.service';
 import { FiatShortenerPipe } from './shared/pipes/fiat-shortener.pipe';
 import { ShortenStringPipe } from './shared/pipes/shorten-string-pipe/shorten-string.pipe';
 import { CapAddressPipe } from './shared/pipes/cap-address-pipe/cap-address-pipe';
-import { AppPreloadingStrategy } from './app.preloading-strategy';
-
-const providers = [
-  ElectrsApiService,
-  StateService,
-  WebsocketService,
-  AudioService,
-  SeoService,
-  OpenGraphService,
-  StorageService,
-  EnterpriseService,
-  LanguageService,
-  ShortenStringPipe,
-  FiatShortenerPipe,
-  CapAddressPipe,
-  AppPreloadingStrategy,
-  { provide: HTTP_INTERCEPTORS, useClass: HttpCacheInterceptor, multi: true }
-];

@NgModule({
  declarations: [
@@ -49,17 +31,21 @@ const providers = [
    BrowserAnimationsModule,
    SharedModule,
  ],
-  providers: providers,
+  providers: [
+    ElectrsApiService,
+    StateService,
+    WebsocketService,
+    AudioService,
+    SeoService,
+    OpenGraphService,
+    StorageService,
+    EnterpriseService,
+    LanguageService,
+    ShortenStringPipe,
+    FiatShortenerPipe,
+    CapAddressPipe,
+    { provide: HTTP_INTERCEPTORS, useClass: HttpCacheInterceptor, multi: true }
+  ],
  bootstrap: [AppComponent]
 })
 export class AppModule { }
-
-@NgModule({})
-export class MempoolSharedModule{
-  static forRoot(): ModuleWithProviders<MempoolSharedModule> {
-    return {
-      ngModule: AppModule,
-      providers: providers
-    };
-  }
-}
--- a/frontend/src/app/app.preloading-strategy.ts
+++ b/frontend/src/app/app.preloading-strategy.ts
@@ -1,10 +0,0 @@
-import { PreloadingStrategy, Route } from '@angular/router';
-import { Observable, timer, mergeMap, of } from 'rxjs';
-
-export class AppPreloadingStrategy implements PreloadingStrategy {
-  preload(route: Route, load: Function): Observable<any> {
-      return route.data && route.data.preload 
-          ? timer(1500).pipe(mergeMap(() => load()))
-          : of(null);
-    }
-}
--- a/frontend/src/app/bisq/bisq-address/bisq-address.component.ts
+++ b/frontend/src/app/bisq/bisq-address/bisq-address.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { SeoService } from '../../services/seo.service';
+import { SeoService } from 'src/app/services/seo.service';
 import { switchMap, filter, catchError } from 'rxjs/operators';
 import { ParamMap, ActivatedRoute } from '@angular/router';
 import { Subscription, of } from 'rxjs';
 import { BisqTransaction } from '../bisq.interfaces';
 import { BisqApiService } from '../bisq-api.service';
-import { WebsocketService } from '../../services/websocket.service';
+import { WebsocketService } from 'src/app/services/websocket.service';

@Component({
  selector: 'app-bisq-address',
--- a/frontend/src/app/bisq/bisq-block/bisq-block.component.ts
+++ b/frontend/src/app/bisq/bisq-block/bisq-block.component.ts
@@ -1,14 +1,14 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { BisqBlock } from '../../bisq/bisq.interfaces';
+import { BisqBlock } from 'src/app/bisq/bisq.interfaces';
 import { Location } from '@angular/common';
 import { BisqApiService } from '../bisq-api.service';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { Subscription, of } from 'rxjs';
 import { switchMap, catchError } from 'rxjs/operators';
-import { SeoService } from '../../services/seo.service';
-import { ElectrsApiService } from '../../services/electrs-api.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { ElectrsApiService } from 'src/app/services/electrs-api.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { WebsocketService } from '../../services/websocket.service';
+import { WebsocketService } from 'src/app/services/websocket.service';

@Component({
  selector: 'app-bisq-block',
--- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts
+++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.ts
@@ -3,9 +3,9 @@ import { BisqApiService } from '../bisq-api.service';
 import { switchMap, map, take, mergeMap, tap } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 import { BisqBlock, BisqOutput, BisqTransaction } from '../bisq.interfaces';
-import { SeoService } from '../../services/seo.service';
+import { SeoService } from 'src/app/services/seo.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { WebsocketService } from '../../services/websocket.service';
+import { WebsocketService } from 'src/app/services/websocket.service';

@Component({
  selector: 'app-bisq-blocks',
--- a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts
+++ b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { Observable, combineLatest, BehaviorSubject, of } from 'rxjs';
 import { map, share, switchMap } from 'rxjs/operators';
-import { SeoService } from '../../services/seo.service';
-import { StateService } from '../../services/state.service';
-import { WebsocketService } from '../../services/websocket.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { StateService } from 'src/app/services/state.service';
+import { WebsocketService } from 'src/app/services/websocket.service';
 import { BisqApiService } from '../bisq-api.service';
 import { Trade } from '../bisq.interfaces';

--- a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.ts
+++ b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.ts
@@ -1,9 +1,9 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { Observable, combineLatest, BehaviorSubject, of } from 'rxjs';
 import { map, share, switchMap } from 'rxjs/operators';
-import { SeoService } from '../../services/seo.service';
-import { StateService } from '../../services/state.service';
-import { WebsocketService } from '../../services/websocket.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { StateService } from 'src/app/services/state.service';
+import { WebsocketService } from 'src/app/services/websocket.service';
 import { BisqApiService } from '../bisq-api.service';
 import { Trade } from '../bisq.interfaces';

--- a/frontend/src/app/bisq/bisq-market/bisq-market.component.ts
+++ b/frontend/src/app/bisq/bisq-market/bisq-market.component.ts
@@ -3,8 +3,8 @@ import { FormBuilder, FormGroup } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import { combineLatest, merge, Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { SeoService } from '../../services/seo.service';
-import { WebsocketService } from '../../services/websocket.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { WebsocketService } from 'src/app/services/websocket.service';
 import { BisqApiService } from '../bisq-api.service';
 import { OffersMarket, Trade } from '../bisq.interfaces';

--- a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts
+++ b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { BisqApiService } from '../bisq-api.service';
 import { BisqStats } from '../bisq.interfaces';
-import { SeoService } from '../../services/seo.service';
-import { StateService } from '../../services/state.service';
-import { WebsocketService } from '../../services/websocket.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { StateService } from 'src/app/services/state.service';
+import { WebsocketService } from 'src/app/services/websocket.service';

@Component({
  selector: 'app-bisq-stats',
--- a/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.ts
+++ b/frontend/src/app/bisq/bisq-transaction-details/bisq-transaction-details.component.ts
@@ -1,5 +1,5 @@
 import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
-import { BisqTransaction } from '../../bisq/bisq.interfaces';
+import { BisqTransaction } from 'src/app/bisq/bisq.interfaces';

@Component({
  selector: 'app-bisq-transaction-details',
--- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts
+++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.ts
@@ -1,15 +1,15 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-import { BisqTransaction } from '../../bisq/bisq.interfaces';
+import { BisqTransaction } from 'src/app/bisq/bisq.interfaces';
 import { switchMap, map, catchError } from 'rxjs/operators';
 import { of, Observable, Subscription } from 'rxjs';
-import { StateService } from '../../services/state.service';
-import { Block, Transaction } from '../../interfaces/electrs.interface';
+import { StateService } from 'src/app/services/state.service';
+import { Block, Transaction } from 'src/app/interfaces/electrs.interface';
 import { BisqApiService } from '../bisq-api.service';
-import { SeoService } from '../../services/seo.service';
-import { ElectrsApiService } from '../../services/electrs-api.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { ElectrsApiService } from 'src/app/services/electrs-api.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { WebsocketService } from '../../services/websocket.service';
+import { WebsocketService } from 'src/app/services/websocket.service';

@Component({
  selector: 'app-bisq-transaction',
--- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts
+++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.ts
@@ -4,11 +4,11 @@ import { BisqTransaction, BisqOutput } from '../bisq.interfaces';
 import { Observable, Subscription } from 'rxjs';
 import { switchMap, map, tap } from 'rxjs/operators';
 import { BisqApiService } from '../bisq-api.service';
-import { SeoService } from '../../services/seo.service';
+import { SeoService } from 'src/app/services/seo.service';
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
-import { IMultiSelectOption, IMultiSelectSettings, IMultiSelectTexts } from '../../components/ngx-bootstrap-multiselect/types'
-import { WebsocketService } from '../../services/websocket.service';
+import { IMultiSelectOption, IMultiSelectSettings, IMultiSelectTexts } from 'src/app/components/ngx-bootstrap-multiselect/types'
+import { WebsocketService } from 'src/app/services/websocket.service';

@Component({
  selector: 'app-bisq-transactions',
--- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.ts
+++ b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
-import { BisqTransaction } from '../../bisq/bisq.interfaces';
-import { StateService } from '../../services/state.service';
+import { BisqTransaction } from 'src/app/bisq/bisq.interfaces';
+import { StateService } from 'src/app/services/state.service';
 import { map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
-import { Block } from '../../interfaces/electrs.interface';
+import { Block } from 'src/app/interfaces/electrs.interface';

@Component({
  selector: 'app-bisq-transfers',
--- a/frontend/src/app/bisq/bsq-amount/bsq-amount.component.ts
+++ b/frontend/src/app/bisq/bsq-amount/bsq-amount.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ChangeDetectionStrategy, Input } from '@angular/core';
-import { StateService } from '../../services/state.service';
+import { StateService } from 'src/app/services/state.service';
 import { Observable } from 'rxjs';

@Component({
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -25,6 +25,12 @@
    </a>
  </div>

+  <br><br>
+  <div class="sponsor-button">
+    <button [hidden]="showNavigateToSponsor" type="button" class="btn btn-primary" (click)="sponsor()" i18n="about.become-a-sponsor">Become a sponsor ❤️</button>
+    <ng-container *ngIf="showNavigateToSponsor" i18n="about.navigate-to-sponsor">Navigate to <a href="https://mempool.space/sponsor" target="_blank">https://mempool.space/sponsor</a> to sponsor</ng-container>
+  </div>
+
  <div class="enterprise-sponsor">
    <h3 i18n="about.sponsors.enterprise.withRocket">Enterprise Sponsors 🚀</h3>
    <div class="wrapper">
@@ -187,8 +193,8 @@
    </div>
  </div>

-  <div class="community-integrations-sponsor">
-    <h3 i18n="about.community-integrations">Community Integrations</h3>
+  <div class="selfhosted-integrations-sponsor">
+    <h3 i18n="about.self-hosted-integrations">Self-Hosted Integrations</h3>
    <div class="wrapper">
      <a href="https://github.com/getumbrel/umbrel" target="_blank" title="Umbrel">
        <img class="image" src="/resources/profile/umbrel.png" />
@@ -218,24 +224,18 @@
        <img class="image" src="/resources/profile/start9.png" />
        <span>EmbassyOS</span>
      </a>
-      <a href="https://github.com/btcpayserver/btcpayserver" target="_blank" title="BTCPay Server">
-        <img class="image" src="/resources/profile/btcpayserver.svg" />
-        <span>BTCPay</span>
-      </a>
+    </div>
+  </div>
+
+  <div class="community-integrations-sponsor">
+    <h3 i18n="about.wallet-integrations">Wallet Integrations</h3>
+    <div class="wrapper">
      <a href="https://github.com/bisq-network/bisq" target="_blank" title="Bisq">
        <img class="image" src="/resources/profile/bisq_network.png" />
        <span>Bisq</span>
      </a>
-      <a href="https://github.com/BlueWallet/BlueWallet" target="_blank" title="BlueWallet">
-        <img class="image" src="/resources/profile/bluewallet.png" />
-        <span>BlueWallet</span>
-      </a>
-      <a href="https://github.com/muun/apollo" target="_blank" title="Muun Wallet">
-        <img class="image" src="/resources/profile/muun.png" />
-        <span>Muun</span>
-      </a>
      <a href="https://github.com/spesmilo/electrum" target="_blank" title="Electrum Wallet">
-        <img class="image" src="/resources/profile/electrum.png" />
+        <img class="image" src="/resources/profile/electrum.jpg" />
        <span>Electrum</span>
      </a>
      <a href="https://github.com/cryptoadvance/specter-desktop" target="_blank" title="Specter Wallet">
@@ -250,14 +250,18 @@
        <img class="image" src="/resources/profile/phoenix.jpg" />
        <span>Phoenix</span>
      </a>
-      <a href="https://github.com/lnbits/lnbits-legend" target="_blank" title="LNbits">
-        <img class="image" src="/resources/profile/lnbits.svg" />
-        <span>LNBits</span>
-      </a>
      <a href="https://github.com/layer2tech/mercury-wallet" target="_blank" title="Mercury Wallet">
        <img class="image" src="/resources/profile/mercury.svg" />
        <span>Mercury</span>
      </a>
+      <a href="https://github.com/muun/apollo" target="_blank" title="Muun Wallet">
+        <img class="image" src="/resources/profile/muun.png" />
+        <span>Muun</span>
+      </a>
+      <a href="https://github.com/BlueWallet/BlueWallet" target="_blank" title="BlueWallet">
+        <img class="image" src="/resources/profile/bluewallet.png" />
+        <span>BlueWallet</span>
+      </a>
      <a href="https://github.com/hsjoberg/blixt-wallet" target="_blank" title="Blixt Wallet">
        <img class="image" src="/resources/profile/blixt.png" />
        <span>Blixt</span>
@@ -293,7 +297,7 @@
  </div>

  <ng-container *ngIf="translators$ | async | keyvalue as translators else loadingSponsors">
-    <div class="project-translators">
+    <div class="community-sponsor">
      <h3 i18n="about.translators">Project Translators</h3>
      <div class="wrapper">
        <ng-template ngFor let-translator [ngForOf]="translators">
@@ -347,38 +351,26 @@
  </div>

  <div class="copyright">
-    <div class="title">
+    <h3 i18n="about.maintainers">The Mempool Open Source Project</h3>
+    <p>
      Copyright &copy; 2019-2022<br>
-      The Mempool Open Source Project
-    </div>
-    <p>
-      <a href="https://github.com/mempool/mempool">The Mempool Open Source Project</a> is free software; you can redistribute it and/or modify it under the terms of (at your option) either:<br>
-    </p>
-    <ul>
-      <li>
-        1) the <a href="https://www.gnu.org/licenses/agpl-3.0-standalone.html">GNU Affero General Public License</a> as published by the Free Software Foundation, either version 3 of the License or any later version approved by a proxy statement published on &lt;https://mempool.space/about&gt;; or<br>
-      </li>
-      <li>
-        2) the <a href="https://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU General Public License</a> as published by the Free Software Foundation, either version 3 of the License or any later version approved by a proxy statement published on &lt;https://mempool.space/about&gt;.<br>
-      </li>
-    </ul>
-    <p>
-      This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the full license terms for more details.<br>
-    </p>
-    <div class="title">
-      Trademark Notice<br>
-    </div>
-    <p>
-      The Mempool Open Source Project&trade;, mempool.space&trade;, the mempool logo&trade;, the mempool.space logos&trade;, the mempool square logo&trade;, and the mempool blocks logo&trade; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
+      Mempool Space K.K.<br>
+      and other shadowy super-coders
    </p>
    <p>
-      While our software is available under an open source software license, the copyright license does not include an implied right or license to use our trademarks. See our <a href="https://mempool.space/trademark-policy">Trademark Policy and Guidelines</a> for more details, published on &lt;https://mempool.space/trademark-policy&gt;.
+      The Mempool Open Source Project&trade;, Mempool Accelerator&trade;, mempool.space&trade;, the mempool logo, the mempool.space logos, the mempool square logo, and the mempool blocks logo; are either registered trademarks or trademarks of Mempool Space K.K in Japan, the United States, and/or other countries.
+    </p>
+    <p>
+      See our <a href="https://mempool.space/trademark-policy">Trademark Policy and Guidelines</a> for more details, published on &lt;https://mempool.space/trademark-policy&gt;.
+    </p>
+    <p>
+      This program incorporates software and other components licensed from third parties. See the full list of <a href="/3rdpartylicenses.txt">Third-party Licenses</a> for legal notices from those projects.
    </p>
  </div>

  <div class="footer-links">
-    <a href="/3rdpartylicenses.txt">Third-party Licenses</a>
    <a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a>
+    <a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a>
  </div>

  <div class="footer-version" *ngIf="officialMempoolSpace">
--- a/frontend/src/app/components/about/about.component.scss
+++ b/frontend/src/app/components/about/about.component.scss
@@ -43,6 +43,7 @@
  .alliances,
  .enterprise-sponsor,
  .community-integrations-sponsor,
+  .selfhosted-integrations-sponsor,
  .maintainers {
    margin-top: 68px;
    margin-bottom: 68px;
@@ -52,7 +53,7 @@
    margin-bottom: 50px;
  }

-  .community-sponsor, .project-translators {
+  .community-sponsor {
    display: flex;
    flex-direction: column;
    .wrapper {
@@ -66,13 +67,6 @@
    }
  }

-  .community-sponsor {
-    img {
-      width: 67px;
-      height: 67px;
-    }
-  }
-
  .alliances {
    margin-bottom: 100px;
    a {
@@ -114,8 +108,8 @@
  .enterprise-sponsor,
  .contributors,
  .community-sponsor,
-  .project-translators,
  .community-integrations-sponsor,
+  .selfhosted-integrations-sponsor,
  .maintainers {
    .wrapper {
      display: inline-block;
@@ -138,7 +132,7 @@
    }
  }

-  .community-sponsor .wrapper, .project-translators .wrapper {
+  .community-sponsor .wrapper {
    margin: 10px auto 20px;
    a img {
      margin: 6px;
@@ -191,6 +185,6 @@
 }

 .community-integrations-sponsor {
-  max-width: 970px;
+  max-width: 830px;
  margin: auto;
 }
--- a/frontend/src/app/components/about/about.component.ts
+++ b/frontend/src/app/components/about/about.component.ts
@@ -1,13 +1,13 @@
 import { ChangeDetectionStrategy, Component, Inject, LOCALE_ID, OnInit } from '@angular/core';
 import { WebsocketService } from '../../services/websocket.service';
-import { SeoService } from '../../services/seo.service';
-import { StateService } from '../../services/state.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { StateService } from 'src/app/services/state.service';
 import { Observable } from 'rxjs';
-import { ApiService } from '../../services/api.service';
-import { IBackendInfo } from '../../interfaces/websocket.interface';
+import { ApiService } from 'src/app/services/api.service';
+import { IBackendInfo } from 'src/app/interfaces/websocket.interface';
 import { Router } from '@angular/router';
 import { map } from 'rxjs/operators';
-import { ITranslators } from '../../interfaces/node-api.interface';
+import { ITranslators } from 'src/app/interfaces/node-api.interface';

@Component({
  selector: 'app-about',
@@ -61,9 +61,9 @@ export class AboutComponent implements OnInit {
    );
  }

-  sponsor(): void {
+  sponsor() {
    if (this.officialMempoolSpace && this.stateService.env.BASE_MODULE === 'mempool') {
-      this.router.navigateByUrl('/enterprise');
+      this.router.navigateByUrl('/sponsor');
    } else {
      this.showNavigateToSponsor = true;
    }
--- a/frontend/src/app/components/address-labels/address-labels.component.html
+++ b/frontend/src/app/components/address-labels/address-labels.component.html
@@ -1,16 +1,9 @@
-<ng-template [ngIf]="channel" [ngIfElse]="default">
-  <div>
-    <div class="badge-positioner">
-      <a [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">
-        <span 
-          *ngIf="label"
-          class="badge badge-pill badge-warning"
-        >{{ label }}</span>
-      </a>
-    </div>
-    &nbsp;
-  </div>
-</ng-template>
+<a *ngIf="channel; else default" [routerLink]="['/lightning/channel' | relativeUrl, channel.id]">
+  <span
+    *ngIf="label"
+    class="badge badge-pill badge-warning"
+  >{{ label }}</span>
+</a>

 <ng-template #default>
  <span
--- a/frontend/src/app/components/address-labels/address-labels.component.scss
+++ b/frontend/src/app/components/address-labels/address-labels.component.scss
@@ -1,7 +1,3 @@
 .badge {
  margin-right: 2px;
 }
-
-.badge-positioner {
-  position: absolute;
-}
--- a/frontend/src/app/components/address-labels/address-labels.component.ts
+++ b/frontend/src/app/components/address-labels/address-labels.component.ts
@@ -1,7 +1,7 @@
 import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
 import { Vin, Vout } from '../../interfaces/electrs.interface';
-import { StateService } from '../../services/state.service';
-import { parseMultisigScript } from '../../bitcoin.utils';
+import { StateService } from 'src/app/services/state.service';
+import { parseMultisigScript } from 'src/app/bitcoin.utils';

@Component({
  selector: 'app-address-labels',
--- a/frontend/src/app/components/address/address-preview.component.html
+++ b/frontend/src/app/components/address/address-preview.component.html
@@ -1,14 +1,12 @@
 <div class="box preview-box" *ngIf="address && !error">
-  <app-preview-title>
-    <span i18n="shared.address">Address</span>
-  </app-preview-title>
  <div class="row">
    <div class="col-md">
-      <div class="row d-flex justify-content-between">
-        <div class="title-wrapper">
-          <h1 class="title truncated"><span class="first">{{addressString.slice(0,-4)}}</span><span class="last-four">{{addressString.slice(-4)}}</span></h1>
-        </div>
+      <div class="title-address">
+        <h1 i18n="shared.address">Address</h1>
      </div>
+      <a [routerLink]="['/address/' | relativeUrl, addressString]" class="address-link" >
+        <span class="truncated-address">{{addressString.slice(0,-4)}}</span><span class="last-four">{{addressString.slice(-4)}}</span>
+      </a>
      <table class="table table-borderless table-striped">
        <tbody>
          <tr *ngIf="addressInfo && addressInfo.unconfidential">
@@ -46,7 +44,7 @@
    <div class="w-100 d-block d-md-none"></div>
    <div class="col-md qrcode-col">
      <div class="qr-wrapper">
-        <app-qrcode [data]="address.address" [size]="448"></app-qrcode>
+        <app-qrcode [data]="address.address" [size]="370"></app-qrcode>
      </div>
    </div>
  </div>
--- a/frontend/src/app/components/address/address-preview.component.scss
+++ b/frontend/src/app/components/address/address-preview.component.scss
@@ -1,5 +1,6 @@
-.title-wrapper {
-  padding: 0 15px;
+h1 {
+  font-size: 42px;
+  margin: 0;
 }

 .qr-wrapper {
@@ -10,21 +11,36 @@
 }

 .qrcode-col {
-  width: 468px;
-  min-width: 468px;
+  width: 420px;
+  min-width: 420px;
  flex-grow: 0;
  flex-shrink: 0;
  text-align: center;
-  padding: 0;
-  margin-left: 2px;
-  margin-right: 15px;
 }

 .table {
-  font-size: 32px;
-  margin-top: 48px;
+  font-size: 24px;

  ::ng-deep .symbol {
-    font-size: 24px;
+    font-size: 18px;
  }
-}
+}
+
+.address-link {
+  font-size: 20px;
+  margin-bottom: 0.5em;
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+  .truncated-address {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: calc(505px - 4em);
+    display: inline-block;
+    white-space: nowrap;
+  }
+  .last-four {
+    display: inline-block;
+    white-space: nowrap;
+  }
+}
--- a/frontend/src/app/components/address/address-preview.component.ts
+++ b/frontend/src/app/components/address/address-preview.component.ts
@@ -3,13 +3,13 @@ import { ActivatedRoute, ParamMap } from '@angular/router';
 import { ElectrsApiService } from '../../services/electrs-api.service';
 import { switchMap, filter, catchError, map, tap } from 'rxjs/operators';
 import { Address, Transaction } from '../../interfaces/electrs.interface';
-import { StateService } from '../../services/state.service';
-import { OpenGraphService } from '../../services/opengraph.service';
-import { AudioService } from '../../services/audio.service';
-import { ApiService } from '../../services/api.service';
+import { StateService } from 'src/app/services/state.service';
+import { OpenGraphService } from 'src/app/services/opengraph.service';
+import { AudioService } from 'src/app/services/audio.service';
+import { ApiService } from 'src/app/services/api.service';
 import { of, merge, Subscription, Observable } from 'rxjs';
-import { SeoService } from '../../services/seo.service';
-import { AddressInformation } from '../../interfaces/node-api.interface';
+import { SeoService } from 'src/app/services/seo.service';
+import { AddressInformation } from 'src/app/interfaces/node-api.interface';

@Component({
  selector: 'app-address-preview',
@@ -19,7 +19,6 @@ import { AddressInformation } from '../../interfaces/node-api.interface';
 export class AddressPreviewComponent implements OnInit, OnDestroy {
  network = '';

-  rawAddress: string;
  address: Address;
  addressString: string;
  isLoadingAddress = true;
@@ -45,6 +44,7 @@ export class AddressPreviewComponent implements OnInit, OnDestroy {
  ) { }

  ngOnInit() {
+    this.openGraphService.setPreviewLoading();
    this.stateService.networkChanged$.subscribe((network) => this.network = network);

    this.addressLoadingStatus$ = this.route.paramMap
@@ -56,8 +56,6 @@ export class AddressPreviewComponent implements OnInit, OnDestroy {
    this.mainSubscription = this.route.paramMap
      .pipe(
        switchMap((params: ParamMap) => {
-          this.rawAddress = params.get('id') || '';
-          this.openGraphService.waitFor('address-data-' + this.rawAddress);
          this.error = undefined;
          this.isLoadingAddress = true;
          this.loadedConfirmedTxCount = 0;
@@ -75,7 +73,6 @@ export class AddressPreviewComponent implements OnInit, OnDestroy {
                this.isLoadingAddress = false;
                this.error = err;
                console.log(err);
-                this.openGraphService.fail('address-data-' + this.rawAddress);
                return of(null);
              })
            );
@@ -93,7 +90,7 @@ export class AddressPreviewComponent implements OnInit, OnDestroy {
          this.address = address;
          this.updateChainStats();
          this.isLoadingAddress = false;
-          this.openGraphService.waitOver('address-data-' + this.rawAddress);
+          this.openGraphService.setPreviewReady();
        })
      )
      .subscribe(() => {},
@@ -101,7 +98,6 @@ export class AddressPreviewComponent implements OnInit, OnDestroy {
          console.log(error);
          this.error = error;
          this.isLoadingAddress = false;
-          this.openGraphService.fail('address-data-' + this.rawAddress);
        }
      );
  }
--- a/frontend/src/app/components/address/address.component.ts
+++ b/frontend/src/app/components/address/address.component.ts
@@ -3,13 +3,13 @@ import { ActivatedRoute, ParamMap } from '@angular/router';
 import { ElectrsApiService } from '../../services/electrs-api.service';
 import { switchMap, filter, catchError, map, tap } from 'rxjs/operators';
 import { Address, Transaction } from '../../interfaces/electrs.interface';
-import { WebsocketService } from '../../services/websocket.service';
-import { StateService } from '../../services/state.service';
-import { AudioService } from '../../services/audio.service';
-import { ApiService } from '../../services/api.service';
+import { WebsocketService } from 'src/app/services/websocket.service';
+import { StateService } from 'src/app/services/state.service';
+import { AudioService } from 'src/app/services/audio.service';
+import { ApiService } from 'src/app/services/api.service';
 import { of, merge, Subscription, Observable } from 'rxjs';
-import { SeoService } from '../../services/seo.service';
-import { AddressInformation } from '../../interfaces/node-api.interface';
+import { SeoService } from 'src/app/services/seo.service';
+import { AddressInformation } from 'src/app/interfaces/node-api.interface';

@Component({
  selector: 'app-address',
--- a/frontend/src/app/components/app/app.component.ts
+++ b/frontend/src/app/components/app/app.component.ts
@@ -1,8 +1,8 @@
 import { Location } from '@angular/common';
 import { Component, HostListener, OnInit, Inject, LOCALE_ID, HostBinding } from '@angular/core';
 import { Router, NavigationEnd } from '@angular/router';
-import { StateService } from '../../services/state.service';
-import { OpenGraphService } from '../../services/opengraph.service';
+import { StateService } from 'src/app/services/state.service';
+import { OpenGraphService } from 'src/app/services/opengraph.service';
 import { NgbTooltipConfig } from '@ng-bootstrap/ng-bootstrap';

@Component({
--- a/frontend/src/app/components/asset-circulation/asset-circulation.component.ts
+++ b/frontend/src/app/components/asset-circulation/asset-circulation.component.ts
@@ -1,9 +1,10 @@
 import { ChangeDetectionStrategy, Component, Inject, Input, LOCALE_ID, OnInit } from '@angular/core';
 import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { moveDec } from '../../bitcoin.utils';
-import { AssetsService } from '../../services/assets.service';
-import { ElectrsApiService } from '../../services/electrs-api.service';
+import { moveDec } from 'src/app/bitcoin.utils';
+import { AssetsService } from 'src/app/services/assets.service';
+import { ElectrsApiService } from 'src/app/services/electrs-api.service';
+import { formatNumber } from '@angular/common';
 import { environment } from 'src/environments/environment';

@Component({
--- a/frontend/src/app/components/asset/asset.component.ts
+++ b/frontend/src/app/components/asset/asset.component.ts
@@ -3,15 +3,15 @@ import { ActivatedRoute, ParamMap } from '@angular/router';
 import { ElectrsApiService } from '../../services/electrs-api.service';
 import { switchMap, filter, catchError, take } from 'rxjs/operators';
 import { Asset, Transaction } from '../../interfaces/electrs.interface';
-import { WebsocketService } from '../../services/websocket.service';
-import { StateService } from '../../services/state.service';
-import { AudioService } from '../../services/audio.service';
-import { ApiService } from '../../services/api.service';
+import { WebsocketService } from 'src/app/services/websocket.service';
+import { StateService } from 'src/app/services/state.service';
+import { AudioService } from 'src/app/services/audio.service';
+import { ApiService } from 'src/app/services/api.service';
 import { of, merge, Subscription, combineLatest } from 'rxjs';
-import { SeoService } from '../../services/seo.service';
+import { SeoService } from 'src/app/services/seo.service';
 import { environment } from 'src/environments/environment';
-import { AssetsService } from '../../services/assets.service';
-import { moveDec } from '../../bitcoin.utils';
+import { AssetsService } from 'src/app/services/assets.service';
+import { moveDec } from 'src/app/bitcoin.utils';

@Component({
  selector: 'app-asset',
--- a/frontend/src/app/components/assets/asset-group/asset-group.component.ts
+++ b/frontend/src/app/components/assets/asset-group/asset-group.component.ts
@@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, ParamMap } from '@angular/router';
 import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiService } from '../../../services/api.service';
-import { AssetsService } from '../../../services/assets.service';
+import { ApiService } from 'src/app/services/api.service';
+import { AssetsService } from 'src/app/services/assets.service';

@Component({
  selector: 'app-asset-group',
--- a/frontend/src/app/components/assets/assets-featured/assets-featured.component.ts
+++ b/frontend/src/app/components/assets/assets-featured/assets-featured.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
-import { ApiService } from '../../../services/api.service';
+import { ApiService } from 'src/app/services/api.service';

@Component({
  selector: 'app-assets-featured',
--- a/frontend/src/app/components/assets/assets-nav/assets-nav.component.ts
+++ b/frontend/src/app/components/assets/assets-nav/assets-nav.component.ts
@@ -4,11 +4,11 @@ import { Router } from '@angular/router';
 import { NgbTypeahead } from '@ng-bootstrap/ng-bootstrap';
 import { merge, Observable, of, Subject } from 'rxjs';
 import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
-import { AssetExtended } from '../../../interfaces/electrs.interface';
-import { AssetsService } from '../../../services/assets.service';
-import { SeoService } from '../../../services/seo.service';
-import { StateService } from '../../../services/state.service';
-import { RelativeUrlPipe } from '../../../shared/pipes/relative-url/relative-url.pipe';
+import { AssetExtended } from 'src/app/interfaces/electrs.interface';
+import { AssetsService } from 'src/app/services/assets.service';
+import { SeoService } from 'src/app/services/seo.service';
+import { StateService } from 'src/app/services/state.service';
+import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe';
 import { environment } from 'src/environments/environment';

@Component({
--- a/frontend/src/app/components/assets/assets.component.ts
+++ b/frontend/src/app/components/assets/assets.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
-import { AssetsService } from '../../services/assets.service';
+import { AssetsService } from 'src/app/services/assets.service';
 import { environment } from 'src/environments/environment';
 import { FormGroup } from '@angular/forms';
 import { filter, map, switchMap, take } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
 import { combineLatest, Observable } from 'rxjs';
-import { AssetExtended } from '../../interfaces/electrs.interface';
-import { SeoService } from '../../services/seo.service';
-import { StateService } from '../../services/state.service';
+import { AssetExtended } from 'src/app/interfaces/electrs.interface';
+import { SeoService } from 'src/app/services/seo.service';
+import { StateService } from 'src/app/services/state.service';

@Component({
  selector: 'app-assets',
--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.html
@@ -2,36 +2,7 @@
  <nav class="navbar navbar-expand-md navbar-dark bg-dark">
  <a class="navbar-brand" [routerLink]="['/' | relativeUrl]" style="position: relative;">
    <ng-container *ngIf="{ val: connectionState$ | async } as connectionState">
-    <div height="35" width="140" class="logo" [ngStyle]="{'opacity': connectionState.val === 2 ? 1 : 0.5 }">
-      <svg width="140" viewBox="0 0 280 71" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <g clip-path="url(#clip0)">
-        <path d="M68.137 62.1803C68.137 66.8789 64.3484 70.6717 59.6552 70.6717H8.48178C3.78853 70.6717 0 66.8789 0 62.1803V10.9485C0 6.24988 3.8168 2.45703 8.48178 2.45703H59.6552C64.3484 2.45703 68.137 6.24988 68.137 10.9485V62.1803Z" fill="#2E3349"/>
-        <path d="M0 36.6504V62.1814C0 66.88 3.8168 70.6728 8.51005 70.6728H59.6552C64.3484 70.6728 68.1652 66.88 68.1652 62.1814V36.6504H0Z" fill="url(#paint0_linear)"/>
-        <path opacity="0.3" d="M60.054 61.5586C60.054 62.6059 59.3472 63.455 58.4707 63.455H49.6497C48.7732 63.455 48.0664 62.6059 48.0664 61.5586V11.5722C48.0664 10.5249 48.7732 9.67578 49.6497 9.67578H58.4707C59.3472 9.67578 60.054 10.5249 60.054 11.5722V61.5586Z" fill="white"/>
-        <path d="M85.4102 33.8734H89.6242V30.6894H89.7179C91.3567 33.0774 94.447 34.4352 97.4437 34.4352C104.327 34.4352 108.728 29.3315 108.728 22.7763C108.728 16.1274 104.28 11.1173 97.4437 11.1173C94.2597 11.1173 91.2162 12.5688 89.7179 14.8632H89.6242V3.84819H85.4102V33.8734ZM96.9287 30.5021C92.4336 30.5021 89.6242 27.2713 89.6242 22.7763C89.6242 18.2812 92.4336 15.0504 96.9287 15.0504C101.424 15.0504 104.233 18.2812 104.233 22.7763C104.233 27.2713 101.424 30.5021 96.9287 30.5021Z" fill="white"/>
-        <path d="M112.059 33.8734H116.274V11.6792H112.059V33.8734ZM111.076 3.71923C111.076 5.40487 112.481 6.80957 114.167 6.80957C115.852 6.80957 117.257 5.40487 117.257 3.71923C117.257 2.0336 115.852 0.628906 114.167 0.628906C112.481 0.628906 111.076 2.0336 111.076 3.71923Z" fill="white"/>
-        <path d="M136.522 14.7695C134.93 12.1474 131.887 11.1173 128.937 11.1173C124.769 11.1173 120.509 13.318 120.509 17.9535C120.509 22.2144 123.693 23.385 127.298 24.2746C129.124 24.696 132.636 25.1643 132.636 27.6927C132.636 29.6125 130.295 30.5021 128.141 30.5021C125.706 30.5021 124.114 29.2379 122.756 27.88L119.572 30.5021C121.773 33.4988 124.489 34.4352 128.141 34.4352C132.542 34.4352 137.131 32.4687 137.131 27.4586C137.131 23.2913 134.321 21.8866 130.669 20.997C128.796 20.5756 125.004 20.201 125.004 17.5321C125.004 15.9401 126.736 15.0504 128.703 15.0504C130.81 15.0504 132.261 16.0337 133.244 17.2511L136.522 14.7695Z" fill="white"/>
-        <path d="M162.956 11.6792H158.742V14.8632H158.648C157.01 12.4752 153.919 11.1173 150.923 11.1173C144.04 11.1173 139.638 16.221 139.638 22.7763C139.638 29.4252 144.086 34.4352 150.923 34.4352C154.107 34.4352 157.15 32.9837 158.648 30.6894H158.742V39.9435H162.956V11.6792ZM151.438 15.0504C155.933 15.0504 158.742 18.2812 158.742 22.7763C158.742 27.2713 155.933 30.5021 151.438 30.5021C146.943 30.5021 144.133 27.2713 144.133 22.7763C144.133 18.2812 146.943 15.0504 151.438 15.0504Z" fill="white"/>
-        <path d="M84.8989 66.394C86.5846 66.394 87.9893 64.9893 87.9893 63.3037C87.9893 61.6181 86.5846 60.2134 84.8989 60.2134C83.2133 60.2134 81.8086 61.6181 81.8086 63.3037C81.8086 64.9893 83.2133 66.394 84.8989 66.394Z" fill="#25B135"/>
-        <path d="M94.6063 66.1131H98.8204V54.5946C98.8204 49.5845 101.536 47.2902 104.58 47.2902C108.653 47.2902 109.262 50.2869 109.262 54.5009V66.1131H113.476V53.9859C113.476 50.0527 115.068 47.2902 119.142 47.2902C123.215 47.2902 123.918 50.3805 123.918 53.7518V66.1131H128.132V53.1899C128.132 48.2266 126.54 43.357 119.704 43.357C117.035 43.357 114.132 44.7617 112.68 47.4775C111.275 44.7617 109.028 43.357 105.75 43.357C101.77 43.357 99.0545 46.0728 98.6331 47.3838H98.5395V43.9189H94.6063V66.1131Z" fill="#25B135"/>
-        <path d="M135.566 49.2567C137.111 48.0862 138.656 46.7283 141.887 46.7283C145.493 46.7283 147.178 49.1163 147.178 51.4106V52.3471H144.088C137.345 52.3471 131.867 54.3137 131.867 60.0261C131.867 64.3338 135.426 66.675 139.546 66.675C142.917 66.675 145.446 65.598 147.319 62.7418H147.412C147.412 63.8656 147.459 64.9893 147.553 66.1131H151.299C151.158 64.9425 151.111 63.6315 151.111 62.0863V50.7551C151.111 46.9156 148.396 43.357 141.84 43.357C138.75 43.357 135.379 44.434 133.038 46.6346L135.566 49.2567ZM147.178 55.4374V56.8421C147.178 59.8388 145.539 63.3037 140.857 63.3037C137.954 63.3037 136.081 62.2268 136.081 59.6983C136.081 56.1398 140.951 55.4374 144.931 55.4374H147.178Z" fill="#25B135"/>
-        <path d="M155.689 66.1131H159.903V54.9692C159.903 50.0996 162.151 47.8521 166.271 47.8521C166.927 47.8521 167.629 47.9925 168.331 48.1798L168.519 43.638C167.957 43.4507 167.301 43.357 166.646 43.357C163.883 43.357 161.074 44.9958 159.997 47.337H159.903V43.9189H155.689V66.1131Z" fill="#25B135"/>
-        <path d="M171.484 66.1131H175.698V54.5946L185.999 66.1131H191.993L180.755 54.0327L191.103 43.9657H185.25L175.698 53.5645V34.5527H171.484V66.1131Z" fill="#25B135"/>
-        <path d="M215.206 56.5612V55.0628C215.206 49.3504 212.209 43.357 204.39 43.357C197.741 43.357 192.918 48.3671 192.918 55.016C192.918 61.6181 197.32 66.675 204.343 66.675C208.604 66.675 211.835 65.1766 214.176 62.1331L210.992 59.6983C209.353 61.7117 207.48 63.0228 204.905 63.0228C201.019 63.0228 197.413 60.4475 197.413 56.5612H215.206ZM197.413 53.1899C197.413 50.24 200.129 46.7283 204.296 46.7283C208.557 46.7283 210.617 49.4909 210.711 53.1899H197.413Z" fill="#25B135"/>
-        <path d="M232.14 43.9189H226.1V37.6914H221.886V43.9189H217.016V47.5711H221.886V59.1364C221.886 62.695 221.98 66.675 228.488 66.675C229.331 66.675 231.297 66.4877 232.281 65.9258V62.0863C231.438 62.6014 230.267 62.7418 229.284 62.7418C226.1 62.7418 226.1 60.1197 226.1 57.6381V47.5711H232.14V43.9189Z" fill="#25B135"/>
-        <path d="M252.654 47.0092C251.062 44.3871 248.019 43.357 245.069 43.357C240.902 43.357 236.641 45.5577 236.641 50.1932C236.641 54.4541 239.825 55.6247 243.43 56.5143C245.256 56.9358 248.768 57.404 248.768 59.9324C248.768 61.8522 246.427 62.7418 244.273 62.7418C241.838 62.7418 240.246 61.4776 238.888 60.1197L235.704 62.7418C237.905 65.7385 240.621 66.675 244.273 66.675C248.674 66.675 253.263 64.7084 253.263 59.6983C253.263 55.5311 250.454 54.1264 246.801 53.2367C244.929 52.8153 241.136 52.4407 241.136 49.7718C241.136 48.1798 242.868 47.2902 244.835 47.2902C246.942 47.2902 248.393 48.2735 249.377 49.4909L252.654 47.0092Z" fill="#25B135"/>
-        </g>
-        <defs>
-        <linearGradient id="paint0_linear" x1="34.0826" y1="36.6504" x2="34.0826" y2="77.1139" gradientUnits="userSpaceOnUse">
-        <stop stop-color="#25B135"/>
-        <stop offset="1" stop-color="#005209"/>
-        </linearGradient>
-        <clipPath id="clip0">
-        <rect width="280" height="70" fill="white" transform="translate(0 0.671875)"/>
-        </clipPath>
-        </defs>
-        </svg>
-      </div>
+      <img src="/resources/bisq/bisq-markets-logo.png" height="35" width="140" class="logo" [ngStyle]="{'opacity': connectionState.val === 2 ? 1 : 0.5 }">
      <div class="connection-badge">
        <div class="badge badge-warning" *ngIf="connectionState.val === 0" i18n="master-page.offline">Offline</div>
        <div class="badge badge-warning" *ngIf="connectionState.val === 1" i18n="master-page.reconnecting">Reconnecting...</div>
@@ -41,16 +12,16 @@

  <div ngbDropdown (window:resize)="onResize($event)" class="dropdown-container" *ngIf="env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED || env.LIQUID_TESTNET_ENABLED">
    <button ngbDropdownToggle type="button" class="btn btn-secondary dropdown-toggle-split" aria-haspopup="true">
-      <app-svg-images name="bisq" width="20" height="20" viewBox="0 0 75 75" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images>
+      <img src="/resources/bisq-logo.png" style="width: 25px; height: 25px;" class="mr-1">
    </button>
    <div ngbDropdownMenu [ngClass]="{'dropdown-menu-right' : isMobile}">
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage" ngbDropdownItem class="mainnet"><app-svg-images name="bitcoin" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Mainnet</a>
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/signet'" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><app-svg-images name="signet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Signet</a>
-      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><app-svg-images name="testnet" width="22" height="22" viewBox="0 0 65 65" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Testnet</a>
+      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage" ngbDropdownItem class="mainnet"><img src="/resources/bitcoin-logo.png" style="width: 30px;" class="mr-1"> Mainnet</a>
+      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/signet'" ngbDropdownItem *ngIf="env.SIGNET_ENABLED" class="signet"><img src="/resources/signet-logo.png" style="width: 30px;" class="mr-1"> Signet</a>
+      <a [href]="env.MEMPOOL_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.TESTNET_ENABLED" class="testnet"><img src="/resources/testnet-logo.png" style="width: 30px;" class="mr-1"> Testnet</a>
      <h6 class="dropdown-header" i18n="master-page.layer2-networks-header">Layer 2 Networks</h6>
-      <a ngbDropdownItem class="mainnet active" routerLink="/"><app-svg-images name="bisq" width="20" height="20" viewBox="0 0 75 75" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Bisq</a>
-      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid"><app-svg-images name="liquid" width="22" height="22" viewBox="0 0 125 125" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Liquid</a>
-      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet"><app-svg-images name="liquidtestnet" width="22" height="22" viewBox="0 0 125 125" style="width: 25px; height: 25px;" class="mainnet mr-1"></app-svg-images> Liquid Testnet</a>
+      <a ngbDropdownItem class="mainnet active" routerLink="/"><img src="/resources/bisq-logo.png" style="width: 30px;" class="mr-1"> Bisq</a>
+      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage" ngbDropdownItem *ngIf="env.LIQUID_ENABLED" class="liquid"><img src="/resources/liquid-logo.png" style="width: 30px;" class="mr-1"> Liquid</a>
+      <a [href]="env.LIQUID_WEBSITE_URL + urlLanguage + '/testnet'" ngbDropdownItem *ngIf="env.LIQUID_TESTNET_ENABLED" class="liquidtestnet"><img src="/resources/liquidtestnet-logo.png" style="width: 30px;" class="mr-1"> Liquid Testnet</a>
    </div>
  </div>

--- a/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts
+++ b/frontend/src/app/components/bisq-master-page/bisq-master-page.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Env, StateService } from '../../services/state.service';
 import { Observable } from 'rxjs';
-import { LanguageService } from '../../services/language.service';
-import { EnterpriseService } from '../../services/enterprise.service';
+import { LanguageService } from 'src/app/services/language.service';

@Component({
  selector: 'app-bisq-master-page',
@@ -19,7 +18,6 @@ export class BisqMasterPageComponent implements OnInit {
  constructor(
    private stateService: StateService,
    private languageService: LanguageService,
-    private enterpriseService: EnterpriseService,
  ) { }

  ngOnInit() {
--- a/frontend/src/app/components/block-audit/block-audit.component.ts
+++ b/frontend/src/app/components/block-audit/block-audit.component.ts
@@ -2,11 +2,11 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { map, share, switchMap, tap } from 'rxjs/operators';
-import { BlockAudit, TransactionStripped } from '../../interfaces/node-api.interface';
-import { ApiService } from '../../services/api.service';
-import { StateService } from '../../services/state.service';
-import { detectWebGL } from '../../shared/graphs.utils';
-import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
+import { BlockAudit, TransactionStripped } from 'src/app/interfaces/node-api.interface';
+import { ApiService } from 'src/app/services/api.service';
+import { StateService } from 'src/app/services/state.service';
+import { detectWebGL } from 'src/app/shared/graphs.utils';
+import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe';
 import { BlockOverviewGraphComponent } from '../block-overview-graph/block-overview-graph.component';

@Component({
--- a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.scss
+++ b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.scss
@@ -61,7 +61,7 @@
  flex-direction: column;
  @media (min-width: 991px) {
    position: relative;
-    top: -100px;
+    top: -65px;
  }
  @media (min-width: 830px) and (max-width: 991px) {
    position: relative;
--- a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
+++ b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
@@ -2,16 +2,16 @@ import { ChangeDetectionStrategy, Component, Inject, Input, LOCALE_ID, NgZone, O
 import { EChartsOption } from 'echarts';
 import { Observable } from 'rxjs';
 import { map, share, startWith, switchMap, tap } from 'rxjs/operators';
-import { ApiService } from '../../services/api.service';
-import { SeoService } from '../../services/seo.service';
+import { ApiService } from 'src/app/services/api.service';
+import { SeoService } from 'src/app/services/seo.service';
 import { formatNumber } from '@angular/common';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { download, formatterXAxis, formatterXAxisLabel, formatterXAxisTimeCategory } from '../../shared/graphs.utils';
-import { StorageService } from '../../services/storage.service';
-import { MiningService } from '../../services/mining.service';
-import { selectPowerOfTen } from '../../bitcoin.utils';
-import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
-import { StateService } from '../../services/state.service';
+import { download, formatterXAxis, formatterXAxisLabel, formatterXAxisTimeCategory } from 'src/app/shared/graphs.utils';
+import { StorageService } from 'src/app/services/storage.service';
+import { MiningService } from 'src/app/services/mining.service';
+import { selectPowerOfTen } from 'src/app/bitcoin.utils';
+import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe';
+import { StateService } from 'src/app/services/state.service';
 import { ActivatedRoute, Router } from '@angular/router';

@Component({
--- a/frontend/src/app/components/block-fees-graph/block-fees-graph.component.scss
+++ b/frontend/src/app/components/block-fees-graph/block-fees-graph.component.scss
@@ -61,7 +61,7 @@
  flex-direction: column;
  @media (min-width: 991px) {
    position: relative;
-    top: -100px;
+    top: -65px;
  }
  @media (min-width: 830px) and (max-width: 991px) {
    position: relative;
--- a/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
+++ b/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
@@ -2,15 +2,15 @@ import { ChangeDetectionStrategy, Component, Inject, Input, LOCALE_ID, OnInit }
 import { EChartsOption, graphic } from 'echarts';
 import { Observable } from 'rxjs';
 import { map, share, startWith, switchMap, tap } from 'rxjs/operators';
-import { ApiService } from '../../services/api.service';
-import { SeoService } from '../../services/seo.service';
+import { ApiService } from 'src/app/services/api.service';
+import { SeoService } from 'src/app/services/seo.service';
 import { formatCurrency, formatNumber, getCurrencySymbol } from '@angular/common';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { download, formatterXAxis, formatterXAxisLabel, formatterXAxisTimeCategory } from '../../shared/graphs.utils';
-import { StorageService } from '../../services/storage.service';
-import { MiningService } from '../../services/mining.service';
+import { download, formatterXAxis, formatterXAxisLabel, formatterXAxisTimeCategory } from 'src/app/shared/graphs.utils';
+import { StorageService } from 'src/app/services/storage.service';
+import { MiningService } from 'src/app/services/mining.service';
 import { ActivatedRoute } from '@angular/router';
-import { FiatShortenerPipe } from '../../shared/pipes/fiat-shortener.pipe';
+import { FiatShortenerPipe } from 'src/app/shared/pipes/fiat-shortener.pipe';

@Component({
  selector: 'app-block-fees-graph',
--- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.html
+++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.html
@@ -1,6 +1,6 @@
 <div class="block-overview-graph">
  <canvas class="block-overview-canvas" [class.clickable]="!!hoverTx" #blockCanvas></canvas>
-  <div class="loader-wrapper" [class.hidden]="!isLoading || disableSpinner">
+  <div class="loader-wrapper" [class.hidden]="!isLoading">
    <div class="spinner-border ml-3 loading" role="status"></div>
  </div>

--- a/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
+++ b/frontend/src/app/components/block-overview-graph/block-overview-graph.component.ts
@@ -1,5 +1,5 @@
 import { Component, ElementRef, ViewChild, HostListener, Input, Output, EventEmitter, NgZone, AfterViewInit, OnDestroy } from '@angular/core';
-import { TransactionStripped } from '../../interfaces/websocket.interface';
+import { TransactionStripped } from 'src/app/interfaces/websocket.interface';
 import { FastVertexArray } from './fast-vertex-array';
 import BlockScene from './block-scene';
 import TxSprite from './tx-sprite';
@@ -17,9 +17,7 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy {
  @Input() blockLimit: number;
  @Input() orientation = 'left';
  @Input() flip = true;
-  @Input() disableSpinner = false;
  @Output() txClickEvent = new EventEmitter<TransactionStripped>();
-  @Output() readyEvent = new EventEmitter();

  @ViewChild('blockCanvas')
  canvas: ElementRef<HTMLCanvasElement>;
@@ -39,8 +37,6 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy {
  selectedTx: TxView | void;
  tooltipPosition: Position;

-  readyNextFrame = false;
-
  constructor(
    readonly ngZone: NgZone,
    readonly elRef: ElementRef,
@@ -82,7 +78,6 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy {
  setup(transactions: TransactionStripped[]): void {
    if (this.scene) {
      this.scene.setup(transactions);
-      this.readyNextFrame = true;
      this.start();
    }
  }
@@ -263,11 +258,6 @@ export class BlockOverviewGraphComponent implements AfterViewInit, OnDestroy {
          this.gl.drawArrays(this.gl.TRIANGLES, 0, pointArray.length / TxSprite.vertexSize);
        }
      }
-
-      if (this.readyNextFrame) {
-        this.readyNextFrame = false;
-        this.readyEvent.emit();
-      }
    }

    /* LOOP */
--- a/frontend/src/app/components/block-overview-graph/block-scene.ts
+++ b/frontend/src/app/components/block-overview-graph/block-scene.ts
@@ -1,6 +1,6 @@
 import { FastVertexArray } from './fast-vertex-array';
 import TxView from './tx-view';
-import { TransactionStripped } from '../../interfaces/websocket.interface';
+import { TransactionStripped } from 'src/app/interfaces/websocket.interface';
 import { Position, Square, ViewUpdateParams } from './sprite-types';

 export default class BlockScene {
--- a/frontend/src/app/components/block-overview-graph/tx-view.ts
+++ b/frontend/src/app/components/block-overview-graph/tx-view.ts
@@ -1,8 +1,8 @@
 import TxSprite from './tx-sprite';
 import { FastVertexArray } from './fast-vertex-array';
-import { TransactionStripped } from '../../interfaces/websocket.interface';
+import { TransactionStripped } from 'src/app/interfaces/websocket.interface';
 import { SpriteUpdateParams, Square, Color, ViewUpdateParams } from './sprite-types';
-import { feeLevels, mempoolFeeColors } from '../../app.constants';
+import { feeLevels, mempoolFeeColors } from 'src/app/app.constants';

 const hoverTransitionTime = 300;
 const defaultHoverColor = hexToColor('1bd8f4');
--- a/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.ts
+++ b/frontend/src/app/components/block-overview-tooltip/block-overview-tooltip.component.ts
@@ -1,6 +1,6 @@
 import { Component, ElementRef, ViewChild, Input, OnChanges, ChangeDetectionStrategy } from '@angular/core';
-import { TransactionStripped } from '../../interfaces/websocket.interface';
-import { Position } from '../../components/block-overview-graph/sprite-types.js';
+import { TransactionStripped } from 'src/app/interfaces/websocket.interface';
+import { Position } from 'src/app/components/block-overview-graph/sprite-types.js';

@Component({
  selector: 'app-block-overview-tooltip',
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.scss
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.scss
@@ -61,7 +61,7 @@
  flex-direction: column;
  @media (min-width: 991px) {
    position: relative;
-    top: -100px;
+    top: -65px;
  }
  @media (min-width: 830px) and (max-width: 991px) {
    position: relative;
--- a/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.ts
+++ b/frontend/src/app/components/block-prediction-graph/block-prediction-graph.component.ts
@@ -2,15 +2,15 @@ import { ChangeDetectionStrategy, Component, Inject, Input, LOCALE_ID, NgZone, O
 import { EChartsOption } from 'echarts';
 import { Observable } from 'rxjs';
 import { map, share, startWith, switchMap, tap } from 'rxjs/operators';
-import { ApiService } from '../../services/api.service';
-import { SeoService } from '../../services/seo.service';
+import { ApiService } from 'src/app/services/api.service';
+import { SeoService } from 'src/app/services/seo.service';
 import { formatNumber } from '@angular/common';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { download, formatterXAxis, formatterXAxisLabel, formatterXAxisTimeCategory } from '../../shared/graphs.utils';
-import { StorageService } from '../../services/storage.service';
+import { download, formatterXAxis, formatterXAxisLabel, formatterXAxisTimeCategory } from 'src/app/shared/graphs.utils';
+import { StorageService } from 'src/app/services/storage.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pipe';
-import { StateService } from '../../services/state.service';
+import { RelativeUrlPipe } from 'src/app/shared/pipes/relative-url/relative-url.pipe';
+import { StateService } from 'src/app/services/state.service';

@Component({
  selector: 'app-block-prediction-graph',
--- a/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.scss
+++ b/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.scss
@@ -61,7 +61,7 @@
  flex-direction: column;
  @media (min-width: 991px) {
    position: relative;
-    top: -100px;
+    top: -65px;
  }
  @media (min-width: 830px) and (max-width: 991px) {
    position: relative;
--- a/Show More
+++ b/Show More