Merge pull request #377 from bitfinexcom/staging

Release version to master
bitfinexcom · May 8, 2024 · 50dc1b4 · 50dc1b4
2 parents 7821574 + 99f1629
commit 50dc1b4
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   linux-test-runner:
     name: Linux Test Runner
-    timeout-minutes: 30
+    timeout-minutes: 90
     runs-on: ubuntu-22.04
     steps:
     - name: Checkout
@@ -31,7 +31,14 @@ jobs:
     - name: Install deps
       run: npm i
     - name: Run tests
-      run: npm test -- --reporter=json --reporter-option output=test-report.json
+      uses: nick-fields/retry@v3
+      continue-on-error: false
+      with:
+        timeout_minutes: 20
+        retry_wait_seconds: 10
+        max_attempts: 3
+        retry_on: any
+        command: npm test -- --reporter=json --reporter-option output=test-report.json
     - uses: actions/upload-artifact@v4
       if: success() || failure()
       with:

diff --git a/bfx-report-ui b/bfx-report-ui
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bfx-reports-framework",
-  "version": "4.17.1",
+  "version": "4.17.2",
   "description": "Bitfinex reports framework",
   "main": "worker.js",
   "license": "Apache-2.0",

diff --git a/test/1-api-sync-mode-sqlite.spec.js b/test/1-api-sync-mode-sqlite.spec.js
@@ -93,7 +93,7 @@ describe('Sync mode API with SQLite', () => {
   })
 
   after(async function () {
-    this.timeout(5000)
+    this.timeout(20000)
 
     await stopEnvironment()
     await rmDB(dbDirPath)

diff --git a/test/2-additional-api-sync-mode-sqlite.spec.js b/test/2-additional-api-sync-mode-sqlite.spec.js
@@ -92,7 +92,7 @@ describe('Additional sync mode API with SQLite', () => {
   })
 
   after(async function () {
-    this.timeout(5000)
+    this.timeout(20000)
 
     await stopEnvironment()
     await rmDB(dbDirPath)

diff --git a/test/3-api-filter-sync-mode-sqlite.spec.js b/test/3-api-filter-sync-mode-sqlite.spec.js
@@ -69,7 +69,7 @@ describe('API filter', () => {
   const auth = { token: '' }
 
   before(async function () {
-    this.timeout(5000)
+    this.timeout(20000)
 
     mockRESTv2Srv = createMockRESTv2SrvWithDate(start, end, 10)
 
@@ -85,7 +85,7 @@ describe('API filter', () => {
   })
 
   after(async function () {
-    this.timeout(5000)
+    this.timeout(20000)
 
     await stopEnvironment()
     await rmDB(dbDirPath)

diff --git a/test/4-sub-account.spec.js b/test/4-sub-account.spec.js
@@ -128,7 +128,7 @@ describe('Sub-account', () => {
   })
 
   after(async function () {
-    this.timeout(5000)
+    this.timeout(20000)
 
     await stopEnvironment()
     await rmDB(dbDirPath)

diff --git a/test/5-recover-password.spec.js b/test/5-recover-password.spec.js
@@ -127,7 +127,7 @@ describe('Recover password', () => {
   })
 
   after(async function () {
-    this.timeout(5000)
+    this.timeout(20000)
 
     await stopEnvironment()
     await rmDB(dbDirPath)

diff --git a/test/6-update-sub-account.spec.js b/test/6-update-sub-account.spec.js
@@ -144,7 +144,7 @@ describe('Update sub-account', () => {
   })
 
   after(async function () {
-    this.timeout(5000)
+    this.timeout(20000)
 
     await stopEnvironment()
     await rmDB(dbDirPath)

diff --git a/workers/loc.api/sync/data.inserter/hooks/recalc.sub.account.ledgers.balances.hook.js b/workers/loc.api/sync/data.inserter/hooks/recalc.sub.account.ledgers.balances.hook.js
@@ -82,7 +82,8 @@ class RecalcSubAccountLedgersBalancesHook extends DataInserterHook {
     ) {
       return {
         balance: _nativeBalance,
-        balanceUsd: _nativeBalanceUsd
+        balanceUsd: _nativeBalanceUsd,
+        _isBalanceRecalced: null
       }
     }
 
@@ -143,7 +144,8 @@ class RecalcSubAccountLedgersBalancesHook extends DataInserterHook {
 
     return {
       balance,
-      balanceUsd
+      balanceUsd,
+      _isBalanceRecalced: 1
     }
   }
 
@@ -316,11 +318,17 @@ class RecalcSubAccountLedgersBalancesHook extends DataInserterHook {
       return
     }
 
+    const authIds = [...auth]
+      .map(([key, auth]) => auth?._id)
+      .filter((id) => Number.isFinite(id))
+    const requiredUserIds = [...new Set(authIds)]
+
     const firstNotRecalcedElem = await this.dao.getElemInCollBy(
       tableName,
       {
         $isNotNull: 'subUserId',
-        $isNull: '_isBalanceRecalced'
+        $isNull: '_isBalanceRecalced',
+        $in: { user_id: requiredUserIds }
       },
       [['mts', 1], ['id', 1]]
     )
@@ -346,6 +354,7 @@ class RecalcSubAccountLedgersBalancesHook extends DataInserterHook {
           filter: {
             $gte: { mts },
             $nin: { _id: skipedIds },
+            $in: { user_id: requiredUserIds },
             $isNotNull: 'subUserId'
           },
           sort: [['mts', 1], ['id', 1]],
@@ -377,7 +386,8 @@ class RecalcSubAccountLedgersBalancesHook extends DataInserterHook {
         const _elem = elem ?? {}
         const {
           balance,
-          balanceUsd
+          balanceUsd,
+          _isBalanceRecalced
         } = await this._getRecalcBalanceAsync(
           auth,
           recordsToGetBalances,
@@ -387,7 +397,7 @@ class RecalcSubAccountLedgersBalancesHook extends DataInserterHook {
         recalcElems.push(Object.assign(_elem, {
           balance,
           balanceUsd,
-          _isBalanceRecalced: 1
+          _isBalanceRecalced
         }))
       }
 

diff --git a/workers/loc.api/sync/data.inserter/index.js b/workers/loc.api/sync/data.inserter/index.js
@@ -552,6 +552,7 @@ class DataInserter extends EventEmitter {
 
     let count = 0
     let serialRequestsCount = 0
+    let serialRequestsCountWithEndLessThanStart = 0
     let prevRes = []
 
     while (true) {
@@ -617,6 +618,15 @@ class DataInserter extends EventEmitter {
         isAllData = true
       }
 
+      // Prevent very rare issue: end <= start
+      if (currIterationArgs.params.start >= currIterationArgs.params.end) {
+        currIterationArgs.params.end = currIterationArgs.params.start + 1
+        serialRequestsCountWithEndLessThanStart += 1
+      }
+      if (serialRequestsCountWithEndLessThanStart > 1) {
+        isAllData = true
+      }
+
       const normalizedApiData = normalizeApiData(res, model)
 
       /*
+5 −4		package-lock.json
+1 −1		package.json
+10 −0		public/locales/en/translations.json
+7 −0		src/components/Preferences/Preferences.js
+8 −0		src/state/auth/actions.js
+2 −0		src/state/auth/constants.js
+6 −0		src/state/auth/reducer.js
+19 −0		src/state/auth/saga.js
+4 −0		src/state/auth/selectors.js
+36 −6		src/ui/DataTable/DataTable.js
+10 −0		src/ui/DataTable/_DataTable.scss
+2 −2		src/ui/Select/Select.js
+39 −0		src/ui/TokenTTLSelector/TokenTTLSelector.js
+1 −0		src/ui/TokenTTLSelector/index.js
+36 −13		src/utils/columns.js