Skip to content

Commit cf1aa3d

Browse files
author
hard-nett
committed
bump pfm
1 parent 6cda881 commit cf1aa3d

File tree

10 files changed

+28
-29
lines changed

10 files changed

+28
-29
lines changed

‎app/keepers/keepers.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ import (
1010
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
1111
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
1212

13-
packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router"
14-
packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper"
15-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
16-
13+
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
14+
packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
15+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
1716
icq "github.com/cosmos/ibc-apps/modules/async-icq/v7"
1817
icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v7/keeper"
1918
icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types"
@@ -418,12 +417,12 @@ func NewAppKeepers(
418417
appKeepers.PacketForwardKeeper = packetforwardkeeper.NewKeeper(
419418
appCodec,
420419
appKeepers.keys[packetforwardtypes.StoreKey],
421-
appKeepers.GetSubspace(packetforwardtypes.ModuleName),
422420
appKeepers.TransferKeeper, // Will be zero-value here. Reference is set later on with SetTransferKeeper.
423421
appKeepers.IBCKeeper.ChannelKeeper,
424422
appKeepers.DistrKeeper,
425423
appKeepers.BankKeeper,
426-
appKeepers.IBCKeeper.ChannelKeeper,
424+
appKeepers.HooksICS4Wrapper,
425+
govModAddress,
427426
)
428427

429428
// Create Transfer Keepers

‎app/keepers/keys.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
2121
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
2222
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
23-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
23+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
2424
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
2525
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
2626
ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"

‎app/modules.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
mint "github.com/cosmos/cosmos-sdk/x/mint"
88
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
9-
packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router"
10-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
9+
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
10+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
1111
icq "github.com/cosmos/ibc-apps/modules/async-icq/v7"
1212
icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types"
1313
ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
@@ -163,7 +163,7 @@ func appModules(
163163
ibcfee.NewAppModule(app.AppKeepers.IBCFeeKeeper),
164164
ica.NewAppModule(&app.AppKeepers.ICAControllerKeeper, &app.AppKeepers.ICAHostKeeper),
165165
icq.NewAppModule(app.AppKeepers.ICQKeeper),
166-
packetforward.NewAppModule(app.AppKeepers.PacketForwardKeeper),
166+
packetforward.NewAppModule(app.AppKeepers.PacketForwardKeeper, app.GetSubspace(packetforwardtypes.ModuleName)),
167167
clock.NewAppModule(appCodec, app.AppKeepers.ClockKeeper),
168168
// cwhooks.NewAppModule(appCodec, app.AppKeepers.CWHooksKeeper),
169169
ibchooks.NewAppModule(app.AppKeepers.AccountKeeper),

‎app/upgrades/v2/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v2
22

33
import (
4-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
4+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
55
icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types"
66
ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
77

‎app/upgrades/v2/upgrade.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types"
1717

18-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
18+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
1919

2020
"github.com/terpnetwork/terp-core/v4/app/keepers"
2121
"github.com/terpnetwork/terp-core/v4/app/upgrades"

‎cmd/terpd/cmd/root.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
9393
}
9494

9595
customAppTemplate, customAppConfig := initAppConfig()
96-
customTMConfig := initTendermintConfig()
96+
customTMConfig := tmcfg.DefaultConfig()
9797

9898
return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customTMConfig)
9999
},
@@ -106,15 +106,15 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {
106106

107107
// initTendermintConfig helps to override default Tendermint Config values.
108108
// return tmcfg.DefaultConfig if no custom configuration is required for the application.
109-
func initTendermintConfig() *tmcfg.Config {
110-
cfg := tmcfg.DefaultConfig()
109+
// func initTendermintConfig() *tmcfg.Config {
110+
// cfg := tmcfg.DefaultConfig()
111111

112-
// these values put a higher strain on node memory
113-
// cfg.P2P.MaxNumInboundPeers = 100
114-
// cfg.P2P.MaxNumOutboundPeers = 40
112+
// // these values put a higher strain on node memory
113+
// // cfg.P2P.MaxNumInboundPeers = 100
114+
// // cfg.P2P.MaxNumOutboundPeers = 40
115115

116-
return cfg
117-
}
116+
// return
117+
// }
118118

119119
// initAppConfig helps to override default appConfig template and configs.
120120
// return "", nil if no custom configuration is required for the application.

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ require (
1212
github.com/cosmos/gogogateway v1.2.0 // indirect
1313
github.com/cosmos/gogoproto v1.4.10
1414
github.com/cosmos/iavl v0.20.1 // indirect
15-
github.com/cosmos/ibc-go/v7 v7.3.0
15+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b
16+
github.com/cosmos/ibc-go/v7 v7.3.1
1617
github.com/cosmos/ics23/go v0.10.0 // indirect
1718
github.com/docker/distribution v2.8.2+incompatible // indirect
1819
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
@@ -40,7 +41,6 @@ require (
4041
cosmossdk.io/log v1.2.1
4142
cosmossdk.io/math v1.1.2
4243
cosmossdk.io/tools/rosetta v0.2.1
43-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1-0.20231012160012-d0f49580a238
4444
github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.0.0
4545
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20230906222317-d88d4028e5c9
4646
github.com/spf13/viper v1.16.0

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,14 +338,14 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK
338338
github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
339339
github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg=
340340
github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
341-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1-0.20231012160012-d0f49580a238 h1:vc9zQUjiYctU3q4uF5usbl2JUqaa3F6bEyboNKOKyBk=
342-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.1-0.20231012160012-d0f49580a238/go.mod h1:WO/xWf+I8m+9PZsBkwZkEREZIW24j90Sz2yOsXU3B9U=
341+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b h1:VwhHRRIPdMshBMb2TP7xrkY4Ee8CJWsHZvucYeJ56no=
342+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.1.3-0.20240228213828-cce7f56d000b/go.mod h1:UvDmcGIWJPIytq+Q78/ff5NTOsuX/7IrNgEugTW5i0s=
343343
github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.0.0 h1:mMHedP3Q+mz5gpOWNz0P+X8hxPdamylrBKc/P2cFakA=
344344
github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.0.0/go.mod h1:/P6l2bWo2AR3rrsfs0DHuFZO3Imzb93sxFD3ihrIgw4=
345345
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20230906222317-d88d4028e5c9 h1:Ji2ch8iw8qLh0xG/NY+RVsQ0tqiy+tViQxiaOHKpsw0=
346346
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20230906222317-d88d4028e5c9/go.mod h1:JwHFbo1oX/ht4fPpnPvmhZr+dCkYK1Vihw+vZE9umR4=
347-
github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw=
348-
github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ=
347+
github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8=
348+
github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g=
349349
github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
350350
github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
351351
github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=

‎interchaintest/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/CosmWasm/wasmd v0.45.0
2020
github.com/cosmos/cosmos-sdk v0.47.5
2121
github.com/cosmos/gogoproto v1.4.10
22-
github.com/cosmos/ibc-go/v7 v7.3.0
22+
github.com/cosmos/ibc-go/v7 v7.3.1
2323
github.com/docker/docker v24.0.4+incompatible
2424
github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230721183422-fb937bb0e165
2525
github.com/stretchr/testify v1.8.4

‎interchaintest/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK
360360
github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
361361
github.com/cosmos/iavl v0.20.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg=
362362
github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
363-
github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw=
364-
github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ=
363+
github.com/cosmos/ibc-go/v7 v7.3.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8=
364+
github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g=
365365
github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
366366
github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
367367
github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA=

0 commit comments

Comments
 (0)