From c08b02c86271eb093abda300bc5c72e475808af8 Mon Sep 17 00:00:00 2001 From: chatton Date: Mon, 23 May 2022 13:38:46 +0100 Subject: [PATCH 1/5] Add Sender to funginble_token_packet events (cherry picked from commit f05a7cf8840ead622e7b5628466e1f9a311a717d) --- modules/apps/transfer/ibc_module.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/apps/transfer/ibc_module.go b/modules/apps/transfer/ibc_module.go index f5ed807d8b2..f611c62642f 100644 --- a/modules/apps/transfer/ibc_module.go +++ b/modules/apps/transfer/ibc_module.go @@ -190,6 +190,7 @@ func (im IBCModule) OnRecvPacket( sdk.NewEvent( types.EventTypePacket, sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), + sdk.NewAttribute(sdk.AttributeKeySender, data.Sender), sdk.NewAttribute(types.AttributeKeyReceiver, data.Receiver), sdk.NewAttribute(types.AttributeKeyDenom, data.Denom), sdk.NewAttribute(types.AttributeKeyAmount, data.Amount), @@ -225,6 +226,7 @@ func (im IBCModule) OnAcknowledgementPacket( sdk.NewEvent( types.EventTypePacket, sdk.NewAttribute(sdk.AttributeKeyModule, types.ModuleName), + sdk.NewAttribute(sdk.AttributeKeySender, data.Sender), sdk.NewAttribute(types.AttributeKeyReceiver, data.Receiver), sdk.NewAttribute(types.AttributeKeyDenom, data.Denom), sdk.NewAttribute(types.AttributeKeyAmount, data.Amount), From 7410f65ec8ddff9ede6be11a9d3b6ae63243ee55 Mon Sep 17 00:00:00 2001 From: chatton Date: Mon, 23 May 2022 14:11:37 +0100 Subject: [PATCH 2/5] chore: Updated CHANGELOG.md (cherry picked from commit c809c518423de21c576b8a80fec7fb5f5e07fca8) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5861e92460b..669c49e06ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,13 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (modules/core/04-channel) [\#1160](https://github.com/cosmos/ibc-go/pull/1160) Improve `uint64 -> string` performance in `Logger`. * (modules/core/04-channel) [\#1279](https://github.com/cosmos/ibc-go/pull/1279) Add selected channel version to MsgChanOpenInitResponse and MsgChanOpenTryResponse. Emit channel version during OpenInit/OpenTry +<<<<<<< HEAD * (modules/core/keeper) [\#1284](https://github.com/cosmos/ibc-go/pull/1284) Add sanity check for the keepers passed into `ibckeeper.NewKeeper`. `ibckeeper.NewKeeper` now panics if any of the keepers passed in is empty. +======= +* (app/29-fee) [\#1305](https://github.com/cosmos/ibc-go/pull/1305) Change version string for fee module to `ics29-1` +* (app/29-fee) [\#1341](https://github.com/cosmos/ibc-go/pull/1341) Check if the fee module is locked and if the fee module is enabled before refunding all fees +* (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1342) Emitting Sender address from `fungible_token_packet` events in `OnReceivePacket` and `OnAcknowledgementPacket`. +>>>>>>> c809c51 (chore: Updated CHANGELOG.md) ### Features From 0bae0e8411852142b8a0b1018a4b147f11e7fd70 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Mon, 23 May 2022 14:19:10 +0100 Subject: [PATCH 3/5] Update CHANGELOG.md (cherry picked from commit d8be3d0ce674c004d7543413cbeba3455d7028e2) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 669c49e06ae..32d7da55594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,8 +53,12 @@ Ref: https://keepachangelog.com/en/1.0.0/ ======= * (app/29-fee) [\#1305](https://github.com/cosmos/ibc-go/pull/1305) Change version string for fee module to `ics29-1` * (app/29-fee) [\#1341](https://github.com/cosmos/ibc-go/pull/1341) Check if the fee module is locked and if the fee module is enabled before refunding all fees +<<<<<<< HEAD * (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1342) Emitting Sender address from `fungible_token_packet` events in `OnReceivePacket` and `OnAcknowledgementPacket`. >>>>>>> c809c51 (chore: Updated CHANGELOG.md) +======= +* (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnReceivePacket` and `OnAcknowledgementPacket`. +>>>>>>> d8be3d0 (Update CHANGELOG.md) ### Features From facf4a39710e3c72fe886c6e29fc7ac79f9a7a01 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Mon, 23 May 2022 14:31:32 +0100 Subject: [PATCH 4/5] Update CHANGELOG.md Co-authored-by: Damian Nolan (cherry picked from commit 46d73a09352d7db7b01d006f64627d519919f44e) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32d7da55594..6f2bab1bf53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,11 +54,15 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (app/29-fee) [\#1305](https://github.com/cosmos/ibc-go/pull/1305) Change version string for fee module to `ics29-1` * (app/29-fee) [\#1341](https://github.com/cosmos/ibc-go/pull/1341) Check if the fee module is locked and if the fee module is enabled before refunding all fees <<<<<<< HEAD +<<<<<<< HEAD * (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1342) Emitting Sender address from `fungible_token_packet` events in `OnReceivePacket` and `OnAcknowledgementPacket`. >>>>>>> c809c51 (chore: Updated CHANGELOG.md) ======= * (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnReceivePacket` and `OnAcknowledgementPacket`. >>>>>>> d8be3d0 (Update CHANGELOG.md) +======= +* (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnRecvPacket` and `OnAcknowledgementPacket`. +>>>>>>> 46d73a0 (Update CHANGELOG.md) ### Features From 36c12e47ebd27dd2b3f6fed10a50b24d6d913c3e Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 24 May 2022 10:47:37 +0200 Subject: [PATCH 5/5] fix conflicts --- CHANGELOG.md | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f2bab1bf53..d812701cd29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,21 +48,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (modules/core/04-channel) [\#1160](https://github.com/cosmos/ibc-go/pull/1160) Improve `uint64 -> string` performance in `Logger`. * (modules/core/04-channel) [\#1279](https://github.com/cosmos/ibc-go/pull/1279) Add selected channel version to MsgChanOpenInitResponse and MsgChanOpenTryResponse. Emit channel version during OpenInit/OpenTry -<<<<<<< HEAD * (modules/core/keeper) [\#1284](https://github.com/cosmos/ibc-go/pull/1284) Add sanity check for the keepers passed into `ibckeeper.NewKeeper`. `ibckeeper.NewKeeper` now panics if any of the keepers passed in is empty. -======= -* (app/29-fee) [\#1305](https://github.com/cosmos/ibc-go/pull/1305) Change version string for fee module to `ics29-1` -* (app/29-fee) [\#1341](https://github.com/cosmos/ibc-go/pull/1341) Check if the fee module is locked and if the fee module is enabled before refunding all fees -<<<<<<< HEAD -<<<<<<< HEAD -* (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1342) Emitting Sender address from `fungible_token_packet` events in `OnReceivePacket` and `OnAcknowledgementPacket`. ->>>>>>> c809c51 (chore: Updated CHANGELOG.md) -======= -* (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnReceivePacket` and `OnAcknowledgementPacket`. ->>>>>>> d8be3d0 (Update CHANGELOG.md) -======= -* (transfer) [\#996](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnRecvPacket` and `OnAcknowledgementPacket`. ->>>>>>> 46d73a0 (Update CHANGELOG.md) +* (transfer) [\#1414](https://github.com/cosmos/ibc-go/pull/1414) Emitting Sender address from `fungible_token_packet` events in `OnRecvPacket` and `OnAcknowledgementPacket`. ### Features