Merge branch 'main' into a7_relayer_watchdog_updates

taikoxyz · Feb 20, 2024 · a4de3d4 · a4de3d4
2 parents 565cb53 + d320f43
commit a4de3d4
Show file tree

Hide file tree

Showing 32 changed files with 3,509 additions and 2,566 deletions.
diff --git a/.github/ISSUE_TEMPLATE/add_project.yml b/.github/ISSUE_TEMPLATE/add_project.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/.github/workflows/bridge-ui-preview.yml b/.github/workflows/bridge-ui-preview.yml
@@ -0,0 +1,33 @@
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_BRIDGE_UI }}
+
+on:
+  push:
+    branches-ignore:
+      - main
+      - release-please-*
+    paths:
+      - "packages/bridge-ui-v2/**"
+
+jobs:
+  Deploy-Preview:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build Project Artifacts
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/bridge-ui-production.yml b/.github/workflows/bridge-ui-production.yml
@@ -0,0 +1,30 @@
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_BRIDGE_UI }}
+
+on:
+  push:
+    tags:
+      - "bridge-ui-v2-*"
+
+jobs:
+  Deploy-Production:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build Project Artifacts
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/fork-diff-preview.yml b/.github/workflows/fork-diff-preview.yml
@@ -0,0 +1,33 @@
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_FORK_DIFF }}
+
+on:
+  push:
+    branches-ignore:
+      - main
+      - release-please-*
+    paths:
+      - "packages/fork-diff/**"
+
+jobs:
+  Deploy-Preview:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build Project Artifacts
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/fork-diff-production.yml b/.github/workflows/fork-diff-production.yml
@@ -0,0 +1,30 @@
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_FORK_DIFF }}
+
+on:
+  push:
+    tags:
+      - "fork-diff-*"
+
+jobs:
+  Deploy-Production:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build Project Artifacts
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/guardian-prover-health-check-ui-preview.yml b/.github/workflows/guardian-prover-health-check-ui-preview.yml
@@ -0,0 +1,33 @@
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_GUARDIAN_PROVER_HEALTH_CHECK_UI }}
+
+on:
+  push:
+    branches-ignore:
+      - main
+      - release-please-*
+    paths:
+      - "packages/guardian-prover-health-check-ui/**"
+
+jobs:
+  Deploy-Preview:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build Project Artifacts
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/guardian-prover-health-check-ui-production.yml b/.github/workflows/guardian-prover-health-check-ui-production.yml
@@ -0,0 +1,30 @@
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_GUARDIAN_PROVER_HEALTH_CHECK_UI }}
+
+on:
+  push:
+    tags:
+      - "guardian-prover-health-check-ui-*"
+
+jobs:
+  Deploy-Production:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Build Project Artifacts
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/validate-pr-title.yml b/.github/workflows/validate-pr-title.yml
@@ -6,7 +6,10 @@ on:
       - opened
       - edited
       - synchronize
-  merge_group:
+  push:
+    branches:
+      - release-please-* # Trigger for release-please PRs, but skip the job
+  merge_group: # Trigger in the merge queue, but skip the job
 
 jobs:
   validate-pr-title:

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -3,6 +3,8 @@
   "packages/bridge-ui-v2": "2.9.0",
   "packages/eventindexer": "0.13.0",
   "packages/fork-diff": "0.4.0",
+  "packages/guardian-prover-health-check": "0.1.0",
+  "packages/guardian-prover-health-check-ui": "0.1.0",
   "packages/protocol": "0.15.2",
   "packages/relayer": "0.12.0"
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -224,6 +224,8 @@ This section describes our documentation standards at Taiko.
 
 Use the [Microsoft Writing Style Guide](https://learn.microsoft.com/en-us/style-guide/welcome/) as a base point of reference for writing style. Generally, don't worry too much about things like typos. What's more important is following the basic [philosophies](#philosophies) outlined above and following structural standards for highly readable and minimal documentation.
 
+For consistency throughout the project, please use **American English**.
+
 ### Creating content
 
 If you are interested in creating some content (video, blog post, tweet thread, visuals, etc.), you are absolutely free to do so. It's useful to get a peer review on these, if you need a peer review please reach out to the community / team on the [Taiko Discord](https://discord.gg/taikoxyz).

diff --git a/packages/bridge-ui-v2/.env.example b/packages/bridge-ui-v2/.env.example
@@ -1,6 +1,9 @@
 # Default explorer as fallback for the sidebar
 export PUBLIC_DEFAULT_EXPLORER=https://
 
+# Use the network swap Url
+export PUBLIC_DEFAULT_SWAP_URL=https://
+
 # Use the bridge guide Urls
 export PUBLIC_GUIDE_URL=https://
 

diff --git a/packages/bridge-ui-v2/src/components/Icon/Icon.svelte b/packages/bridge-ui-v2/src/components/Icon/Icon.svelte
@@ -40,7 +40,8 @@
     | 'approve-light'
     | 'approve-dark'
     | 'welcome-icon'
-    | 'settings';
+    | 'settings'
+    | 'swap';
 </script>
 
 <script lang="ts">
@@ -494,5 +495,12 @@
       fill-rule="evenodd"
       clip-rule="evenodd"
       fill="none" />
+  {:else if type === 'swap'}
+    <path
+      d="M8.75 1.410156 L8.75 18.75 C7.371094 18.75 6.25 17.628906 6.25 16.25 L6.25 8.125 L2.945312 8.125 C2.550781 8.125 2.351562 7.648438 2.632812 7.367188 L8.636719 1.363281 C8.679688 1.320312 8.75 1.351562 8.75 1.410156 Z M17.367188 12.632812 L11.367188 18.632812 C11.324219 18.675781 11.25 18.644531 11.25 18.582031 L11.25 1.25 C12.628906 1.25 13.75 2.371094 13.75 3.75 L13.75 11.875 L17.054688 11.875 C17.449219 11.875 17.648438 12.351562 17.367188 12.632812 Z M17.367188 12.632812"
+      class={fillClass}
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      fill="none" />
   {/if}
 </svg>
diff --git a/packages/bridge-ui-v2/src/components/SideNavigation/SideNavigation.svelte b/packages/bridge-ui-v2/src/components/SideNavigation/SideNavigation.svelte
@@ -12,7 +12,7 @@
   import { LinkButton } from '$components/LinkButton';
   import { LogoWithText } from '$components/Logo';
   import { ThemeButton } from '$components/ThemeButton';
-  import { PUBLIC_DEFAULT_EXPLORER, PUBLIC_GUIDE_URL } from '$env/static/public';
+  import { PUBLIC_DEFAULT_EXPLORER, PUBLIC_DEFAULT_SWAP_URL, PUBLIC_GUIDE_URL } from '$env/static/public';
   import { connectedSourceChain } from '$stores/network';
 
   let drawerToggleElem: HTMLInputElement;
@@ -97,6 +97,12 @@
               </LinkButton>
             </li>
             <li class="border-t border-t-divider-border pt-2">
+              <LinkButton href={PUBLIC_DEFAULT_SWAP_URL} external>
+                <Icon type="swap" />
+                <span>{$t('nav.swap')}</span>
+              </LinkButton>
+            </li>
+            <li>
               <LinkButton
                 href={$connectedSourceChain
                   ? chainConfig[$connectedSourceChain.id].urls.explorer