fix: user decorator missing roles

.github/workflows/app-deploy-feature-branch.yml

@@ -67,6 +67,11 @@ jobs:
 
           CHANNEL_URL=$(firebase --project staging-scan-v2 hosting:channel:list --json | jq --arg channel_name "${CHANNEL_NAME}" -r '.result.channels[]|select(.name|contains($channel_name)) | .url')
           echo $CHANNEL_URL
+          if [ -n "$FIREBASE_TOKEN" ]; then
+            echo "FIREBASE_TOKEN exists!"
+          else
+            echo "FIREBASE_TOKEN is not set"
+          fi
           if [ -z "$CHANNEL_URL" ]; then
             echo "New channel"
             firebase --project staging-scan-v2 hosting:channel:create $CHANNEL_NAME
@@ -77,7 +82,7 @@ jobs:
       - name: Deploy
         working-directory: ./packages/app
         run: |
-          firebase --project staging-scan-v2 hosting:channel:deploy ${{ env.CHANNEL_NAME }}
+          firebase --project staging-scan-v2 hosting:channel:deploy ${{ env.CHANNEL_NAME }} --only staging-scan-v2
 
       - name: Publish preview url
         if: github.event.pull_request.head.repo.full_name == github.repository
@@ -97,7 +102,7 @@ jobs:
       contents: write
     with:
       targetUrl: ${{ needs.build.outputs.dappUrl }}
-      testnet_network_value_for_e2e: "/?network=sepolia"
-      default_network_value_for_e2e: "/?network=mainnet"
+      testnet_network_value_for_e2e: "/?network=zksync-os-testnet-alpha"
+      default_network_value_for_e2e: "/?network=zksync-os-mainnet"
       publish_to_allure: true
       environmentTags: "and not @productionEnv"

.github/workflows/app-deploy-preview.yml

@@ -87,7 +87,7 @@ jobs:
       contents: write
     with:
       targetUrl: ${{ needs.deploy.outputs.dappUrl }}
-      testnet_network_value_for_e2e: "/?network=sepolia"
-      default_network_value_for_e2e: "/?network=mainnet"
+      testnet_network_value_for_e2e: "/?network=zksync-os-testnet-alpha"
+      default_network_value_for_e2e: "/?network=zksync-os-mainnet"
       publish_to_allure: true
       environmentTags: "and not @featureEnv"

.github/workflows/app-e2e.yml

@@ -13,16 +13,16 @@ on:
         required: false
       targetUrl:
         type: string
-        default: 'https://staging-scan-v2.zksync.dev/'
+        default: 'https://staging-scan-v2.zksync.dev'
         required: true
       default_network_value_for_e2e:
         type: string
-        default: '/?network=mainnet'
+        default: '/?network=zksync-os-mainnet'
         required: true
       testnet_network_value_for_e2e:
-          type: string
-          default: '/?network=sepolia'
-          required: true
+        type: string
+        default: '/?network=zksync-os-testnet-alpha'
+        required: true
       publish_to_allure: #Here we define the variable that can be overwritten by caller workflow
         type: boolean
         description: "Publish test results to allure"
@@ -47,15 +47,16 @@ jobs:
       fail-fast: false
       matrix:
         tags: [
-                "@artifactsSet1",
-                "@artifactsSet2",
-                "@artifactsSet3",
-                "@artifactsSet4",
-                "@redirectionSet1",
-                "@redirectionSet2",
-                "@redirectionSet3",
-                "@copying",
-                "@search",
+                # Disabled all tests running on Mainnet until Mainnet is deployed
+                # "@artifactsSet1",
+                # "@artifactsSet2",
+                # "@artifactsSet3",
+                # "@artifactsSet4",
+                # "@redirectionSet1",
+                # "@redirectionSet2",
+                # "@redirectionSet3",
+                # "@copying",
+                # "@search",
                 "@testnetSmokeSuite"
               ]
 

.github/workflows/release-zksync-os.yml

