chore: finalise v1.1.0 upgrade (#28)

Co-authored-by: John Letey <[email protected]>

CHANGELOG.md

@@ -17,7 +17,7 @@
 ### Improvements
 
 - [#22](https://github.com/KYVENetwork/chain/pull/22) Various minor code improvements, cleanups, and validations.
-- (deps) [#21](https://github.com/KYVENetwork/chain/pull/21) Bump Cosmos SDK to [v0.46.11](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.11) ([`v0.46.11-kyve-rc0`](https://github.com/KYVENetwork/cosmos-sdk/releases/tag/v0.46.11-kyve-rc0)).
+- (deps) [#21](https://github.com/KYVENetwork/chain/pull/21), [#28](https://github.com/KYVENetwork/chain/pull/28) Bump Cosmos SDK to [v0.46.12](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.12) ([`v0.46.12-kyve`](https://github.com/KYVENetwork/cosmos-sdk/releases/tag/v0.46.12-kyve)).
 - (deps) [#21](https://github.com/KYVENetwork/chain/pull/21) Switch to CometBFT from Informal Systems' Tendermint fork.
 - (ibc) [#27](https://github.com/KYVENetwork/chain/pull/27) Enable tokens to be sent and received via IBC.
 
@@ -39,12 +39,12 @@
 
 ### State Machine Breaking
 
-- (`x/stakers`) [#23](https://github.com/KYVENetwork/chain/pull/23) Improve metadata by adding `Identity`, `SecurityContact`, `Details` fields, deprecating `Logo`.
 - (`x/bundles`) [#19](https://github.com/KYVENetwork/chain/pull/19) Migrate `NetworkFee` param to type `sdk.Dec`.
 - (`x/bundles`) [#22](https://github.com/KYVENetwork/chain/pull/22) Switch to a non-manipulable pseudo-random source seed for uploader selection.
 - (`x/bundles`) [#26](https://github.com/KYVENetwork/chain/pull/26) Include the timestamp of the block that finalized a bundle.
 - (`x/delegation`) [#19](https://github.com/KYVENetwork/chain/pull/19) Migrate `VoteSlash`, `UploadSlash`, `TimeoutSlash` params to type `sdk.Dec`.
 - (`x/stakers`) [#19](https://github.com/KYVENetwork/chain/pull/19) Migrate `Commission` to type `sdk.Dec`.
+- (`x/stakers`) [#23](https://github.com/KYVENetwork/chain/pull/23) Improve metadata by adding `Identity`, `SecurityContact`, `Details` fields, deprecating `Logo`.
 
 ## [v1.0.0](https://github.com/KYVENetwork/chain/releases/tag/v1.0.0) - 2023-03-10
 

Makefile

@@ -1,19 +1,21 @@
 COMMIT := $(shell git log -1 --format='%H')
 VERSION := v1.0.0 # $(shell echo $(shell git describe --tags) | sed 's/^v//')
 
-DENOM ?= ukyve
-TEAM_TGE ?= 2023-03-14T14:03:14
-TEAM_ALLOCATION ?= 165000000000000
-TEAM_FOUNDATION_ADDRESS ?= kyve1xjpl57p7f49y5gueu7rlfytaw9ramcn5zhjy2g
-TEAM_BCP_ADDRESS ?= kyve1fnh4kghr25tppskap50zk5j385pt65tyyjaraa
+TEAM_ALLOCATION := 165000000000000
 ifeq ($(ENV),kaon)
 $(info 📑 Using Kaon environment...)
 DENOM := tkyve
 TEAM_TGE := 2023-02-07T14:00:00
 TEAM_FOUNDATION_ADDRESS := kyve1vut528et85755xsncjwl6dx8xakuv26hxgyv0n
 TEAM_BCP_ADDRESS := kyve1vut528et85755xsncjwl6dx8xakuv26hxgyv0n
+else ifeq ($(ENV),mainnet)
+$(info 📑 Using mainnet environment...)
+DENOM := ukyve
+TEAM_TGE := 2023-03-14T14:03:14
+TEAM_FOUNDATION_ADDRESS := kyve1xjpl57p7f49y5gueu7rlfytaw9ramcn5zhjy2g
+TEAM_BCP_ADDRESS := kyve1fnh4kghr25tppskap50zk5j385pt65tyyjaraa
 else
-$(info 📑 Using default environment...)
+$(error ❌  Please specify a build environment..)
 endif
 
 ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=kyve \
@@ -105,7 +107,7 @@ vet:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-BUF_VERSION=1.15.0
+BUF_VERSION=1.17.0
 
 proto-all: proto-format proto-lint proto-gen
 

app/app.go

@@ -779,8 +779,13 @@ func NewKYVEApp(
 		v11.CreateUpgradeHandler(
 			app.mm,
 			app.configurator,
+			appCodec,
+			keys[bundlesTypes.StoreKey],
+			keys[delegationTypes.StoreKey],
+			keys[stakersTypes.StoreKey],
 			app.AccountKeeper,
-			app.StakersKeeper,
+			app.ICAControllerKeeper,
+			app.ICAHostKeeper,
 			app.IBCTransferKeeper,
 		),
 	)

app/upgrades/v1_1/constants.go

@@ -3,7 +3,10 @@ package v1_1
 // UpgradeName is the name of this specific software upgrade used on-chain.
 const UpgradeName = "v1.1.0"
 
-// MainnetChainID is the Chain ID of KYVE mainnet.
+// TestnetChainID is the Chain ID of the KYVE testnet (Kaon).
+const TestnetChainID = "kaon-1"
+
+// MainnetChainID is the Chain ID of the KYVE mainnet.
 const MainnetChainID = "kyve-1"
 
 // InvestorAccounts is a list of accounts from our second funding round.
@@ -50,6 +53,6 @@ const (
 	// This is 6-months after KYVE mainnet launch.
 	StartTime = 1694649600
 	// EndTime - Sep 14th, 2025.
-	// This is 2 years after StartTime.
+	// This is 2-years after StartTime.
 	EndTime = 1757808000
 )