Merge pull request blockscout#1 from poanetwork/master

merge
ilgon-technologies · Dec 22, 2020 · 1c368aa · 1c368aa
2 parents 97ecb2b + f41e898
commit 1c368aa
Show file tree

Hide file tree

Showing 96 changed files with 4,085 additions and 3,105 deletions.
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -19,8 +19,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - name: "ELIXIR_VERSION.lock"
@@ -46,8 +46,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -61,8 +61,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -76,8 +76,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -103,8 +103,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -121,8 +121,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -142,8 +142,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -167,8 +167,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -211,8 +211,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
+      - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+      - run: echo 'export PATH=~/.cargo/bin/:$PATH' >> $GITHUB_ENV
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -265,8 +267,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
+      - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+      - run: echo 'export PATH=~/.cargo/bin/:$PATH' >> $GITHUB_ENV
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -321,8 +325,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
+      - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+      - run: echo 'export PATH=~/.cargo/bin/:$PATH' >> $GITHUB_ENV
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -377,8 +383,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
+      - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+      - run: echo 'export PATH=~/.cargo/bin/:$PATH' >> $GITHUB_ENV
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get
@@ -433,8 +441,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: '22.2'
-          elixir-version: '1.10.4'
+          otp-version: '23.0.1'
+          elixir-version: '1.11.2'
       - run: mix local.hex --force
       - run: mix local.rebar --force
       - run: mix deps.get

diff --git a/.tool-versions b/.tool-versions
@@ -1,3 +1,3 @@
-elixir 1.10.4
-erlang 22.2
+elixir 1.11.2
+erlang 23.0.3
 nodejs 14.15.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,46 @@
 ## Current
 
 ### Features