@@ -0,0 +1,170 @@
+name: Create ZKsync OS Release
+
+on:
+  push:
+    branches:
+      - zksync-os
+
+jobs:
+  createReleaseVersion:
+    name: Create ZKsync OS Release Version
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    outputs:
+      releaseVersion: ${{ steps.release.outputs.releaseVersion }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Lint
+        run: |
+          npm run lint -- -- --no-fix --max-warnings 0
+
+      - name: Test
+        run: |
+          npm run test:ci
+
+      - name: App type check
+        working-directory: ./packages/app
+        run: |
+          npm run typecheck
+
+      - name: Create Release Version
+        id: release
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+            VITE_APP_ENVIRONMENT=production \
+              npx semantic-release
+
+  createDockerImages:
+    name: Create Docker Images
+    runs-on: [matterlabs-ci-runner]
+    permissions:
+      contents: read
+    needs: createReleaseVersion
+    if: ${{ github.ref == 'refs/heads/zksync-os' && needs.createReleaseVersion.outputs.releaseVersion != '' }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Docker Build
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Auth to google artifact registry
+        run: |
+          gcloud auth configure-docker us-docker.pkg.dev -q 
+
+      - name: Build and push Docker image for API
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: |
+              "matterlabs/block-explorer-api:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+              "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/block-explorer-api:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+          file: packages/api/Dockerfile
+          no-cache: true
+
+      - name: Build and push Docker image for Worker
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: |
+              "matterlabs/block-explorer-worker:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+              "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/block-explorer-worker:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+          file: packages/worker/Dockerfile
+          no-cache: true
+
+      - name: Build and push Docker image for Data Fetcher
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: |
+              "matterlabs/block-explorer-data-fetcher:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+              "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/block-explorer-data-fetcher:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+          file: packages/data-fetcher/Dockerfile
+          no-cache: true
+
+      - name: Build and push Docker image for App
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: |
+              "matterlabs/block-explorer-app:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+              "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/block-explorer-app:v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+          file: packages/app/Dockerfile
+          no-cache: true
+
+  deployFrontendToStaging:
+    name: Deploy Block Explorer frontend to zksync-os instance
+    runs-on: matterlabs-firebase-deployer
+    permissions:
+      contents: read
+    needs: createReleaseVersion
+    if: ${{ github.ref == 'refs/heads/zksync-os' && needs.createReleaseVersion.outputs.releaseVersion != '' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - name: Install Firebase CLI and auth
+        run: |
+          npm install -g firebase-tools
+
+      - name: Download Dist package
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          version: "tags/v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+          file: "dist.zip"
+          target: "dist.zip"
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Unzip Dist package
+        run: |
+          unzip dist.zip -d packages/app
+
+      - name: Update config
+        run: |
+          echo "window[\"##runtimeConfig\"] = { appEnvironment: \"staging\", sentryDSN: \"${{ vars.SENTRY_DSN }}\"  };" > packages/app/dist/config.js
+
+      - name: Download Storybook package
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          version: "tags/v${{ needs.createReleaseVersion.outputs.releaseVersion }}"
+          file: "storybook-static.zip"
+          target: "storybook-static.zip"
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Unzip Storybook package
+        run: |
+          unzip storybook-static.zip -d packages/app
+
+      - name: Deploy
+        working-directory: ./packages/app
+        run: |
+          firebase --project staging-scan-v2 deploy

.releaserc

@@ -15,6 +15,10 @@
     {
       "name": "prividium",
       "prerelease": true
+    },
+        {
+      "name": "zksync-os",
+      "prerelease": true
     }
   ],
   "plugins": [

docker-compose-cli.yaml

@@ -21,7 +21,6 @@ services:
       - DATABASE_NAME=block-explorer
       - BLOCKCHAIN_RPC_URL=http://host.docker.internal:${RPC_PORT}
       - DATA_FETCHER_URL=http://data-fetcher:3040
-      - BATCHES_PROCESSING_POLLING_INTERVAL=1000
     restart: unless-stopped
     extra_hosts:
       - "host.docker.internal:host-gateway"

docker-compose-prividium.yaml

@@ -25,7 +25,6 @@ services:
       - DATABASE_NAME=block-explorer
       - BLOCKCHAIN_RPC_URL=http://zksync:3050
       - DATA_FETCHER_URL=http://data-fetcher:3040
-      - BATCHES_PROCESSING_POLLING_INTERVAL=1000
     ports:
       - '3001:3001'
     depends_on:

docker-compose.yaml

@@ -22,7 +22,6 @@ services:
       - DATABASE_NAME=block-explorer
       - BLOCKCHAIN_RPC_URL=http://zksync:3050
       - DATA_FETCHER_URL=http://data-fetcher:3040
-      - BATCHES_PROCESSING_POLLING_INTERVAL=1000
     ports:
       - '3001:3001'
     depends_on:
@@ -53,7 +52,10 @@ services:
       - PORT=3020
       - METRICS_PORT=3005
       - LOG_LEVEL=verbose
-      - DATABASE_URL=postgres://postgres:postgres@postgres:5432/block-explorer
+      - DATABASE_HOST=postgres
+      - DATABASE_USER=postgres
+      - DATABASE_PASSWORD=postgres
+      - DATABASE_NAME=block-explorer
     ports:
       - '3020:3020'
       - '3005:3005'
@@ -64,7 +66,7 @@ services:
   postgres:
     image: "postgres:14"
     logging:
-      driver: none 
+      driver: none
     volumes:
       - postgres:/var/lib/postgresql/data
     ports:
@@ -112,7 +114,7 @@ services:
     environment:
       - DATABASE_PROVER_URL=postgres://postgres:postgres@postgres/prover_local
       - DATABASE_URL=postgres://postgres:postgres@postgres/zksync_local
-      - ETH_CLIENT_WEB3_URL=http://reth:8545 
+      - ETH_CLIENT_WEB3_URL=http://reth:8545
     healthcheck:
       test: curl --fail http://localhost:3071/health || exit 1
       interval: 10s
@@ -125,4 +127,4 @@ volumes:
   reth:
   postgres:
   zksync-config:
-  zksync-data:
+  zksync-data: