[TRA-80] Update subaccount-to-subaccount transfers for collateral poo…

…ls. (#1178)

protocol/testing/e2e/funding/funding_e2e_test.go

@@ -483,7 +483,7 @@ func TestFunding(t *testing.T) {
 					tApp.App,
 					testapp.MustMakeCheckTxOptions{
 						AccAddressForSigning: transfer.Transfer.Sender.Owner,
-						Gas:                  100_000,
+						Gas:                  110_000,
 						FeeAmt:               constants.TestFeeCoins_5Cents,
 					},
 					&transfer,

protocol/testutil/constants/perpetuals.go

@@ -379,6 +379,7 @@ var TestMarketPerpetuals = []perptypes.Perpetual{
 		FundingIndex: dtypes.ZeroInt(),
 	},
 	IsoUsd_IsolatedMarket,
+	Iso2Usd_IsolatedMarket,
 }
 
 // AddPremiumVotes messages.

protocol/testutil/constants/positions.go

@@ -79,6 +79,22 @@ var (
 		Quantums:     dtypes.NewInt(100_000_000),
 		FundingIndex: dtypes.NewInt(0),
 	}
+	PerpetualPosition_OneISO2Long = satypes.PerpetualPosition{
+		PerpetualId:  4,
+		Quantums:     dtypes.NewInt(10_000_000),
+		FundingIndex: dtypes.NewInt(0),
+	}
+	// Short position for arbitrary isolated market
+	PerpetualPosition_OneISOShort = satypes.PerpetualPosition{
+		PerpetualId:  3,
+		Quantums:     dtypes.NewInt(-100_000_000),
+		FundingIndex: dtypes.NewInt(0),
+	}
+	PerpetualPosition_OneISO2Short = satypes.PerpetualPosition{
+		PerpetualId:  4,
+		Quantums:     dtypes.NewInt(-10_000_000),
+		FundingIndex: dtypes.NewInt(0),
+	}
 
 	// Asset Positions
 	Usdc_Asset_0 = satypes.AssetPosition{

protocol/x/sending/keeper/transfer.go

@@ -22,21 +22,17 @@ func (k Keeper) ProcessTransfer(
 ) (err error) {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), metrics.ProcessTransfer, metrics.Latency)
 
-	updates := []satypes.Update{
-		pendingTransfer.GetSenderSubaccountUpdate(),
-		pendingTransfer.GetRecipientSubaccountUpdate(),
-	}
-
-	success, successPerUpdate, err := k.subaccountsKeeper.UpdateSubaccounts(ctx, updates, satypes.Transfer)
+	err = k.subaccountsKeeper.TransferFundsFromSubaccountToSubaccount(
+		ctx,
+		pendingTransfer.Sender,
+		pendingTransfer.Recipient,
+		pendingTransfer.AssetId,
+		pendingTransfer.GetBigQuantums(),
+	)
 	if err != nil {
 		return err
 	}
 
-	// If not successful, return error indicating why.
-	if err := satypes.GetErrorFromUpdateResults(success, successPerUpdate, updates); err != nil {
-		return err
-	}
-
 	recipientAddr := pendingTransfer.Recipient.MustGetAccAddress()
 
 	// Create an account for the recipient address if one does not exist.

protocol/x/sending/types/expected_keepers.go

@@ -53,6 +53,13 @@ type SubaccountsKeeper interface {
 		assetId uint32,
 		amount *big.Int,
 	) (err error)
+	TransferFundsFromSubaccountToSubaccount(
+		ctx sdk.Context,
+		senderSubaccountId satypes.SubaccountId,
+		recipientSubaccountId satypes.SubaccountId,
+		assetId uint32,
+		quantums *big.Int,
+	) (err error)
 	SetSubaccount(ctx sdk.Context, subaccount satypes.Subaccount)
 	GetSubaccount(
 		ctx sdk.Context,

protocol/x/subaccounts/keeper/transfer.go

@@ -316,3 +316,90 @@ func (k Keeper) TransferInsuranceFundPayments(
 		[]sdk.Coin{coinToTransfer},
 	)
 }
+
+// TransferFundsFromSubaccountToSubaccount returns an error if the call to `k.CanUpdateSubaccounts()`
+// fails. Otherwise, updates the asset quantums in the subaccounts, translates the
+// `assetId` and `quantums` into a `sdk.Coin`, and call `bankKeeper.SendCoins()` if the collateral
+// pools for the two subaccounts are different.
+// TODO(CORE-168): Change function interface to accept `denom` and `amount` instead of `assetId` and
+// `quantums`.
+func (k Keeper) TransferFundsFromSubaccountToSubaccount(
+	ctx sdk.Context,
+	senderSubaccountId types.SubaccountId,
+	recipientSubaccountId types.SubaccountId,
+	assetId uint32,
+	quantums *big.Int,
+) error {
+	// TODO(DEC-715): Support non-USDC assets.
+	if assetId != assettypes.AssetUsdc.Id {
+		return types.ErrAssetTransferThroughBankNotImplemented
+	}
+
+	updates := []types.Update{
+		{
+			SubaccountId: senderSubaccountId,
+			AssetUpdates: []types.AssetUpdate{
+				{
+					AssetId:          assettypes.AssetUsdc.Id,
+					BigQuantumsDelta: new(big.Int).Neg(quantums),
+				},
+			},
+		},
+		{
+			SubaccountId: recipientSubaccountId,
+			AssetUpdates: []types.AssetUpdate{
+				{
+					AssetId:          assettypes.AssetUsdc.Id,
+					BigQuantumsDelta: new(big.Int).Set(quantums),
+				},
+			},
+		},
+	}
+	success, successPerUpdate, err := k.CanUpdateSubaccounts(ctx, updates, types.Transfer)
+	if err != nil {
+		return err
+	}
+	if err := types.GetErrorFromUpdateResults(success, successPerUpdate, updates); err != nil {
+		return err
+	}
+
+	_, coinToTransfer, err := k.assetsKeeper.ConvertAssetToCoin(
+		ctx,
+		assetId,
+		quantums,
+	)
+	if err != nil {
+		return err
+	}
+
+	senderCollateralPoolAddr, err := k.GetCollateralPoolForSubaccount(ctx, senderSubaccountId)
+	if err != nil {
+		return err
+	}
+
+	recipientCollateralPoolAddr, err := k.GetCollateralPoolForSubaccount(ctx, recipientSubaccountId)
+	if err != nil {
+		return err
+	}
+
+	// Different collateral pool address, need to do a bank send.
+	if !senderCollateralPoolAddr.Equals(recipientCollateralPoolAddr) {
+		// Use SendCoins API instead of SendCoinsFromModuleToModule since we don't need the
+		// module account feature
+		if err := k.bankKeeper.SendCoins(
+			ctx,
+			senderCollateralPoolAddr,
+			recipientCollateralPoolAddr,
+			[]sdk.Coin{coinToTransfer},
+		); err != nil {
+			return err
+		}
+	}
+
+	// Apply subaccount updates.
+	return k.applyValidSubaccountUpdateForTransfer(
+		ctx,
+		updates,
+		types.Transfer,
+	)
+}