fix: fix the query for max withdraw (#2638)

* fix: fix the query for max withdraw * update the docker and update the go version in github workflows
umee-network · Dec 8, 2024 · f3a428c · f3a428c
1 parent 3407c72
commit f3a428c
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
 
       - uses: actions/checkout@v4

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
 
       - name: golangci-lint main

diff --git a/.github/workflows/release-umee.yml b/.github/workflows/release-umee.yml
@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
 
       - name: Set Env

diff --git a/.github/workflows/simulations.yml b/.github/workflows/simulations.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
 
       - name: Install runsim
         run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - name: Test application non-determinism
         if: env.GIT_DIFF
@@ -65,7 +65,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -95,7 +95,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -124,7 +124,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
       - uses: actions/cache@v4
         id: cache-go-tparse
         with:
@@ -52,7 +52,7 @@ jobs:
         if: steps.cache-binaries.outputs.cache-hit != 'true' && env.GIT_DIFF
         uses: actions/setup-go@v5
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
         env:
           GOOS: ${{ matrix.targetos }}
@@ -78,7 +78,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
       - name: Test and Create Coverage Report
         if: env.GIT_DIFF
@@ -110,7 +110,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: "1.22"
+          go-version: "1.23"
           cache: true
 
       - name: Test E2E

diff --git a/contrib/images/umee.e2e.dockerfile b/contrib/images/umee.e2e.dockerfile
@@ -1,7 +1,7 @@
 # Docker for e2e testing
 # Creates dynamic binaries, by building from the latest version of umeed
 
-FROM golang:1.22-bookworm AS builder
+FROM golang:1.23-bookworm AS builder
 ARG EXPERIMENTAL=true
 
 ## Download go module dependencies for umeed
@@ -18,7 +18,7 @@ RUN if [ "$EXPERIMENTAL" = "true" ] ; then echo "Installing experimental build";
 RUN make install
 
 ## Prepare the final clear binary
-FROM ubuntu:23.04
+FROM ubuntu:24.04
 EXPOSE 26656 26657 1317 9090 7171
 ENTRYPOINT ["umeed", "start"]
 

diff --git a/contrib/images/umeed.dockerfile b/contrib/images/umeed.dockerfile
@@ -1,7 +1,7 @@
 # Stage-1: build
 # We use Debian Bullseye rather then Alpine because Alpine has problem building libwasmvm
 # - requires to download libwasmvm_muslc from external source. Build with glibc is straightforward.
-FROM golang:1.22-bookworm AS builder
+FROM golang:1.23-bookworm AS builder
 
 WORKDIR /src/
 # optimization: if go.sum didn't change, docker will use cached image
@@ -14,7 +14,7 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=badgerdb make install
 
 # Stage-2: copy binary and required artifacts to a fresh image
 # we need to use debian compatible system.
-FROM ubuntu:23.04
+FROM ubuntu:24.04
 EXPOSE 26656 26657 1317 9090
 # Run umeed by default, omit entrypoint to ease using container with CLI
 CMD ["umeed"]

diff --git a/x/leverage/keeper/grpc_query.go b/x/leverage/keeper/grpc_query.go
@@ -308,9 +308,7 @@ func (q Querier) MaxWithdraw(
 	} else {
 		// Denom not specified
 		for _, t := range q.GetAllRegisteredTokens(ctx) {
-			if !t.Blacklist {
-				denoms = append(denoms, t.BaseDenom)
-			}
+			denoms = append(denoms, t.BaseDenom)
 		}
 	}