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.

Sign up for GitHub

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

Jump to bottom

fix: prevent blocked addresses from sending ICS 20 transfers (backport #1907) #1945

Merged
merged 2 commits into from
Aug 9, 2022
Merged

fix: prevent blocked addresses from sending ICS 20 transfers (backport #1907) #1945

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6ecea7
fix: prevent blocked addresses from sending ICS 20 transfers (#1907)
colin-axner Aug 9, 2022
72bb76a
fix conflicts
colin-axner Aug 9, 2022
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
Prev Previous commit
fix conflicts
  • Loading branch information
@colin-axner
colin-axner committed Aug 9, 2022
commit 72bb76a0b827046b46ab31560107851fa0a21bcf
2 changes: 1 addition & 1 deletion modules/apps/transfer/keeper/msg_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package keeper_test
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
"github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
)

func (suite *KeeperTestSuite) TestMsgTransfer() {
Expand Down
9 changes: 0 additions & 9 deletions modules/apps/transfer/keeper/relay_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ func (suite *KeeperTestSuite) TestSendTransfer() {
)
suite.chainA.CreateChannelCapability(suite.chainA.GetSimApp().ScopedIBCMockKeeper, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID)
amount = sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))
<<<<<<< HEAD
}, true, false},

=======
}, true, false,
},
{
Expand All @@ -73,7 +69,6 @@ func (suite *KeeperTestSuite) TestSendTransfer() {
sender = suite.chainA.GetSimApp().AccountKeeper.GetModuleAddress(types.ModuleName)
}, true, false,
},
>>>>>>> f891c29 (fix: prevent blocked addresses from sending ICS 20 transfers (#1907))
// createOutgoingPacket tests
// - source chain
{"send coin failed",
Expand Down Expand Up @@ -133,11 +128,7 @@ func (suite *KeeperTestSuite) TestSendTransfer() {

err = suite.chainA.GetSimApp().TransferKeeper.SendTransfer(
suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, amount,
<<<<<<< HEAD
suite.chainA.SenderAccount.GetAddress(), suite.chainB.SenderAccount.GetAddress().String(), clienttypes.NewHeight(0, 110), 0,
=======
sender, suite.chainB.SenderAccount.GetAddress().String(), suite.chainB.GetTimeoutHeight(), 0,
>>>>>>> f891c29 (fix: prevent blocked addresses from sending ICS 20 transfers (#1907))
)

if tc.expPass {
Expand Down