sqaush v14.1.1

burnt-labs · Dec 21, 2024 · bbbca62 · bbbca62
1 parent dd41cca
commit bbbca62
Show file tree

Hide file tree

Showing 22 changed files with 673 additions and 232 deletions.
diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
@@ -83,10 +83,11 @@ jobs:
     uses: burnt-labs/xion/.github/workflows/build-release.yaml@main
     secrets: inherit
 
-  update-networks:
-    name: Update Networks Repo
-    needs:
-      - build-release
-      - build-release-info
-    uses: burnt-labs/xion/.github/workflows/update-networks.yaml@main
-    secrets: inherit
+  # TODO: move to triggered action in burnt-networks repo
+  # update-networks:
+  #   name: Update Networks Repo
+  #   needs:
+  #     - build-release
+  #     - build-release-info
+  #   uses: burnt-labs/xion/.github/workflows/update-networks.yaml@main
+  #   secrets: inherit
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -37,6 +37,9 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
 
+      - name: Install wget
+        run: sudo apt-get update && sudo apt-get install -y wget
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:
@@ -71,6 +74,8 @@ jobs:
           platforms: ${{ matrix.os }}/${{ matrix.arch }}
           tags: xion:${{ matrix.os }}-${{ matrix.arch }}
           build-args: |
+            COMMIT=${{ github.sha }}
+            VERSION=${{ github.ref_name }}
             XIOND_BINARY=dist/xiond_${{ matrix.os }}_${{ matrix.arch }}/xiond
 
       - name: Build Heighliner Image
@@ -84,6 +89,8 @@ jobs:
           platforms: ${{ matrix.os }}/${{ matrix.arch }}
           tags: heighliner:${{ matrix.os }}-${{ matrix.arch }}
           build-args: |
+            COMMIT=${{ github.sha }}
+            VERSION=${{ github.ref_name }}
             XIOND_BINARY=dist/xiond_${{ matrix.os }}_${{ matrix.arch }}/xiond
 
       - name: Save Docker Image

diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -94,4 +94,4 @@ jobs:
       - name: Inspect image
         run: |
            jq -cr '.tags | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON" | \
-           xargs -n1 docker buildx imagetools inspect%
+           xargs -n1 docker buildx imagetools inspect
diff --git a/.github/workflows/heighliner-push.yaml b/.github/workflows/heighliner-push.yaml
@@ -91,4 +91,4 @@ jobs:
       - name: Inspect image
         run: |
           jq -cr '.tags | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON" | \
-          xargs -n1 docker buildx imagetools inspect%
+          xargs -n1 docker buildx imagetools inspect
diff --git a/.github/workflows/update-networks.yaml b/.github/workflows/update-networks.yaml
@@ -26,12 +26,17 @@ jobs:
           METADATA_PATH=${BASE_PATH}/governance-proposals/software-upgrades/metadata
           PROPOSAL_PATH=${BASE_PATH}/governance-proposals/software-upgrades/proposal
           UPGRADE_NAME=$(echo ${GITHUB_REF_NAME} | cut -d. -f1)
+          CURRENT_MAJOR=$(echo ${UPGRADE_NAME} | cut -dv -f2)
+          PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD^)
+          PREVIOUS_MAJOR=$(echo ${PREVIOUS_TAG} | cut -d. -f1 | cut -dv -f2)
+          IS_MAJOR_UPGRADE=$([ "${CURRENT_MAJOR}" -gt "${PREVIOUS_MAJOR}" ] && echo "true" || echo "false")
           echo "BASE_PATH=${BASE_PATH}" | tee -a ${GITHUB_ENV}
           echo "NETWORK=${NETWORK}" | tee -a ${GITHUB_ENV}
           echo "BINARIES_PATH=${BINARIES_PATH}" | tee -a ${GITHUB_ENV}
           echo "METADATA_PATH=${METADATA_PATH}" | tee -a ${GITHUB_ENV}
           echo "PROPOSAL_PATH=${PROPOSAL_PATH}" | tee -a ${GITHUB_ENV}
           echo "UPGRADE_NAME=${UPGRADE_NAME}" | tee -a ${GITHUB_ENV}
+          echo "IS_MAJOR_UPGRADE=${IS_MAJOR_UPGRADE}" | tee -a ${GITHUB_ENV}
           echo "NETWORKS_REPO=burnt-labs/burnt-networks" | tee -a ${GITHUB_ENV}
 
       - name: Install SSH key
