feat(upgrade): setup upgrade info for v2.0.0

Signed-off-by: Artur Troian <[email protected]>

Author: troian

.github/actions/setup-ubuntu/action.yaml

@@ -14,7 +14,7 @@ runs:
     - name: Install dependencies
       # Shell must explicitly specify the shell for each step. https://github.com/orgs/community/discussions/18597
       shell: bash
-      run: sudo apt install -y make direnv unzip lz4 wget curl npm jq pv coreutils
+      run: sudo apt install -y make direnv unzip lz4 wget curl npm jq pv coreutils musl-tools
     - name: Setup npm
       uses: actions/setup-node@v4
       with:

.github/workflows/tests.yaml

@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup environment
         uses: ./.github/actions/setup-ubuntu
-      - run: make bins
+      - run: BUILD_OPTIONS=static-link make bins
       - run: make docker-image
 
   tests:

.goreleaser.yaml

@@ -17,7 +17,6 @@ builds:
       - CC=o64-clang
       - CXX=o64-clang++
       - CGO_CFLAGS=-mmacosx-version-min=10.12
-      - CGO_LDFLAGS=-L./.cache/lib -mmacosx-version-min=10.12
     flags:
       - "-mod={{ .Env.MOD }}"
       - "-tags={{ .Env.BUILD_TAGS }} static_wasm"
@@ -26,6 +25,7 @@ builds:
       - "{{ .Env.BUILD_LDFLAGS }}"
       - -s -w
       - -linkmode=external
+      - -extldflags "-L./.cache/lib -mmacosx-version-min=10.12"
   - id: akash-darwin-arm64
     binary: akash
     main: ./cmd/akash
@@ -37,7 +37,6 @@ builds:
       - CC=oa64-clang
       - CXX=oa64-clang++
       - CGO_CFLAGS=-mmacosx-version-min=10.12
-      - CGO_LDFLAGS=-L./.cache/lib -mmacosx-version-min=10.12
     flags:
       - "-mod={{ .Env.MOD }}"
       - "-tags={{ .Env.BUILD_TAGS }} static_wasm"
@@ -46,6 +45,7 @@ builds:
       - "{{ .Env.BUILD_LDFLAGS }}"
       - -s -w
       - -linkmode=external
+      - -extldflags "-L./.cache/lib -mmacosx-version-min=10.12"
   - id: akash-linux-amd64
     binary: akash
     main: ./cmd/akash

Makefile

@@ -18,9 +18,20 @@ GIT_HEAD_ABBREV       := $(shell git rev-parse --abbrev-ref HEAD)
 
 IS_PREREL             := $(shell $(ROOT_DIR)/script/is_prerelease.sh "$(RELEASE_TAG)" && echo "true" || echo "false")
 IS_MAINNET            := $(shell $(ROOT_DIR)/script/mainnet-from-tag.sh "$(RELEASE_TAG)" && echo "true" || echo "false")
+IS_STABLE             ?= false
+
+ifeq ($(IS_MAINNET), true)
+	ifeq ($(IS_PREREL), false)
+		IS_STABLE                  := true
+	endif
+endif
 
 GOMOD                  ?= readonly
+
+ifneq ($(UNAME_OS),Darwin)
 BUILD_OPTIONS          ?= static-link
+endif
+
 BUILD_TAGS             := osusergo netgo ledger muslc gcc
 DB_BACKEND             := goleveldb
 BUILD_FLAGS            :=
@@ -51,8 +62,12 @@ ldflags := -X github.com/cosmos/cosmos-sdk/version.Name=akash \
 
 GORELEASER_LDFLAGS := $(ldflags)
 
-ifeq (,$(findstring static-link,$(BUILD_OPTIONS)))
-	ldflags += -linkmode=external -extldflags "-Wl,-z,muldefs -static"
+ldflags += -linkmode=external
+
+ifeq (static-link,$(findstring static-link,$(BUILD_OPTIONS)))
+	ldflags += -extldflags "-L$(AKASH_DEVCACHE_LIB) -lm -Wl,-z,muldefs -static"
+else
+	ldflags += -extldflags "-L$(AKASH_DEVCACHE_LIB)"
 endif
 
 # check for nostrip option

_build/akash.Dockerfile

@@ -1,8 +1,6 @@
 FROM debian:bullseye
 LABEL "org.opencontainers.image.source"="https://github.com/akash-network/node"
 
-ARG WASMVM_VERSION
-
 COPY ./akash /bin/
 
 EXPOSE 26656 26657 26658

_run/common-commands.mk

@@ -24,15 +24,15 @@ multisig-send:
 		"$(AKASH_HOME)/multisig-sig-main.json" \
 		"$(AKASH_HOME)/multisig-sig-other.json" \
 		> "$(AKASH_HOME)/multisig-final.json"
