fix(auction) link rewards accounts (#2516)

* fix(auction): use correct account linking for x/leverage

* fix(auction): use correct account linking for x/metoken

app/app.go

@@ -478,14 +478,23 @@ func New(
 		distrtypes.ModuleName,
 	)
 
+	rewardsAuctionAccs := auctionmodule.SubAccounts()
+	app.AuctionKeeperB = auctionkeeper.NewBuilder(
+		appCodec,
+		keys[auction.StoreKey],
+		rewardsAuctionAccs,
+		app.BankKeeper,
+		app.UGovKeeperB.EmergencyGroup,
+	)
+
 	app.LeverageKeeper = leveragekeeper.NewKeeper(
 		appCodec,
 		keys[leveragetypes.ModuleName],
 		app.BankKeeper,
 		app.OracleKeeper,
 		app.UGovKeeperB.EmergencyGroup,
 		cast.ToBool(appOpts.Get(leveragetypes.FlagEnableLiquidatorQuery)),
-		authtypes.NewModuleAddress(metoken.ModuleName),
+		rewardsAuctionAccs.RewardsCollect,
 	)
 
 	app.LeverageKeeper.SetTokenHooks(app.OracleKeeper.Hooks())
@@ -505,14 +514,7 @@ func New(
 		app.LeverageKeeper,
 		app.OracleKeeper,
 		app.UGovKeeperB.EmergencyGroup,
-	)
-
-	app.AuctionKeeperB = auctionkeeper.NewBuilder(
-		appCodec,
-		keys[auction.StoreKey],
-		auctionmodule.SubAccounts(),
-		app.BankKeeper,
-		app.UGovKeeperB.EmergencyGroup,
+		rewardsAuctionAccs.RewardsCollect,
 	)
 
 	// register the staking hooks

x/auction/keeper/keeper.go

@@ -19,7 +19,8 @@ type Builder struct {
 	storeKey storetypes.StoreKey
 	bank     auction.BankKeeper
 	ugov     ugov.EmergencyGroupBuilder
-	accs     SubAccounts
+
+	Accs SubAccounts
 }
 
 func NewBuilder(cdc codec.BinaryCodec,
@@ -28,15 +29,15 @@ func NewBuilder(cdc codec.BinaryCodec,
 	b auction.BankKeeper,
 	ugov ugov.EmergencyGroupBuilder) Builder {
 
-	return Builder{cdc: cdc, storeKey: key, accs: accs,
+	return Builder{cdc: cdc, storeKey: key, Accs: accs,
 		bank: b, ugov: ugov}
 }
 
 func (kb Builder) Keeper(ctx *sdk.Context) Keeper {
 	return Keeper{
 		store: ctx.KVStore(kb.storeKey),
 		cdc:   kb.cdc,
-		accs:  kb.accs,
+		accs:  kb.Accs,
 		bank:  kb.bank,
 		ugov:  kb.ugov(ctx),
 

x/leverage/keeper/internal_test.go

@@ -4,10 +4,9 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 
+	"github.com/umee-network/umee/v6/tests/accs"
 	"github.com/umee-network/umee/v6/x/leverage/types"
-	"github.com/umee-network/umee/v6/x/metoken"
 	ugovmocks "github.com/umee-network/umee/v6/x/ugov/mocks"
 )
 
@@ -34,7 +33,7 @@ func NewTestKeeper(
 		ok,
 		ugovmocks.NewSimpleEmergencyGroupBuilder(),
 		enableLiquidatorQuery,
-		authtypes.NewModuleAddress(metoken.ModuleName),
+		accs.GenerateAddr("auction.Rewards"),
 	)
 	return k, TestKeeper{&k}
 }

x/leverage/keeper/keeper.go

@@ -21,7 +21,7 @@ type Keeper struct {
 	oracleKeeper           types.OracleKeeper
 	ugov                   ugov.EmergencyGroupBuilder
 	liquidatorQueryEnabled bool
-	meTokenAddr            sdk.AccAddress
+	rewardsAuction         sdk.AccAddress
 
 	tokenHooks []types.TokenHooks
 	bondHooks  []types.BondHooks
@@ -34,7 +34,7 @@ func NewKeeper(
 	o types.OracleKeeper,
 	ugov ugov.EmergencyGroupBuilder,
 	enableLiquidatorQuery bool,
-	meTokenAddr sdk.AccAddress,
+	rewardsAuction sdk.AccAddress,
 ) Keeper {
 	return Keeper{
 		cdc:                    cdc,
@@ -43,7 +43,7 @@ func NewKeeper(
 		oracleKeeper:           o,
 		ugov:                   ugov,
 		liquidatorQueryEnabled: enableLiquidatorQuery,
-		meTokenAddr:            meTokenAddr,
+		rewardsAuction:         rewardsAuction,
 	}
 }
 

x/metoken/keeper/intest/keeper_test.go

@@ -54,20 +54,20 @@ func initTestSuite(t *testing.T, registry []metoken.Index, balances []metoken.In
 		AnyTimes()
 	oracleMock.EXPECT().SetExchangeRate(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
 
-	kb := keeper.NewBuilder(
+	app.MetokenKeeperB = keeper.NewBuilder(
 		app.AppCodec(),
 		app.GetKey(metoken.ModuleName),
 		app.BankKeeper,
 		app.LeverageKeeper,
 		oracleMock,
 		app.UGovKeeperB.EmergencyGroup,
+		app.AuctionKeeperB.Accs.RewardsCollect,
 	)
-	app.MetokenKeeperB = kb
 
 	genState := metoken.DefaultGenesisState()
 	genState.Registry = registry
 	genState.Balances = balances
-	kb.Keeper(&ctx).InitGenesis(*genState)
+	app.MetokenKeeperB.Keeper(&ctx).InitGenesis(*genState)
 
 	queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry())
 	metoken.RegisterQueryServer(queryHelper, keeper.NewQuerier(app.MetokenKeeperB))

x/metoken/keeper/intest/msg_server_test.go

@@ -616,6 +616,7 @@ func TestMsgServer_Swap_Depegging(t *testing.T) {
 		app.LeverageKeeper,
 		oracleMock,
 		app.UGovKeeperB.EmergencyGroup,
+		app.AuctionKeeperB.Accs.RewardsCollect,
 	)
 	app.MetokenKeeperB = kb
 	msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB)
@@ -714,6 +715,7 @@ func TestMsgServer_Swap_Depegging(t *testing.T) {
 		app.LeverageKeeper,
 		oracleMock,
 		app.UGovKeeperB.EmergencyGroup,
+		app.AuctionKeeperB.Accs.RewardsCollect,
 	)
 	app.MetokenKeeperB = kb
 	msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB)
@@ -1357,6 +1359,7 @@ func TestMsgServer_Redeem_Depegging(t *testing.T) {
 		app.LeverageKeeper,
 		oracleMock,
 		app.UGovKeeperB.EmergencyGroup,
+		app.AuctionKeeperB.Accs.RewardsCollect,
 	)
 	app.MetokenKeeperB = kb
 	msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB)
@@ -1456,6 +1459,7 @@ func TestMsgServer_Redeem_Depegging(t *testing.T) {
 		app.LeverageKeeper,
 		oracleMock,
 		app.UGovKeeperB.EmergencyGroup,
+		app.AuctionKeeperB.Accs.RewardsCollect,
 	)
 	app.MetokenKeeperB = kb
 	msgServer = keeper.NewMsgServerImpl(app.MetokenKeeperB)

x/metoken/keeper/keeper.go

@@ -18,6 +18,7 @@ type Builder struct {
 	leverageKeeper metoken.LeverageKeeper
 	oracleKeeper   metoken.OracleKeeper
 	ugov           ugov.EmergencyGroupBuilder
+	rewardsAuction sdk.AccAddress
 }
 
 // NewBuilder returns Builder object.
@@ -28,6 +29,7 @@ func NewBuilder(
 	leverageKeeper metoken.LeverageKeeper,
 	oracleKeeper metoken.OracleKeeper,
 	ugov ugov.EmergencyGroupBuilder,
+	rewardsAuction sdk.AccAddress,
 ) Builder {
 	return Builder{
 		cdc:            cdc,
@@ -36,6 +38,7 @@ func NewBuilder(
 		leverageKeeper: leverageKeeper,
 		oracleKeeper:   oracleKeeper,
 		ugov:           ugov,
+		rewardsAuction: rewardsAuction,
 	}
 }
 
@@ -46,6 +49,7 @@ type Keeper struct {
 	leverageKeeper metoken.LeverageKeeper
 	oracleKeeper   metoken.OracleKeeper
 	ugov           ugov.EmergencyGroupBuilder
+	rewardsAuction sdk.AccAddress
 
 	// TODO: ctx should be removed when we migrate leverageKeeper and oracleKeeper
 	ctx *sdk.Context
@@ -60,6 +64,7 @@ func (b Builder) Keeper(ctx *sdk.Context) Keeper {
 		leverageKeeper: b.leverageKeeper,
 		oracleKeeper:   b.oracleKeeper,
 		ugov:           b.ugov,
+		rewardsAuction: b.rewardsAuction,
 		ctx:            ctx,
 	}
 }

x/metoken/keeper/unit_test.go

@@ -8,6 +8,7 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/stretchr/testify/require"
 
+	"github.com/umee-network/umee/v6/tests/accs"
 	"github.com/umee-network/umee/v6/tests/tsdk"
 	"github.com/umee-network/umee/v6/x/metoken"
 	"github.com/umee-network/umee/v6/x/metoken/mocks"
@@ -19,7 +20,7 @@ func initSimpleKeeper(t *testing.T) Keeper {
 	interfaceRegistry := types.NewInterfaceRegistry()
 	cdc := codec.NewProtoCodec(interfaceRegistry)
 	storeKey := storetypes.NewMemoryStoreKey("metoken")
-	kb := NewBuilder(cdc, storeKey, nil, nil, nil, nil)
+	kb := NewBuilder(cdc, storeKey, nil, nil, nil, nil, accs.GenerateAddr("auction.Rewards"))
 	ctx, _ := tsdk.NewCtxOneStore(t, storeKey)
 
 	k := kb.Keeper(&ctx)