Fixes for release v1.37.0

.gitignore

@@ -15,6 +15,7 @@
 /public/assets/envs.js
 /public/assets/configs
 /public/icons/sprite.svg
+/public/icons/sprite.*.svg
 /public/icons/README.md
 /analyze
 

Dockerfile

@@ -56,17 +56,18 @@ WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
-# Generate .env.registry with ENVs list and save build args into .env file
-COPY --chmod=755 ./deploy/scripts/collect_envs.sh ./
-RUN ./collect_envs.sh ./docs/ENVS.md
+# Build SVG sprite and generate .env.registry with ENVs list and save build args into .env file
+RUN set -a && \
+    source ./deploy/scripts/build_sprite.sh && \
+    ./deploy/scripts/collect_envs.sh ./docs/ENVS.md && \
+    set +a
 
 # Next.js collects completely anonymous telemetry data about general usage.
 # Learn more here: https://nextjs.org/telemetry
 # Uncomment the following line in case you want to disable telemetry during the build.
 # ENV NEXT_TELEMETRY_DISABLED 1
 
 # Build app for production
-RUN yarn svg:build-sprite
 RUN yarn build
 
 

configs/app/app.ts

@@ -10,6 +10,7 @@ const baseUrl = [
   appPort && ':' + appPort,
 ].filter(Boolean).join('');
 const isDev = getEnvValue('NEXT_PUBLIC_APP_ENV') === 'development';
