Merge pull request #164 from terra-money/fix/pfm-integration

fix: pfm integration + e2e

.github/workflows/interchaine2e.yml

@@ -57,6 +57,7 @@ jobs:
         # names of `make` commands to run tests
         test:
           - "test-e2e-pob"
+          - "test-e2e-pmf"
       fail-fast: false
 
     steps:

Makefile

@@ -327,7 +327,10 @@ simulate:
 test-e2e-pob:
 	cd interchaintest && go test -race -v -run TestPOB .
 
-.PHONY: test test-all test-cover test-unit test-race simulate test-e2e-pob
+test-e2e-pmf:
+	cd interchaintest && go test -race -v -run TestPMF .
+
+.PHONY: test test-all test-cover test-unit test-race simulate test-e2e-pob test-e2e-pmf
 
 ###############################################################################
 ###                                Linting                                  ###

app/app.go

@@ -340,7 +340,7 @@ type TerraApp struct {
 
 	// IBC hooks
 	IBCHooksKeeper   *ibchookskeeper.Keeper
-	TransferStack    *ibchooks.IBCMiddleware
+	TransferStack    porttypes.Middleware
 	Ics20WasmHooks   *ibchooks.WasmHooks
 	HooksICS4Wrapper ibchooks.ICS4Middleware
 
@@ -593,7 +593,21 @@ func NewTerraApp(
 
 	// Hooks Middleware
 	hooksTransferStack := ibchooks.NewIBCMiddleware(&transferIBCModule, &app.HooksICS4Wrapper)
-	app.TransferStack = &hooksTransferStack
+
+	// Packet forwarding middleware
+	app.RouterKeeper = *routerkeeper.NewKeeper(
+		appCodec,
+		app.keys[routertypes.StoreKey],
+		app.GetSubspace(routertypes.ModuleName),
+		app.TransferKeeper,
+		app.IBCKeeper.ChannelKeeper,
+		app.DistrKeeper,
+		app.BankKeeper,
+		app.IBCKeeper.ChannelKeeper,
+	)
+	pmfTransferStack := router.NewIBCMiddleware(hooksTransferStack, &app.RouterKeeper, 5, routerkeeper.DefaultForwardTransferPacketTimeoutTimestamp, routerkeeper.DefaultRefundTransferPacketTimeoutTimestamp)
+
+	app.TransferStack = &pmfTransferStack
 
 	app.IBCFeeKeeper = ibcfeekeeper.NewKeeper(
 		appCodec, keys[ibcfeetypes.StoreKey],
@@ -626,17 +640,6 @@ func NewTerraApp(
 	icaHostIBCModule := icahost.NewIBCModule(app.ICAHostKeeper)
 	icaHostStack := ibcfee.NewIBCMiddleware(icaHostIBCModule, app.IBCFeeKeeper)
 
-	app.RouterKeeper = *routerkeeper.NewKeeper(
-		appCodec,
-		app.keys[routertypes.StoreKey],
-		app.GetSubspace(routertypes.ModuleName),
-		app.TransferKeeper,
-		app.IBCKeeper.ChannelKeeper,
-		app.DistrKeeper,
-		app.BankKeeper,
-		app.IBCKeeper.ChannelKeeper,
-	)
-
 	// Create evidence Keeper for to register the IBC light client misbehaviour evidence route
 	evidenceKeeper := evidencekeeper.NewKeeper(
 		appCodec, keys[evidencetypes.StoreKey], app.StakingKeeper, app.SlashingKeeper,
@@ -687,7 +690,7 @@ func NewTerraApp(
 	ibcRouter := porttypes.NewRouter().
 		AddRoute(icacontrollertypes.SubModuleName, icaControllerStack).
 		AddRoute(icahosttypes.SubModuleName, icaHostStack).
-		AddRoute(ibctransfertypes.ModuleName, hooksTransferStack).
+		AddRoute(ibctransfertypes.ModuleName, pmfTransferStack).
 		AddRoute(wasmtypes.ModuleName, wasmStack)
 
 	app.IBCKeeper.SetRouter(ibcRouter)

interchaintest/config.go

@@ -0,0 +1,61 @@
+package interchaintest
+
+import (
+	"fmt"
+
+	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v7/ibc"
+
+	"github.com/cosmos/cosmos-sdk/types/module/testutil"
+)
+
+var (
+	Denom            = "uluna"
+	VotingPeriod     = "15s"
+	MaxDepositPeriod = "10s"
+	Image            = ibc.DockerImage{
+		Repository: "terramoneycore",
+		Version:    "latest",
+		UidGid:     "1025:1025",
+	}
+	IBCRelayerImage   = "ghcr.io/cosmos/relayer"
+	IBCRelayerVersion = "main"
+	config            = ibc.ChainConfig{
+		Type:                   "cosmos",
+		Name:                   "terra",
+		ChainID:                "phoenix-1",
+		Images:                 []ibc.DockerImage{Image},
+		Bin:                    "terrad",
+		Bech32Prefix:           "terra",
+		Denom:                  Denom,
+		CoinType:               "330",
+		GasPrices:              fmt.Sprintf("0%s", Denom),
+		GasAdjustment:          2.0,
+		TrustingPeriod:         "112h",
+		NoHostMount:            false,
+		ConfigFileOverrides:    nil,
+		EncodingConfig:         encoding(),
+		UsingNewGenesisCommand: true,
+		ModifyGenesis:          cosmos.ModifyGenesis(defaultGenesisKV),
+	}
+	// SDK v47 Genesis
+	defaultGenesisKV = []cosmos.GenesisKV{
+		{
+			Key:   "app_state.gov.params.voting_period",
+			Value: VotingPeriod,
+		},
+		{
+			Key:   "app_state.gov.params.max_deposit_period",
+			Value: MaxDepositPeriod,
+		},
+		{
+			Key:   "app_state.gov.params.min_deposit.0.denom",
+			Value: Denom,
+		},
+	}
+)
+
+func encoding() *testutil.TestEncodingConfig {
+	cfg := cosmos.DefaultEncoding()
+	return &cfg
+}