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

packet-forward-middleware packet memo, retry on timeout, and atomic forwards #306

Merged
merged 16 commits into from
Nov 8, 2022
Merged

packet-forward-middleware packet memo, retry on timeout, and atomic forwards #306

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c47a9b4
Make examples its own module
agouin Sep 22, 2022
a5eb892
Make cosmos specific module and run in CI in separate task
agouin Sep 23, 2022
802f287
Update e2e test for memo refactor
agouin Nov 5, 2022
becedb6
Update test to chain-level params
agouin Sep 25, 2022
50d6d09
Use gaia with pfm with configurable timeout and retries
agouin Sep 25, 2022
5d6cf64
Update SendIBCTransfer uses
agouin Nov 5, 2022
01c6612
fix interchain test
agouin Nov 5, 2022
3094262
Add GetClients method to Relayer and helper for getting transfer chan…
agouin Nov 6, 2022
559df4b
Update packet forward test for multi-hop, add multi-hop refund test
agouin Nov 6, 2022
c3d241f
Update tests for atomic forwards
agouin Nov 6, 2022
6d6bb24
Wait for a block after ack before checking balances
agouin Nov 7, 2022
62d1052
reduce wait to 1 block
agouin Nov 7, 2022
393a8bc
Add multi-hop flow with refund through chain with native denom. Add a…
agouin Nov 8, 2022
86cb722
Remove stale comment
agouin Nov 8, 2022
6f88ff2
handle feedback
agouin Nov 8, 2022
ac23e31
Add TransferOptions
agouin Nov 8, 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
Next Next commit
Wait for a block after ack before checking balances
  • Loading branch information
@agouin
agouin committed Nov 7, 2022
commit 6d6bb24cbbeb6247cab50c0201feb8fb62f06041
56 changes: 33 additions & 23 deletions examples/ibc/packet_forward_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package ibc_test
import (
"context"
"encoding/json"
"fmt"
"testing"
"time"

Expand Down Expand Up @@ -157,10 +156,6 @@ func TestPacketForwardMiddleware(t *testing.T) {
secondHopIBCDenom := secondHopDenomTrace.IBCDenom()
thirdHopIBCDenom := thirdHopDenomTrace.IBCDenom()

fmt.Printf("first hop denom: %s, first hop denom trace: %+v, first hop ibc denom: %s", firstHopDenom, firstHopDenomTrace, firstHopIBCDenom)
fmt.Printf("second hop denom: %s, second hop denom trace: %+v, second hop ibc denom: %s", secondHopDenom, secondHopDenomTrace, secondHopIBCDenom)
fmt.Printf("third hop denom: %s, third hop denom trace: %+v, third hop ibc denom: %s", thirdHopDenom, thirdHopDenomTrace, thirdHopIBCDenom)

t.Run("multi-hop a->b->c->d", func(t *testing.T) {
// Send packet from Chain A->Chain B->Chain C->Chain D

Expand Down Expand Up @@ -198,24 +193,26 @@ func TestPacketForwardMiddleware(t *testing.T) {

transferTx, err := chainA.SendIBCTransfer(ctx, abChan.ChannelID, userA.KeyName, transfer, nil, string(memo))
require.NoError(t, err)

_, err = testutil.PollForAck(ctx, chainA, chainAHeight, chainAHeight+30, transferTx.Packet)
require.NoError(t, err)
err = testutil.WaitForBlocks(ctx, 2, chainA)
require.NoError(t, err)

chainABalance, err := chainA.GetBalance(ctx, userA.Bech32Address(chainA.Config().Bech32Prefix), chainA.Config().Denom)
require.NoError(t, err)
require.Equal(t, userFunds-transferAmount, chainABalance)

chainBBalance, err := chainB.GetBalance(ctx, userB.Bech32Address(chainB.Config().Bech32Prefix), firstHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainBBalance)

chainCBalance, err := chainC.GetBalance(ctx, userC.Bech32Address(chainC.Config().Bech32Prefix), secondHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainCBalance)

chainDBalance, err := chainD.GetBalance(ctx, userD.Bech32Address(chainD.Config().Bech32Prefix), thirdHopIBCDenom)
require.NoError(t, err)

require.Equal(t, userFunds-transferAmount, chainABalance)
require.Equal(t, int64(0), chainBBalance)
require.Equal(t, int64(0), chainCBalance)
require.Equal(t, transferAmount, chainDBalance)
})

Expand Down Expand Up @@ -257,24 +254,26 @@ func TestPacketForwardMiddleware(t *testing.T) {

transferTx, err := chainD.SendIBCTransfer(ctx, dcChan.ChannelID, userD.KeyName, transfer, nil, string(memo))
require.NoError(t, err)

_, err = testutil.PollForAck(ctx, chainD, chainDHeight, chainDHeight+30, transferTx.Packet)
require.NoError(t, err)
err = testutil.WaitForBlocks(ctx, 2, chainA)
require.NoError(t, err)

chainDBalance, err := chainD.GetBalance(ctx, userD.Bech32Address(chainD.Config().Bech32Prefix), thirdHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainDBalance)

chainCBalance, err := chainC.GetBalance(ctx, userC.Bech32Address(chainC.Config().Bech32Prefix), secondHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainCBalance)

chainBBalance, err := chainB.GetBalance(ctx, userB.Bech32Address(chainB.Config().Bech32Prefix), firstHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainBBalance)

chainABalance, err := chainA.GetBalance(ctx, userA.Bech32Address(chainA.Config().Bech32Prefix), chainA.Config().Denom)
require.NoError(t, err)

require.Equal(t, int64(0), chainDBalance)
require.Equal(t, int64(0), chainCBalance)
require.Equal(t, int64(0), chainBBalance)
require.Equal(t, userFunds, chainABalance)
})

Expand Down Expand Up @@ -303,20 +302,22 @@ func TestPacketForwardMiddleware(t *testing.T) {

transferTx, err := chainA.SendIBCTransfer(ctx, abChan.ChannelID, userA.KeyName, transfer, nil, string(memo))
require.NoError(t, err)

_, err = testutil.PollForAck(ctx, chainA, chainAHeight, chainAHeight+25, transferTx.Packet)
require.NoError(t, err)
err = testutil.WaitForBlocks(ctx, 2, chainA)
require.NoError(t, err)

chainABalance, err := chainA.GetBalance(ctx, userA.Bech32Address(chainA.Config().Bech32Prefix), chainA.Config().Denom)
require.NoError(t, err)
require.Equal(t, userFunds, chainABalance)

chainBBalance, err := chainB.GetBalance(ctx, userB.Bech32Address(chainB.Config().Bech32Prefix), firstHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainBBalance)

chainCBalance, err := chainC.GetBalance(ctx, userC.Bech32Address(chainC.Config().Bech32Prefix), secondHopIBCDenom)
require.NoError(t, err)

require.Equal(t, userFunds, chainABalance)
require.Equal(t, int64(0), chainBBalance)
require.Equal(t, int64(0), chainCBalance)
})

Expand Down Expand Up @@ -347,20 +348,22 @@ func TestPacketForwardMiddleware(t *testing.T) {

transferTx, err := chainA.SendIBCTransfer(ctx, abChan.ChannelID, userA.KeyName, transfer, nil, string(memo))
require.NoError(t, err)

_, err = testutil.PollForAck(ctx, chainA, chainAHeight, chainAHeight+25, transferTx.Packet)
require.NoError(t, err)
err = testutil.WaitForBlocks(ctx, 2, chainA)
require.NoError(t, err)

chainABalance, err := chainA.GetBalance(ctx, userA.Bech32Address(chainA.Config().Bech32Prefix), chainA.Config().Denom)
require.NoError(t, err)
require.Equal(t, userFunds, chainABalance)

chainBBalance, err := chainB.GetBalance(ctx, userB.Bech32Address(chainB.Config().Bech32Prefix), firstHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainBBalance)

chainCBalance, err := chainC.GetBalance(ctx, userC.Bech32Address(chainC.Config().Bech32Prefix), secondHopIBCDenom)
require.NoError(t, err)

require.Equal(t, userFunds, chainABalance)
require.Equal(t, int64(0), chainBBalance)
require.Equal(t, int64(0), chainCBalance)
})

