Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Module sends with correct API #502

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions x/auction/keeper/auction.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@

var proposerReward sdk.Coins
if params.ProposerFee.IsZero() {
// send the entire bid to the escrow account when no proposer fee is set
if err := k.bankKeeper.SendCoins(ctx, bidder, escrowAddress, sdk.NewCoins(bid)); err != nil {
return err
}
return k.SendBid(ctx, bidder, escrowAddress, sdk.NewCoins(bid))
} else {
rewardsAddress, err := k.rewardsAddressProvider.GetRewardsAddress(ctx)
if err != nil {
Expand All @@ -118,7 +115,7 @@
bid := sdk.NewDecCoinsFromCoins(bid)
proposerReward, _ = bid.MulDecTruncate(params.ProposerFee).TruncateDecimal()

if err := k.bankKeeper.SendCoins(ctx, bidder, rewardsAddress, proposerReward); err != nil {
if err := k.SendBid(ctx, bidder, rewardsAddress, proposerReward); err != nil {
return err
}

Expand All @@ -127,7 +124,7 @@
escrowTotal := bid.Sub(sdk.NewDecCoinsFromCoins(proposerReward...))
escrowReward, _ := escrowTotal.TruncateDecimal()

if err := k.bankKeeper.SendCoins(ctx, bidder, escrowAddress, escrowReward); err != nil {
if err := k.SendBid(ctx, bidder, escrowAddress, escrowReward); err != nil {
return err
}
}
Expand Down Expand Up @@ -206,6 +203,16 @@
return nil
}

// SendBid sends the bid from the bidder to the relevant address.
func (k Keeper) SendBid(ctx sdk.Context, from, to sdk.AccAddress, bid sdk.Coins) error {
moduleAddress := k.accountKeeper.GetModuleAddress(types.ModuleName)
if moduleAddress.Equals(to) {
return k.bankKeeper.SendCoinsFromAccountToModule(ctx, from, types.ModuleName, bid)

Check warning on line 210 in x/auction/keeper/auction.go

View check run for this annotation

Codecov / codecov/patch

x/auction/keeper/auction.go#L210

Added line #L210 was not covered by tests
}

return k.bankKeeper.SendCoins(ctx, from, to, bid)
}

// filterSigners removes any signers from the currentSigners map that are not in the txSigners map.
func filterSigners(currentSigners, txSigners map[string]struct{}) {
for signer := range currentSigners {
Expand Down
2 changes: 2 additions & 0 deletions x/auction/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type Keeper struct {
cdc codec.BinaryCodec
storeKey storetypes.StoreKey

accountKeeper types.AccountKeeper
bankKeeper types.BankKeeper
rewardsAddressProvider types.RewardsAddressProvider

Expand Down Expand Up @@ -73,6 +74,7 @@ func NewKeeperWithRewardsAddressProvider(
return Keeper{
cdc: cdc,
storeKey: storeKey,
accountKeeper: accountKeeper,
bankKeeper: bankKeeper,
rewardsAddressProvider: rewardsAddressProvider,
authority: authority,
Expand Down
1 change: 1 addition & 0 deletions x/auction/types/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type AccountKeeper interface {
//
//go:generate mockery --name BankKeeper --output ./mocks --outpkg mocks --case underscore
type BankKeeper interface {
SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error
GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin
}
Expand Down
3 changes: 1 addition & 2 deletions x/auction/types/mocks/account_keeper.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 15 additions & 2 deletions x/auction/types/mocks/bank_keeper.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions x/auction/types/mocks/distribution_keeper.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions x/auction/types/mocks/rewards_address_provider.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions x/auction/types/mocks/staking_keeper.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading