Merge branch 'main' into dependabot/go_modules/github.com/mgechev/rev…

…ive-1.3.9

.github/workflows/release-umee.yml

@@ -39,15 +39,15 @@ jobs:
  if: github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'Enable:ReleaseBuild')
  with:
  version: latest
- args: build --rm-dist --skip-validate # skip validate skips initial sanity checks in order to be able to fully run
+ args: build --clean --skip=before,validate # skip validate skips initial sanity checks in order to be able to fully run
  env:
  TM_VERSION: ${{ env.TM_VERSION }}
  - name: Release
  uses: goreleaser/goreleaser-action@v6
  if: startsWith(github.ref, 'refs/tags/')
  with:
  version: latest
- args: release --rm-dist --release-notes ./RELEASE_NOTES.md
+ args: release --clean --release-notes ./RELEASE_NOTES.md
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  TM_VERSION: ${{ env.TM_VERSION }}

.goreleaser.yml

@@ -20,9 +20,10 @@ builds:
  - -s -w -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X github.com/cosmos/cosmos-sdk/version.Name=umee -X github.com/cosmos/cosmos-sdk/version.AppName=umeed -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }} -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }} -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger -X github.com/cometbft/cometbft/version.TMCoreSemVer={{ .Env.TM_VERSION }}
  goos:
  - linux
+ # - darwin
  goarch:
- - amd64
-# - arm64 # github only supports linux @ amd64
+ - amd64 # github only supports linux @ amd64
+ # - arm64
 
 archives:
  - id: tarball
@@ -46,4 +47,4 @@ checksum:
  algorithm: sha256
 
 changelog:
- skip: false
+ disable: true

app/upgrades.go

@@ -59,24 +59,22 @@ func (app UmeeApp) RegisterUpgradeHandlers() {
 }
 
 func (app *UmeeApp) registerUpgrade6_6RC1(upgradeInfo upgradetypes.Plan) {
- planName := "v6.6-rc1"
+ planName := "v6.6"
 
  app.UpgradeKeeper.SetUpgradeHandler(planName,
  func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
  printPlanName(planName, ctx.Logger())
 
  // update leverage and metoken params to include burn auction fee share.
  lparams := app.LeverageKeeper.GetParams(ctx)
- // TODO: need to check the reward auction fee params value for v6.6
- lparams.RewardsAuctionFee = sdk.MustNewDecFromStr("0.01")
+ lparams.RewardsAuctionFee = sdk.MustNewDecFromStr("0.02")
  if err := app.LeverageKeeper.SetParams(ctx, lparams); err != nil {
  return nil, err
  }
 
  mekeeper := app.MetokenKeeperB.Keeper(&ctx)
  meparams := mekeeper.GetParams()
- // TODO: need to check the Rewards Auction Fee Factor params value for v6.6
- meparams.RewardsAuctionFeeFactor = 10000 // 100% of fees goes to rewards auction
+ meparams.RewardsAuctionFeeFactor = 1000 // 10% of fees goes to rewards auction
  if err := mekeeper.SetParams(meparams); err != nil {
  return nil, err
  }

x/auction/genesis.go

@@ -10,9 +10,7 @@ import (
 // DefaultGenesis creates a default genesis state
 func DefaultGenesis() *GenesisState {
  return &GenesisState{
- // check bid duration value for v6.6 upgrade
- // RewardsParams: RewardsParams{BidDuration: 14 * 24 * 3600}, // 14 days
- RewardsParams: RewardsParams{BidDuration: 4 * 3600}, // 4 hours for bid duration this is only for canon-4 network
+ RewardsParams: RewardsParams{BidDuration: 14 * 24 * 3600}, // 14 days
  RewardAuctionId: 0,
  RewardsAuctions: []RewardsKV{},
  RewardsBids: []BidKV{},

x/auction/msgs.go

@@ -19,7 +19,6 @@ const minBidDuration = 3600 // 1h in seconds
 
 // MinRewardsBid is the minimum increase of the previous bid or the minimum bid if it's the
 // first one. 50 UX = 50e6uumee
-// TODO: need to check the value for v6.6 upgrade
 var MinRewardsBid = sdk.NewInt(50_000_000)
 
 //