From 5ca9de5a420239beeb1e65226bc51c970b7d50cd Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Wed, 11 May 2022 19:08:41 -0700 Subject: [PATCH 1/5] Fix the socks5 connection after updating the socks lib --- backend/src/api/fiat-conversion.ts | 2 +- backend/src/sync-assets.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/api/fiat-conversion.ts b/backend/src/api/fiat-conversion.ts index f28f34a0b..5fdde7274 100644 --- a/backend/src/api/fiat-conversion.ts +++ b/backend/src/api/fiat-conversion.ts @@ -43,7 +43,7 @@ class FiatConversion { agentOptions: { keepAlive: true, }, - host: config.SOCKS5PROXY.HOST, + hostname: config.SOCKS5PROXY.HOST, port: config.SOCKS5PROXY.PORT }; diff --git a/backend/src/sync-assets.ts b/backend/src/sync-assets.ts index 032e71ee2..74d15e901 100644 --- a/backend/src/sync-assets.ts +++ b/backend/src/sync-assets.ts @@ -29,7 +29,7 @@ class SyncAssets { agentOptions: { keepAlive: true, }, - host: config.SOCKS5PROXY.HOST, + hostname: config.SOCKS5PROXY.HOST, port: config.SOCKS5PROXY.PORT }; From 4fdcf39639e9f914b714df5661134d107ff27094 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 12 May 2022 19:35:58 +0900 Subject: [PATCH 2/5] Modify minfee node bitcoin.conf to connect to external peers --- production/bitcoin.minfee.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/production/bitcoin.minfee.conf b/production/bitcoin.minfee.conf index a11d1f4c5..d8ff97258 100644 --- a/production/bitcoin.minfee.conf +++ b/production/bitcoin.minfee.conf @@ -2,10 +2,8 @@ datadir=/minfee server=1 txindex=0 listen=1 -discover=0 daemon=1 prune=1337 -maxconnections=1 rpcallowip=127.0.0.1 rpcuser=__BITCOIN_RPC_USER__ rpcpassword=__BITCOIN_RPC_PASS__ @@ -15,4 +13,4 @@ rpcpassword=__BITCOIN_RPC_PASS__ bind=127.0.0.1:8303 rpcbind=127.0.0.1:8302 rpcport=8302 -connect=127.0.0.1:8333 +addnode=127.0.0.1:8333 From 5d5be6f05d1c45757dbe3f3ad53d2d9b4f349348 Mon Sep 17 00:00:00 2001 From: Felipe Knorr Kuhn <100320+knorrium@users.noreply.github.com> Date: Thu, 12 May 2022 10:17:53 -0700 Subject: [PATCH 3/5] Fix ELECTRUM_TLS_ENABLED Docker variable --- docker/README.md | 2 +- docker/backend/start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/README.md b/docker/README.md index 07590d0dd..37a2cc079 100644 --- a/docker/README.md +++ b/docker/README.md @@ -155,7 +155,7 @@ Corresponding `docker-compose.yml` overrides: environment: ELECTRUM_HOST: "" ELECTRUM_PORT: "" - ELECTRUM_TLS: "" + ELECTRUM_TLS_ENABLED: "" ... ``` diff --git a/docker/backend/start.sh b/docker/backend/start.sh index 09672184d..960171e43 100644 --- a/docker/backend/start.sh +++ b/docker/backend/start.sh @@ -28,7 +28,7 @@ __CORE_RPC_PASSWORD__=${CORE_RPC_PASSWORD:=mempool} # ELECTRUM __ELECTRUM_HOST__=${ELECTRUM_HOST:=127.0.0.1} __ELECTRUM_PORT__=${ELECTRUM_PORT:=50002} -__ELECTRUM_TLS_ENABLED__=${ELECTRUM_TLS:=false} +__ELECTRUM_TLS_ENABLED__=${ELECTRUM_TLS_ENABLED:=false} # ESPLORA __ESPLORA_REST_API_URL__=${ESPLORA_REST_API_URL:=http://127.0.0.1:3000} From 9377faea9c8959e1fefb15504d763b920f763ad1 Mon Sep 17 00:00:00 2001 From: nymkappa Date: Sat, 30 Apr 2022 15:23:53 +0900 Subject: [PATCH 4/5] Skip missing blocks during block hash chain validation --- backend/src/repositories/BlocksRepository.ts | 26 ++++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/backend/src/repositories/BlocksRepository.ts b/backend/src/repositories/BlocksRepository.ts index 0792f130f..ad063277f 100644 --- a/backend/src/repositories/BlocksRepository.ts +++ b/backend/src/repositories/BlocksRepository.ts @@ -397,18 +397,28 @@ class BlocksRepository { const [blocks]: any[] = await DB.query(`SELECT height, hash, previous_block_hash, UNIX_TIMESTAMP(blockTimestamp) as timestamp FROM blocks ORDER BY height`); - let currentHeight = 1; - while (currentHeight < blocks.length) { - if (blocks[currentHeight].previous_block_hash !== blocks[currentHeight - 1].hash) { - logger.warn(`Chain divergence detected at block ${blocks[currentHeight - 1].height}, re-indexing newer blocks and hashrates`); - await this.$deleteBlocksFrom(blocks[currentHeight - 1].height); - await HashratesRepository.$deleteHashratesFromTimestamp(blocks[currentHeight - 1].timestamp - 604800); + let partialMsg = false; + let idx = 1; + while (idx < blocks.length) { + if (blocks[idx].height - 1 !== blocks[idx - 1].height) { + if (partialMsg === false) { + logger.info('Some blocks are not indexed, skipping missing blocks during chain validation'); + partialMsg = true; + } + ++idx; + continue; + } + + if (blocks[idx].previous_block_hash !== blocks[idx - 1].hash) { + logger.warn(`Chain divergence detected at block ${blocks[idx - 1].height}, re-indexing newer blocks and hashrates`); + await this.$deleteBlocksFrom(blocks[idx - 1].height); + await HashratesRepository.$deleteHashratesFromTimestamp(blocks[idx - 1].timestamp - 604800); return false; } - ++currentHeight; + ++idx; } - logger.info(`${currentHeight} blocks hash validated in ${new Date().getTime() - start} ms`); + logger.info(`${idx} blocks hash validated in ${new Date().getTime() - start} ms`); return true; } catch (e) { logger.err('Cannot validate chain of block hash. Reason: ' + (e instanceof Error ? e.message : e)); From 0f39914a601c8ff01744c16c963976672cf1d41e Mon Sep 17 00:00:00 2001 From: nymkappa Date: Fri, 13 May 2022 15:34:26 +0200 Subject: [PATCH 5/5] Added some missing alt tags on some img --- .../blocks-list/blocks-list.component.html | 2 +- .../master-page/master-page.component.html | 16 ++++++++-------- .../pool-ranking/pool-ranking.component.html | 5 +++-- .../src/app/components/pool/pool.component.html | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.html b/frontend/src/app/components/blocks-list/blocks-list.component.html index e31214443..a27d8fbeb 100644 --- a/frontend/src/app/components/blocks-list/blocks-list.component.html +++ b/frontend/src/app/components/blocks-list/blocks-list.component.html @@ -29,7 +29,7 @@
+ onError="this.src = './resources/mining-pools/default.svg'" [alt]="'Logo of ' + block.extras.pool.name + ' mining pool'"> {{ block.extras.pool.name }} {{ block.extras.coinbaseRaw | hex2ascii }} diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 98e490f37..1daabcfac 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -3,7 +3,7 @@