Merge release/3.0 into main

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
         env:
           GITHUB_USER: ${{ secrets.GH_USER }}
           GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
-        run: git config --global url."https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com".insteadOf "https://github.com"
+        run: git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/docker-push.yaml

@@ -8,7 +8,14 @@ on:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    env:
+      GOPRIVATE: github.com/sagaxyz/*
     steps:
+      - name: Set up access to private Go modules
+        env:
+          GITHUB_USER: ${{ secrets.GH_USER }}
+          GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
+        run: git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
       - name: Checkout
         uses: actions/checkout@v4
       - name: Extract tag name
@@ -35,4 +42,7 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
+          build-args: |
+            GITHUB_USER=${{ secrets.GH_USER }}
+            GITHUB_TOKEN=${{ secrets.GH_ACCESS_TOKEN }}
           tags: sagaxyz/ssc:${{ steps.tag_name.outputs.formatted_tag }}

.github/workflows/e2e.yml

@@ -1,9 +1,11 @@
 name: End to end tests
 
 on:
-  push:
-    tags:
-      - "v*.*.*"
+  pull_request:
+    branches:
+      - main
+      - release/**
+      - fix/**
   workflow_dispatch:
 
 jobs:
@@ -16,11 +18,6 @@ jobs:
       - name: Git fetch everything
         run: git fetch --prune --unshallow
 
-      - name: Get Github tag
-        id: meta
-        run: |
-          echo "::set-output name=tag::$(echo ${{github.ref_name}} | sed -e 's/^v//')"
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -51,7 +48,9 @@ jobs:
           [
             test-e2e-basic-ibc-transfer,
             test-e2e-pfm-ibc-transfer,
+            test-e2e-gmp-pfm-transfer,
             test-e2e-chainlet-launch,
+            test-e2e-api-endpoints,
           ]
       fail-fast: false
     steps:

Dockerfile

@@ -9,7 +9,7 @@ RUN apt-get update -y
 
 COPY . .
 
-RUN git config --global --add url."https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
+RUN git config --global url."https://x-access-token:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 RUN make build
 
 FROM golang:${GO_VERSION}-alpine3.22

Makefile

@@ -418,13 +418,17 @@ benchmark:
 	@go test -mod=readonly -bench=. $(PACKAGES_NOSIMULATION)
 .PHONY: benchmark
 
-.PHONY: test-e2e-basic-ibc-transfer test-e2e-pfm-ibc-transfer test-e2e-chainlet-launch-test
+.PHONY: test-e2e-basic-ibc-transfer test-e2e-pfm-ibc-transfer test-e2e-gmp-pfm-transfer test-e2e-chainlet-launch test-e2e-api-endpoints
 test-e2e-basic-ibc-transfer: rm-testcache
-	cd e2e && go test -race -run TestBasicIBCTransfer .
+	cd e2e && go test -v -race -run TestBasicIBCTransfer .
 test-e2e-pfm-ibc-transfer: rm-testcache
-	cd e2e && go test -race -run TestPFMTransfer .
+	cd e2e && go test -v -race -run TestPFMTransfer .
+test-e2e-gmp-pfm-transfer: rm-testcache
+	cd e2e && go test -v -race -run TestGMPWithPFMTransfer .
 test-e2e-chainlet-launch: rm-testcache
-	cd e2e && go test -race -run TestChainletLaunch .
+	cd e2e && go test -v -race -run TestChainletLaunch .
+test-e2e-api-endpoints: rm-testcache
+	cd e2e && go test -v -race -run TestAPIEndpoints .
 
 rm-testcache:
 	go clean -testcache