Tuan/fix ante

.github/mergify.yml

@@ -0,0 +1,44 @@
+queue_rules:
+  - name: default
+    conditions:
+      - '#approved-reviews-by>=1'
+      - base=main
+      - label=automerge
+
+pull_request_rules:
+  - name: automerge to main with label automerge and branch protection passing
+    conditions:
+      - '#approved-reviews-by>=1'
+      - base=main
+      - label=automerge
+    actions:
+      queue:
+        name: default
+        method: squash
+        commit_message_template: |
+          {{ title }} (#{{ number }})
+          {{ body }}
+  - name: backport patches to v4.0.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v4.0.x
+    actions:
+      backport:
+        branches:
+          - release/v4.0.x
+  - name: backport patches to v6.0.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v6.0.x
+    actions:
+      backport:
+        branches:
+          - release/v6.0.x
+  - name: backport patches to v7.0.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v7.0.x
+    actions:
+      backport:
+        branches:
+          - release/v7.0.x

.github/workflows/build.yml

@@ -15,5 +15,5 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
       - run: go build ./...

.github/workflows/codeql.yml

@@ -1,15 +1,15 @@
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   pull_request:
     paths:
-      - "**.go"
+      - '**.go'
   push:
     branches:
       - main
       - release/**
     paths:
-      - "**.go"
+      - '**.go'
 
 jobs:
   analyze:
@@ -25,16 +25,16 @@ jobs:
         uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
-          languages: "go"
+          languages: 'go'
           queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality
-          
+
       - name: Build
         run: make build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v2

.github/workflows/interchaintest.yaml

@@ -10,77 +10,115 @@ jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Check out the repo
+      - name: Check out the repo
         uses: actions/checkout@v3
-      - 
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - 
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - 
-        name: Build and push 
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
         id: build_push_image
         uses: docker/build-push-action@v3
         with:
           file: Dockerfile
           context: .
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           tags: |
-            ghcr.io/notional-labs/fee-abstraction-ictest:latest
+            osmolabs/fee-abstraction-ictest:latest
   test-basic:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.21
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: checkout code
         uses: actions/checkout@v3
 
       - run: make ictest-basic
         env:
-          BRANCH_CI: "latest"
+          BRANCH_CI: 'latest'
 
   test-ibc:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.21
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: checkout code
         uses: actions/checkout@v3
 
       - run: make ictest-ibc
         env:
-          BRANCH_CI: "latest"
+          BRANCH_CI: 'latest'
 
   test-packet-forward:
     runs-on: ubuntu-latest
     needs: build-and-push-image
     steps:
-      - name: Set up Go 1.19
+      - name: Set up Go 1.21
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: checkout code
         uses: actions/checkout@v3
 
       - run: make ictest-packet-forward
         env:
-          BRANCH_CI: "latest"
+          BRANCH_CI: 'latest'
 
+  test-host-zone-proposal:
+    runs-on: ubuntu-latest
+    needs: build-and-push-image
+    steps:
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.21
+
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - run: make ictest-host-zone-proposal
+        env:
+          BRANCH_CI: 'latest'
+
+  test-feeabs:
+    runs-on: ubuntu-latest
+    needs: build-and-push-image
+    steps:
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.21
+
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - run: make ictest-feeabs
+        env:
+          BRANCH_CI: 'latest'
+
+  test-query-osmosis-twap:
+    runs-on: ubuntu-latest
+    needs: build-and-push-image
+    steps:
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.21
+
+      - name: checkout code
+        uses: actions/checkout@v3
+
+      - run: make ictest-query-osmosis-twap
+        env:
+          BRANCH_CI: 'latest'

.github/workflows/lint.yml

@@ -15,10 +15,10 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          args: --timeout 15m
+          args: --timeout 15m

.github/workflows/push_docker_image.yml

@@ -2,11 +2,11 @@
 #
 # On every new `vX.Y.Z` tag the following images are pushed:
 #
-# notional-labs/fee-abstraction:X.Y.Z    # is pushed
-# notional-labs/fee-abstraction:X.Y      # is updated to X.Y.Z
-# notional-labs/fee-abstraction:X        # is updated to X.Y.Z
-# notional-labs/fee-abstraction:latest   # is updated to X.Y.Z
-# 
+# osmosis-labs/fee-abstraction:X.Y.Z    # is pushed
+# osmosis-labs/fee-abstraction:X.Y      # is updated to X.Y.Z
+# osmosis-labs/fee-abstraction:X        # is updated to X.Y.Z
+# osmosis-labs/fee-abstraction:latest   # is updated to X.Y.Z
+#
 # All the images above have support for linux/amd64 and linux/arm64.
 #
 # Due to QEMU virtualization used to build multi-platform docker images
@@ -19,28 +19,24 @@ on:
     types: [published, created, edited]
   push:
     tags:
-    - 'v[0-9]+.[0-9]+.[0-9]+' # ignore rc
+      - 'v[0-9]+.[0-9]+.[0-9]+' # ignore rc
 jobs:
   feeapp-images:
     runs-on: ubuntu-latest
     steps:
-      - 
-        name: Check out the repo
+      - name: Check out the repo
         uses: actions/checkout@v3
-      - 
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      - 
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2 
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Parse tag
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Parse tag
         id: tag
         run: |
           VERSION=$(echo ${{ github.ref_name }} | sed "s/v//")
@@ -51,8 +47,7 @@ jobs:
           echo "MAJOR_VERSION=$MAJOR_VERSION" >> $GITHUB_ENV
           echo "MINOR_VERSION=$MINOR_VERSION" >> $GITHUB_ENV
           echo "PATCH_VERSION=$PATCH_VERSION" >> $GITHUB_ENV
-      - 
-        name: Build and push 
+      - name: Build and push
         id: build_push_image
         uses: docker/build-push-action@v3
         with:
@@ -61,6 +56,6 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm64
           tags: |
-            ghcr.io/notional-labs/fee-abstraction:${{ env.MAJOR_VERSION }}
-            ghcr.io/notional-labs/fee-abstraction:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}
-            ghcr.io/notional-labs/fee-abstraction:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}
+            osmolabs/fee-abstraction:${{ env.MAJOR_VERSION }}
+            osmolabs/fee-abstraction:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}
+            osmolabs/fee-abstraction:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}

.github/workflows/push_protobuf_image.yml

@@ -0,0 +1,45 @@
+# This workflow pushes new protobuf docker images on every change of Dockerfile.
+#
+# Images are pushed:
+#
+# osmolabs/fa-proto-gen:commit-hash    # is pushed
+# osmolabs/fa-proto-gen:latest         # is updated
+# 
+# All the images above have support for linux/amd64 and linux/arm64.
+
+name: Push Protogen Images
+
+on:
+  push:
+    paths:
+      - "proto/Dockerfile"
+jobs:
+  feeapp-images:
+    runs-on: ubuntu-latest
+    steps:
+      - 
+        name: Check out the repo
+        uses: actions/checkout@v3
+      - 
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - 
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - 
+        name: Build and push 
+        id: build_push_image
+        uses: docker/build-push-action@v3
+        with:
+          file: proto/Dockerfile
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            osmolabs/fa-proto-gen:${{ github.sha }}