From 19ce5ee37f54e6b3449d6464d985b9b1513a4cda Mon Sep 17 00:00:00 2001 From: Sai Kumar <17549398+gsk967@users.noreply.github.com> Date: Tue, 4 Jun 2024 23:31:12 +0530 Subject: [PATCH 1/4] fix: fix the auction creation in every end block (#2536) * fix: fix the auction creation in every block * ++ * set auction id 0 on query --- Makefile | 4 ++-- x/auction/keeper/rewards.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 273afdb68b..8023d10965 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ go-mod-tidy: clean: @echo "--> Cleaning..." - @rm -rf $(BUILD_DIR)/** $(DIST_DIR)/** + @rm -rf $(BUILDDIR)/** $(DIST_DIR)/** .PHONY: build build-linux build-experimental build-no_cgo clean go-mod-tidy @@ -237,7 +237,7 @@ test-e2e-clean: docker rm umee0 umee1 umee2 umee-gaia-relayer gaiaval0 umee-price-feeder || true docker network prune -f -test-qa: +test-qa: @go test ./tests/qa/... -timeout 30m -v -tags='test_qa' $(MOCKS_DIR): diff --git a/x/auction/keeper/rewards.go b/x/auction/keeper/rewards.go index ad58713af1..1ce4914c1b 100644 --- a/x/auction/keeper/rewards.go +++ b/x/auction/keeper/rewards.go @@ -22,7 +22,8 @@ func (k Keeper) FinalizeRewardsAuction() error { if a == nil { return k.initNewAuction(id+1, []sdk.Coin{}) } - if !a.EndsAt.After(now) { + + if a.EndsAt.After(now) { return nil } From d49667a22dd5c968a2b16b7e3fa10c8c60417ed1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:04:09 +0000 Subject: [PATCH 2/4] build(deps): Bump golang/govulncheck-action from 1.0.2 to 1.0.3 (#2535) Bumps [golang/govulncheck-action](https://github.com/golang/govulncheck-action) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/golang/govulncheck-action/releases) - [Commits](https://github.com/golang/govulncheck-action/compare/v1.0.2...v1.0.3) --- updated-dependencies: - dependency-name: golang/govulncheck-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sai Kumar <17549398+gsk967@users.noreply.github.com> --- .github/workflows/govulncheck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index d02d78055b..b40d1d78d2 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -22,7 +22,7 @@ jobs: FILES: | go.mod go.sum - - uses: golang/govulncheck-action@v1.0.2 + - uses: golang/govulncheck-action@v1.0.3 id: govulncheck if: env.GIT_DIFF with: From 1e0119b503c06eba4e4f5ab8bedc34d2ceb951b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:06:37 +0000 Subject: [PATCH 3/4] build(deps): Bump goreleaser/goreleaser-action from 5 to 6 (#2537) Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 5 to 6. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](https://github.com/goreleaser/goreleaser-action/compare/v5...v6) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-umee.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-umee.yml b/.github/workflows/release-umee.yml index a6e35f04d5..6acd409bcb 100644 --- a/.github/workflows/release-umee.yml +++ b/.github/workflows/release-umee.yml @@ -35,7 +35,7 @@ jobs: make proto-update-swagger-docs - name: goreleaser test-build - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v6 if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Enable:ReleaseBuild') with: version: latest @@ -43,7 +43,7 @@ jobs: env: TM_VERSION: ${{ env.TM_VERSION }} - name: Release - uses: goreleaser/goreleaser-action@v5 + uses: goreleaser/goreleaser-action@v6 if: startsWith(github.ref, 'refs/tags/') with: version: latest From d9a8202d42a3f8b15afcd484dca312a6c401ae7f Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 6 Jun 2024 17:37:46 +0200 Subject: [PATCH 4/4] fix(auction): last bid (#2543) --- x/auction/keeper/rewards.go | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/x/auction/keeper/rewards.go b/x/auction/keeper/rewards.go index 1ce4914c1b..6e7c8086c7 100644 --- a/x/auction/keeper/rewards.go +++ b/x/auction/keeper/rewards.go @@ -82,20 +82,21 @@ func (k Keeper) rewardsBid(msg *auction.MsgRewardsBid) error { sender, err := sdk.AccAddressFromBech32(msg.Sender) util.Panic(err) - if !bytes.Equal(sender, lastBid.Bidder) { - returned := coin.UmeeInt(lastBid.Amount) - if err = k.sendFromModule(lastBid.Bidder, returned); err != nil { - return err - } - if err = k.sendToModule(sender, msg.Amount); err != nil { - return err - } - } else { - diff := msg.Amount.SubAmount(lastBid.Amount) - if err = k.sendToModule(sender, diff); err != nil { - return err + toAuction := msg.Amount + if lastBid != nil { + if bytes.Equal(sender, lastBid.Bidder) { + // bidder updates his last bid: send only diff + toAuction = msg.Amount.SubAmount(lastBid.Amount) + } else { + returned := coin.UmeeInt(lastBid.Amount) + if err = k.sendFromModule(lastBid.Bidder, returned); err != nil { + return err + } } } + if err = k.sendToModule(sender, toAuction); err != nil { + return err + } bid := auction.Bid{Bidder: sender, Amount: msg.Amount.Amount} return store.SetValue(k.store, key, &bid, keyMsg)