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

troian · troian · commit 47434f89ec0f · 2025-11-12T13:55:35.000-06:00
Signed-off-by: Artur Troian &lt;troian@users.noreply.github.com&gt;
diff --git a/.github/actions/setup-ubuntu/action.yaml b/.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:
diff --git a/.github/workflows/tests.yaml b/.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:
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -17,7 +17,7 @@ builds:
       - CC=o64-clang
       - CXX=o64-clang++
       - CGO_CFLAGS=-mmacosx-version-min=10.12
-      - CGO_LDFLAGS=-L./.cache/lib -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"
diff --git a/Makefile b/Makefile
@@ -52,7 +52,7 @@ 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 -extldflags "-L$(AKASH_DEVCACHE_LIB) -Wl,-z,muldefs -static"
 endif
 
 # check for nostrip option
diff --git a/app/app.go b/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
diff --git a/app/types/app.go b/app/types/app.go
@@ -48,12 +48,8 @@ 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,9 +111,9 @@ type AppKeepers struct {
 		IBC             *ibckeeper.Keeper
 		Evidence        *evidencekeeper.Keeper
 		Transfer        ibctransferkeeper.Keeper
-		ICAController   icacontrollerkeeper.Keeper
-		ICAHost         icahostkeeper.Keeper
-		Wasm            *wasmkeeper.Keeper
+		//ICAController   icacontrollerkeeper.Keeper
+		//ICAHost         icahostkeeper.Keeper
+		Wasm *wasmkeeper.Keeper
 	}
 
 	Akash struct {
@@ -503,17 +499,17 @@ func (app *App) InitNormalKeepers(
 	// 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)
+	//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)
 
diff --git a/go.mod b/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
 
diff --git a/go.sum b/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=
diff --git a/make/releasing.mk b/make/releasing.mk
@@ -34,7 +34,7 @@ ifeq ($(GORELEASER_MOUNT_CONFIG),true)
 endif
 
 .PHONY: bins
-bins: $(BINS)
+bins: $(AKASH)
 
 .PHONY: build
 build:
diff --git a/make/test-integration.mk b/make/test-integration.mk
@@ -16,7 +16,7 @@ test-nocache:
 
 .PHONY: test-full
 test-full:
-	$(GO_TEST) -v -tags=$(BUILD_TAGS) $(TEST_MODULES)
+	$(GO_TEST) -v -tags=$(build_tag_cs) $(TEST_MODULES)
 
 .PHONY: test-integration
 test-integration:
diff --git a/make/test-upgrade.mk b/make/test-upgrade.mk
@@ -21,17 +21,14 @@ UPGRADE_FROM            := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name
 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
 
-SNAPSHOT_SOURCE         ?= sandbox1
+SNAPSHOT_SOURCE         ?= sandbox
 
 ifeq ($(SNAPSHOT_SOURCE),mainnet)
 	SNAPSHOT_NETWORK    := akashnet-2
 	CHAIN_METADATA_URL  := https://raw.githubusercontent.com/akash-network/net/master/mainnet/meta.json
 else ifeq ($(SNAPSHOT_SOURCE),sandbox)
 	SNAPSHOT_NETWORK    := sandbox-2
 	CHAIN_METADATA_URL  := https://raw.githubusercontent.com/akash-network/net/master/sandbox-2/meta.json
-else ifeq ($(SNAPSHOT_SOURCE),sandbox1)
-	SNAPSHOT_NETWORK    := sandbox-01
-	CHAIN_METADATA_URL  := https://raw.githubusercontent.com/akash-network/net/master/sandbox/meta.json
 else
 $(error "invalid snapshot source $(SNAPSHOT_SOURCE)")
 endif
@@ -67,6 +64,7 @@ test: init
 	$(GO_TEST) -run "^\QTestUpgrade\E$$" -tags e2e.upgrade -timeout 180m -v -args \
 		-cosmovisor=$(COSMOVISOR) \
 		-workdir=$(AP_RUN_DIR)/validators \
+		-sourcesdir=$(AKASH_ROOT) \
 		-config=$(TEST_CONFIG) \
 		-upgrade-name=$(UPGRADE_TO) \
 		-upgrade-version="$(UPGRADE_BINARY_VERSION)" \
@@ -75,7 +73,7 @@ test: init
 .PHONY: test-reset
 test-reset:
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) --max-validators=$(MAX_VALIDATORS) clean
-	#$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) --chain-meta=$(CHAIN_METADATA_URL) bins
+	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --gbv=$(GENESIS_BINARY_VERSION) --chain-meta=$(CHAIN_METADATA_URL) bins
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --uto=$(UPGRADE_TO) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) keys
 	$(ROOT_DIR)/script/upgrades.sh --workdir=$(AP_RUN_DIR) --config="$(PWD)/config.json" --state-config=$(STATE_CONFIG) --snapshot-url=$(SNAPSHOT_URL) --chain-meta=$(CHAIN_METADATA_URL) --max-validators=$(MAX_VALIDATORS) prepare-state
 
diff --git a/meta.json b/meta.json
@@ -44,6 +44,11 @@
             "skipped": false,
             "from_binary": "v0.38.6-rc2",
             "from_version": "v0.38.0"
+        },
+        "v2.0.0": {
+            "skipped": false,
+            "from_binary": "v1.0.3-rc4",
+            "from_version": "v1.0.0"
         }
     }
 }
