Skip to content

Commit

Permalink
Merge branch 'main' into a7_relayer_watchdog_updates
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberhorsey authored Feb 20, 2024
2 parents bf7d0f9 + efaca93 commit 9262f3d
Show file tree
Hide file tree
Showing 366 changed files with 299 additions and 4,807 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bridge-ui-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- main
- release-please-*
paths:
- "packages/bridge-ui-v2/**"
- "packages/bridge-ui/**"

jobs:
Deploy-Preview:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bridge-ui-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
on:
push:
tags:
- "bridge-ui-v2-*"
- "bridge-ui-*"

jobs:
Deploy-Production:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Bridge UI v2
name: Bridge UI

on:
push:
branches: [main]
paths:
- "packages/bridge-ui-v2/**"
- "packages/bridge-ui/**"
pull_request:
paths:
- "packages/bridge-ui-v2/**"
- "packages/bridge-ui/**"

jobs:
build:
Expand All @@ -28,31 +28,31 @@ jobs:
# and the Svelte check complains about not finding the exports from $env/static/public,
# which will be generated based on the .env file when running `svelte-kit sync`
- name: Copy .env.example to .env
working-directory: ./packages/bridge-ui-v2
working-directory: ./packages/bridge-ui
run: cp .env.example .env

- name: Export config to .env
working-directory: ./packages/bridge-ui-v2
working-directory: ./packages/bridge-ui
run: pnpm export:config

- name: Build Svelte app
env:
SKIP_ENV_VALDIATION: "true"
working-directory: ./packages/bridge-ui-v2
working-directory: ./packages/bridge-ui
run: pnpm build

- name: Svelte check
working-directory: ./packages/bridge-ui-v2
working-directory: ./packages/bridge-ui
run: pnpm svelte:check

- name: Linting
working-directory: ./packages/bridge-ui-v2
working-directory: ./packages/bridge-ui
run: pnpm lint

- name: Unit tests
env:
SKIP_ENV_VALDIATION: "true"
working-directory: ./packages/bridge-ui-v2
working-directory: ./packages/bridge-ui
run: pnpm test:unit

# TODO: Playwright tests?
6 changes: 3 additions & 3 deletions .github/workflows/eventindexer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: go test `go list ./... | grep -v ./contracts | grep -v ./mock | grep -v ./cmd` -coverprofile=coverage.txt -covermode=atomic

- name: eventindexer - Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./packages/eventindexer/coverage.txt
flags: eventindexer
Expand All @@ -72,14 +72,14 @@ jobs:
password: ${{ secrets.GCR_JSON_KEY }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
gcr.io/evmchain/eventindexer
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/guardianproverhealthcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: go test `go list ./... | grep -v ./contracts | grep -v ./mock | grep -v ./cmd` -coverprofile=coverage.txt -covermode=atomic

- name: guardian-prover-health-check - Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./packages/guardian-prover-health-check/coverage.txt
flags: guardian-prover-health-check
Expand All @@ -72,14 +72,14 @@ jobs:
password: ${{ secrets.GCR_JSON_KEY }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
gcr.io/evmchain/guardian-prover-health-check
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/relayer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: go test `go list ./... | grep -v ./contracts | grep -v ./mock | grep -v ./cmd` -coverprofile=coverage.txt -covermode=atomic

- name: relayer - Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./packages/relayer/coverage.txt
flags: relayer
Expand All @@ -72,14 +72,14 @@ jobs:
password: ${{ secrets.GCR_JSON_KEY }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
gcr.io/evmchain/relayer
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/validate-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
deps
deps-dev
branding
bridge-ui-v2
bridge-ui
eventindexer
fork-diff
guardian-prover-health-check
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages/branding": "0.3.0",
"packages/bridge-ui-v2": "2.9.0",
"packages/bridge-ui": "2.9.0",
"packages/eventindexer": "0.13.0",
"packages/fork-diff": "0.4.0",
"packages/guardian-prover-health-check": "0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"solidity.formatter": "forge",
"i18n-ally.localesPaths": [
"packages/bridge-ui-v2/src/i18n",
"packages/bridge-ui/src/i18n",
"packages/guardian-prover-health-check-ui/src/i18n"
],
"i18n-ally.keystyle": "nested"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ taiko-mono/
β”œβ”€β”€ <a href="./README.md">README.md</a>
β”œβ”€β”€ <a href="./packages">packages</a>
β”‚ β”œβ”€β”€ <a href="./packages/branding">branding</a>: Taiko branding materials.
β”‚ β”œβ”€β”€ <a href="./packages/bridge-ui-v2">bridge-ui-v2</a>: Taiko bridge frontend UI v2.
β”‚ β”œβ”€β”€ <a href="./packages/bridge-ui">bridge-ui</a>: Taiko bridge frontend UI.
β”‚ β”œβ”€β”€ <a href="./packages/eventindexer">eventindexer</a>: Event indexer.
β”‚ β”œβ”€β”€ <a href="./packages/fork-diff">fork-diff</a>: Fork <a href="https://geth.taiko.xyz">diff page</a> (currently, for Geth).
β”‚ β”œβ”€β”€ <a href="./packages/protocol">protocol</a>: Taiko protocol and bridge smart contracts.
Expand Down
6 changes: 3 additions & 3 deletions lefthook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
pre-commit:
parallel: true
commands:
bridge-ui-v2:
glob: "packages/bridge-ui-v2/**.{js,ts,css,svelte}"
run: pnpm -F bridge-ui-v2 svelte:check && pnpm -F bridge-ui-v2 lint:fix && git add {staged_files}
bridge-ui:
glob: "packages/bridge-ui/**.{js,ts,css,svelte}"
run: pnpm -F bridge-ui svelte:check && pnpm -F bridge-ui lint:fix && git add {staged_files}
protocol_sol:
glob: "packages/protocol/**.{sol}"
run: pnpm -F protocol lint:sol && git add {staged_files}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Bridge UI v2
# Bridge UI

This package contains the Bridge UI built with svelte and wagmi

- [Bridge UI v2](#bridge-ui-v2)
- [Bridge UI](#bridge-ui)
- [Development setup](#development-setup)
- [Set up environment variables](#set-up-environment-variables)
- [Set up configurations](#set-up-configurations)
Expand Down Expand Up @@ -56,7 +56,7 @@ These are the additional configuration files that have to be filled in:

<br>

To get started, open your terminal in `/packages/bridge-ui-v2/`
To get started, open your terminal in `/packages/bridge-ui/`

1. Copy the config examples
```bash
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "bridge-ui-v2",
"name": "bridge-ui",
"version": "2.9.0",
"private": true,
"scripts": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 9262f3d

Please sign in to comment.