fix(x/take): set 2 percent AKT take rate during v0.24.0 upgrade

Signed-off-by: Artur Troian <troian.ap@gmail.com>
akash-network · Aug 22, 2023 · 55672bd · 55672bd
1 parent 3eae639
commit 55672bd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -212,7 +212,6 @@ jobs:
           toolchain=$(cat go.mod | grep toolchain | cut -d ' ' -f 2 | sed 's/go*//')
           echo "GOTOOLCHAIN=go${toolchain}" >> $GITHUB_ENV
           echo "GOVERSION=${toolchain}" >> $GITHUB_ENV
-          echo "GOROOT=/opt/hostedtoolcache/go/${toolchain}/x64" >> $GITHUB_ENV
       - uses: actions/setup-go@v4
         with:
           go-version: "${{ env.GOVERSION }}"

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.20
 toolchain go1.21.0
 
 require (
-	github.com/akash-network/akash-api v0.0.26
+	github.com/akash-network/akash-api v0.0.27
 	github.com/blang/semver/v4 v4.0.0
 	github.com/boz/go-lifecycle v0.1.1
 	github.com/cosmos/cosmos-sdk v0.45.16

diff --git a/go.sum b/go.sum
@@ -99,8 +99,8 @@ github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBA
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/akash-network/akash-api v0.0.26 h1:2e0m52pE/a2Ka2i8Zkh1ourLxNKLYBaCbPcXKV5vncw=
-github.com/akash-network/akash-api v0.0.26/go.mod h1:9/uYusyBcZecBQCgZWUbXRu0i1tyxj4/ze45XB2oLIU=
+github.com/akash-network/akash-api v0.0.27 h1:jit/zaBtx97ctL35/wM0r8yBJ74sXJsVlCa6uTEamHo=
+github.com/akash-network/akash-api v0.0.27/go.mod h1:9/uYusyBcZecBQCgZWUbXRu0i1tyxj4/ze45XB2oLIU=
 github.com/akash-network/cometbft v0.34.27-akash h1:V1dApDOr8Ee7BJzYyQ7Z9VBtrAul4+baMeA6C49dje0=
 github.com/akash-network/cometbft v0.34.27-akash/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw=
 github.com/akash-network/ledger-go v0.14.3 h1:LCEFkTfgGA2xFMN2CtiKvXKE7dh0QSM77PJHCpSkaAo=

diff --git a/make/test-upgrade.mk b/make/test-upgrade.mk
@@ -19,8 +19,8 @@ export AKASH_LOG_COLOR          = true
 KEY_OPTS                := --keyring-backend=$(AKASH_KEYRING_BACKEND)
 KEY_NAME                ?= validator
 UPGRADE_TO              ?= v0.24.0
-UPGRADE_FROM            := $(shell cat $(ROOT_DIR)/meta.json | jq --arg name $(UPGRADE_TO) '.upgrades[$$name].from_version' | tr -d '\n')
-GENESIS_BINARY_VERSION  := $(shell cat $(ROOT_DIR)/meta.json | jq --arg name $(UPGRADE_TO) '.upgrades[$$name].from_binary' | tr -d '\n')
+UPGRADE_FROM            := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name $(UPGRADE_TO) '.upgrades[$$name].from_version' | tr -d '\n')
+GENESIS_BINARY_VERSION  := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name $(UPGRADE_TO) '.upgrades[$$name].from_binary' | tr -d '\n')
 UPGRADE_BINARY_VERSION  ?= local
 
 GENESIS_CONFIG_TEMPLATE ?= $(CURDIR)/config-$(UPGRADE_TO).tmpl.json

diff --git a/tests/upgrade/upgrade_test.go b/tests/upgrade/upgrade_test.go
@@ -487,6 +487,7 @@ func (l *launcher) run() error {
 		fmt.Sprintf("DAEMON_RESTART_AFTER_UPGRADE=true"),
 		fmt.Sprintf("DAEMON_ALLOW_DOWNLOAD_BINARIES=true"),
 		fmt.Sprintf("DAEMON_RESTART_DELAY=3s"),
+		fmt.Sprintf("COSMOVISOR_COLOR_LOGS=false"),
 		fmt.Sprintf("UNSAFE_SKIP_BACKUP=true"),
 		fmt.Sprintf("AKASH_HOME=%s", l.params.homeDir),
 		fmt.Sprintf("AKASH_KEYRING_BACKEND=test"),

diff --git a/x/take/keeper/keeper.go b/x/take/keeper/keeper.go
@@ -26,7 +26,6 @@ type Keeper struct {
 
 // NewKeeper creates and returns an instance for deployment keeper
 func NewKeeper(cdc codec.BinaryCodec, skey sdk.StoreKey, pspace paramtypes.Subspace) IKeeper {
-
 	if !pspace.HasKeyTable() {
 		pspace = pspace.WithKeyTable(types.ParamKeyTable())
 	}