@@ -60,26 +65,8 @@ jobs:
         run: |
           cp /tmp/binaries.json ${UPGRADE_NAME}.json
 
-      - name: Add version to chain.json
-        run: |
-          set -Eeuo pipefail
-          CHAIN_JSON=${BASE_PATH}/chain-registry/chain.json
-          VERSION_JSON=/tmp/version.json
-          cp ${CHAIN_JSON} /tmp/chain.json
-          jq --slurpfile version ${VERSION_JSON} '
-            .codebase.versions |= (
-              map(
-                if .name == $version[0].name then
-                  ($version[0] + {height: .height, proposal: .proposal})
-                else
-                  .
-                end
-              ) +
-              if any(.[]; .name == $version[0].name) then [] else $version end
-            )
-          ' /tmp/chain.json | tee ${CHAIN_JSON}
-
-      - name: Add metadata json
+      - name: Add metadata json for major upgrade
+        if: env.IS_MAJOR_UPGRADE == 'true'
         working-directory: ${{ env.METADATA_PATH }}
         run: |
           set -Eeuo pipefail
@@ -94,7 +81,8 @@ jobs:
             vote_option_context: "YES to approve the upgrade, NO to reject the upgrade."
           }' | tee ${UPGRADE_NAME}.json
 
-      - name: Add proposal json
+      - name: Add proposal json for major upgrade
+        if: env.IS_MAJOR_UPGRADE == 'true'
         working-directory: ${{ env.PROPOSAL_PATH }}
         run: |
           set -Eeuo pipefail
@@ -122,7 +110,8 @@ jobs:
             summary: "Software Upgrade \($version)"
           }' | tee ${UPGRADE_NAME}.json
 
-      - name: Create PR
+      - name: Create PR for major upgrade
+        if: env.IS_MAJOR_UPGRADE == 'true'
         env:
           GH_TOKEN: ${{ github.token }}
         run: |

diff --git a/.github/workflows/update-swagger.yaml b/.github/workflows/update-swagger.yaml
@@ -17,12 +17,12 @@ jobs:
 
       - name: Generate Swagger
         env:
-          DOCKER_IMAGE: ghcr.io/cosmos/proto-builder:0.14.0
+          DOCKER_IMAGE: ghcr.io/cosmos/proto-builder:0.15.0
         run: |
           # runs as runner:docker (1001:121)
-          chmod -R o+wX client/docs
+          chmod -R o+wX client
           make proto-swagger-gen
