From d5d29ef67a96f714c47729385fda9573b7016dbd Mon Sep 17 00:00:00 2001
From: Miguel Dingli <miguel.dingli.15@um.edu.mt>
Date: Mon, 27 Jan 2020 15:46:55 +0100
Subject: [PATCH] Merge PR #5557: Added amount event to InputOutputCoins for
 MsgMultSend

---
 CHANGELOG.md                          |  4 ++
 x/bank/internal/keeper/keeper.go      |  1 +
 x/bank/internal/keeper/keeper_test.go | 88 +++++++++++++++++++++++++++
 x/bank/spec/04_events.md              |  1 +
 4 files changed, 94 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4c258b72e..5b1a9c20bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 * (modules) [\#5555](https://github.com/cosmos/cosmos-sdk/pull/5555) Move x/auth/client/utils/ types and functions to x/auth/client/.
 
+### Bug Fixes
+
+* (x/bank) [\#5531](https://github.com/cosmos/cosmos-sdk/issues/5531) Added missing amount event to MsgMultiSend, emitted for each output.
+
 ## [v0.38.0] - 2020-01-23
 
 ### State Machine Breaking
diff --git a/x/bank/internal/keeper/keeper.go b/x/bank/internal/keeper/keeper.go
index 64e539c44c..25e47b0739 100644
--- a/x/bank/internal/keeper/keeper.go
+++ b/x/bank/internal/keeper/keeper.go
@@ -208,6 +208,7 @@ func (keeper BaseSendKeeper) InputOutputCoins(ctx sdk.Context, inputs []types.In
 			sdk.NewEvent(
 				types.EventTypeTransfer,
 				sdk.NewAttribute(types.AttributeKeyRecipient, out.Address.String()),
+				sdk.NewAttribute(sdk.AttributeKeyAmount, out.Coins.String()),
 			),
 		)
 	}
diff --git a/x/bank/internal/keeper/keeper_test.go b/x/bank/internal/keeper/keeper_test.go
index 92da5be72f..6b6f3cd404 100644
--- a/x/bank/internal/keeper/keeper_test.go
+++ b/x/bank/internal/keeper/keeper_test.go
@@ -194,6 +194,94 @@ func TestMsgSendEvents(t *testing.T) {
 	require.Equal(t, event2, events[3])
 }
 
+func TestMsgMultiSendEvents(t *testing.T) {
+	app, ctx := createTestApp(false)
+
+	app.BankKeeper.SetSendEnabled(ctx, true)
+
+	addr := sdk.AccAddress([]byte("addr1"))
+	addr2 := sdk.AccAddress([]byte("addr2"))
+	addr3 := sdk.AccAddress([]byte("addr3"))
+	addr4 := sdk.AccAddress([]byte("addr4"))
+	acc := app.AccountKeeper.NewAccountWithAddress(ctx, addr)
+	acc2 := app.AccountKeeper.NewAccountWithAddress(ctx, addr2)
+
+	app.AccountKeeper.SetAccount(ctx, acc)
+	app.AccountKeeper.SetAccount(ctx, acc2)
+	newCoins := sdk.NewCoins(sdk.NewInt64Coin("foocoin", 50))
+	newCoins2 := sdk.NewCoins(sdk.NewInt64Coin("barcoin", 100))
+	inputs := []types.Input{
+		{Address: addr, Coins: newCoins},
+		{Address: addr2, Coins: newCoins2},
+	}
+	outputs := []types.Output{
+		{Address: addr3, Coins: newCoins},
+		{Address: addr4, Coins: newCoins2},
+	}
+	err := app.BankKeeper.InputOutputCoins(ctx, inputs, outputs)
+	require.Error(t, err)
+	events := ctx.EventManager().Events()
+	require.Equal(t, 0, len(events))
+
+	// Set addr's coins but not addr2's coins
+	app.BankKeeper.SetCoins(ctx, addr, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 50)))
+
+	err = app.BankKeeper.InputOutputCoins(ctx, inputs, outputs)
+	require.Error(t, err)
+	events = ctx.EventManager().Events()
+	require.Equal(t, 1, len(events))
+	event1 := sdk.Event{
+		Type:       sdk.EventTypeMessage,
+		Attributes: []tmkv.Pair{},
+	}
+	event1.Attributes = append(
+		event1.Attributes,
+		tmkv.Pair{Key: []byte(types.AttributeKeySender), Value: []byte(addr.String())})
+	require.Equal(t, event1, events[0])
+
+	// Set addr's coins and addr2's coins
+	app.BankKeeper.SetCoins(ctx, addr, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 50)))
+	newCoins = sdk.NewCoins(sdk.NewInt64Coin("foocoin", 50))
+	app.BankKeeper.SetCoins(ctx, addr2, sdk.NewCoins(sdk.NewInt64Coin("barcoin", 100)))
+	newCoins2 = sdk.NewCoins(sdk.NewInt64Coin("barcoin", 100))
+
+	err = app.BankKeeper.InputOutputCoins(ctx, inputs, outputs)
+	require.NoError(t, err)
+	events = ctx.EventManager().Events()
+	require.Equal(t, 5, len(events))
+	event2 := sdk.Event{
+		Type:       sdk.EventTypeMessage,
+		Attributes: []tmkv.Pair{},
+	}
+	event2.Attributes = append(
+		event2.Attributes,
+		tmkv.Pair{Key: []byte(types.AttributeKeySender), Value: []byte(addr2.String())})
+	event3 := sdk.Event{
+		Type:       types.EventTypeTransfer,
+		Attributes: []tmkv.Pair{},
+	}
+	event3.Attributes = append(
+		event3.Attributes,
+		tmkv.Pair{Key: []byte(types.AttributeKeyRecipient), Value: []byte(addr3.String())})
+	event3.Attributes = append(
+		event3.Attributes,
+		tmkv.Pair{Key: []byte(sdk.AttributeKeyAmount), Value: []byte(newCoins.String())})
+	event4 := sdk.Event{
+		Type:       types.EventTypeTransfer,
+		Attributes: []tmkv.Pair{},
+	}
+	event4.Attributes = append(
+		event4.Attributes,
+		tmkv.Pair{Key: []byte(types.AttributeKeyRecipient), Value: []byte(addr4.String())})
+	event4.Attributes = append(
+		event4.Attributes,
+		tmkv.Pair{Key: []byte(sdk.AttributeKeyAmount), Value: []byte(newCoins2.String())})
+	require.Equal(t, event1, events[1])
+	require.Equal(t, event2, events[2])
+	require.Equal(t, event3, events[3])
+	require.Equal(t, event4, events[4])
+}
+
 func TestViewKeeper(t *testing.T) {
 	app, ctx := createTestApp(false)
 
diff --git a/x/bank/spec/04_events.md b/x/bank/spec/04_events.md
index 481ee9f0d2..1f97e7ab9b 100644
--- a/x/bank/spec/04_events.md
+++ b/x/bank/spec/04_events.md
@@ -23,6 +23,7 @@ The bank module emits the following events:
 | Type     | Attribute Key | Attribute Value    |
 |----------|---------------|--------------------|
 | transfer | recipient     | {recipientAddress} |
+| transfer | amount        | {amount}           |
 | message  | module        | bank               |
 | message  | action        | multisend          |
 | message  | sender        | {senderAddress}    |