+- [#3531](https://github.com/poanetwork/blockscout/pull/3531) - Allow double quotes in input data of contract methods
+- [#3515](https://github.com/poanetwork/blockscout/pull/3515) - CRC total balance
+- [#3513](https://github.com/poanetwork/blockscout/pull/3513) - Allow square brackets for an array input data in contracts interaction
+- [#3480](https://github.com/poanetwork/blockscout/pull/3480) - Add support of Autonity client
+- [#3470](https://github.com/poanetwork/blockscout/pull/3470) - Display sum of tokens' USD value at tokens holder's address page
 - [#3462](https://github.com/poanetwork/blockscout/pull/3462) - Display price for bridged tokens
 
 ### Fixes
+- [#3530](https://github.com/poanetwork/blockscout/pull/3530) - Allow trailing/leading whitespaces for inputs for contract read methods
+- [#3526](https://github.com/poanetwork/blockscout/pull/3526) - Order staking pools
+- [#3525](https://github.com/poanetwork/blockscout/pull/3525) - Address token balance on demand fetcher
+- [#3514](https://github.com/poanetwork/blockscout/pull/3514) - Read contract: fix internal server error
+- [#3513](https://github.com/poanetwork/blockscout/pull/3513) - Fix input data processing for method call (array type of data)
+- [#3509](https://github.com/poanetwork/blockscout/pull/3509) - Fix QR code tooltip appearance in mobile view
+- [#3507](https://github.com/poanetwork/blockscout/pull/3507), [#3510](https://github.com/poanetwork/blockscout/pull/3510) - Fix left margin of balance card in mobile view
+- [#3506](https://github.com/poanetwork/blockscout/pull/3506) - Fix token trasfer's tile styles: prevent overlapping of long names
+- [#3505](https://github.com/poanetwork/blockscout/pull/3505) - Fix Staking DApp first loading
+- [#3433](https://github.com/poanetwork/blockscout/pull/3433) - Token balances and rewards tables deadlocks elimination
+- [#3494](https://github.com/poanetwork/blockscout/pull/3494), [#3497](https://github.com/poanetwork/blockscout/pull/3497), [#3504](https://github.com/poanetwork/blockscout/pull/3504), [#3517](https://github.com/poanetwork/blockscout/pull/3517) - Contracts interaction: fix method call with array[] inputs
+- [#3494](https://github.com/poanetwork/blockscout/pull/3494), [#3495](https://github.com/poanetwork/blockscout/pull/3495) - Contracts interaction: fix tuple output display
+- [#3479](https://github.com/poanetwork/blockscout/pull/3479) - Fix working with big numbers in Staking DApp
+- [#3477](https://github.com/poanetwork/blockscout/pull/3477) - Contracts interaction: fix broken call of GnosisProxy contract methods with parameters
+- [#3477](https://github.com/poanetwork/blockscout/pull/3477) - Contracts interaction: fix broken call of fallback function
+- [#3476](https://github.com/poanetwork/blockscout/pull/3476) - Fix contract verification of precompiled contracts
 - [#3467](https://github.com/poanetwork/blockscout/pull/3467) - Fix Firefox styles
 - [#3464](https://github.com/poanetwork/blockscout/pull/3464) - Fix display of token transfers list at token page (fix unique identifier of a tile)
 
+- [#3457](https://github.com/poanetwork/blockscout/pull/3457) - Fix endless block invalidation issue
+- [#3457](https://github.com/poanetwork/blockscout/pull/3457) - Fix doubled total transferred/minted/burnt tokens on transaction's page if block has reorg
+- [#3457](https://github.com/poanetwork/blockscout/pull/3457) - Fix doubled token transfer on block's page if block has reorg
+
 ### Chore
+- [#3500](https://github.com/poanetwork/blockscout/pull/3500) - Update solc version in explorer folder
+- [#3498](https://github.com/poanetwork/blockscout/pull/3498) - Make Staking DApp work with transferAndCall function
+- [#3496](https://github.com/poanetwork/blockscout/pull/3496) - Rollback websocket_client module to 1.3.0
+- [#3489](https://github.com/poanetwork/blockscout/pull/3489) - Migrate to Webpack@5
+- [#3487](https://github.com/poanetwork/blockscout/pull/3487) - Docker setup update to be compatible with Erlang OTP 23
+- [#3484](https://github.com/poanetwork/blockscout/pull/3484) - Elixir upgrade to 11.2
+- [#3483](https://github.com/poanetwork/blockscout/pull/3483) - Update outdated dependencies
+- [#3483](https://github.com/poanetwork/blockscout/pull/3483) - Migrate to Erlang/OTP 23
 - [#3468](https://github.com/poanetwork/blockscout/pull/3468) - Do not check supported networks on application loading page
 - [#3467](https://github.com/poanetwork/blockscout/pull/3467) - NodeJS engine upgrade up to 14
 - [#3460](https://github.com/poanetwork/blockscout/pull/3460) - Update Staking DApp scripts due to MetaMask breaking changes

diff --git a/apps/block_scout_web/.sobelow-conf b/apps/block_scout_web/.sobelow-conf
@@ -1,9 +1,9 @@
 [
   verbose: false,
   private: true,
-  skip: false,
+  skip: true,
   router: "lib/block_scout_web/router.ex",
   exit: "low",
   format: "compact",
-  ignore: ["Config.Headers", "Config.CSWH"]
+  ignore: ["Config.Headers", "Config.CSWH", "XSS.SendResp", "XSS.Raw"]
 ]
diff --git a/apps/block_scout_web/assets/css/components/_card.scss b/apps/block_scout_web/assets/css/components/_card.scss
@@ -34,9 +34,6 @@ $card-tab-icon-color-active: #fff !default;
 .card-background-1 {
   background-color: $card-background-1;
   color: $card-background-1-text-color;
-  @include media-breakpoint-down(sm) {
-    margin-left: 15px;
-  }
   a:not(.dropdown-item),
   a:not(.dropdown-item):hover {
     color: $card-background-1-text-color;

diff --git a/apps/block_scout_web/assets/css/theme/_variables-non-critical.scss b/apps/block_scout_web/assets/css/theme/_variables-non-critical.scss
@@ -1,4 +1,4 @@
-@import "theme/base_variables";
+@import "base_variables";
 @import "neutral_variables-non-critical";
 // @import "xusdt_variables-non-critical";
 // @import "dai_variables-non-critical";

diff --git a/apps/block_scout_web/assets/css/theme/_variables.scss b/apps/block_scout_web/assets/css/theme/_variables.scss
@@ -1,4 +1,4 @@
-@import "theme/base_variables";
+@import "base_variables";
 @import "neutral_variables";
 // @import "xusdt_variables";
 // @import "dai_variables";

diff --git a/apps/block_scout_web/assets/js/lib/async_listing_load.js b/apps/block_scout_web/assets/js/lib/async_listing_load.js
@@ -25,6 +25,9 @@ import '../app'
  *
  *   the data-async-load is the attribute responsible for binding the store.
  *
+ *   data-no-first-loading attribute can also be used along with data-async-load
+ *   to prevent loading items for the first time
+ *
  * If the page has a redux associated with, you need to connect the reducers instead of creating
  * the store using the `createStore`. For instance:
  *
@@ -39,6 +42,8 @@ import '../app'
  *
  */
 
+var enableFirstLoading = true
+
 export const asyncInitialState = {
   /* it will consider any query param in the current URI as paging */
   beyondPageOne: (URI(window.location).query() !== ''),
@@ -310,7 +315,10 @@ function firstPageLoad (store) {
   function loadItemsPrev () {
     loadPage(store, store.getState().prevPagePath)
   }
-  loadItemsNext()
+
+  if (enableFirstLoading) {
+    loadItemsNext()
+  }
 
   $element.on('click', '[data-error-message]', (event) => {
     event.preventDefault()
@@ -334,7 +342,12 @@ function firstPageLoad (store) {
 
 const $element = $('[data-async-load]')
 if ($element.length) {
-  const store = createStore(asyncReducer)
-  connectElements({ store, elements })
-  firstPageLoad(store)
+  if (Object.prototype.hasOwnProperty.call($element.data(), 'noFirstLoading')) {
+    enableFirstLoading = false
+  }
+  if (enableFirstLoading) {
+    const store = createStore(asyncReducer)
+    connectElements({ store, elements })
+    firstPageLoad(store)
+  }
 }
diff --git a/apps/block_scout_web/assets/js/lib/loading_element.js b/apps/block_scout_web/assets/js/lib/loading_element.js
@@ -1,5 +1,5 @@
 import $ from 'jquery'
 
-$('button[data-loading="animation"]').click(event => {
+$('button[data-loading="animation"]').click(_event => {
   $('#loading').removeClass('d-none')
 })
diff --git a/apps/block_scout_web/assets/js/lib/modals.js b/apps/block_scout_web/assets/js/lib/modals.js
@@ -189,3 +189,8 @@ export function openQuestionModal (title, text, acceptCallback = null, exceptCal
 
   openModal($modal)
 }
+
+export function openQrModal () {
+  const $modal = $('#qrModal')
+  openModal($modal)
+}