Merge branch 'main' of github.com:blockscout/frontend

.github/workflows/cleanup.yml

@@ -14,3 +14,9 @@ jobs:
       appNamespace: review-front-$GITHUB_REF_NAME_SLUG
       dockerImage: prerelease-$GITHUB_REF_NAME_SLUG
     secrets: inherit
+  cleanup_l2:
+    uses: blockscout/blockscout-ci-cd/.github/workflows/cleanup.yaml@master
+    with:
+      appNamespace: review-front-l2-$GITHUB_REF_NAME_SLUG
+      dockerImage: prerelease-$GITHUB_REF_NAME_SLUG
+    secrets: inherit

.github/workflows/publish-docker-deploy-review-l2.yml

+name: Deploy l2 review environment (manually)
+
+on:
+  # pull_request:
+  # push:
+  workflow_dispatch:
+
+env:
+  K8S_LOCAL_PORT: ${{ secrets.K8S_LOCAL_PORT }}
+  K8S_HOST: ${{ secrets.K8S_HOST }}
+  BASTION_HOST: ${{ secrets.BASTION_HOST }}
+  K8S_PORT: ${{ secrets.K8S_PORT }}
+  USERNAME: ${{ secrets.USERNAME }}
+  BASTION_SSH_KEY: ${{secrets.BASTION_SSH_KEY}}
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to registry
+    runs-on: ubuntu-latest
+    outputs:
+      shortSha: ${{ steps.output-step.outputs.short-sha }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      # Will automatically make nice tags, see the table here https://github.com/docker/metadata-action#basic
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/blockscout/frontend
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Add SHORT_SHA env property with commit short sha
+        run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
+
+      - name: Add outputs
+        run: |
+          echo "::set-output name=short-sha::${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}"
+        id: output-step
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          cache-from: type=gha
+          tags: ghcr.io/blockscout/frontend:prerelease-${{ env.GITHUB_REF_NAME_SLUG }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            GIT_COMMIT_SHA=${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}
+
+  deploy_review_l2:
+    name: Deploy review l2
+    needs: push_to_registry
+    uses: blockscout/blockscout-ci-cd/.github/workflows/deploy.yaml@master
+    with:
+      env_vars: VALUES_DIR=deploy/values/review-l2,APP_NAME=bs-stack,DOCKER_IMAGE=prerelease-$GITHUB_REF_NAME_SLUG,K8S_DOMAIN=blockscout-main.test.aws-k8s.blockscout.com
+      globalEnv: review
+      appNamespace: review-front-l2-$GITHUB_REF_NAME_SLUG
+      blockscoutIngressHost: review-front-l2
+      frontendIngressHost: review-front-l2
+      frontendImage: ghcr.io/blockscout/frontend:prerelease-$GITHUB_REF_NAME_SLUG
+      gethIngressHost: review-front-geth-l2
+      scVerifierIngressHost: review-front-sc-verifier-l2
+    secrets: inherit

.github/workflows/publish-docker-deploy-review.yml

-name: Deploy review environment
+name: Deploy review environment (manually)
 
 on:
-  pull_request:
+  # pull_request:
   # push:
   workflow_dispatch:
 
@@ -63,8 +63,8 @@ jobs:
           build-args: |
             GIT_COMMIT_SHA=${{ env.GITHUB_EVENT_PULL_REQUEST_HEAD_SHA_SHORT }}
 
-  deploy_frontend:
-    name: Deploy frontend app
+  deploy_review:
+    name: Deploy review
     needs: push_to_registry
     uses: blockscout/blockscout-ci-cd/.github/workflows/deploy.yaml@master
     with:

deploy/values/review-l2/.sops.yaml

+
+---
+creation_rules:
+  - path_regex: ^(.+/)?secrets\.yaml$
+    pgp: >-
+      99E83B7490B1A9F51781E6055317CE0D5CE1230B

deploy/values/review-l2/secrets.yaml

+frontend:
+    environment:
+        NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS:
+            _default: ENC[AES256_GCM,data:yShwsa6ajoFXg/6QSgEARkZRVVrwrdsR69NSmyvBH2O5EUQ0OvsWpW64,iv:K/HT6C9pYCK63LNyF3HERFc79vDS4cB0H4pINIlNhh0=,tag:X0HqeAP01diTvDOwoEP6lw==,type:str]
+        NEXT_PUBLIC_SENTRY_DSN:
+            _default: ENC[AES256_GCM,data:n/H2AH2n9ovn265iFbbrqeOOWS3s7FXgDv5FXJ2Dz133GuhTaqIU5psWjTraZ/Vh+dVM8M9zBLFfUanCWOz7cerq/QUoSVZjKvIvcyp6F072DGU=,iv:Co/pSR+U0vfkmWR+LDpxcQKDJl0WNbaEZihpzrRJcbc=,tag:HUiCX8WGJXWCDB59Y6iIbw==,type:str]
+        SENTRY_CSP_REPORT_URI:
+            _default: ENC[AES256_GCM,data:Hf4azYsGh2lysotK7afaHI85IaLBJeQmPlGE/lwokmX2eaQHVZJ/i5RsaoKoOCSiNyfAowr7P+6IBEC16BUTQMpbhYveBd7c/xjIsoomoHbTdoAdZA/QxNVpS4a2qVthruFudyT1BoZUHIGQ,iv:Mid+PfbslOyivrFSXopdeW96YvOcLP+g2RGcw1o7B98=,tag:IuPUsGdbZQodCMyi1DR04Q==,type:str]
+        NEXT_PUBLIC_AUTH0_CLIENT_ID:
+            _default: ENC[AES256_GCM,data:4cTeqxQnGcpzPK4bMqxZpLgMeFSSDbajN/fmb1UunH8=,iv:bPTQfahGfWF1OfArvYQeSQItMa0Ymkt6eUfDZFBQSOY=,tag:8xHe5AUkbH/rl6cOfkVAKg==,type:str]
+        NEXT_PUBLIC_WALLET_CONNECT_PROJECT_ID:
+            _default: ENC[AES256_GCM,data:x1CNJWk9wmqxjKWzD62pIb+scdzt5V22SPrXjvmsIR0=,iv:UjcwWfuGk3HDazHT5OcruevkQX/qAXiaHu6uVoJrSmE=,tag:NcCDR3tRULpiGJRpwBK0GQ==,type:str]
+        NEXT_PUBLIC_RE_CAPTCHA_APP_SITE_KEY:
+            _default: ENC[AES256_GCM,data:MCne89QeuJCrC/xIsYm+8n2dEPIdrd7UTfKm5H3w34nLCrCP5+e4ZA==,iv:NAEBjnkHCuiojGBD49hJGFd5R1jvS6VOEbqMmWQ4mWc=,tag:zYRe8AYbjNwV64gEoGcI3A==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age: []
+    lastmodified: "2023-02-22T17:57:18Z"
+    mac: ENC[AES256_GCM,data:yAGUhwe//2/MH6xAYZw9qzzbv8gvuj6qGUAOxYBPK5VEsRpU+2VgiCMR4peK5z062qk225x3VZNX6+FAaLq/Z5780DIaB/8zctCbddN/nkGVkvm5BQUs8UMKnm7maOLSdhbi8dR+e8DWUN+rEwh6DM44I+sbsZ6FnxQ4p6LecE0=,iv:lDP1lVVgPiARNwxoobRkG/w2NaiLOaumP0svB2K8xgo=,tag:uJ/GbZH72VSYNcLVAoumvw==,type:str]
+    pgp:
+        - created_at: "2022-09-14T13:42:28Z"
+          enc: |
+            -----BEGIN PGP MESSAGE-----
+
+            hQEMA1MXzg1c4SMLAQgAoRceoDDpqXEbiz6DaMX7YS7j5mcp+xVoemU9qY4ln7dT
+            XtwAWiRVr7mf1ZDI77bQunbyWAU3zM/lFDsrlNUMAUGZzoOOtIGSnjCqCYB5JGiP
+            ZfdjG88RAJx+WMIgWl66PW1ceru8We+KauQyG7bD5g59g3b5RadEhH3VER4cYJof
+            VI0+NPpAcGciRsV3vxGGf4q1ppM3Pz0AnXcC+HB+hxWa5DeAhZlavFO2zYBCzw/o
+            ypyLCoOcuEDSj9AY+EYnjyXIS72DXPA953/8QSaMSZ9JVKG5imtXslGEdj9PIQOp
+            0rPqjZCxzydQaPZ68jXMg2Ci4gZT4ZPle9fRFxNGdtJeAScCUk+5L70orvNmWwgD
+            3fFnMY6tMDd/qSqSRFEJ0Vm0M4MYSg5mgW9M64zGfw1bZLLjsIGMe2ZqQC/sZh1O
+            Mrk3/xd4md/Ko8BQcaZ6lCi0olz6KWTzmQhXgNTx9A==
+            =mNH9
+            -----END PGP MESSAGE-----
+          fp: 99E83B7490B1A9F51781E6055317CE0D5CE1230B
+    unencrypted_suffix: _unencrypted
+    version: 3.7.3

deploy/values/review-l2/values.yaml

+global:
+  env: review
+frontend:
+  app: blockscout
+  enabled: true
+  image:
+    _default: ghcr.io/blockscout/frontend:main
+  replicas:
+    app: 1
+  docker:
+    port: 80
+    targetPort: 3000
+  ingress:
+    enabled: true
+    # annotations:
+    #   - 'nginx.ingress.kubernetes.io/use-regex: "true"'
+    host:
+      _default: frontend.test.blockscout.aws-k8s.blockscout.com
+    # enable https
+    tls:
+      enabled: true
+    path:
+      exact:
+        # - "/(apps|auth/profile|account)"
+        - "/"
+      prefix:
+      # - "/(apps|auth/profile|account)"
+        - "/account"
+        - "/apps"
+        - "/_next"
+        - "/node-api"
+        - "/static"
+        - "/auth/profile"
+        - "/txs"
+        - "/tx"
+        - "/blocks"
+        - "/block"
+        - "/login"
+        - "/address"
+        - "/stats"
+        - "/search-results"
+        - "/token"
+        - "/tokens"
+        - "/accounts"
+        - "/visualize"
+        - "/api-docs"
+        - "/csv-export"
+
+  resources:
+    limits:
+      memory:
+        _default: "0.1Gi"
+      cpu:
+        _default: "0.1"
+    requests:
+      memory:
+        _default: "0.1Gi"
+      cpu:
+        _default: "0.1"
+  # node label
+  nodeSelector:
+    enabled: true
+    app: blockscout
+  environment:
+    NEXT_PUBLIC_BLOCKSCOUT_VERSION:
+      _default: v5.1.0-beta
+    NEXT_PUBLIC_FOOTER_GITHUB_LINK:
+      _default: https://github.com/blockscout/blockscout
+    NEXT_PUBLIC_FOOTER_TWITTER_LINK:
+      _default: https://www.twitter.com/blockscoutcom
+    NEXT_PUBLIC_APP_ENV:
+      _default: stable
+    NEXT_PUBLIC_APP_INSTANCE:
+      _default: base_goerli
+    NEXT_PUBLIC_NETWORK_NAME:
+      _default: "Base Göerli"
+    NEXT_PUBLIC_NETWORK_SHORT_NAME:
+      _default: Base
+    NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME:
+      _default: optimism
+    NEXT_PUBLIC_NETWORK_TYPE:
+      _default: base_goerli
+    NEXT_PUBLIC_NETWORK_ID:
+      _default: 420
+    NEXT_PUBLIC_NETWORK_CURRENCY_NAME:
+      _default: Ether
+    NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL:
+      _default: ETH
+    NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS:
+      _default: 18
+    NEXT_PUBLIC_NETWORK_VERIFICATION_TYPE:
+      _default: validation
+    NEXT_PUBLIC_IS_ACCOUNT_SUPPORTED:
+      _default: 'true'
+    NEXT_PUBLIC_FEATURED_NETWORKS:
+      _default: "[{'title':'Göerli','url':'https://eth-goerli.blockscout.com/','group':'testnets','type':'goerli'},{'title':'Base Göerli','url':'https://l2-goerli.blockscout.com/','group':'testnets','type':'base_goerli'}]"
+    NEXT_PUBLIC_API_HOST:
+      _default: blockscout-optimism-goerli.test.aws-k8s.blockscout.com
+    NEXT_PUBLIC_APP_HOST:
+      _default: blockscout-optimism-goerli.test.aws-k8s.blockscout.com
+    NEXT_PUBLIC_API_BASE_PATH:
+      _default: /
+    NEXT_PUBLIC_MARKETPLACE_SUBMIT_FORM:
+      _default: https://airtable.com/shrqUAcjgGJ4jU88C
+    NEXT_PUBLIC_MARKETPLACE_APP_LIST:
+      _default: "[{'author':'Uniswap','id':'uniswap','title':'Uniswap','logo':'https://www.gitbook.com/cdn-cgi/image/width=288,dpr=2.200000047683716,format=auto/https%3A%2F%2Ffiles.gitbook.com%2Fv0%2Fb%2Fgitbook-x-prod.appspot.com%2Fo%2Fspaces%252F-Lq1XoWGmy8zggj_u2fM%252Fuploads%252FT8RR0UqqvH6wAVfaaM4f%252FUniswap.png%3Falt%3Dmedia%26token%3D797851a0-2d80-4f7b-8d80-f9ba664c0b3d','categories':['tools'],'shortDescription':'Uniswap is a cryptocurrency exchange which uses a decentralized network protocol.','site':'https://docs.uniswap.org/','description':'Uniswap is a cryptocurrency exchange which uses a decentralized network protocol.','url':'https://app.uniswap.org/swap'}, {'author':'Aave','id': 'aave','title': 'Aave','logo': 'https://www.gitbook.com/cdn-cgi/image/width=288,dpr=2.200000047683716,format=auto/https%3A%2F%2Ffiles.gitbook.com%2Fv0%2Fb%2Fgitbook-x-prod.appspot.com%2Fo%2Fspaces%252F-Lq1XoWGmy8zggj_u2fM%252Fuploads%252FaNQY8jHNue30P2caV79v%252FAave.png%3Falt%3Dmedia%26token%3Dda9ea09b-a5d8-4bf1-bdfe-41837eebdd03','categories':['tools'],'shortDescription':'Aave is a decentralised non-custodial liquidity market protocol where users can participate as suppliers or borrowers. Suppliers provide liquidity to the market to earn a passive income, while borrowers are able to borrow in an overcollateralised (perpetually) or undercollateralised (one-block liquidity) fashion.','site': 'https://docs.aave.com/faq/','description': 'Aave is a decentralised non-custodial liquidity market protocol where users can participate as suppliers or borrowers. Suppliers provide liquidity to the market to earn a passive income, while borrowers are able to borrow in an overcollateralised (perpetually) or undercollateralised (one-block liquidity) fashion.','url': 'https://staging.aave.com/'}, {'author': 'Blockscout','id':'token-approval-tracker','title':'Token Approval Tracker','logo':'https://approval-tracker.apps.blockscout.com/icon-192.png','categories':['security','tools'],'shortDescription':'Token Approval Tracker shows all approvals for any ERC20-compliant tokens and NFTs and lets to revoke them or adjust the approved amount.','site':'https://docs.blockscout.com/for-users/blockscout-apps/token-approval-tracker','description':'Token Approval Tracker shows all approvals for any ERC20-compliant tokens and NFTs and lets to revoke them or adjust the approved amount.','url':'https://approval-tracker.apps.blockscout.com/'}]"
+    NEXT_PUBLIC_LOGOUT_URL:
+      _default: https://blockscoutcom.us.auth0.com/v2/logout
+    NEXT_PUBLIC_LOGOUT_RETURN_URL:
+      _default: http://blockscout-optimism-goerli.test.aws-k8s.blockscout.com/auth/logout
+    NEXT_PUBLIC_STATS_API_HOST:
+      _default: https://stats-optimism-goerli.test.aws-k8s.blockscout.com
+    NEXT_PUBLIC_API_SPEC_URL:
+      _default: https://raw.githubusercontent.com/blockscout/blockscout-api-v2-swagger/main/swagger.yaml
+    NEXT_PUBLIC_NETWORK_EXPLORERS:
+      _default: ''
+    NEXT_PUBLIC_HOMEPAGE_PLATE_GRADIENT:
+      _default: "linear-gradient(136.9deg,rgb(107 94 236) 1.5%,rgb(0 82 255) 56.84%,rgb(82 62 231) 98.54%)"
+    NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS:
+      _default: ''
+    NEXT_PUBLIC_NETWORK_RPC_URL:
+      _default: https://goerli.optimism.io
+    NEXT_PUBLIC_HOMEPAGE_CHARTS:
+      _default: "['daily_txs']"
+    NEXT_PUBLIC_IS_TESTNET:
+      _default: "true"
+    NEXT_PUBLIC_VISUALIZE_API_HOST:
+      _default: https://visualizer-optimism-goerli.test.aws-k8s.blockscout.com
+    NEXT_PUBLIC_IS_L2_NETWORK:
+      _default: "true"
+    NEXT_PUBLIC_L1_BASE_URL:
+      _default: https://blockscout-main.test.aws-k8s.blockscout.com
+    NEXT_PUBLIC_L2_WITHDRAWAL_URL:
+      _default: https://app.optimism.io/bridge/withdraw

lib/csp/getCspPolicy.ts

@@ -77,6 +77,9 @@ function makePolicyMap() {
       '*.walletconnect.com',
       'wss://*.bridge.walletconnect.org',
       'wss://www.walletlink.org',
+
+      // github (spec for api-docs page)
+      'raw.githubusercontent.com',
     ],
 
     'script-src': [

ui/apiDocs/SwaggerUI.tsx

@@ -57,6 +57,9 @@ const SwaggerUI = () => {
   const reqInterceptor = React.useCallback((req: any) => {
     if (!req.loadSpec) {
       req.url = req.url.replace(DEFAULT_SERVER, appConfig.api.host);
+      const url = new URL(req.url);
+      url.protocol = 'https:';
+      req.url = url.toString();
     }
     return req;
   }, []);