-	$(AKASH) "$(CHAIN_OPTS)" tx broadcast "$(AKASH_HOME)/multisig-final.json"
+	$(AKASH) $(CHAIN_OPTS) tx broadcast "$(AKASH_HOME)/multisig-final.json"
 
 .PHONY: akash-node-ready
 akash-node-ready: SHELL=$(BASH_PATH)
 akash-node-ready:
 	@( \
 		max_retry=15; \
 		counter=0; \
-		while [[ counter -lt max_retry ]]; do \
+		while [[ $$counter -lt $$max_retry ]]; do \
 			read block < <(curl -s $(AKASH_NODE)/status | jq -r '.result.sync_info.latest_block_height' 2> /dev/null); \
 			if [[ $$? -ne 0 || $$block -lt 1 ]]; then \
 				echo "unable to get node status. sleep for 1s"; \

_run/common.mk

@@ -75,6 +75,7 @@ client-init-key-multisig:
 		--multisig "$(subst $(space),$(comma),$(strip $(MULTISIG_SIGNERS)))" \
 		--multisig-threshold 2
 
+.NOTPARALLEL: node-init
 .INTERMEDIATE: node-init
 node-init: node-init-genesis node-init-genesis-accounts node-init-genesis-certs node-init-gentx node-init-finalize
 

app/app.go

@@ -141,7 +141,7 @@ func NewApp(
 		if vl, valid := val.([]wasmkeeper.Option); valid {
 			wasmOpts = append(wasmOpts, vl...)
 		} else {
-			panic(fmt.Sprintf("invalid type for aptOpts.Get(\"wasmh\"). expected %s, actual %s", reflect.TypeOf(wasmOpts).String(), reflect.TypeOf(vl).String()))
+			panic(fmt.Sprintf("invalid type for aptOpts.Get(\"wasm\"). expected %s, actual %s", reflect.TypeOf(wasmOpts).String(), reflect.TypeOf(val).String()))
 		}
 	}
 
@@ -163,7 +163,6 @@ func NewApp(
 		panic(fmt.Sprintf("error while reading wasm config: %s", err))
 	}
 
-	wasmConfig.ContractDebugMode = false
 	// Memory limits - prevent DoS
 	wasmConfig.MemoryCacheSize = 100 // 100 MB max
 	// Query gas limit - prevent expensive queries

app/sim_test.go

@@ -12,7 +12,6 @@ import (
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
-	simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -169,8 +168,12 @@ func TestAppImportExport(t *testing.T) {
 
 	t.Log("importing genesis...\n")
 
-	newDB, newDir, _, _, err := simtestutil.SetupSimulation(config, "leveldb-app-sim-2", "Simulation-2", simcli.FlagVerboseValue, simcli.FlagEnabledValue)
+	newDB, newDir, _, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim-2", "Simulation-2", sim.FlagVerboseValue, sim.FlagEnabledValue)
 	require.NoError(t, err, "simulation setup failed")
+	if skip {
+		t.Skip("skipping application import/export simulation")
+	}
+
 	defer func() {
 		require.NoError(t, newDB.Close())
 		require.NoError(t, os.RemoveAll(newDir))
@@ -521,14 +524,14 @@ func TestAppStateDeterminism(t *testing.T) {
 }
 
 func setupSimulationApp(t *testing.T, msg string) (simtypes.Config, sdkutil.EncodingConfig, dbm.DB, simtestutil.AppOptionsMap, log.Logger, *akash.AkashApp) {
-	config := simcli.NewConfigFromFlags()
+	config := sim.NewConfigFromFlags()
 	config.ChainID = AppChainID
 
 	encodingConfig := sdkutil.MakeEncodingConfig()
 
 	akash.ModuleBasics().RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
-	db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", simcli.FlagVerboseValue, simcli.FlagEnabledValue)
+	db, dir, logger, skip, err := simtestutil.SetupSimulation(config, "leveldb-app-sim", "Simulation", sim.FlagVerboseValue, sim.FlagEnabledValue)
 	if skip {
 		t.Skip(msg)
 	}
@@ -539,11 +542,11 @@ func setupSimulationApp(t *testing.T, msg string) (simtypes.Config, sdkutil.Enco
 		require.NoError(t, os.RemoveAll(dir))
 	})
 
-	appOpts := make(simtestutil.AppOptionsMap, 0)
+	appOpts := make(simtestutil.AppOptionsMap)
 	appOpts[cflags.FlagHome] = dir // ensure a unique folder
-	appOpts[cflags.FlagInvCheckPeriod] = simcli.FlagPeriodValue
+	appOpts[cflags.FlagInvCheckPeriod] = sim.FlagPeriodValue
 	app := akash.NewApp(logger, db, nil, true, sim.FlagPeriodValue, map[int64]bool{}, encodingConfig, appOpts, fauxMerkleModeOpt, baseapp.SetChainID(AppChainID))
 
-	require.Equal(t, "AkashApp", app.Name())
+	require.Equal(t, akash.AppName, app.Name())
 	return config, encodingConfig, db, appOpts, logger, app
 }

app/types/app.go

@@ -48,12 +48,6 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-	icacontroller "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller"
-	icacontrollerkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/keeper"
-	icacontrollertypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/controller/types"
-	icahostkeeper "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/keeper"
-	icahosttypes "github.com/cosmos/ibc-go/v10/modules/apps/27-interchain-accounts/host/types"
-	ibccallbacks "github.com/cosmos/ibc-go/v10/modules/apps/callbacks"
 	"github.com/cosmos/ibc-go/v10/modules/apps/transfer"
 	ibctransferkeeper "github.com/cosmos/ibc-go/v10/modules/apps/transfer/keeper"
 	ibctransfertypes "github.com/cosmos/ibc-go/v10/modules/apps/transfer/types"
@@ -115,8 +109,6 @@ type AppKeepers struct {
 		IBC             *ibckeeper.Keeper
 		Evidence        *evidencekeeper.Keeper
 		Transfer        ibctransferkeeper.Keeper
-		ICAController   icacontrollerkeeper.Keeper
-		ICAHost         icahostkeeper.Keeper
 		Wasm            *wasmkeeper.Keeper
 	}
 
@@ -500,21 +492,6 @@ func (app *App) InitNormalKeepers(
 	// Create fee enabled wasm ibc Stack
 	wasmStackIBCHandler := wasm.NewIBCHandler(app.Keepers.Cosmos.Wasm, app.Keepers.Cosmos.IBC.ChannelKeeper, app.Keepers.Cosmos.Transfer, app.Keepers.Cosmos.IBC.ChannelKeeper)
 
-	// Create Interchain Accounts Stack
-	// SendPacket, since it is originating from the application to core IBC:
-	// icaAuthModuleKeeper.SendTx -> icaController.SendPacket -> fee.SendPacket -> channel.SendPacket
-	var icaControllerStack porttypes.IBCModule
-	// integration point for custom authentication modules
-	// sees https://medium.com/the-interchain-foundation/ibc-go-v6-changes-to-interchain-accounts-and-how-it-impacts-your-chain-806c185300d7
-	var noAuthzModule porttypes.IBCModule
-	icaControllerStack = icacontroller.NewIBCMiddlewareWithAuth(noAuthzModule, app.Keepers.Cosmos.ICAController)
-	// app.ICAAuthModule = icaControllerStack.(ibcmock.IBCModule)
-	icaControllerStack = icacontroller.NewIBCMiddlewareWithAuth(icaControllerStack, app.Keepers.Cosmos.ICAController)
-	icaControllerStack = ibccallbacks.NewIBCMiddleware(icaControllerStack, app.Keepers.Cosmos.IBC.ChannelKeeper, wasmStackIBCHandler, wasm.DefaultMaxIBCCallbackGas)
-	icaICS4Wrapper := icaControllerStack.(porttypes.ICS4Wrapper)
-	// Since the callback middleware itself is an ics4wrapper, it needs to be passed to the ica controller keeper
-	app.Keepers.Cosmos.ICAController.WithICS4Wrapper(icaICS4Wrapper)
-
 	transferIBCModule := transfer.NewIBCModule(app.Keepers.Cosmos.Transfer)
 
 	// Create static IBC router, add transfer route, then set and seal it
@@ -540,7 +517,6 @@ func (app *App) SetupHooks() {
 			app.Keepers.Cosmos.Slashing.Hooks(),
 		),
 	)
-
 	app.Keepers.Cosmos.Gov.SetHooks(
 		govtypes.NewMultiGovHooks(
 		// insert governance hooks receivers here
@@ -573,8 +549,6 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(crisistypes.ModuleName).WithKeyTable(crisistypes.ParamKeyTable())     // nolint: staticcheck // SA1019
 	paramsKeeper.Subspace(ibctransfertypes.ModuleName).WithKeyTable(ibctransfertypes.ParamKeyTable())
 	paramsKeeper.Subspace(ibcexported.ModuleName).WithKeyTable(ibctable)
-	paramsKeeper.Subspace(icacontrollertypes.SubModuleName)
-	paramsKeeper.Subspace(icahosttypes.SubModuleName)
 
 	// akash params subspaces
 	paramsKeeper.Subspace(dtypes.ModuleName).WithKeyTable(dv1beta.ParamKeyTable())