diff --git a/script/upgrades.sh b/script/upgrades.sh
@@ -548,7 +548,7 @@ function prepare_state() {
 			valjson=$(cat "$valdir/validator.json")
 			if [[ $cnt -gt 0 ]]; then
 				if [[ $($semver compare "$akashversion" v1.0.0-rc0) -ge 0 ]]; then
-					$AKASH tx staking create-validator "$valjson" --home="$rvaldir" --from="validator$cnt" --yes
+					$AKASH tx staking create-validator "$valdir/validator.json" --home="$rvaldir" --from="validator$cnt" --yes
 				else
 					$AKASH tx staking create-validator \
 						--home="$rvaldir" \
diff --git a/tests/upgrade/config-v0.24.0.tmpl.json b/tests/upgrade/config-v0.24.0.tmpl.json
diff --git a/tests/upgrade/sdktypes.go b/tests/upgrade/sdktypes.go
@@ -0,0 +1,56 @@
+package upgrade
+
+import (
+	"encoding/json"
+
+	upgradetypes "cosmossdk.io/x/upgrade/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+// These files defines sdk specific types necessary to perform upgrade simulation.
+// we're not using SDK generated types to prevent import of different types of cosmos sdk
+
+type nodeStatus struct {
+	SyncInfo struct {
+		LatestBlockHeight string `json:"latest_block_height"`
+		CatchingUp        bool   `json:"catching_up"`
+	} `json:"sync_info"`
+}
+
+type votingParams struct {
+	VotingPeriod string `json:"voting_period"`
+}
+
+type depositParams struct {
+	MinDeposit sdk.Coins `json:"min_deposit"`
+}
+
+type govParams struct {
+	VotingParams  votingParams  `json:"voting_params"`
+	DepositParams depositParams `json:"deposit_params"`
+}
+
+type proposalResp struct {
+	ID    string `json:"id"`
+	Title string `json:"title"`
+}
+
+type proposalsResp struct {
+	Proposals []proposalResp `json:"proposals"`
+}
+
+type SoftwareUpgradeProposal struct {
+	Type      string            `json:"@type"`
+	Authority string            `json:"authority"`
+	Plan      upgradetypes.Plan `json:"plan"`
+}
+
+type ProposalMsg struct {
+	// Msgs defines an array of sdk.Msgs proto-JSON-encoded as Anys.
+	Messages  []json.RawMessage `json:"messages,omitempty"`
+	Metadata  string            `json:"metadata"`
+	Deposit   string            `json:"deposit"`
+	Title     string            `json:"title"`
+	Summary   string            `json:"summary"`
+	Expedited bool              `json:"expedited"`
+}
diff --git a/tests/upgrade/test-cases.json b/tests/upgrade/test-cases.json
@@ -1,4 +1,12 @@
 {
+    "v2.0.0": {
+        "modules": {
+            "added": [
+                "wasm",
+                "awasm"
+            ]
+        }
+    },
     "v1.0.0": {
         "modules": {
             "added": [
diff --git a/tests/upgrade/test-config.json b/tests/upgrade/test-config.json
@@ -1,8 +1,7 @@
 {
     "chain-id": "localakash",
     "validators": [
-        ".akash0",
-        ".akash1"
+        ".akash0"
     ],
     "work": {
         "home": ".akash0",
diff --git a/tests/upgrade/testdata/hackatom.wasm b/tests/upgrade/testdata/hackatom.wasm
diff --git a/tests/upgrade/types/types.go b/tests/upgrade/types/types.go
@@ -11,6 +11,7 @@ import (
 type TestParams struct {
 	Home           string
 	Node           string
+	SourceDir      string
 	ChainID        string
 	KeyringBackend string
 	From           string
diff --git a/tests/upgrade/upgrade_test.go b/tests/upgrade/upgrade_test.go
diff --git a/tests/upgrade/workers_test.go b/tests/upgrade/workers_test.go
diff --git a/upgrades/software/v2.0.0/upgrade.go b/upgrades/software/v2.0.0/upgrade.go
diff --git a/x/wasm/module.go b/x/wasm/module.go

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func NewApp(`
`141`	`141`	`if vl, valid := val.([]wasmkeeper.Option); valid {`
`142`	`142`	`wasmOpts = append(wasmOpts, vl...)`
`143`	`143`	`} else {`
`144`		`- panic(fmt.Sprintf("invalid type for aptOpts.Get(\"wasmh\"). expected %s, actual %s", reflect.TypeOf(wasmOpts).String(), reflect.TypeOf(vl).String()))`
	`144`	`+ panic(fmt.Sprintf("invalid type for aptOpts.Get(\"wasm\"). expected %s, actual %s", reflect.TypeOf(wasmOpts).String(), reflect.TypeOf(vl).String()))`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`@@ -163,7 +163,6 @@ func NewApp(`
`163`	`163`	`panic(fmt.Sprintf("error while reading wasm config: %s", err))`
`164`	`164`	`}`
`165`	`165`
`166`		`- wasmConfig.ContractDebugMode = false`
`167`	`166`	`// Memory limits - prevent DoS`
`168`	`167`	`wasmConfig.MemoryCacheSize = 100 // 100 MB max`
`169`	`168`	`// Query gas limit - prevent expensive queries`