From 3e2c20c507e62a5bacd4857631708f1be56c9457 Mon Sep 17 00:00:00 2001 From: Jorge Hernandez <3452489+jhernandezb@users.noreply.github.com> Date: Sun, 31 Jul 2022 17:46:21 -0600 Subject: [PATCH] update wasmd and ibc-go (#644) * update wasmd and ibc-go * pull always --- .drone.yml | 14 +++++++------- app/upgrades.go | 27 ++++++++++++++++++++++++--- go.mod | 4 ++-- go.sum | 8 ++++---- scripts/ci/upgrade/proposal.sh | 6 +++--- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index aad4dbd06..886b0c932 100644 --- a/.drone.yml +++ b/.drone.yml @@ -75,12 +75,12 @@ steps: password: from_secret: docker_password tags: - - v6-beta + - v7-alpha when: event: - push branch: - - feature/prepare-release + - jhernandezb/upgrade-depdencies - name: docker_release image: plugins/docker:18 settings: @@ -281,7 +281,7 @@ steps: environment: GOPROXY: http://goproxy - name: stargaze - image: publicawesome/stargaze:5.0.0 + image: publicawesome/stargaze:6.0.0 commands: - ./scripts/ci/upgrade/setup-preinstalled-stargaze.sh environment: @@ -311,12 +311,12 @@ steps: commands: - /bin/bash ./scripts/ci/transfer-relayer.sh - name: proposal - image: publicawesome/stargaze:5.0.0 + image: publicawesome/stargaze:6.0.0 commands: - ./scripts/ci/upgrade/proposal.sh - name: stargaze-upgraded - pull: always - image: publicawesome/stargaze:v6-beta + pull: true + image: publicawesome/stargaze:v7-alpha commands: - ./scripts/ci/upgrade/run-upgrade.sh environment: @@ -365,6 +365,6 @@ depends_on: - ibc-integration-test --- kind: signature -hmac: ee2b0dc39d8a7bb0083fd2f865afdd2b83af4d7c5d1ccb83f7afedef451092b1 +hmac: 4b668796b958b936416e6c8d86414240ba0875bfe75e69cdaea917b4e9bfbeef ... diff --git a/app/upgrades.go b/app/upgrades.go index f6025f010..293cfd42b 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -7,16 +7,37 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - allocmoduletypes "github.com/public-awesome/stargaze/v6/x/alloc/types" + ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" ) // next upgrade name -const upgradeName = "v6" +const upgradeName = "v7" + +func equalTraces(dtA, dtB ibctransfertypes.DenomTrace) bool { + return dtA.BaseDenom == dtB.BaseDenom && dtA.Path == dtB.Path +} // RegisterUpgradeHandlers returns upgrade handlers func (app *App) RegisterUpgradeHandlers(cfg module.Configurator) { app.UpgradeKeeper.SetUpgradeHandler(upgradeName, func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - app.AccountKeeper.GetModuleAccount(ctx, allocmoduletypes.FairburnPoolName) + // list of traces that must replace the old traces in store + var newTraces []ibctransfertypes.DenomTrace + app.TransferKeeper.IterateDenomTraces(ctx, + func(dt ibctransfertypes.DenomTrace) bool { + // check if the new way of splitting FullDenom + // into Trace and BaseDenom passes validation and + // is the same as the current DenomTrace. + // If it isn't then store the new DenomTrace in the list of new traces. + newTrace := ibctransfertypes.ParseDenomTrace(dt.GetFullDenomPath()) + if err := newTrace.Validate(); err == nil && !equalTraces(newTrace, dt) { + newTraces = append(newTraces, newTrace) + } + return false + }) + // replace the outdated traces with the new trace information + for _, nt := range newTraces { + app.TransferKeeper.SetDenomTrace(ctx, nt) + } return app.mm.RunMigrations(ctx, cfg, vm) }) diff --git a/go.mod b/go.mod index 0d7fef46b..a8ce27af9 100644 --- a/go.mod +++ b/go.mod @@ -3,12 +3,12 @@ module github.com/public-awesome/stargaze/v6 go 1.18 require ( - github.com/CosmWasm/wasmd v0.27.0 + github.com/CosmWasm/wasmd v0.28.0 github.com/CosmWasm/wasmvm v1.0.0 github.com/armon/go-metrics v0.4.0 github.com/cosmos/cosmos-sdk v0.45.6 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/ibc-go/v3 v3.0.1 + github.com/cosmos/ibc-go/v3 v3.1.0 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 diff --git a/go.sum b/go.sum index 23dd4db8c..e3f7b007f 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmd v0.27.0 h1:GYctl+sqCa8zpDTTUhX0/nf/4ej9J7x/88UmKH9V6Nc= -github.com/CosmWasm/wasmd v0.27.0/go.mod h1:iiHoIuoCjR7kV4cS7PPt4NmyOXv+V9kohRQBsFIreMU= +github.com/CosmWasm/wasmd v0.28.0 h1:t4AMhe6qR/JIpDv7cmKtJKtsGndMRlI2zOgqDtwNfiw= +github.com/CosmWasm/wasmd v0.28.0/go.mod h1:+YFMYloXHkrMKYoIGKMzmbEtH0is99ZWl2xgh/U2Dic= github.com/CosmWasm/wasmvm v1.0.0 h1:NRmnHe3xXsKn2uEcB1F5Ha323JVAhON+BI6L177dlKc= github.com/CosmWasm/wasmvm v1.0.0/go.mod h1:ei0xpvomwSdONsxDuONzV7bL1jSET1M8brEx0FCXc+A= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -233,8 +233,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v3 v3.0.1 h1:JMQhAHYt/chIm240kIXeFIJfQr8m6FR3sE/eDqbpxWA= -github.com/cosmos/ibc-go/v3 v3.0.1/go.mod h1:DbOlOa4yKumaHGKApKkJN90L88PCjSD9ZBdAfL9tT40= +github.com/cosmos/ibc-go/v3 v3.1.0 h1:aVPqkrGBluz6t9+d/sLZIG/zQ9O1KJzVeR4UlL/IFTQ= +github.com/cosmos/ibc-go/v3 v3.1.0/go.mod h1:DbOlOa4yKumaHGKApKkJN90L88PCjSD9ZBdAfL9tT40= github.com/cosmos/interchain-accounts v0.1.0 h1:QmuwNsf1Hxl3P5GSGt7Z+JeuHPiZw4Z34R/038P5T6s= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= diff --git a/scripts/ci/upgrade/proposal.sh b/scripts/ci/upgrade/proposal.sh index 2b368dc98..f049a268c 100755 --- a/scripts/ci/upgrade/proposal.sh +++ b/scripts/ci/upgrade/proposal.sh @@ -13,10 +13,10 @@ HEIGHT=$(starsd status --node http://stargaze:26657 --home $STARGAZE_HOME | jq . echo "current height $HEIGHT" HEIGHT=$(expr $HEIGHT + 20) echo "submit with height $HEIGHT" -starsd tx gov submit-proposal software-upgrade v6 --upgrade-height $HEIGHT \ +starsd tx gov submit-proposal software-upgrade v7 --upgrade-height $HEIGHT \ --deposit 10000000ustars \ ---description "V6 Upgrade" \ ---title "V6 Upgrade" \ +--description "V7 Upgrade" \ +--title "V7 Upgrade" \ --gas-prices 0.025ustars --gas auto --gas-adjustment 1.5 --from validator \ --chain-id stargaze -b block --yes --node http://stargaze:26657 --home $STARGAZE_HOME --keyring-backend test