Merge branch 'main' into itamarreif/bridge/docs-update

astriaorg · Nov 5, 2024 · 01a0966 · 01a0966
2 parents 2ca8d6a + 3c6e456
commit 01a0966
Show file tree

Hide file tree

Showing 160 changed files with 6,859 additions and 2,649 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -10,13 +10,19 @@ Brief background on why these changes were made, ie "why?"
 ## Testing
 How are these changes tested?
 
+## Changelogs
+Ensure all relevant changelog files are updated as necessary. See
+[keepachangelog](https://keepachangelog.com/en/1.1.0/#how) for change
+categories. Replace this text with e.g. "Changelogs updated." or "No updates
+required." to acknowledge changelogs have been considered.
+
 ## Metrics
 - List out metrics added by PR, delete section if none. 
 
 ## Breaking Changelist
 - Bulleted list of breaking changes, any notes on migration. Delete section if none.
 
 ## Related Issues
-Link any issues that are related, prefer full github links.
+Link any issues that are related, prefer full GitHub links.
 
 closes <!-- list any issues closed here -->
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -230,9 +230,73 @@ jobs:
           TAG=sha-$(git rev-parse --short HEAD)
           just ibc-test run $TAG
 
+  ibc-no-native-asset-test:
+    needs: [ run_checker, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli ]
+    if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'astriaorg/astria') && (github.event_name == 'merge_group' || needs.run_checker.outputs.run_docker == 'true')
+    runs-on: buildjet-8vcpu-ubuntu-2204
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install just
+        uses: taiki-e/install-action@just
+      - name: Install kind
+        uses: helm/kind-action@v1
+        with:
+          install_only: true
+      - name: Log in to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup IBC Bridge Test Environment
+        timeout-minutes: 8
+        run: |
+          TAG=sha-$(git rev-parse --short HEAD)
+          just deploy cluster
+          kubectl create secret generic regcred --from-file=.dockerconfigjson=$HOME/.docker/config.json --type=kubernetes.io/dockerconfigjson
+          echo -e "\n\nDeploying with astria images tagged $TAG"
+          just ibc-test deploy-without-native $TAG
+      - name: Run IBC utia as native test
+        timeout-minutes: 3
+        run: |
+          TAG=sha-$(git rev-parse --short HEAD)
+          just ibc-test run-without-native $TAG
+
+  ibc-timeout-refund:
+    needs: [ run_checker, composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli ]
+    if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'astriaorg/astria') && (github.event_name == 'merge_group' || needs.run_checker.outputs.run_docker == 'true')
+    runs-on: buildjet-8vcpu-ubuntu-2204
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install just
+        uses: taiki-e/install-action@just
+      - name: Install kind
+        uses: helm/kind-action@v1
+        with:
+          install_only: true
+      - name: Log in to GHCR
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup IBC Bridge Test Environment
+        timeout-minutes: 8
+        run: |
+          TAG=sha-$(git rev-parse --short HEAD)
+          just deploy cluster
+          kubectl create secret generic regcred --from-file=.dockerconfigjson=$HOME/.docker/config.json --type=kubernetes.io/dockerconfigjson
+          echo -e "\n\nDeploying with astria images tagged $TAG"
+          just ibc-test deploy-timeout $TAG
+      - name: Run IBC ICS20 Transfer test
+        timeout-minutes: 3
+        run: |
+          TAG=sha-$(git rev-parse --short HEAD)
+          just ibc-test run-timeout $TAG
+
   docker:
     if: ${{ always() && !cancelled() }}
-    needs: [composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli, smoke-test, smoke-cli, ibc-bridge-test]
+    needs: [composer, conductor, sequencer, sequencer-relayer, evm-bridge-withdrawer, cli, smoke-test, smoke-cli, ibc-bridge-test, ibc-no-native-asset-test, ibc-timeout-refund]
     uses: ./.github/workflows/reusable-success.yml
     with:
       success: ${{ !contains(needs.*.result, 'failure') }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,6 +1,12 @@
 name: Lint
-on: 
+on:
   pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - unlabeled
   merge_group:
   push:
     branches:
@@ -22,25 +28,36 @@ jobs:
           github_token: ${{ github.token }}
       - uses: bufbuild/buf-lint-action@v1
       - run: buf format -d --exit-code
+        if: always()
       # Run breaking changes against each module, running against whole workspace
       # fails if new packages are added
       - uses: bufbuild/buf-breaking-action@v1
+        if: always()
+        continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'allow-breaking-proto') }}
         with:
           input: "proto/primitives"
           against: "buf.build/astria/primitives"
       - uses: bufbuild/buf-breaking-action@v1
+        if: always()
+        continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'allow-breaking-proto') }}
         with:
           input: "proto/executionapis"
           against: "buf.build/astria/execution-apis"
       - uses: bufbuild/buf-breaking-action@v1
+        if: always()
+        continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'allow-breaking-proto') }}
         with:
           input: "proto/sequencerblockapis"
           against: "buf.build/astria/sequencerblock-apis"
       - uses: bufbuild/buf-breaking-action@v1
+        if: always()
+        continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'allow-breaking-proto') }}
         with:
           input: "proto/protocolapis"
           against: "buf.build/astria/protocol-apis"
       - uses: bufbuild/buf-breaking-action@v1
+        if: always()
+        continue-on-error: ${{ contains(github.event.pull_request.labels.*.name, 'allow-breaking-proto') }}
         with:
           input: "proto/composerapis"
           against: "buf.build/astria/composer-apis"
@@ -79,10 +96,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: DavidAnson/markdownlint-cli2-action@v11
-        with:
-          globs: |
-            **/*.md
-            #.github
 
   charts:
     runs-on: ubuntu-latest

diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc
@@ -0,0 +1,10 @@
+{
+  "globs": [
+    "**/*.md"
+  ],
+  "ignores": [
+    "target",
+    ".github",
+    "**/*/astria-bridge-contracts/lib/**/*.md"
+  ]
+}
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,5 +1,7 @@
 * @joroshiba @SuperFluffy @noot
 
+*.snap @joroshiba
+
 specs/ @astriaorg/engineering
 justfile @astriaorg/engineering
 README.md @astriaorg/engineering
@@ -27,3 +29,4 @@ rust-toolchain @astriaorg/rust-reviewers
 .cargo/ @astriaorg/rust-reviewers
 nextest.toml @astriaorg/rust-reviewers
 rusfmt.toml @astriaorg/rust-reviewers
+crates/*/CHANGELOG.md @astriaorg/rust-reviewers