fix: failing tests

.github/linters/.golangci.yaml

@@ -7,7 +7,6 @@ linters:
   enable:
     - bodyclose
     - depguard
-    - depguard
     - dogsled
     - errcheck
     - exportloopref
@@ -28,7 +27,12 @@ linters:
     - typecheck
     - unconvert
     - unused
-
+
+issues:
+  exclude-rules:
+    - text: "ST1003:"
+      linters:
+        - stylecheck
 
 linters-settings:
   dogsled:

.github/workflows/test.yml

@@ -210,7 +210,7 @@ jobs:
       - name: Setting up network with old binary inside (mainnet version)
         working-directory: ./tests/upgrade/integration
         run: |
-          bash scripts/setup.sh
+          bash scripts/old_binary_setup.sh
 
       - name: Run pre-upgrade tests
         working-directory: ./tests/upgrade/integration/v2
@@ -228,6 +228,11 @@ jobs:
         run: |
           bash scripts/upgrade.sh
 
+      - name: Verifying docker processes
+        working-directory: ./tests/upgrade/integration
+        run: |
+          docker ps -a
+
       - name: Run post-upgrade tests
         working-directory: ./tests/upgrade/integration/v2
         run: |

ante/fee_test.go

@@ -233,7 +233,7 @@ var _ = Describe("Fee tests on DeliverTx", func() {
 		antehandler := sdk.ChainAnteDecorators(dfd)
 
 		taxDecorator := cheqdpost.NewTaxDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.DidKeeper, s.app.ResourceKeeper)
-		posthandler := sdk.ChainAnteDecorators(taxDecorator)
+		posthandler := sdk.ChainPostDecorators(taxDecorator)
 
 		// get supply before tx
 		supplyBeforeDeflation, _, err := s.app.BankKeeper.GetPaginatedTotalSupply(s.ctx, &query.PageRequest{})
@@ -243,7 +243,7 @@ var _ = Describe("Fee tests on DeliverTx", func() {
 		_, err = antehandler(s.ctx, tx, false)
 		Expect(err).To(BeNil(), "Tx errored when taxable on deliverTx")
 
-		_, err = posthandler(s.ctx, tx, false)
+		_, err = posthandler(s.ctx, tx, false, true)
 		Expect(err).To(BeNil(), "Tx errored when fee payer had sufficient funds and provided sufficient fee while subtracting tax on deliverTx")
 
 		// get fee params
@@ -297,7 +297,7 @@ var _ = Describe("Fee tests on DeliverTx", func() {
 		antehandler := sdk.ChainAnteDecorators(dfd)
 
 		taxDecorator := cheqdpost.NewTaxDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.DidKeeper, s.app.ResourceKeeper)
-		posthandler := sdk.ChainAnteDecorators(taxDecorator)
+		posthandler := sdk.ChainPostDecorators(taxDecorator)
 
 		// get supply before tx
 		supplyBefore, _, err := s.app.BankKeeper.GetPaginatedTotalSupply(s.ctx, &query.PageRequest{})
@@ -307,7 +307,7 @@ var _ = Describe("Fee tests on DeliverTx", func() {
 		_, err = antehandler(s.ctx, tx, false)
 		Expect(err).To(BeNil(), "Tx errored when non-taxable on deliverTx")
 
-		_, err = posthandler(s.ctx, tx, false)
+		_, err = posthandler(s.ctx, tx, false, true)
 		Expect(err).To(BeNil(), "Tx errored when non-taxable on deliverTx from posthandler")
 
 		// check balance of fee payer
@@ -354,7 +354,7 @@ var _ = Describe("Fee tests on DeliverTx", func() {
 		antehandler := sdk.ChainAnteDecorators(dfd)
 
 		taxDecorator := cheqdpost.NewTaxDecorator(s.app.AccountKeeper, s.app.BankKeeper, s.app.FeeGrantKeeper, s.app.DidKeeper, s.app.ResourceKeeper)
-		posthandler := sdk.ChainAnteDecorators(taxDecorator)
+		posthandler := sdk.ChainPostDecorators(taxDecorator)
 
 		// get supply before tx
 		supplyBefore, _, err := s.app.BankKeeper.GetPaginatedTotalSupply(s.ctx, &query.PageRequest{})
@@ -364,7 +364,7 @@ var _ = Describe("Fee tests on DeliverTx", func() {
 		_, err = antehandler(s.ctx, tx, true)
 		Expect(err).To(BeNil(), "Tx errored when taxable on deliverTx simulation mode")
 
-		_, err = posthandler(s.ctx, tx, true)
+		_, err = posthandler(s.ctx, tx, true, true)
 		Expect(err).To(BeNil(), "Tx errored when fee payer had sufficient funds and provided sufficient fee while skipping tax simulation mode")
 
 		// check balance of fee payer

app/app.go

@@ -12,6 +12,7 @@ import (
 	"github.com/cheqd/cheqd-node/app/migrations"
 	upgradeV1 "github.com/cheqd/cheqd-node/app/upgrades/v1"
 	upgradeV2 "github.com/cheqd/cheqd-node/app/upgrades/v2"
+	posthandler "github.com/cheqd/cheqd-node/post"
 	did "github.com/cheqd/cheqd-node/x/did"
 	didkeeper "github.com/cheqd/cheqd-node/x/did/keeper"
 	didtypes "github.com/cheqd/cheqd-node/x/did/types"
@@ -277,6 +278,7 @@ func New(
 	bApp.SetVersion(version.Version)
 	bApp.SetProtocolVersion(ProtocolVersion)
 	bApp.SetInterfaceRegistry(interfaceRegistry)
+	bApp.SetTxEncoder(txConfig.TxEncoder())
 
 	keys := sdk.NewKVStoreKeys(
 		authtypes.StoreKey,
@@ -317,7 +319,6 @@ func New(
 		memKeys:           memKeys,
 		// invCheckPeriod:    invCheckPeriod,
 	}
-
 	app.ParamsKeeper = initParamsKeeper(appCodec, legacyAmino, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey])
 
 	// set the BaseApp's parameter store
@@ -355,7 +356,6 @@ func New(
 		BlockedAddresses(),
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
-
 	app.AuthzKeeper = authzkeeper.NewKeeper(
 		keys[authzkeeper.StoreKey],
 		appCodec,
@@ -446,7 +446,7 @@ func New(
 		app.BaseApp,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
-
+	app.setupUpgradeStoreLoaders()
 	// Create IBC Keeper
 	app.IBCKeeper = ibckeeper.NewKeeper(
 		appCodec,
@@ -770,22 +770,22 @@ func New(
 	app.sm = module.NewSimulationManagerFromAppModules(app.ModuleManager.Modules, overrideModules)
 	app.sm.RegisterStoreDecoders()
 
-	// postHandler, err := posthandler.NewPostHandler(posthandler.HandlerOptions{
-	// 	AccountKeeper:  app.AccountKeeper,
-	// 	BankKeeper:     app.BankKeeper,
-	// 	FeegrantKeeper: app.FeeGrantKeeper,
-	// 	DidKeeper:      app.DidKeeper,
-	// 	ResourceKeeper: app.ResourceKeeper,
-	// })
-	// if err != nil {
-	// 	tmos.Exit(err.Error())
-	// }
+	postHandler, err := posthandler.NewPostHandler(posthandler.HandlerOptions{
+		AccountKeeper:  app.AccountKeeper,
+		BankKeeper:     app.BankKeeper,
+		FeegrantKeeper: app.FeeGrantKeeper,
+		DidKeeper:      app.DidKeeper,
+		ResourceKeeper: app.ResourceKeeper,
+	})
+	if err != nil {
+		tmos.Exit(err.Error())
+	}
 
 	app.SetInitChainer(app.InitChainer)
 	app.SetBeginBlocker(app.BeginBlocker)
 	app.SetAnteHandler(anteHandler)
 	app.SetEndBlocker(app.EndBlocker)
-	// app.SetPostHandler(postHandler)
+	app.SetPostHandler(postHandler)
 
 	// Note: This migration is completed, we can remove these lines.
 	// Upgrade handler for v1
@@ -1159,6 +1159,26 @@ func BlockedAddresses() map[string]bool {
 	return modAccAddrs
 }
 
+// configure store loader that checks if version == upgradeHeight and applies store upgrades
+func (app *App) setupUpgradeStoreLoaders() {
+	upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
+	if err != nil {
+		panic(fmt.Sprintf("failed to read upgrade info from disk %s", err))
+	}
+
+	if app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
+		return
+	}
+
+	storeUpgrades := storetypes.StoreUpgrades{
+		Added: []string{
+			consensusparamtypes.ModuleName,
+			crisistypes.ModuleName,
+		},
+	}
+	app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
+}
+
 func (app *App) RegisterUpgradeHandlers() {
 	baseAppLegacySS := app.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())
 

app/test_helpers.go

@@ -10,6 +10,11 @@ import (
 	"strconv"
 	"time"
 
+	resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
+	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
+	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+
 	dbm "github.com/cometbft/cometbft-db"
 	abci "github.com/cometbft/cometbft/abci/types"
 	tmjson "github.com/cometbft/cometbft/libs/json"
@@ -184,89 +189,89 @@ func SetupTest(isCheckTx bool) (*TestApp, error) {
 	return app, nil
 }
 
-// func genesisStateWithValSet(
-// 	app *TestApp, genesisState GenesisState,
-// 	valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount,
-// 	balances ...banktypes.Balance,
-// ) (GenesisState, error) {
-// 	// set genesis accounts
-// 	authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs)
-// 	genesisState[authtypes.ModuleName] = app.AppCodec().MustMarshalJSON(authGenesis)
-
-// 	validators := make([]stakingtypes.Validator, 0, len(valSet.Validators))
-// 	delegations := make([]stakingtypes.Delegation, 0, len(valSet.Validators))
-
-// 	bondAmt := sdk.DefaultPowerReduction
-
-// 	for _, val := range valSet.Validators {
-// 		pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey)
-// 		if err != nil {
-// 			return nil, err
-// 		}
-// 		pkAny, err := codectypes.NewAnyWithValue(pk)
-// 		if err != nil {
-// 			return nil, err
-// 		}
-// 		validator := stakingtypes.Validator{
-// 			OperatorAddress:   sdk.ValAddress(val.Address).String(),
-// 			ConsensusPubkey:   pkAny,
-// 			Jailed:            false,
-// 			Status:            stakingtypes.Bonded,
-// 			Tokens:            bondAmt,
-// 			DelegatorShares:   sdk.OneDec(),
-// 			Description:       stakingtypes.Description{},
-// 			UnbondingHeight:   int64(0),
-// 			UnbondingTime:     time.Unix(0, 0).UTC(),
-// 			Commission:        stakingtypes.NewCommission(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()),
-// 			MinSelfDelegation: sdk.ZeroInt(),
-// 		}
-// 		validators = append(validators, validator)
-// 		delegations = append(delegations, stakingtypes.NewDelegation(genAccs[0].GetAddress(), val.Address.Bytes(), sdk.OneDec()))
-
-// 	}
-// 	// set validators and delegations
-// 	stakingGenesis := stakingtypes.NewGenesisState(stakingtypes.DefaultParams(), validators, delegations)
-// 	genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(stakingGenesis)
-
-// 	totalSupply := sdk.NewCoins()
-// 	for _, b := range balances {
-// 		// add genesis acc tokens to total supply
-// 		totalSupply = totalSupply.Add(b.Coins...)
-// 	}
-
-// 	for range delegations {
-// 		// add delegated tokens to total supply
-// 		totalSupply = totalSupply.Add(sdk.NewCoin(sdk.DefaultBondDenom, bondAmt))
-// 	}
-
-// 	// add bonded amount to bonded pool module account
-// 	balances = append(balances, banktypes.Balance{
-// 		Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(),
-// 		Coins:   sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)},
-// 	})
-
-// 	// update total supply
-// 	bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}, []banktypes.SendEnabled{})
-// 	genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis)
-
-// 	// set did module genesis state
-// 	didGenesis := didtypes.DefaultGenesis()
-// 	genesisState[didtypes.ModuleName] = app.AppCodec().MustMarshalJSON(didGenesis)
-
-// 	// set resource module genesis state
-// 	resourceGenesis := resourcetypes.DefaultGenesis()
-// 	genesisState[resourcetypes.ModuleName] = app.AppCodec().MustMarshalJSON(resourceGenesis)
-
-// 	return genesisState, nil
-// }
+func genesisStateWithValSet(
+	app *TestApp, genesisState GenesisState,
+	valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount,
+	balances ...banktypes.Balance,
+) (GenesisState, error) {
+	// set genesis accounts
+	authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs)
+	genesisState[authtypes.ModuleName] = app.AppCodec().MustMarshalJSON(authGenesis)
+
+	validators := make([]stakingtypes.Validator, 0, len(valSet.Validators))
+	delegations := make([]stakingtypes.Delegation, 0, len(valSet.Validators))
+
+	bondAmt := sdk.DefaultPowerReduction
+
+	for _, val := range valSet.Validators {
+		pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey)
+		if err != nil {
+			return nil, err
+		}
+		pkAny, err := codectypes.NewAnyWithValue(pk)
+		if err != nil {
+			return nil, err
+		}
+		validator := stakingtypes.Validator{
+			OperatorAddress:   sdk.ValAddress(val.Address).String(),
+			ConsensusPubkey:   pkAny,
+			Jailed:            false,
+			Status:            stakingtypes.Bonded,
+			Tokens:            bondAmt,
+			DelegatorShares:   sdk.OneDec(),
+			Description:       stakingtypes.Description{},
+			UnbondingHeight:   int64(0),
+			UnbondingTime:     time.Unix(0, 0).UTC(),
+			Commission:        stakingtypes.NewCommission(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()),
+			MinSelfDelegation: sdk.ZeroInt(),
+		}
+		validators = append(validators, validator)
+		delegations = append(delegations, stakingtypes.NewDelegation(genAccs[0].GetAddress(), val.Address.Bytes(), sdk.OneDec()))
+
+	}
+	// set validators and delegations
+	stakingGenesis := stakingtypes.NewGenesisState(stakingtypes.DefaultParams(), validators, delegations)
+	genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(stakingGenesis)
+
+	totalSupply := sdk.NewCoins()
+	for _, b := range balances {
+		// add genesis acc tokens to total supply
+		totalSupply = totalSupply.Add(b.Coins...)
+	}
+
+	for range delegations {
+		// add delegated tokens to total supply
+		totalSupply = totalSupply.Add(sdk.NewCoin(sdk.DefaultBondDenom, bondAmt))
+	}
+
+	// add bonded amount to bonded pool module account
+	balances = append(balances, banktypes.Balance{
+		Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(),
+		Coins:   sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)},
+	})
+
+	// update total supply
+	bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}, []banktypes.SendEnabled{})
+	genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis)
+
+	// set did module genesis state
+	didGenesis := didtypes.DefaultGenesis()
+	genesisState[didtypes.ModuleName] = app.AppCodec().MustMarshalJSON(didGenesis)
+
+	// set resource module genesis state
+	resourceGenesis := resourcetypes.DefaultGenesis()
+	genesisState[resourcetypes.ModuleName] = app.AppCodec().MustMarshalJSON(resourceGenesis)
+
+	return genesisState, nil
+}
 
 // SetupWithGenesisValSet initializes a new SimApp with a validator set and genesis accounts
 // that also act as delegators. For simplicity, each validator is bonded with a delegation
 // of one consensus engine unit in the default token of the simapp from first genesis
 // account. A Nop logger is set in SimApp.
 func SetupWithGenesisValSet(valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) (*TestApp, error) {
 	app, genesisState := setup(true, 5)
-	genesisState, err := simtestutil.GenesisStateWithValSet(app.AppCodec(), genesisState, valSet, genAccs, balances...)
+	genesisState, err := genesisStateWithValSet(app, genesisState, valSet, genAccs, balances...)
 	if err != nil {
 		return nil, err
 	}