Remove extra files, duplicated code after merges

hemilabs · May 31, 2024 · b98c721 · b98c721
1 parent a35b4a8
commit b98c721
Show file tree

Hide file tree

Showing 75 changed files with 453 additions and 4,612 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -486,8 +486,6 @@
 - [#8802](https://github.com/blockscout/blockscout/pull/8802) - Enable API v2 by default
 - [#8742](https://github.com/blockscout/blockscout/pull/8742) - Merge rsk branch into the master branch
 - [#8728](https://github.com/blockscout/blockscout/pull/8728) - Remove repos_list (default value for ecto repos) from Explorer.ReleaseTasks
-- [#8702](https://github.com/blockscout/blockscout/pull/8702) - Add OP withdrawal status to transaction page in API
-- [#8740](https://github.com/blockscout/blockscout/pull/8740) - Add delay to Indexer.Fetcher.OptimismTxnBatch module initialization
 
 <details>
   <summary>Dependencies version bumps</summary>
@@ -653,7 +651,6 @@
 
 ### Fixes
 
-- [#8364](https://github.com/blockscout/blockscout/pull/8364) - Fix API v2 for OP Withdrawals
 - [#8446](https://github.com/blockscout/blockscout/pull/8446) - Fix market cap calculation in case of CMC
 - [#8431](https://github.com/blockscout/blockscout/pull/8431) - Fix contracts' output decoding
 - [#8354](https://github.com/blockscout/blockscout/pull/8354) - Hotfix for proper addresses' tokens displaying
@@ -759,9 +756,6 @@
 
 ### Fixes
 
-- [#8229](https://github.com/blockscout/blockscout/pull/8229) - Fix Indexer.Fetcher.OptimismTxnBatch
-- [#8208](https://github.com/blockscout/blockscout/pull/8208) - Ignore invalid frame by OP transaction batches module
-- [#8122](https://github.com/blockscout/blockscout/pull/8122) - Ignore previously handled frame by OP transaction batches module
 - [#8233](https://github.com/blockscout/blockscout/pull/8233) - Fix API v2 broken tx response
 - [#8147](https://github.com/blockscout/blockscout/pull/8147) - Switch sourcify tests from POA Sokol to Gnosis Chiado
 - [#8145](https://github.com/blockscout/blockscout/pull/8145) - Handle negative holders count in API v2
@@ -850,7 +844,6 @@
 
 ### Fixes
 
-- [#7776](https://github.com/blockscout/blockscout/pull/7776) - Fix transactions ordering in Indexer.Fetcher.OptimismTxnBatch
 - [#8187](https://github.com/blockscout/blockscout/pull/8187) - API v1 500 error convert to 404, if requested path is incorrect
 - [#7852](https://github.com/blockscout/blockscout/pull/7852) - Token balances refactoring & fixes
 - [#7872](https://github.com/blockscout/blockscout/pull/7872) - Fix pending gas price in pending tx
@@ -860,7 +853,6 @@
 - [#7803](https://github.com/blockscout/blockscout/pull/7803) - Fix additional sources and interfaces, save names for vyper contracts
 - [#7758](https://github.com/blockscout/blockscout/pull/7758) - Remove limit for configurable fetchers
 - [#7764](https://github.com/blockscout/blockscout/pull/7764) - Fix missing ranges insertion and deletion logic
-- [#7827](https://github.com/blockscout/blockscout/pull/7827) - Fix transaction batches module for L2 OP stack
 - [#7843](https://github.com/blockscout/blockscout/pull/7843) - Fix created_contract_code_indexed_at updating
 - [#7855](https://github.com/blockscout/blockscout/pull/7855) - Handle internal transactions unique_violation
 - [#7899](https://github.com/blockscout/blockscout/pull/7899) - Fix catchup numbers_to_ranges function
@@ -944,8 +936,6 @@
 - [#7532](https://github.com/blockscout/blockscout/pull/7532) - Handle empty id in json rpc responses
 - [#7544](https://github.com/blockscout/blockscout/pull/7544) - Add ERC-1155 signatures to uncataloged_token_transfer_block_numbers
 - [#7363](https://github.com/blockscout/blockscout/pull/7363) - CSV export filters
-- [#6980](https://github.com/blockscout/blockscout/pull/6980) - Add Optimism BedRock support (Txn Batches, Output Roots, Deposits, Withdrawals)
-- [#7200](https://github.com/blockscout/blockscout/pull/7200) - Add Optimism BedRock Deposits to the main page in API
 - [#7697](https://github.com/blockscout/blockscout/pull/7697) - Limit fetchers init tasks
 
 ### Fixes
@@ -967,7 +957,6 @@
 - [#7516](https://github.com/blockscout/blockscout/pull/7516) - Fix shrinking logo in Safari
 - [#7590](https://github.com/blockscout/blockscout/pull/7590) - Drop genesis block in internal transactions fetcher
 - [#7639](https://github.com/blockscout/blockscout/pull/7639) - Fix contract creation transactions
-- [#7219](https://github.com/blockscout/blockscout/pull/7219) - Output L1 fields in API v2 for transaction page and fix transaction fee calculation
 - [#7724](https://github.com/blockscout/blockscout/pull/7724), [#7753](https://github.com/blockscout/blockscout/pull/7753) - Move MissingRangesCollector init logic to handle_continue
 - [#7751](https://github.com/blockscout/blockscout/pull/7751) - Add missing method_to_url params for trace transactions
 
@@ -1241,7 +1230,6 @@
 - [#7009](https://github.com/blockscout/blockscout/pull/7009) - Fix updating coin balances with empty value
 - [#7055](https://github.com/blockscout/blockscout/pull/7055) - Set updated_at on token update even if there are no changes
 - [#7080](https://github.com/blockscout/blockscout/pull/7080) - Deduplicate second degree relations before insert
-- [#7135](https://github.com/blockscout/blockscout/pull/7135) - Block reorg fixes
 - [#7161](https://github.com/blockscout/blockscout/pull/7161) - Treat "" as empty value while parsing env vars
 - [#7135](https://github.com/blockscout/blockscout/pull/7135) - Block reorg fixes
 
@@ -1505,7 +1493,6 @@
 
 ### Fixes
 
-- [#6699](https://github.com/blockscout/blockscout/pull/6699) - L1 tx fields fix for Goerli Optimism BedRock update
 - [#6676](https://github.com/blockscout/blockscout/pull/6676) - Fix `/smart-contracts` bugs in API v2
 - [#6603](https://github.com/blockscout/blockscout/pull/6603) - Add to MM button explorer URL fix
 - [#6512](https://github.com/blockscout/blockscout/pull/6512) - Allow gasUsed in failed internal txs; Leave error field for staticcall

diff --git a/apps/block_scout_web/assets/css/components/_btn_no_border.scss b/apps/block_scout_web/assets/css/components/_btn_no_border.scss
@@ -12,7 +12,7 @@ $btn-no-border-color: $primary !default;
 }
 
 .btn-no-border-link-to-tems {
-  background-color: rgba($common-link-color, 0.1) !important;
+  background-color: rgba($primary, 0.1) !important;
   border-color: #00000000 !important;
   align-items: center;
   border-radius: 2px;
@@ -22,7 +22,7 @@ $btn-no-border-color: $primary !default;
   user-select: none;
   text-align: center;
   white-space: nowrap;
-  color: $common-link-color !important;
+  color: $primary !important;
 
   &:hover {
     border-color: #f5f6fa;

diff --git a/apps/block_scout_web/assets/css/components/_custom_tooltips.scss b/apps/block_scout_web/assets/css/components/_custom_tooltips.scss
@@ -1,7 +1,5 @@
 /* Custom Validator Tooltip at Block Details Page */
 $tooltip-background-color: $btn-line-color !default;
-$tooltip-inversed-background-color: #fff !default;
-$tooltip-inversed-color: #333 !default;
 
 .tooltip-validator-details {
     left: -100px !important;
@@ -14,30 +12,30 @@ $tooltip-inversed-color: #333 !default;
 
 .tooltip-inversed-color {
     .tooltip-inner {
-        background-color: $tooltip-inversed-background-color !important;
-        color: $tooltip-inversed-color !important;
+        background-color: #fff !important;
+        color: #333 !important;
     }
 }
 
 .tooltip-inversed-color.bs-tooltip-top .arrow::before,
 .tooltip-inversed-color.bs-tooltip-auto[x-placement^="top"] .arrow::before {
-    border-top-color: $tooltip-inversed-background-color !important;
+    border-top-color: #fff !important;
 }
 
 .tooltip-inversed-color.bs-tooltip-right .arrow::before,
 .tooltip-inversed-color.bs-tooltip-auto[x-placement^="right"] .arrow::before {
-    border-right-color: $tooltip-inversed-background-color !important;
+    border-right-color: #fff !important;
 }
 
 .tooltip-inversed-color.bs-tooltip-bottom .arrow::before,
 .tooltip-inversed-color.bs-tooltip-auto[x-placement^="bottom"] .arrow::before {
-    border-bottom-color: $tooltip-inversed-background-color !important;
+    border-bottom-color: #fff !important;
 }
 
 
 .tooltip-inversed-color.bs-tooltip-left .arrow::before,
 .tooltip-inversed-color.bs-tooltip-auto[x-placement^="left"] .arrow::before {
-    border-left-color: $tooltip-inversed-background-color !important;
+    border-left-color: #fff !important;
 }
 
 /* Inversed color Bootstrap Tooltip end*/

diff --git a/apps/block_scout_web/assets/css/components/_dashboard-banner.scss b/apps/block_scout_web/assets/css/components/_dashboard-banner.scss
@@ -18,8 +18,6 @@ $dashboard-stats-item-border-color: $primary !default;
 $dashboard-banner-network-plain-container-height: 205px;
 $dashboard-banner-chart-axis-font-color: $dashboard-stats-item-value-color !default;
 $dashboard-banner-chart-axis-font-color-alt: #333;
-$dashboard-stats-left-border-color: $secondary !default;
-$dashboard-banner-network-stats-label: $tertiary default;
 
 .dashboard-banner-container {
   @include gradient-container();
@@ -153,7 +151,7 @@ $dashboard-banner-network-stats-label: $tertiary default;
 
     &.tx-per-day {
       &::before {
-        background: $dashboard-line-color-transactions;
+        background-color: $dashboard-line-color-transactions;
       }
     }
   }
@@ -277,17 +275,10 @@ $dashboard-banner-network-stats-label: $tertiary default;
   @include stats-item($dashboard-stats-item-border-color, $dashboard-stats-item-label-color, $dashboard-stats-item-value-color);
 
   .dashboard-banner-network-stats-item {
-    ::before {
-      background-color: $dashboard-stats-left-border-color !important;
-    }
     @media (max-width: 374px) {
       padding-left: calc(0.6rem + 4px);
       padding-right: 0.5rem;
     }
-
-    & .dashboard-banner-network-stats-label {
-      color: $dashboard-banner-network-stats-label !important;
-    }
   }
 
   .dashboard-banner-network-stats-value {

diff --git a/apps/block_scout_web/assets/css/components/_footer.scss b/apps/block_scout_web/assets/css/components/_footer.scss
@@ -2,7 +2,6 @@ $footer-background-color: $secondary !default;
 $footer-title-color: #fff !default;
 $footer-text-color: rgba(#fff, 0.7) !default;
 $footer-link-color: $footer-text-color !default;
-$footer-fontawesome-color: $footer-text-color !default;
 $footer-item-disc-color: $primary !default;
 $footer-social-icon-color: $footer-text-color !default;
 $footer-logo-height: 28px !default;
@@ -86,7 +85,6 @@ $footer-logo-width: auto !default;
     list-style-type: none;
     margin: 0 0 25px;
     padding: 0;
-    color: $footer-link-color;
 
     li {
       align-items: center;
@@ -121,7 +119,3 @@ $footer-logo-width: auto !default;
 .footer-brand {
   text-decoration: none !important;
 }
-
-.footer-social-icon-container {
-  background-color: $footer-fontawesome-color !important;
-}
diff --git a/apps/block_scout_web/assets/css/components/_form.scss b/apps/block_scout_web/assets/css/components/_form.scss
@@ -135,7 +135,7 @@ $form-control-border-color-active: $primary !default;
 }
 
 .search-input {
-  background: url("data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%2016%2017%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2217%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%23828ba0%22%20fill-rule%3D%22evenodd%22%20d%3D%22M15.713%2015.727a.982.982%200%200%201-1.388%200l-2.289-2.29C10.773%2014.403%209.213%2015%207.5%2015A7.5%207.5%200%201%201%2015%207.5c0%201.719-.602%203.284-1.575%204.55l2.288%202.288a.983.983%200%200%201%200%201.389zM7.5%202a5.5%205.5%200%201%200%200%2011%205.5%205.5%200%201%200%200-11z%22%3E%3C%2Fpath%3E%0A%3C%2Fsvg%3E") no-repeat 20px 20px;
+  background: url("data:image/svg+xml,%3Csvg%20viewBox%3D%220%200%2016%2017%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2216%22%20height%3D%2217%22%3E%0A%20%20%20%20%3Cpath%20fill%3D%22%237DD79F%22%20fill-rule%3D%22evenodd%22%20d%3D%22M15.713%2015.727a.982.982%200%200%201-1.388%200l-2.289-2.29C10.773%2014.403%209.213%2015%207.5%2015A7.5%207.5%200%201%201%2015%207.5c0%201.719-.602%203.284-1.575%204.55l2.288%202.288a.983.983%200%200%201%200%201.389zM7.5%202a5.5%205.5%200%201%200%200%2011%205.5%205.5%200%201%200%200-11z%22%2F%3E%0A%3C%2Fsvg%3E") no-repeat 20px 20px;
   background-position: left;
   background-position-x: 10px;
   padding-left: 35px;

diff --git a/apps/block_scout_web/assets/css/components/_label.scss b/apps/block_scout_web/assets/css/components/_label.scss
@@ -1,5 +1,3 @@
-$testnet-label-svg: no-repeat url(../static/images/testnet_label_light.svg) !default;
-
 .bs-label {
     display: inline-block;
     padding: 0 5px;
@@ -100,7 +98,7 @@ $testnet-label-svg: no-repeat url(../static/images/testnet_label_light.svg) !def
 }
 
 .testnet-label {
-    background: $testnet-label-svg;
-    background-size: contain;
-    width: 70px;
+    background-color: transparent;
+    border: 1px solid #828ba0;
+    color: #828ba0;
 }
diff --git a/apps/block_scout_web/assets/css/components/_navbar.scss b/apps/block_scout_web/assets/css/components/_navbar.scss
@@ -13,7 +13,6 @@ $header-textfield-magnifier-color: $header-links-color !default;
 $header-link-horizontal-padding: 0.71rem;
 $navbar-logo-height: auto !default;
 $navbar-logo-width: auto !default;
-$dropdown-item-hover-color: #333 !default;
 $header-logo-text-color: #333 !default;
 
 .navbar.navbar-primary {
@@ -27,15 +26,6 @@ $header-logo-text-color: #333 !default;
 
   .navbar-nav {
 
-    .nav-item .dropdown-menu .dropdown-item {
-      &.active,
-      &:focus,
-      &:hover {
-        background-color: rgba($primary, .1);
-        color: $dropdown-item-hover-color;
-      }
-    }
-
     .nav-submenu {
       padding: 10px 20px;
       color: $header-links-color;
@@ -260,8 +250,7 @@ $header-logo-text-color: #333 !default;
 }
 
 .navbar-logo {
-  max-height: 28px;
-  height: $navbar-logo-height;
+  max-height: $navbar-logo-height;
   width: $navbar-logo-width;
 }
 

diff --git a/apps/block_scout_web/assets/css/components/_tile.scss b/apps/block_scout_web/assets/css/components/_tile.scss
@@ -11,13 +11,11 @@ $tile-type-unique-token-image-color: $orange !default;
 $tile-type-internal-transaction-color: $teal !default;
 $tile-type-api-documentation-color: $primary !default;
 $tile-type-progress-bar-color: $primary !default;
-$tile-address_hash_link-color: $primary !default;
 $tile-status-error-reason: #ff7986 !default;
 $tile-status-awaiting-internal-transactions: $warning !default;
 $tile-padding: 1rem;
 $tile-title-color: #333 !default;
 $tile-body-a-color: #5959d8 !default;
-$tile-block-number-color: $primary !default;
 
 @mixin generate-tile-block($prefix, $color, $label-color: false) {
   &#{ $prefix } {
@@ -294,18 +292,8 @@ $tile-block-number-color: $primary !default;
       margin-bottom: 12px;
       padding: 1rem 1rem 0 1rem;
     }
-
-    & a[data-selector=block-number] {
-      color: $tile-block-number-color !important;
-    }
   }
 
-  &.tile-type-transaction {
-		& a[data-test=address_hash_link] span {
-			color: $tile-address_hash_link-color !important;
-		}
-	}
-
   &.tile-type-contract-creation {
     .tile-text-highlight {
       text-decoration: underline;
@@ -596,6 +584,10 @@ $cube-quantity: 5;
   border-radius: 4px;
 }
 
+.dark-theme-applied .dark-block-loader {
+  background-color: #313355;
+}
+
 .title-with-label {
   display: inline-block;
   vertical-align: middle;

diff --git a/apps/block_scout_web/assets/css/components/_transaction.scss b/apps/block_scout_web/assets/css/components/_transaction.scss
@@ -26,7 +26,7 @@
 			top: -3px;
 			left: 3px;
 			path {
-				fill: $common-link-color;
+				fill: $primary;
 			}
 		}
 		&:hover {