Merge pull request #297 from rsksmart/develop

Merge develop into master

Author: nicov-iov

.github/workflows/codeql.yml

@@ -9,8 +9,7 @@ on:
     - cron: "0 0 * * *"
 
 # Declare default permissions as read only.
-permissions:
-  contents: read
+permissions: read-all
 
 jobs:
   analyze:
@@ -31,15 +30,15 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 #v3.27.6
+        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a #v3.28.8
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 #v3.27.6
+        uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a #v3.28.8
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 #v3.27.6
+        uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a #v3.28.8
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/mainnet-deploy.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches: [master]
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   mainnet_build_and_deploy:
     runs-on: ubuntu-latest
@@ -13,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup Node 16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a #v4.2.0
         with:
           node-version: "16"
 
@@ -27,7 +30,7 @@ jobs:
         run: npm run build-with-tracking:mainnet
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 #v4.0.3
         with:
           role-to-assume: ${{ secrets.MAINNET_ROLE_ARN }}
           aws-region: ${{ secrets.MAINNET_AWS_REGION }}

.github/workflows/scorecard.yml

@@ -33,7 +33,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 #v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 #v4.6.0
         with:
           name: SARIF file
           path: results.sarif
@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
         with:
           sarif_file: results.sarif

.github/workflows/staging-deploy.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches: [staging]
 
+    # Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   staging_build_and_deploy:
     runs-on: ubuntu-latest
@@ -13,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup Node 16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a #v4.2.0
         with:
           node-version: "16"
 
@@ -27,7 +30,7 @@ jobs:
         run: npm run build-with-tracking:staging
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 #v4.0.3
         with:
           role-to-assume: ${{ secrets.STAGING_ROLE_ARN }}
           aws-region: ${{ secrets.STAGING_AWS_REGION }}

.github/workflows/testnet-deploy.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches: [develop]
 
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   testnet_build_and_deploy:
     runs-on: ubuntu-latest
@@ -13,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup Node 16
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a #v4.2.0
         with:
           node-version: "16"
 
@@ -27,7 +30,7 @@ jobs:
         run: npm run build-with-tracking:testnet
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@4fc4975a852c8cd99761e2de1f4ba73402e44dd9 #v4.0.3
         with:
           role-to-assume: ${{ secrets.TESTNET_ROLE_ARN }}
           aws-region: ${{ secrets.TESTNET_AWS_REGION }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsk-explorer",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "private": true,
   "description": "Rsk explorer client",
   "author": "emi <emiliorizzo@gmail.com>",

src/config/entities/balances.js

@@ -23,10 +23,6 @@ const Balances = () => {
         field: 'timestamp',
         type: 'date'
       },
-      time: {
-        field: 'timestamp',
-        type: 'timestamp'
-      },
       balance
     }
   }
@@ -36,10 +32,27 @@ const Balance = () => {
   let { fields } = Balances()
   const { balance } = Address().fields
   balance.filters = valueFilters()
+
+  // reset these fields for proper order display
+  delete fields.block
+  delete fields.date
+  delete fields.balance
+
   fields = Object.assign(fields, {
     balance,
     address: { trim: 'auto' },
-    blockHash: { trim: 'auto' }
+    blockHash: { trim: 'auto' },
+    block: {
+      field: 'blockNumber'
+    },
+    time: {
+      field: 'timestamp',
+      type: 'timestamp'
+    },
+    date: {
+      field: 'timestamp',
+      type: 'date'
+    }
   })
   return {
 

src/config/entities/event.js

@@ -72,7 +72,6 @@ export const Events = () => {
         renderAs: 'field-list',
         renderAsProps: eventArgumentData
       },
-      timestamp: null,
       blockNumber: {
         type: 'block'
       }
@@ -116,7 +115,10 @@ export const EventFields = () => {
       hideIfEmpty: true,
       trim: 0
     },
-    timestamp: null,
+    timestamp: {
+      field: 'timestamp',
+      type: 'timestamp'
+    },
     created: {
       field: 'timestamp',
       type: 'date'

src/config/entities/internalTransaction.js

@@ -55,7 +55,6 @@ const InternalTransactions = () => {
       type: {
         field: '_type'
       },
-      timestamp: null,
       value: {
         field: 'action.value',
         filters: valueFilters(true),
@@ -84,7 +83,7 @@ const InternalTransactions = () => {
 }
 
 const InternalTransaction = () => {
-  const { from, to, timestamp, value } = InternalTransactions().fields
+  const { from, to, value } = InternalTransactions().fields
   value.filters = valueFilters()
   const fields = {
     from,
@@ -102,7 +101,10 @@ const InternalTransaction = () => {
     status: {
       field: 'status'
     },
-    timestamp,
+    timestamp: {
+      field: 'timestamp',
+      type: 'timestamp'
+    },
     date: {
       field: 'timestamp',
       format: 'date'

src/config/entities/transaction.js

@@ -123,6 +123,7 @@ const TxFields = () => {
 const Txs = () => {
   const fields = TxFields()
   delete (fields.index)
+  delete (fields.time)
   fields.status = Object.assign(fields.status, {
     filters: [(value, data, context) => {
       if (isExport(context)) return txStatus(value)