From d322a95c3c5c0c48443cd0596ffb0a4a9ef84213 Mon Sep 17 00:00:00 2001 From: Sai Kumar <17549398+gsk967@users.noreply.github.com> Date: Fri, 2 Aug 2024 20:03:09 +0530 Subject: [PATCH 1/2] update the params for mainnet (#2580) --- app/upgrades.go | 8 +++----- x/auction/genesis.go | 4 +--- x/auction/msgs.go | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/upgrades.go b/app/upgrades.go index 81ddbb512d..37c536c5ad 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -59,7 +59,7 @@ 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) { @@ -67,16 +67,14 @@ func (app *UmeeApp) registerUpgrade6_6RC1(upgradeInfo upgradetypes.Plan) { // 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 } diff --git a/x/auction/genesis.go b/x/auction/genesis.go index 8157cb9bf3..867993839e 100644 --- a/x/auction/genesis.go +++ b/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{}, diff --git a/x/auction/msgs.go b/x/auction/msgs.go index 6a06d3d928..ed08668da6 100644 --- a/x/auction/msgs.go +++ b/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) // From 2acc4a767cfe60b09c66e1f98989a72fe31a615c Mon Sep 17 00:00:00 2001 From: Sai Kumar <17549398+gsk967@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:03:12 +0530 Subject: [PATCH 2/2] fix: fix the goreleaser (#2581) --- .github/workflows/release-umee.yml | 4 ++-- .goreleaser.yml | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-umee.yml b/.github/workflows/release-umee.yml index 6acd409bcb..e490826afb 100644 --- a/.github/workflows/release-umee.yml +++ b/.github/workflows/release-umee.yml @@ -39,7 +39,7 @@ 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 @@ -47,7 +47,7 @@ jobs: 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 }} diff --git a/.goreleaser.yml b/.goreleaser.yml index 0dc2fe6e66..5a2f6a5c98 100644 --- a/.goreleaser.yml +++ b/.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