diff --git a/CHANGELOG.md b/CHANGELOG.md index 683d995e98..21543cfb98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ ## Current ### Features -- [#2642](https://github.com/poanetwork/blockscout/pull/2642) - add ERC721 coin instance page +- [#2733](https://github.com/poanetwork/blockscout/pull/2733) - Add cache for first page of uncles +- [#2735](https://github.com/poanetwork/blockscout/pull/2735) - Add pending transactions cache +- [#2726](https://github.com/poanetwork/blockscout/pull/2726) - Remove internal_transaction block_number setting from blocks runner - [#2717](https://github.com/poanetwork/blockscout/pull/2717) - Improve speed of nonconsensus data removal - [#2679](https://github.com/poanetwork/blockscout/pull/2679) - added fixed height for card chain blocks and card chain transactions - [#2678](https://github.com/poanetwork/blockscout/pull/2678) - fixed dashboard banner height bug @@ -10,8 +12,14 @@ - [#2666](https://github.com/poanetwork/blockscout/pull/2666) - fetch token counters in parallel - [#2665](https://github.com/poanetwork/blockscout/pull/2665) - new menu layout for mobile devices - [#2663](https://github.com/poanetwork/blockscout/pull/2663) - Fetch address counters in parallel +- [#2642](https://github.com/poanetwork/blockscout/pull/2642) - add ERC721 coin instance page ### Fixes +- [#2750](https://github.com/poanetwork/blockscout/pull/2750) - fixed contract buttons color for NFT token instance on each theme +- [#2746](https://github.com/poanetwork/blockscout/pull/2746) - fixed wrong alignment in logs decoded view +- [#2745](https://github.com/poanetwork/blockscout/pull/2745) - optimize addresses page +- [#2742](https://github.com/poanetwork/blockscout/pull/2742) - +fixed menu hovers in dark mode desktop view - [#2737](https://github.com/poanetwork/blockscout/pull/2737) - switched hardcoded subnetwork value to elixir expression for mobile menu - [#2736](https://github.com/poanetwork/blockscout/pull/2736) - do not update cache if no blocks were inserted - [#2731](https://github.com/poanetwork/blockscout/pull/2731) - fix library verification @@ -30,6 +38,7 @@ - [#2671](https://github.com/poanetwork/blockscout/pull/2671) - fixed buttons color at smart contract section - [#2660](https://github.com/poanetwork/blockscout/pull/2660) - set correct last value for coin balances chart data - [#2619](https://github.com/poanetwork/blockscout/pull/2619) - Enforce DB transaction's order to prevent deadlocks +- [#2738](https://github.com/poanetwork/blockscout/pull/2738) - do not fail block `internal_transactions_indexed_at` field update ### Chore - [#2724](https://github.com/poanetwork/blockscout/pull/2724) - fix ci by commenting a line in hackney library diff --git a/README.md b/README.md index 138ddf18d8..d8cb35d7a0 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Currently available full-featured block explorers (Etherscan, Etherchain, Blockc |--------------------------------------------------------|-------------------------------------------------------|------------------------------------------------------|----------------------------------------------------------------| | [Callisto](https://blockscout.com/callisto/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | [Celo Testnet](https://alfajores-blockscout.celo-testnet.org/) | | [Ethereum Classic](https://blockscout.com/etc/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | [Matic Testnet](https://explorer.testnet2.matic.network/) | -| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [LUKSO L14 Testnet](https://blockscout.com/lukso/l14) | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | | +| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [LUKSO L14 Testnet](https://blockscout.com/lukso/l14) | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | [Mordor Testnet](https://mordorexplorer.ethernode.io/) | | [POA Core Network](https://blockscout.com/poa/core) | [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | | | [RSK](https://blockscout.com/rsk/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | | | [xDai Chain](https://blockscout.com/poa/dai) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | | diff --git a/apps/block_scout_web/assets/css/_layout.scss b/apps/block_scout_web/assets/css/_layout.scss index f1a4e92312..da36762bee 100644 --- a/apps/block_scout_web/assets/css/_layout.scss +++ b/apps/block_scout_web/assets/css/_layout.scss @@ -8,3 +8,7 @@ background-color: #fbfafc; } } + +.logs-hash { + line-height: 24px !important; +} \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_address-overview.scss b/apps/block_scout_web/assets/css/components/_address-overview.scss index a936aec99f..f758e4affc 100644 --- a/apps/block_scout_web/assets/css/components/_address-overview.scss +++ b/apps/block_scout_web/assets/css/components/_address-overview.scss @@ -79,4 +79,8 @@ &:last-child { margin-bottom: 0; } +} + +.logs-decoded { + line-height: 25px!important; } \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss index fec11f0146..b6bfa5d202 100644 --- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss +++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss @@ -792,35 +792,37 @@ $labels-dark: #8a8dba; // header nav, labels .dark-theme-applied .dropdown-item.active, .dark-theme-applied .dropdown-item:hover, .dark-theme-applied .dropdown-item:focus { background-image: none; width: 100%; - background-color: #35335d!important; + background-color: #3f426c!important; } - .dark-theme-applied .dropdown-item:hover:before { - content: "|"; - height: 50px; - width: 50%; - opacity: 1; - background: none; - right: 17%; - color: $dark-primary; - position: relative; -} -.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover, -.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link.activeLink, -.dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:focus { - background-image: none; - width: 100%; - background-color: #35335d!important; - color: white; - border: none; - } - .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover:before - { - content: "|"; - height: 50px; - width: 50%; - opacity: 1; - background: none; - left: 24%; - top: 14%; - color: $dark-primary; - } +@media (max-width: 991.98px) { + .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover, + .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link.activeLink, + .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:focus { + background-image: none; + width: 100%; + background-color: #35335d!important; + color: white; + border: none; + } + .dark-theme-applied .dropdown-item:hover:before { + content: "|"; + height: 50px; + width: 50%; + opacity: 1; + background: none; + right: 17%; + color: $dark-primary; + position: relative; + } + .dark-theme-applied .navbar.navbar-primary .navbar-nav .nav-link:hover:before + { + content: "|"; + height: 50px; + width: 50%; + opacity: 1; + background: none; + left: 24%; + top: 14%; + color: $dark-primary; + } + } diff --git a/apps/block_scout_web/assets/css/theme/_ether1_variables.scss b/apps/block_scout_web/assets/css/theme/_ether1_variables.scss index 323ceb22ac..ec5e65bb95 100644 --- a/apps/block_scout_web/assets/css/theme/_ether1_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ether1_variables.scss @@ -37,7 +37,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: #4b021e; // button border and font color && hover bg color $btn-copy-color: #4b021e; // btn copy $btn-qr-color: #4b021e; // btn qr-code - +$btn-contract-color: #4b021e; //links & tile .tile a { color: $tertiary !important; } // links color for badges .tile-type-block { diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss index 6b8d6d7f96..ffcdc4a44b 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss @@ -35,6 +35,7 @@ $btn-line-color: $tertiary; // button border and font color && hover bg color $btn-copy-color: $tertiary; // btn copy $btn-qr-color: $tertiary; // btn qr-code $btn-address-card-icon-color: $tertiary; // btn address color +$btn-contract-color: $tertiary; //links & tile $tile-body-a-color: $tertiary; diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss b/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss index a06e0be93e..564242b150 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss @@ -38,6 +38,7 @@ $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code $btn-address-card-icon-color: $secondary; // btn address color +$btn-contract-color: $secondary; //links & tile $tile-body-a-color: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_goerli_variables.scss b/apps/block_scout_web/assets/css/theme/_goerli_variables.scss index af57f2d1a2..d9d5d2ea17 100644 --- a/apps/block_scout_web/assets/css/theme/_goerli_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_goerli_variables.scss @@ -44,6 +44,7 @@ $btn-line-color: $sub-accent-color; // button border and font color && hover bg $btn-copy-color: $sub-accent-color; // btn copy $btn-qr-color: $sub-accent-color; // btn qr-code $btn-address-card-icon-color: $sub-accent-color; // btn address color +$btn-contract-color: $sub-accent-color; //links & tile $tile-body-a-color: $sub-accent-color; diff --git a/apps/block_scout_web/assets/css/theme/_kovan_variables.scss b/apps/block_scout_web/assets/css/theme/_kovan_variables.scss index b47c3de0b2..dc1cceafbd 100644 --- a/apps/block_scout_web/assets/css/theme/_kovan_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_kovan_variables.scss @@ -39,6 +39,7 @@ $btn-line-color: $tertiary; // button border and font color && hover bg color $btn-copy-color: $tertiary; // btn copy $btn-qr-color: $tertiary; // btn qr-code $btn-address-card-icon-color: $tertiary; // btn address color +$btn-contract-color: $tertiary; //links & tile $tile-body-a-color: $tertiary; diff --git a/apps/block_scout_web/assets/css/theme/_poa_variables.scss b/apps/block_scout_web/assets/css/theme/_poa_variables.scss index 536ecdc105..88dcb6eb06 100644 --- a/apps/block_scout_web/assets/css/theme/_poa_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_poa_variables.scss @@ -41,6 +41,7 @@ $btn-line-color: $primary; // button border and font color && hover bg color $btn-copy-color: $primary; // btn copy $btn-qr-color: $primary; // btn qr-code $btn-address-card-icon-color: $primary; // btn address color +$btn-contract-color: $primary; //links & tile $tile-body-a-color: $primary; diff --git a/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss b/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss index 21388bb315..68631dc349 100644 --- a/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss @@ -38,6 +38,7 @@ $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code $btn-address-card-icon-color: $secondary; // btn address color +$btn-contract-color: $secondary; //links & tile $tile-body-a-color: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss b/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss index 21388bb315..68631dc349 100644 --- a/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss @@ -38,6 +38,7 @@ $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code $btn-address-card-icon-color: $secondary; // btn address color +$btn-contract-color: $secondary; //links & tile $tile-body-a-color: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_rsk_variables.scss b/apps/block_scout_web/assets/css/theme/_rsk_variables.scss index 8d3bff31d2..1e23b819c4 100644 --- a/apps/block_scout_web/assets/css/theme/_rsk_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_rsk_variables.scss @@ -39,7 +39,7 @@ $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code $btn-address-card-icon-color: $secondary; // btn address color - +$btn-contract-color: $secondary; // card $card-background-1: $secondary; $card-tab-active: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_social_variables.scss b/apps/block_scout_web/assets/css/theme/_social_variables.scss index 3d878dcf10..22718bd084 100644 --- a/apps/block_scout_web/assets/css/theme/_social_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_social_variables.scss @@ -5,4 +5,4 @@ $tertiary: #53a9ff; $footer-background-color: $primary; $footer-title-color: #fff; $footer-text-color: #fff; -$footer-item-disc-color: $secondary; +$footer-item-disc-color: $secondary; \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_sokol_variables.scss b/apps/block_scout_web/assets/css/theme/_sokol_variables.scss index 2860342f1e..836cc8a114 100644 --- a/apps/block_scout_web/assets/css/theme/_sokol_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_sokol_variables.scss @@ -50,7 +50,7 @@ $btn-line-color: $sub-accent-color; // button border and font color && hover bg $btn-copy-color: $sub-accent-color; // btn copy $btn-qr-color: $sub-accent-color; // btn qr-code $btn-address-card-icon-color: $sub-accent-color; // btn address color - +$btn-contract-color: $sub-accent-color; //links & tile $tile-body-a-color: $sub-accent-color; $tile-type-block-color: $sub-accent-color; diff --git a/apps/block_scout_web/assets/css/theme/_tomochain_variables.scss b/apps/block_scout_web/assets/css/theme/_tomochain_variables.scss index 6f7694de7d..d3c3a166d5 100644 --- a/apps/block_scout_web/assets/css/theme/_tomochain_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_tomochain_variables.scss @@ -1,3 +1,4 @@ $primary: #211841; $secondary: #f16950; $tertiary: #8b84bc; +$btn-contract-color: $primary; diff --git a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex index e2cb1f6db7..d91552229a 100644 --- a/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex +++ b/apps/block_scout_web/lib/block_scout_web/controllers/address_controller.ex @@ -44,8 +44,7 @@ defmodule BlockScoutWeb.AddressController do index: index, exchange_rate: exchange_rate, total_supply: total_supply, - tx_count: tx_count, - validation_count: validation_count(address.hash) + tx_count: tx_count ) end) diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex index 56f1a2bbb2..4945dca50c 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address/_tile.html.eex @@ -29,11 +29,6 @@ <%= @tx_count %> <%= gettext "Transactions sent" %> - <% if validator?(@address) do %> - - <%= @validation_count %> - <%= gettext "Validations" %> - <% end %> diff --git a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex index 92a8ebc6cc..945049ace6 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/address_logs/_logs.html.eex @@ -17,7 +17,7 @@
<%= gettext "Transaction" %>
-

+

<%= link( @log.transaction, to: transaction_path(@conn, :show, @log.transaction), diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex index 925028503c..2b21120556 100644 --- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex +++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex @@ -27,7 +27,7 @@ document.getElementById("navbar-logo").style.filter = "brightness(0) invert(1)"; } -