Expand Down Expand Up @@ -406,17 +409,24 @@ func TestPacketForwardMiddleware(t *testing.T) {
require.NoError(t, err)
_, err = testutil.PollForAck(ctx, chainA, chainAHeight, chainAHeight+25, transferTx.Packet)
require.NoError(t, err)
err = testutil.WaitForBlocks(ctx, 2, chainA)
require.NoError(t, err)

chainABalance, err := chainA.GetBalance(ctx, userA.Bech32Address(chainA.Config().Bech32Prefix), chainA.Config().Denom)
chainDBalance, err := chainD.GetBalance(ctx, userD.Bech32Address(chainD.Config().Bech32Prefix), thirdHopIBCDenom)
require.NoError(t, err)

chainCBalance, err := chainC.GetBalance(ctx, userC.Bech32Address(chainC.Config().Bech32Prefix), secondHopIBCDenom)
require.NoError(t, err)
require.Equal(t, userFunds, chainABalance)

chainBBalance, err := chainB.GetBalance(ctx, userB.Bech32Address(chainB.Config().Bech32Prefix), firstHopIBCDenom)
require.NoError(t, err)
require.Equal(t, int64(0), chainBBalance)

chainCBalance, err := chainC.GetBalance(ctx, userC.Bech32Address(chainC.Config().Bech32Prefix), secondHopIBCDenom)
chainABalance, err := chainA.GetBalance(ctx, userA.Bech32Address(chainA.Config().Bech32Prefix), chainA.Config().Denom)
require.NoError(t, err)

require.Equal(t, userFunds, chainABalance)
require.Equal(t, int64(0), chainBBalance)
require.Equal(t, int64(0), chainCBalance)
require.Equal(t, int64(0), chainDBalance)
})
}