feat(x/tieredrewards): ADR-006 implementation - tiered lock rewards

CHANGELOG.md

@@ -4,9 +4,10 @@
 
 ## Features
 - [#1236](https://github.com/crypto-org-chain/chain-main/pull/1236) Add inflation decay. Refactor maxsupply module to inflation module
-- [#1237](https://github.com/crypto-org-chain/chain-main/pull/1237) Add tierrewards module with base rewards top up
+- [#1237](https://github.com/crypto-org-chain/chain-main/pull/1237) Add basic code for tierrewards module with base rewards top up
 - [#1250](https://github.com/crypto-org-chain/chain-main/pull/1250) Remove DecayStartHeight from inflation module
 - [#1251](https://github.com/crypto-org-chain/chain-main/pull/1251) Remove unused decay_start_height field and move genesis to its own file
+- [#1249](https://github.com/crypto-org-chain/chain-main/pull/1249) Implement tiered rewards module
 
 ### Improvements
 - [#1169](https://github.com/crypto-org-chain/chain-main/pull/1169) Update linter and tidy up code

Makefile

@@ -207,6 +207,7 @@ lint-fix:
 	@echo "--> Running linter"
 	@golangci-lint run --fix
 	@go mod verify
+	@black --line-length 88 integration_tests/
 	@flake8 --show-source --count --statistics
 	@find . -name "*.nix" -type f | xargs nixfmt -c
 
@@ -308,8 +309,11 @@ nix-integration-test-gov: check-network
 nix-integration-test-inflation: check-network 
 	nix-shell ./integration_tests/shell.nix --run "pytest -v -m inflation"	
 
-nix-integration-test-base-rewards: check-network 
-	nix-shell ./integration_tests/shell.nix --run "pytest -v -m base_rewards"	
+nix-integration-test-base-rewards: check-network
+	nix-shell ./integration_tests/shell.nix --run "pytest -v -m base_rewards"
+
+nix-integration-test-tieredrewards: check-network
+	nix-shell ./integration_tests/shell.nix --run "pytest -v -m tieredrewards"
 
 nix-integration-test-grpc: check-network make-proto
 	nix-shell ./integration_tests/shell.nix --run "pytest -v -m grpc"

app/app.go

@@ -162,12 +162,14 @@ var (
 		ibctransfertypes.ModuleName:        {authtypes.Minter, authtypes.Burner},
 		icatypes.ModuleName:                nil,
 		tieredrewardstypes.RewardsPoolName: nil,
+		tieredrewardstypes.ModuleName:      {authtypes.Staking},
 	}
 	// moduleAccsAllowedToReceiveExternalFunds defines module accounts that can
 	// receive tokens from external accounts via MsgSend, bypassing the default
 	// block on sends to module accounts.
 	moduleAccsAllowedToReceiveExternalFunds = map[string]bool{
 		tieredrewardstypes.RewardsPoolName: true,
+		tieredrewardstypes.ModuleName:      true,
 	}
 )
 
@@ -401,6 +403,7 @@ func New(
 	app.StakingKeeper.SetHooks(stakingtypes.NewMultiStakingHooks(
 		app.DistrKeeper.Hooks(),
 		app.SlashingKeeper.Hooks(),
+		app.TieredRewardsKeeper.Hooks(),
 	))
 
 	app.AuthzKeeper = authzkeeper.NewKeeper(runtime.NewKVStoreService(keys[authzkeeper.StoreKey]), appCodec, app.MsgServiceRouter(), app.AccountKeeper)
@@ -433,12 +436,18 @@ func New(
 		Example of setting gov params:
 		govConfig.MaxMetadataLen = 10000
 	*/
+	tierTallyFn := tieredrewardskeeper.NewCalculateVoteResultsAndVotingPowerFn(
+		app.TieredRewardsKeeper,
+		app.StakingKeeper,
+		app.AccountKeeper,
+	)
 	govKeeper := govkeeper.NewKeeper(
 		appCodec,
 		runtime.NewKVStoreService(keys[govtypes.StoreKey]),
 		app.AccountKeeper, app.BankKeeper,
 		app.StakingKeeper, app.DistrKeeper,
 		app.MsgServiceRouter(), govConfig, authAddr,
+		govkeeper.WithCustomCalculateVoteResultsAndVotingPowerFn(tierTallyFn),
 	)
 	govKeeper.SetLegacyRouter(govRouter)
 	app.GovKeeper = *govKeeper.SetHooks(

app/upgrades.go

@@ -169,7 +169,7 @@ func updateTieredRewardsParams(app *ChainApp, sdkCtx sdk.Context) error {
 	tieredrewardsParams := tieredrewardstypes.DefaultParams()
 	tieredrewardsParams.TargetBaseRewardsRate = math.LegacyMustNewDecFromStr("0.03") // 3%
 
-	if err := app.TieredRewardsKeeper.Params.Set(sdkCtx, tieredrewardsParams); err != nil {
+	if err := app.TieredRewardsKeeper.SetParams(sdkCtx, tieredrewardsParams); err != nil {
 		return err
 	}
 

buf.work.yaml

@@ -1,4 +1,4 @@
 version: v1
 directories:
   - proto
-  - third_party/ibc-go/proto
+  - third_party/ibc-go/proto

go.mod

@@ -40,6 +40,7 @@ require (
 	github.com/stretchr/testify v1.11.1
 	google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7
 	google.golang.org/grpc v1.75.0
+	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v2 v2.4.0
 )
 
@@ -236,7 +237,6 @@ require (
 	google.golang.org/api v0.247.0 // indirect
 	google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
-	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gotest.tools/v3 v3.5.2 // indirect
 	nhooyr.io/websocket v1.8.11 // indirect
@@ -247,7 +247,7 @@ require (
 
 replace github.com/crypto-org-chain/cronos-store/memiavl => github.com/crypto-org-chain/cronos-store/memiavl v0.0.0-20250912125026-c998a90e2881
 
-replace github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.0.0-20260311065045-34b487225358
+replace github.com/cosmos/cosmos-sdk => github.com/randy-cro/cosmos-sdk v0.0.0-20260331080144-2685515a9e26
 
 replace (
 	// use cosmos fork of keyring

go.sum

@@ -918,8 +918,6 @@ github.com/creachadair/tomledit v0.0.24 h1:5Xjr25R2esu1rKCbQEmjZYlrhFkDspoAbAKb6
 github.com/creachadair/tomledit v0.0.24/go.mod h1:9qHbShRWQzSCcn617cMzg4eab1vbLCOjOshAWSzWr8U=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/crypto-org-chain/cosmos-sdk v0.0.0-20260311065045-34b487225358 h1:hCOdp+XZwiw+0tIg+g4mlHgeWKaxwk+6yFJAqwKNfzk=
-github.com/crypto-org-chain/cosmos-sdk v0.0.0-20260311065045-34b487225358/go.mod h1:N6YuprhAabInbT3YGumGDKONbvPX5dNro7RjHvkQoKE=
 github.com/crypto-org-chain/cronos-store/memiavl v0.0.0-20250912125026-c998a90e2881 h1:EDyxlMIC50plAgvz+IY4Bu6ymLb/6BhNtQLc96VLQ14=
 github.com/crypto-org-chain/cronos-store/memiavl v0.0.0-20250912125026-c998a90e2881/go.mod h1:Cgi3xIJ4py34GX6pr653a3BpAD9bLeq4kqkupow1T4g=
 github.com/crypto-org-chain/cronos-store/store v0.0.0-20250912125026-c998a90e2881 h1:dl6VKXDHfMGZmadlh51nCiJoCPTLSRksN8F+P3y3ZtE=
@@ -1655,6 +1653,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
 github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
+github.com/randy-cro/cosmos-sdk v0.0.0-20260331080144-2685515a9e26 h1:KhK6YvT2ajgDqrfhp3np8H8KY9gPmfKVjBDtgilg0zA=
+github.com/randy-cro/cosmos-sdk v0.0.0-20260331080144-2685515a9e26/go.mod h1:N6YuprhAabInbT3YGumGDKONbvPX5dNro7RjHvkQoKE=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=

gomod2nix.toml

@@ -189,9 +189,9 @@ schema = 3
     version = "v1.0.0-beta.5"
     hash = "sha256-Fy/PbsOsd6iq0Njy3DVWK6HqWsogI+MkE8QslHGWyVg="
   [mod."github.com/cosmos/cosmos-sdk"]
-    version = "v0.0.0-20260311065045-34b487225358"
-    hash = "sha256-C1rHn6NVMJUV+/bgeqkJjaT+BYXymVNQNGdggmkUon8="
-    replaced = "github.com/crypto-org-chain/cosmos-sdk"
+    version = "v0.0.0-20260331080144-2685515a9e26"
+    hash = "sha256-AAowre6PquPdYIiqICtebwrQn/ZfrZaDvBssAJZzMNk="
+    replaced = "github.com/randy-cro/cosmos-sdk"
   [mod."github.com/cosmos/go-bip39"]
     version = "v1.0.0"
     hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA="

integration_tests/configs/base_rewards.jsonnet

@@ -10,9 +10,24 @@ local validator = import 'validator.jsonnet';
     accounts: default.accounts + default.signers,
     genesis+: genesis {
       app_state+: {
+        // Pin max=min=0 so no new coins enter the fee collector during these tests.
+        mint: {
+          minter: {
+            inflation: '0.000000000000000000',
+            annual_provisions: '0.000000000000000000',
+          },
+          params: {
+            mint_denom: 'basecro',
+            inflation_rate_change: '0.130000000000000000',
+            inflation_max: '0.000000000000000000',
+            inflation_min: '0.000000000000000000',
+            goal_bonded: '0.670000000000000000',
+            blocks_per_year: '63115',
+          },
+        },
         tieredrewards: {
           params: {
-            target_base_rewards_rate: '100.000000000000000000',
+            target_base_rewards_rate: '1.000000000000000000',
           },
         },
       },

integration_tests/configs/tieredrewards.jsonnet

@@ -0,0 +1,65 @@
+local default = import 'accounts.jsonnet';
+local genesis = import 'genesis.jsonnet';
+local validator = import 'validator.jsonnet';
+
+{
+  'tieredrewards-test': {
+    validators: [validator {
+      commission_rate: '0.000000000000000000',
+    }, validator],
+    accounts: default.accounts + default.signers,
+    genesis+: genesis {
+      app_state+: {
+        // Increase voting_period so approve_proposal (deposit + 2 votes) completes
+        // within the window. genesis.jsonnet defaults to 10s which is too tight.
+        gov+: {
+          params+: {
+            voting_period: '30s',
+            max_deposit_period: '30s',
+            min_deposit: [{ denom: 'basecro', amount: '10000000' }],
+          },
+        },
+        // Disable mint inflation for clean reward accounting.
+        mint: {
+          minter: {
+            inflation: '0.000000000000000000',
+            annual_provisions: '0.000000000000000000',
+          },
+          params: {
+            mint_denom: 'basecro',
+            inflation_rate_change: '0.130000000000000000',
+            inflation_max: '0.000000000000000000',
+            inflation_min: '0.000000000000000000',
+            goal_bonded: '0.670000000000000000',
+            blocks_per_year: '63115',
+          },
+        },
+        tieredrewards: {
+          params: {
+            target_base_rewards_rate: '0.030000000000000000',
+          },
+          // Two tiers with short exit durations suitable for integration tests.
+          // Tier 1: 5s exit — used for full exit-flow tests.
+          // Tier 2: 30s exit — used for testing "exit not yet elapsed" rejection.
+          tiers: [
+            {
+              id: 1,
+              exit_duration: '5s',
+              bonus_apy: '0.040000000000000000',
+              min_lock_amount: '1000000',
+              close_only: false,
+            },
+            {
+              id: 2,
+              exit_duration: '30s',
+              bonus_apy: '0.020000000000000000',
+              min_lock_amount: '5000000',
+              close_only: false,
+            },
+          ],
+          next_position_id: '1',
+        },
+      },
+    },
+  },
+}

integration_tests/conftest.py

@@ -18,6 +18,7 @@ def pytest_configure(config):
     config.addinivalue_line("markers", "byzantine: marks byzantine tests")
     config.addinivalue_line("markers", "gov: marks gov tests")
     config.addinivalue_line("markers", "solomachine: marks solomachine tests")
+    config.addinivalue_line("markers", "tieredrewards: marks tieredrewards tests")
 
 
 @pytest.fixture(scope="session")