diff --git a/.github/ISSUE_TEMPLATE/add_project.yml b/.github/ISSUE_TEMPLATE/add_project.yml deleted file mode 100644 index 6785ac46eb..0000000000 --- a/.github/ISSUE_TEMPLATE/add_project.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: "Add a project to Taiko's ecosystem 🌐" -description: "Add a project to Taiko's ecosystem" -title: "Add [PROJECT_NAME] to the ecosystem page" -labels: ["area.website", "category.ecosystem"] -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to add your project. You can see existing examples on Taiko's ecosystem page [here](https://taiko.xyz/ecosystem)! NOTE: We can only accept ecosystem projects that have integrated with Taiko or have clear plans to do so in the future. - - type: input - id: title - attributes: - label: Title of your project - validations: - required: true - - type: input - id: description - attributes: - label: Short (1-2 sentence) description of your project - validations: - required: true - - type: input - id: link - attributes: - label: Link to your project - validations: - required: true - - type: dropdown - id: isLive - attributes: - label: Live on Testnet - description: Is your project deployed on one of Taiko's testnets? - multiple: false - options: - - "Yes (default)" - - "No" - validations: - required: true - - type: input - id: evidence - attributes: - label: If your project is live on one of Taiko's testnets, please provide evidence of that here (eg. links, screenshots). If your project is NOT live, please provide your plan for integration here. - validations: - required: true - - type: textarea - id: logo - attributes: - label: Upload a quality logo to your project - description: 512x512 or 1:1 ratio is preferred. If no image is provided we will use a placeholder image. - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 7ddc38c358..0000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Bug report 🐛 -description: Report a bug -labels: ["category.bug", "status.needs-triage"] -body: - - type: markdown - attributes: - value: | - Before submitting, please check if an existing issue already exists. Thanks for taking the time to improve Taiko! - - type: textarea - id: description - attributes: - label: Describe the bug - description: A concise description of the problem and what you expected to happen. - value: Description of the bug here. - validations: - required: true - - type: textarea - id: steps-to-reproduce - attributes: - label: Steps to reproduce - description: Steps to reproduce the bug, a numbered list could be good. - value: Steps to reproduce here. - - type: textarea - id: additional-context - attributes: - label: Additional context - description: Provide any additional context, screenshots, etc. - value: Additional context here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 6165e27904..0000000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,4 +0,0 @@ -contact_links: - - name: Community support - url: https://discord.gg/taikoxyz - about: This issue tracker is only for feature requests and bug reports. Community support is available on Discord! diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml deleted file mode 100644 index 6a0c5f411f..0000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Feature request 💡 -description: Request a feature -labels: ["category.enhancement", "status.needs-triage"] -body: - - type: markdown - attributes: - value: | - Before submitting, please check if an existing issue already exists. Thanks for taking the time to improve Taiko! - - type: textarea - id: description - attributes: - label: Describe the feature request - description: A concise description of what the problem and proposed solution is. - value: Description of the feature request here. - validations: - required: true - - type: textarea - id: alternatives - attributes: - label: Describe alternatives you've considered - description: A concise description of any alternative solutions you've considered. - value: Description of the alternatives you've considered here. - - type: textarea - id: additional-context - attributes: - label: Additional context - description: Provide any additional context, screenshots, etc. - value: Additional context here. diff --git a/.github/actions/install-pnpm-dependencies/action.yml b/.github/actions/install-pnpm-dependencies/action.yml index b8d2d59735..5d98115c22 100644 --- a/.github/actions/install-pnpm-dependencies/action.yml +++ b/.github/actions/install-pnpm-dependencies/action.yml @@ -7,7 +7,7 @@ runs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 - name: Install pnpm uses: pnpm/action-setup@v2 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index edc8d9ea79..7cb08e48c3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -26,12 +26,3 @@ updates: time: "04:20" timezone: "America/New_York" open-pull-requests-limit: 10 - - - package-ecosystem: "pip" - directory: "/packages/protocol/simulation" - schedule: - interval: "monthly" - day: "saturday" - time: "04:20" - timezone: "America/New_York" - open-pull-requests-limit: 10 diff --git a/.github/workflows/bridge-ui-preview.yml b/.github/workflows/bridge-ui-preview.yml new file mode 100644 index 0000000000..655a84f8ae --- /dev/null +++ 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/**" + +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 new file mode 100644 index 0000000000..25521c07c8 --- /dev/null +++ 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-*" + +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/bridge-ui-v2.yml b/.github/workflows/bridge-ui.yml similarity index 69% rename from .github/workflows/bridge-ui-v2.yml rename to .github/workflows/bridge-ui.yml index b07dfe5849..b3f24222e8 100644 --- a/.github/workflows/bridge-ui-v2.yml +++ b/.github/workflows/bridge-ui.yml @@ -1,25 +1,25 @@ -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: runs-on: ubuntu-latest steps: - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12.1 with: access_token: ${{ github.token }} - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install pnpm dependencies uses: ./.github/actions/install-pnpm-dependencies @@ -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? diff --git a/.github/workflows/eventindexer.yml b/.github/workflows/eventindexer.yml index f81fc33286..d4c4fa4873 100644 --- a/.github/workflows/eventindexer.yml +++ b/.github/workflows/eventindexer.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: 1.21.0 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: @@ -33,11 +33,11 @@ jobs: needs: lint steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12.1 with: access_token: ${{ github.token }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v3 with: go-version: ">=1.21.0" @@ -60,12 +60,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: Login to GCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: gcr.io username: _json_key diff --git a/.github/workflows/fork-diff-preview.yml b/.github/workflows/fork-diff-preview.yml new file mode 100644 index 0000000000..40df9c85b3 --- /dev/null +++ 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 new file mode 100644 index 0000000000..4356613846 --- /dev/null +++ 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 new file mode 100644 index 0000000000..0aa9441319 --- /dev/null +++ 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 new file mode 100644 index 0000000000..43be2ee3a3 --- /dev/null +++ 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/guardianproverhealthcheck.yaml b/.github/workflows/guardianproverhealthcheck.yaml index 076ebdde77..3cfe08fdef 100644 --- a/.github/workflows/guardianproverhealthcheck.yaml +++ b/.github/workflows/guardianproverhealthcheck.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: 1.21.0 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: @@ -33,11 +33,11 @@ jobs: needs: lint steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12.1 with: access_token: ${{ github.token }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v3 with: go-version: "1.21.0" @@ -60,12 +60,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: Login to GCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: gcr.io username: _json_key diff --git a/.github/workflows/protocol.yml b/.github/workflows/protocol.yml index 3ab258ab7b..5959e0e150 100644 --- a/.github/workflows/protocol.yml +++ b/.github/workflows/protocol.yml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Cancel previous runs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12.1 with: access_token: ${{ github.token }} - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive diff --git a/.github/workflows/relayer.yml b/.github/workflows/relayer.yml index d639d6942d..9c4759dba3 100644 --- a/.github/workflows/relayer.yml +++ b/.github/workflows/relayer.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-go@v3 with: go-version: 1.21.0 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: @@ -33,11 +33,11 @@ jobs: needs: lint steps: - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 + uses: styfle/cancel-workflow-action@0.12.1 with: access_token: ${{ github.token }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v3 with: go-version: "1.21.0" @@ -60,12 +60,12 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: Login to GCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: gcr.io username: _json_key diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index bc8f1e16f3..a7f54817eb 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -7,6 +7,6 @@ jobs: release-please: runs-on: ubuntu-latest steps: - - uses: google-github-actions/release-please-action@v3 + - uses: google-github-actions/release-please-action@v4 with: command: manifest diff --git a/.github/workflows/validate-pr-title.yml b/.github/workflows/validate-pr-title.yml index 1ae95faf3b..eb72507de0 100644 --- a/.github/workflows/validate-pr-title.yml +++ b/.github/workflows/validate-pr-title.yml @@ -6,9 +6,14 @@ on: - opened - edited - synchronize + 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: + if: github.event_name == 'pull_request_target' runs-on: ubuntu-latest steps: - uses: amannn/action-semantic-pull-request@v5 @@ -26,15 +31,13 @@ jobs: deps deps-dev branding - bridge-ui-v2 + bridge-ui eventindexer fork-diff guardian-prover-health-check guardian-prover-health-check-ui protocol relayer - starter-dapp - status-page requireScope: true subjectPattern: ^(?![A-Z]).+$ # Require lowercase PR title subjectPatternError: | diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b26787c882..0d98e5560e 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,9 +1,10 @@ { "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", + "packages/guardian-prover-health-check-ui": "0.1.0", "packages/protocol": "0.15.2", - "packages/relayer": "0.12.0", - "packages/status-page": "0.12.0" + "packages/relayer": "0.12.0" } diff --git a/.vscode/settings.json b/.vscode/settings.json index a4427d4a80..5c31457e20 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3e27701b0b..6951c4b5cd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ This section describes our coding standards at Taiko. ### Pull requests -Specify the scope of your change with a [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/) in the PR title (for example, `feat(scope): description of feature`). This will be squashed and merged into the `main` branch. You can find the full list of allowed scopes [here](https://github.com/taikoxyz/taiko-mono/blob/main/.github/workflows/lint-pr.yml#L19). +Specify the scope of your change with a [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/) in the PR title (for example, `feat(scope): description of feature`). This will be squashed and merged into the `main` branch. You can find the full list of allowed scopes [here](https://github.com/taikoxyz/taiko-mono/blob/main/.github/workflows/validate-pr-title.yml). Because we squash all of the changes into a single commit, please try to keep the PR limited to the scope specified in the commit message. This commit message will end up in the automated changelog by checking which packages are affected by the commit. @@ -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/README.md b/README.md index 2c93444a83..38a57d8633 100644 --- a/README.md +++ b/README.md @@ -34,13 +34,11 @@ taiko-mono/ ├── README.md ├── packages │ ├── branding: Taiko branding materials. -│ ├── bridge-ui-v2: Taiko bridge frontend UI v2. +│ ├── bridge-ui: Taiko bridge frontend UI. │ ├── eventindexer: Event indexer. │ ├── fork-diff: Fork diff page (currently, for Geth). │ ├── protocol: Taiko protocol and bridge smart contracts. -│ ├── relayer: Bridge backend relayer in Go. -│ ├── starter-dapp: Template for Taiko dapps. -│ └── status-page: Taiko protocol status page. +│ └── relayer: Bridge backend relayer in Go. ... diff --git a/go.mod b/go.mod index d6671b6f2e..6bc29f2d18 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 gorm.io/datatypes v1.0.7 gorm.io/driver/mysql v1.4.3 - gorm.io/gorm v1.24.6 + gorm.io/gorm v1.25.7 gotest.tools v2.2.0+incompatible ) diff --git a/go.sum b/go.sum index 2f0ca3b0f4..c6bd821c2e 100644 --- a/go.sum +++ b/go.sum @@ -998,8 +998,8 @@ gorm.io/gorm v1.21.3/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= -gorm.io/gorm v1.24.6 h1:wy98aq9oFEetsc4CAbKD2SoBCdMzsbSIvSUUFJuHi5s= -gorm.io/gorm v1.24.6/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A= +gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= diff --git a/lefthook.yml b/lefthook.yml index fef133d5cf..70c57c19a8 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -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} diff --git a/packages/bridge-ui-v2/scripts/exportJsonToEnv.js b/packages/bridge-ui-v2/scripts/exportJsonToEnv.js deleted file mode 100755 index 9ab0ce051e..0000000000 --- a/packages/bridge-ui-v2/scripts/exportJsonToEnv.js +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/env node - -import * as fs from 'fs'; -import * as path from 'path'; - -import { PluginLogger as LogUtil } from './utils/PluginLogger.js'; - -const Logger = new LogUtil('exportJsonToEnv'); - -const envFile = './.env'; - -const bridgesPath = 'config/configuredBridges.json'; -const chainsPath = 'config/configuredChains.json'; -const tokensPath = 'config/configuredCustomTokens.json'; -const relayerPath = 'config/configuredRelayer.json'; -const eventIndexerPath = 'config/configuredEventIndexer.json'; - -// Create a backup of the existing .env file -fs.copyFileSync(envFile, `${envFile}.bak`); - -const jsonFiles = [bridgesPath, chainsPath, tokensPath, relayerPath, eventIndexerPath]; - -jsonFiles.forEach((jsonFile) => { - if (fs.existsSync(jsonFile)) { - Logger.info(`Exporting ${jsonFile} to .env file...`); - - const fileContent = fs.readFileSync(jsonFile); - let base64Content = fileContent.toString('base64'); - const filename = path.basename(jsonFile, '.json'); - - if (filename !== 'configuredChains') { - base64Content = base64Content.replace(/\s+/g, ''); - } - - const envKey = filename.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toUpperCase(); - - const envFileContent = fs.readFileSync(envFile, 'utf-8'); - const regex = new RegExp(`^export ${envKey}=.*$`, 'm'); - - if (regex.test(envFileContent)) { - fs.writeFileSync(envFile, envFileContent.replace(regex, `export ${envKey}='${base64Content}'`)); - } else { - fs.appendFileSync(envFile, `\nexport ${envKey}='${base64Content}'`); - } - - Logger.info(`Successfully updated ${envKey}`); - } else { - Logger.error(`Warning: File ${jsonFile} does not exist.`); - } -}); - -Logger.info('Done.'); diff --git a/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte b/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte deleted file mode 100644 index a4db9babfd..0000000000 --- a/packages/bridge-ui-v2/src/components/Bridge/Actions.svelte +++ /dev/null @@ -1,215 +0,0 @@ - - -{#if oldStyle} - - -
{$t('bridge.nft.step.import.no_nft_found')}
-- {$t('bridge.nft.step.import.scan_screen.title', { values: { number: foundNFTs.length } })} -
-{$t('bridge.nft.step.import.scan_screen.description')}
-{$t('bridge.nft.step.import.no_nft_found')}
++ {$t('bridge.nft.step.import.scan_screen.title', { values: { number: foundNFTs.length } })} +
+{$t('bridge.nft.step.import.scan_screen.description')}
+