-          chmod -R o-w client/docs/*
+          chmod -R o-w client/*
 
       # Need to sort out using signed commits to use
       # - name: Commit if Changed

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -23,7 +23,7 @@ builds:
     hooks:
       pre:
         - cmd: mkdir -p ./dist/lib
-        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I % wget https://github.com/CosmWasm/wasmvm/releases/download/%/libwasmvm_muslc.aarch64.a -O ./dist/lib/libwasmvm_muslc.aarch64.a'
+        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I {} wget https://github.com/CosmWasm/wasmvm/releases/download/{}/libwasmvm_muslc.aarch64.a -O ./dist/lib/libwasmvm_muslc.aarch64.a'
     no_unique_dist_dir: true
     ldflags:
       - -X github.com/cosmos/cosmos-sdk/version.Name={{ .ProjectName }}
@@ -57,7 +57,7 @@ builds:
     hooks:
       pre:
         - cmd: mkdir -p ./dist/lib
-        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I % wget https://github.com/CosmWasm/wasmvm/releases/download/%/libwasmvm_muslc.x86_64.a -O ./dist/lib/libwasmvm_muslc.x86_64.a'
+        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I {} wget https://github.com/CosmWasm/wasmvm/releases/download/{}/libwasmvm_muslc.x86_64.a -O ./dist/lib/libwasmvm_muslc.x86_64.a'
     no_unique_dist_dir: true
     ldflags:
       - -X github.com/cosmos/cosmos-sdk/version.Name={{ .ProjectName }}
@@ -89,7 +89,7 @@ builds:
     hooks:
       pre:
         - cmd: mkdir -p ./dist/lib
-        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I % wget https://github.com/CosmWasm/wasmvm/releases/download/%/libwasmvmstatic_darwin.a -O ./dist/lib/libwasmvmstatic_darwin.a'
+        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I {} wget https://github.com/CosmWasm/wasmvm/releases/download/{}/libwasmvmstatic_darwin.a -O ./dist/lib/libwasmvmstatic_darwin.a'
     no_unique_dist_dir: true
     ldflags:
       - -X github.com/cosmos/cosmos-sdk/version.Name={{ .ProjectName }}
@@ -122,7 +122,7 @@ builds:
     hooks:
       pre:
         - cmd: mkdir -p ./dist/lib
-        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I % wget https://github.com/CosmWasm/wasmvm/releases/download/%/libwasmvmstatic_darwin.a -O ./dist/lib/libwasmvmstatic_darwin.a'
+        - cmd: sh -c 'grep "github.com/CosmWasm/wasmvm" go.mod | cut -d " " -f 1 | xargs -I {} go list -m {} | cut -d " " -f 2 | xargs -I {} wget https://github.com/CosmWasm/wasmvm/releases/download/{}/libwasmvmstatic_darwin.a -O ./dist/lib/libwasmvmstatic_darwin.a'
     no_unique_dist_dir: true
     ldflags:
       - -X github.com/cosmos/cosmos-sdk/version.Name={{ .ProjectName }}

diff --git a/Makefile b/Makefile
@@ -3,7 +3,6 @@
 PACKAGES_SIMTEST = $(shell go list ./... | grep '/simulation')
 VERSION ?= $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT ?= $(shell git log -1 --format='%H')
-TAG_VERSION ?= $(shell git rev-parse --short HEAD)
 LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
 BINDIR ?= $(GOPATH)/bin
@@ -17,8 +16,8 @@ DOCKER := $(shell which docker)
 GORELEASER_CROSS_IMAGE ?= goreleaser/goreleaser-cross
 GORELEASER_CROSS_VERSION ?= v1.22.7
 # need custom image
-GORELEASER_IMAGE ?= $(GORELEASER_CROSS_IMAGE) #goreleaser/goreleaser
-GORELEASER_VERSION ?= $(GORELEASER_CROSS_VERSION) #v2.3.2
+GORELEASER_IMAGE ?= $(GORELEASER_CROSS_IMAGE)
+GORELEASER_VERSION ?= $(GORELEASER_CROSS_VERSION)
 GORELEASER_RELEASE ?= false
 GORELEASER_SKIP_FLAGS ?= ""
 
@@ -86,7 +85,7 @@ all: install lint test
 install: go.sum
 	go install -mod=readonly $(BUILD_FLAGS) ./cmd/xiond
 
-build: go.sum
+build: guard-VERSION guard-COMMIT
 ifeq ($(OS),Windows_NT)
 	$(error wasmd server not supported. Use "make build-windows-client" for client)
 	exit 1
@@ -231,6 +230,12 @@ clean:
 distclean: clean
 	rm -rf vendor/
 
+guard-%:
+	@ if [ "${${*}}" = "" ]; then \
+        echo "Environment variable $* not set"; \
+        exit 1; \
+	fi
+
 ###############################################################################
 ###                                Testing                                  ###
 ###############################################################################

diff --git a/client/docs/static/openapi.json b/client/docs/static/openapi.json
@@ -51010,6 +51010,26 @@
                 },
                 "description": "QueryParamsResponse is the response type for the Query/Params RPC method."
             },
+            "xion.v1.QueryPlatformMinimumResponse": {
+                "type": "object",
+                "properties": {
+                    "minimums": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "denom": {
+                                    "type": "string"
+                                },
+                                "amount": {
+                                    "type": "string"
+                                }
+                            },
+                            "description": "Coin defines a token with a denomination and an amount.\n\nNOTE: The amount field is an Int which implements the custom method\nsignatures required by gogoproto."
+                        }
+                    }
+                }
+            },
             "xion.v1.QueryPlatformPercentageResponse": {
                 "type": "object",
                 "properties": {

diff --git a/client/docs/static/swagger.json b/client/docs/static/swagger.json
@@ -48372,6 +48372,26 @@
       },
       "description": "QueryParamsResponse is the response type for the Query/Params RPC method."
     },
+    "xion.v1.QueryPlatformMinimumResponse": {
+      "type": "object",
+      "properties": {
+        "minimums": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "denom": {
+                "type": "string"
+              },
+              "amount": {
+                "type": "string"
+              }
+            },
+            "description": "Coin defines a token with a denomination and an amount.\n\nNOTE: The amount field is an Int which implements the custom method\nsignatures required by gogoproto."
+          }
+        }
+      }
+    },
     "xion.v1.QueryPlatformPercentageResponse": {
       "type": "object",
       "properties": {