+const spriteHash = getEnvValue('NEXT_PUBLIC_ICON_SPRITE_HASH');
 
 const app = Object.freeze({
   isDev,
@@ -18,6 +19,7 @@ const app = Object.freeze({
   port: appPort,
   baseUrl,
   useProxy: getEnvValue('NEXT_PUBLIC_USE_NEXT_JS_PROXY') === 'true',
+  spriteHash,
 });
 
 export default app;

deploy/scripts/build_sprite.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+yarn icons build -i ./icons -o ./public/icons --optimize
+
+# Skip hash creation and renaming for playwright environment
+if [ "$NEXT_PUBLIC_APP_ENV" != "pw" ]; then
+    # Generate hash from the sprite file
+    HASH=$(md5sum ./public/icons/sprite.svg | cut -d' ' -f1 | head -c 8)
+
+    # Remove old sprite files
+    rm -f ./public/icons/sprite.*.svg
+
+    # Rename the new sprite file
+    mv ./public/icons/sprite.svg "./public/icons/sprite.${HASH}.svg"
+
+    export NEXT_PUBLIC_ICON_SPRITE_HASH=${HASH}
+
+    echo "SVG sprite created: sprite.${HASH}.svg"
+else
+    echo "SVG sprite created: sprite.svg (hash skipped for playwright environment)"
+fi

docs/BUILD-TIME_ENVS.md

@@ -7,3 +7,4 @@ These variables are passed to the app during the image build process. They canno
 | NEXT_PUBLIC_GIT_COMMIT_SHA | `string` | SHA of the latest commit in the branch from which image is built | false | `29d0613e` |
 | NEXT_PUBLIC_GIT_TAG | `string` | Git tag of the latest commit in the branch from which image is built | true | `v1.0.0` |
 | NEXT_OPEN_TELEMETRY_ENABLED | `boolean` | Enables OpenTelemetry SDK | true | `true` |
+| NEXT_PUBLIC_ICON_SPRITE_HASH | `string` | Hash post-fix of the SVG sprite file (generated automatically during the sprite build) | `08be4b10` | `true` |

lib/contexts/rewards.tsx

@@ -138,7 +138,7 @@ export function RewardsContextProvider({ children }: Props) {
   // Save the API token to cookies and state
   const saveApiToken = useCallback((token: string | undefined) => {
     if (token) {
-      cookies.set(cookies.NAMES.REWARDS_API_TOKEN, token);
+      cookies.set(cookies.NAMES.REWARDS_API_TOKEN, token, { expires: 365 });
     } else {
       cookies.remove(cookies.NAMES.REWARDS_API_TOKEN);
     }

lib/mixpanel/index.ts

@@ -1,6 +1,7 @@
 import getPageType from './getPageType';
 import getUuid from './getUuid';
 import logEvent from './logEvent';
+import reset from './reset';
 import useInit from './useInit';
 import useLogPageView from './useLogPageView';
 import * as userProfile from './userProfile';
@@ -13,4 +14,5 @@ export {
   getPageType,
   getUuid,
   userProfile,
+  reset,
 };

lib/mixpanel/reset.ts

@@ -0,0 +1,10 @@
+import mixpanel from 'mixpanel-browser';
+
+import config from 'configs/app';
+
+export default function reset() {
+  if (!config.features.mixpanel.isEnabled) {
+    return;
+  }
+  mixpanel.reset();
+}

lib/web3/wagmiConfig.ts

@@ -31,6 +31,7 @@ const wagmi = (() => {
     projectId: feature.walletConnect.projectId,
     ssr: true,
     batch: { multicall: { wait: 100 } },
+    syncConnectedChain: false,
   });
 
   return { config: wagmiAdapter.wagmiConfig, adapter: wagmiAdapter };

mocks/address/tabCounters.ts

@@ -1,7 +1,7 @@
 import type { AddressTabsCounters } from 'types/api/address';
 
 export const base: AddressTabsCounters = {
-  internal_txs_count: 13,
+  internal_transactions_count: 13,
   logs_count: 51,
   token_balances_count: 3,
   token_transfers_count: 3,

mocks/blocks/block.ts

@@ -215,7 +215,7 @@ export const withBlobTxs: Block = {
   blob_gas_used: '393216',
   burnt_blob_fees: '8461393325064192',
   excess_blob_gas: '79429632',
-  blob_tx_count: 1,
+  blob_transaction_count: 1,
 };
 
 export const withWithdrawals: Block = {

package.json

@@ -23,7 +23,7 @@
     "lint:envs-validator:test": "cd ./deploy/tools/envs-validator && ./test.sh",
     "prepare": "husky install",
     "svg:format": "svgo -r ./icons",
-    "svg:build-sprite": "icons build -i ./icons -o ./public/icons --optimize",
+    "svg:build-sprite": "./deploy/scripts/build_sprite.sh",
     "test:pw": "./tools/scripts/pw.sh",
     "test:pw:local": "export NODE_PATH=$(pwd)/node_modules && yarn test:pw",
     "test:pw:docker": "docker run --rm --ipc=host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.49.0-noble ./tools/scripts/pw.docker.sh",

public/icons/name.d.ts

@@ -94,10 +94,13 @@
 	| "merits_with_dot"
 	| "merits"
 	| "minus"
+	| "monaco/cargo"
 	| "monaco/file"
 	| "monaco/folder-open"
 	| "monaco/folder"
+	| "monaco/rust"
 	| "monaco/solidity"
+	| "monaco/toml"
 	| "monaco/vyper"
 	| "moon-with-star"
 	| "moon"

stubs/address.ts

@@ -48,7 +48,7 @@ export const ADDRESS_COUNTERS: AddressCounters = {
 };
 
 export const ADDRESS_TABS_COUNTERS: AddressTabsCounters = {
-  internal_txs_count: 10,
+  internal_transactions_count: 10,
   logs_count: 10,
   token_balances_count: 10,
   token_transfers_count: 10,

tools/scripts/dev.preset.sh

@@ -19,13 +19,14 @@ dotenv \
   -e $config_file \
   -- bash -c './deploy/scripts/download_assets.sh ./public/assets/configs'
 
-yarn svg:build-sprite
+source ./deploy/scripts/build_sprite.sh
 echo ""
 
 # generate envs.js file and run the app
 dotenv \
   -v NEXT_PUBLIC_GIT_COMMIT_SHA=$(git rev-parse --short HEAD) \
   -v NEXT_PUBLIC_GIT_TAG=$(git describe --tags --abbrev=0) \
+  -v NEXT_PUBLIC_ICON_SPRITE_HASH="${NEXT_PUBLIC_ICON_SPRITE_HASH}" \
   -e $config_file \
   -e $secrets_file \
   -- bash -c './deploy/scripts/make_envs_script.sh && next dev -p $NEXT_PUBLIC_APP_PORT' |

tools/scripts/dev.sh

@@ -8,13 +8,14 @@ dotenv \
   -e .env \
   -- bash -c './deploy/scripts/download_assets.sh ./public/assets/configs'
 
-yarn svg:build-sprite
+source ./deploy/scripts/build_sprite.sh
 echo ""
 
 # generate envs.js file and run the app
 dotenv \
   -v NEXT_PUBLIC_GIT_COMMIT_SHA=$(git rev-parse --short HEAD) \
   -v NEXT_PUBLIC_GIT_TAG=$(git describe --tags --abbrev=0) \
+  -v NEXT_PUBLIC_ICON_SPRITE_HASH="${NEXT_PUBLIC_ICON_SPRITE_HASH}" \
   -e .env.secrets \
   -e .env.development.local \
   -e .env.local \

tools/scripts/pw.sh

@@ -8,6 +8,8 @@ dotenv \
   -e $config_file \
   -- bash -c './deploy/scripts/make_envs_script.sh ./playwright/envs.js'
 
+# Important to set this variable here, so the sprite will be built correctly
+export NEXT_PUBLIC_APP_ENV=pw
 yarn svg:build-sprite
 
 # Check if the "--affected" argument is present in the script args

types/api/address.ts

@@ -191,7 +191,7 @@ export type AddressWithdrawalsItem = {
 };
 
 export type AddressTabsCounters = {
-  internal_txs_count: number | null;
+  internal_transactions_count: number | null;
   logs_count: number | null;
   token_balances_count: number | null;
   token_transfers_count: number | null;

types/api/block.ts

@@ -54,7 +54,7 @@ export interface Block {
   blob_gas_used?: string;
   burnt_blob_fees?: string;
   excess_blob_gas?: string;
-  blob_tx_count?: number;
+  blob_transaction_count?: number;
   // ZKSYNC FIELDS
   zksync?: Omit<ZkSyncBatchesItem, 'number' | 'transaction_count' | 'timestamp'> & {
     batch_number: number | null;

types/api/verifiedContracts.ts

@@ -1,5 +1,5 @@
 export interface VerifiedContractsSorting {
-  sort: 'balance' | 'txs_count';
+  sort: 'balance' | 'transactions_count';
   order: 'asc' | 'desc';
 }
 

ui/address/contract/ContractSourceAddressSelector.tsx

@@ -60,7 +60,7 @@ const ContractSourceAddressSelector = ({ className, selectedItem, onItemSelect,
       <Select
         options={ options }
         name="contract-source-address"
-        defaultValue={ options[0].value }
+        defaultValue={ selectedItem.address }
         onChange={ handleItemSelect }
         isLoading={ isLoading }
         maxW={{ base: '180px', lg: 'none' }}

ui/block/BlockDetails.tsx

@@ -126,11 +126,11 @@ const BlockDetails = ({ query }: Props) => {
       </LinkInternal>
     );
 
-    const blockBlobTxsNum = (config.features.dataAvailability.isEnabled && data.blob_tx_count) ? (
+    const blockBlobTxsNum = (config.features.dataAvailability.isEnabled && data.blob_transaction_count) ? (
       <>
         <span> including </span>
         <LinkInternal href={ route({ pathname: '/block/[height_or_hash]', query: { height_or_hash: heightOrHash, tab: 'blob_txs' } }) }>
-          { data.blob_tx_count } blob txn{ data.blob_tx_count === 1 ? '' : 's' }
+          { data.blob_transaction_count } blob txn{ data.blob_transaction_count === 1 ? '' : 's' }
         </LinkInternal>
       </>
     ) : null;

ui/block/useBlockBlobTxsQuery.tsx

@@ -16,7 +16,7 @@ export default function useBlockBlobTxsQuery({ heightOrHash, blockQuery, tab }:
     pathParams: { height_or_hash: heightOrHash },
     filters: { type: 'blob_transaction' },
     options: {
-      enabled: Boolean(tab === 'blob_txs' && !blockQuery.isPlaceholderData && blockQuery.data?.blob_tx_count),
+      enabled: Boolean(tab === 'blob_txs' && !blockQuery.isPlaceholderData && blockQuery.data?.blob_transaction_count),
       placeholderData: generateListStub<'block_txs'>(TX, 3, { next_page_params: null }),
       refetchOnMount: false,
     },

ui/blocks/BlocksTableItem.tsx

@@ -136,7 +136,7 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => {
       ) }
       { !isRollup && !config.UI.views.block.hiddenFields?.base_fee && Boolean(baseFeeValue) && (
         <Td fontSize="sm" isNumeric>
-          <Skeleton isLoaded={ !isLoading } display="inline-block">
+          <Skeleton isLoaded={ !isLoading } display="inline-block" whiteSpace="pre-wrap" wordBreak="break-word">
             { baseFeeValue }
           </Skeleton>
         </Td>

ui/pages/Address.tsx

@@ -206,7 +206,7 @@ const AddressPageContent = () => {
       {
         id: 'internal_txns',
         title: 'Internal txns',
-        count: addressTabsCountersQuery.data?.internal_txs_count,
+        count: addressTabsCountersQuery.data?.internal_transactions_count,
         component: <AddressInternalTxs scrollRef={ tabsScrollRef } shouldRender={ !isTabsLoading } isQueryEnabled={ areQueriesEnabled }/>,
       },
       addressTabsCountersQuery.data?.celo_election_rewards_count ? {

ui/pages/Block.tsx

@@ -77,7 +77,7 @@ const BlockPageContent = () => {
         </>
       ),
     },
-    config.features.dataAvailability.isEnabled && blockQuery.data?.blob_tx_count ?
+    config.features.dataAvailability.isEnabled && blockQuery.data?.blob_transaction_count ?
       {
         id: 'blob_txs',
         title: 'Blob txns',

ui/pages/RewardsDashboard.tsx

@@ -120,7 +120,7 @@ const RewardsDashboard = () => {
                 <>
                   See the{ ' ' }
                   <LinkExternal
-                    href="https://docs.blockscout.com/using-blockscout/merits/streak-number-and-daily-rewards"
+                    href="https://docs.blockscout.com/using-blockscout/merits/streak-rewards"
                     isExternal
                   >
                     docs

ui/pools/PoolsTable.tsx

@@ -18,12 +18,12 @@ type Props = {
 
 const PoolsTable = ({ items, page, isLoading, top }: Props) => {
   return (
-    <Table>
+    <Table minWidth="900px">
       <Thead top={ top ?? ACTION_BAR_HEIGHT_DESKTOP }>
         <Tr>
           <Th width="70%">Pool</Th>
           <Th width="30%">DEX </Th>
-          <Th width="120px" isNumeric>
+          <Th width="130px" isNumeric>
             <Flex alignItems="center" justifyContent="end">
               FDV
               <Hint
@@ -33,8 +33,8 @@ const PoolsTable = ({ items, page, isLoading, top }: Props) => {
               />
             </Flex>
           </Th>
-          <Th width="120px" isNumeric>Market cap</Th>
-          <Th width="120px" isNumeric>Liquidity</Th>
+          <Th width="130px" isNumeric>Market cap</Th>
+          <Th width="130px" isNumeric>Liquidity</Th>
           <Th width="75px" isNumeric>View in</Th>
         </Tr>
       </Thead>

ui/pools/PoolsTableItem.tsx

@@ -31,9 +31,14 @@ const PoolsTableItem = ({
           <Skeleton isLoaded={ !isLoading }>
             <Text px={ 2 }>{ getItemIndex(index, page) }</Text>
           </Skeleton>
-          <Box>
+          <Box overflow="hidden">
             <PoolEntity pool={ item } fontWeight={ 700 } mb={ 2 } isLoading={ isLoading }/>
-            <AddressEntity address={{ hash: item.contract_address }} noIcon isLoading={ isLoading }/>
+            <AddressEntity
+              address={{ hash: item.contract_address }}
+              noIcon
+              isLoading={ isLoading }
+              truncation="constant_long"
+            />
           </Box>
         </Flex>
       </Td>

ui/shared/IconSvg.tsx

@@ -3,7 +3,9 @@ import { Skeleton, chakra } from '@chakra-ui/react';
 import { type IconName } from 'public/icons/name';
 import React from 'react';
 
-export const href = '/icons/sprite.svg';
+import config from 'configs/app';
+
+export const href = config.app.spriteHash ? `/icons/sprite.${ config.app.spriteHash }.svg` : '/icons/sprite.svg';
 
 export { IconName };
 

ui/shared/monaco/CodeEditorFileIcon.tsx

@@ -19,6 +19,18 @@ const CodeEditorFileIcon = ({ className, fileName }: Props) => {
       return 'monaco/solidity';
     }
 
+    if (/.rs$/.test(fileName)) {
+      return 'monaco/rust';
+    }
+
+    if (/^Cargo\./.test(fileName)) {
+      return 'monaco/cargo';
+    }
+
+    if (/.toml$/.test(fileName)) {
+      return 'monaco/toml';
+    }
+
     return 'monaco/file';
   })();