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

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(vl).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/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
@@ -573,8 +550,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())

go.mod

@@ -47,8 +47,8 @@ require (
 	google.golang.org/grpc v1.75.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools/v3 v3.5.2
-	pkg.akt.dev/go v0.1.6-rc1
-	pkg.akt.dev/go/cli v0.1.5-rc1
+	pkg.akt.dev/go v0.1.6-rc3
+	pkg.akt.dev/go/cli v0.1.5-rc3
 	pkg.akt.dev/go/sdl v0.1.1
 )
 
@@ -61,7 +61,7 @@ replace (
 	// use akash fork of cometbft
 	github.com/cometbft/cometbft => github.com/akash-network/cometbft v0.38.19-akash.1
 	// use akash fork of cosmos sdk
-	github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10
+	github.com/cosmos/cosmos-sdk => github.com/akash-network/cosmos-sdk v0.53.4-akash.10
 
 	github.com/cosmos/gogoproto => github.com/akash-network/gogoproto v1.7.0-akash.2
 

go.sum

@@ -1285,8 +1285,8 @@ github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3
 github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM=
 github.com/akash-network/cometbft v0.38.19-akash.1 h1:am45M/0vjs1FEwh1WiLv/cp92Yskj2Dls997phjnxso=
 github.com/akash-network/cometbft v0.38.19-akash.1/go.mod h1:UCu8dlHqvkAsmAFmWDRWNZJPlu6ya2fTWZlDrWsivwo=
-github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10 h1:zPQVFSuBQKE3orKGgePPLU6eWn7kTAMCfuqFFa1Gc3Y=
-github.com/akash-network/cosmos-sdk v0.53.4-akash.b.10/go.mod h1:gZcyUJu6h94FfxgJbuBpiW7RPCFEV/+GJdy4UAJ3Y1Q=
+github.com/akash-network/cosmos-sdk v0.53.4-akash.10 h1:8XyxL+VfqkdVYaDudk4lrNX9vH/n3JxRizcLQlUiC/o=
+github.com/akash-network/cosmos-sdk v0.53.4-akash.10/go.mod h1:gZcyUJu6h94FfxgJbuBpiW7RPCFEV/+GJdy4UAJ3Y1Q=
 github.com/akash-network/gogoproto v1.7.0-akash.2 h1:zY5seM6kBOLMBWn15t8vrY1ao4J1HjrhNaEeO/Soro0=
 github.com/akash-network/gogoproto v1.7.0-akash.2/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -3282,10 +3282,10 @@ nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
 nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA=
 pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
-pkg.akt.dev/go v0.1.6-rc1 h1:Bl1/tSPAyUnpPl/rv13pZqAZYp/a5ZNRbIOk6eSFRlw=
-pkg.akt.dev/go v0.1.6-rc1/go.mod h1:lKU6b+hR+LAWslGemTYg8raiBHru4K1jolk+LDUU57Y=
-pkg.akt.dev/go/cli v0.1.5-rc1 h1:g6AuRfwPZA0FpHo02tSeQvdLhvszRHoGb3VUdpgpoak=
-pkg.akt.dev/go/cli v0.1.5-rc1/go.mod h1:G2PaN/gYDVDUuTF0TzQcQgx9Tn1iIx3Ca3kIF61sY2M=
+pkg.akt.dev/go v0.1.6-rc3 h1:7w0TyrMLAJH7hOWTHOjCH69Ofh93DYWoSSeZWs1uG7E=
+pkg.akt.dev/go v0.1.6-rc3/go.mod h1:XAwgUugjjoSqiUNM3Ph/jZMZxDbo6fhJpZlEk5XRmOk=
+pkg.akt.dev/go/cli v0.1.5-rc3 h1:82X7H8LuSTftog1N70Zw4duwLMCGhUZHUsD19LhYcVE=
+pkg.akt.dev/go/cli v0.1.5-rc3/go.mod h1:AJinKcxEzo/YTxvEcvQOnCoHeGXQh8FfZePy8Q3aJnc=
 pkg.akt.dev/go/sdl v0.1.1 h1:3CcAqWeKouFlvUSjQMktWLDqftOjn4cBX37TRFT7BRM=
 pkg.akt.dev/go/sdl v0.1.1/go.mod h1:ADsH8/kh61tWTax8nV0utelOaKWfU3qbG+OT3v9nmeY=
 pkg.akt.dev/specs v0.0.1 h1:OP0zil3Fr4kcCuybFqQ8LWgSlSP2Yn7306meWpu6/S4=

make/init.mk

@@ -100,6 +100,9 @@ RELEASE_TAG                      ?= $(shell git describe --tags --abbrev=0)
 
 WASMVM_LIBS  := libwasmvm_muslc.x86_64.a \
 libwasmvm_muslc.aarch64.a \
-libwasmvmstatic_darwin.a
+libwasmvmstatic_darwin.a \
+libwasmvm.aarch64.so \
+libwasmvm.dylib \
+libwasmvm.x86_64.so
 
 include $(AKASH_ROOT)/make/setup-cache.mk

make/releasing.mk

@@ -34,7 +34,7 @@ ifeq ($(GORELEASER_MOUNT_CONFIG),true)
 endif
 
 .PHONY: bins
-bins: $(BINS)
+bins: $(AKASH)
 
 .PHONY: build
 build:
@@ -65,6 +65,7 @@ test-bins: wasmvm-libs
 	docker run \
 		--rm \
 		-e MOD="$(GOMOD)" \
+		-e STABLE=$(IS_STABLE) \
 		-e BUILD_TAGS="$(GORELEASER_TAGS)" \
 		-e BUILD_LDFLAGS="$(GORELEASER_LDFLAGS)" \
 		-e DOCKER_IMAGE=$(RELEASE_DOCKER_IMAGE) \
@@ -87,6 +88,7 @@ docker-image: wasmvm-libs
 	docker run \
 		--rm \
 		-e MOD="$(GOMOD)" \
+		-e STABLE=$(IS_STABLE) \
 		-e BUILD_TAGS="$(GORELEASER_TAGS)" \
 		-e BUILD_LDFLAGS="$(GORELEASER_LDFLAGS)" \
 		-e DOCKER_IMAGE=$(RELEASE_DOCKER_IMAGE) \
@@ -114,6 +116,7 @@ release: wasmvm-libs gen-changelog
 	docker run \
 		--rm \
 		-e MOD="$(GOMOD)" \
+		-e STABLE=$(IS_STABLE) \
 		-e BUILD_TAGS="$(GORELEASER_TAGS)" \
 		-e BUILD_LDFLAGS="$(GORELEASER_LDFLAGS)" \
 		-e GITHUB_TOKEN="$(GITHUB_TOKEN)" \