feat: withdraw automatically converts base token denoms (#646) (#647)

Makefile

@@ -133,11 +133,11 @@ PACKAGES_E2E=$(shell go list ./... | grep '/e2e')
 TEST_PACKAGES=./...
 TEST_TARGETS := test-unit test-unit-cover test-race test-e2e
 
-test-unit: ARGS=-timeout=5m -tags='norace'
+test-unit: ARGS=-timeout=10m -tags='norace'
 test-unit: TEST_PACKAGES=$(PACKAGES_UNIT)
-test-unit-cover: ARGS=-timeout=5m -tags='norace' -coverprofile=coverage.txt -covermode=atomic
+test-unit-cover: ARGS=-timeout=10m -tags='norace' -coverprofile=coverage.txt -covermode=atomic
 test-unit-cover: TEST_PACKAGES=$(PACKAGES_UNIT)
-test-race: ARGS=-timeout=5m -race
+test-race: ARGS=-timeout=10m -race
 test-race: TEST_PACKAGES=$(PACKAGES_UNIT)
 test-e2e: ARGS=-timeout=25m -v
 test-e2e: TEST_PACKAGES=$(PACKAGES_E2E)

proto/umee/leverage/v1beta1/tx.proto

@@ -31,14 +31,15 @@ service Msg {
 }
 
 // MsgLendAsset represents a lender's request to lend a base asset type to the
-// module
+// module.
 message MsgLendAsset {
   string                   lender = 1;
   cosmos.base.v1beta1.Coin amount = 2 [(gogoproto.nullable) = false];
 }
 
 // MsgWithdrawAsset represents a lender's request to withdraw a previously loaned
-// base asset type from the module
+// base asset type from the module. Amount can either be exact uTokens to withdraw
+// or equivalent base assets.
 message MsgWithdrawAsset {
   string                   lender = 1;
   cosmos.base.v1beta1.Coin amount = 2 [(gogoproto.nullable) = false];

x/leverage/keeper/keeper.go

@@ -109,9 +109,27 @@ func (k Keeper) LendAsset(ctx sdk.Context, lenderAddr sdk.AccAddress, loan sdk.C
 }
 
 // WithdrawAsset attempts to deposit uTokens into the leverage module in exchange
-// for the original tokens loaned. If the uToken type is invalid or account balance
-// insufficient on either side, we return an error.
-func (k Keeper) WithdrawAsset(ctx sdk.Context, lenderAddr sdk.AccAddress, uToken sdk.Coin) error {
+// for the original tokens loaned. Accepts either a uToken amount to withdraw or
+// an equivalent base token amount to be converted automatically via exchange rate.
+// If the token or uToken denom is invalid or account balance insufficient for either
+// lender or module, we return an error.
+func (k Keeper) WithdrawAsset(ctx sdk.Context, lenderAddr sdk.AccAddress, withdrawal sdk.Coin) error {
+	var (
+		uToken sdk.Coin
+		err    error
+	)
+
+	if k.IsAcceptedToken(ctx, withdrawal.Denom) {
+		// Automatically convert base token input to equivalent uTokens
+		uToken, err = k.ExchangeToken(ctx, withdrawal)
+		if err != nil {
+			return err
+		}
+	} else {
+		// Otherwise use original input
+		uToken = withdrawal
+	}
+
 	if !k.IsAcceptedUToken(ctx, uToken.Denom) {
 		return sdkerrors.Wrap(types.ErrInvalidAsset, uToken.String())
 	}