Skip to content

Commit 92c4760

Browse files
puneet2019puneet2019
authored
update pfm version for v11.x (#307)
update pfm version
1 parent aa1d6a8 commit 92c4760

File tree

10 files changed

+457
-21
lines changed

10 files changed

+457
-21
lines changed

‎app/keepers/keepers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ import (
4646
"github.com/cosmos/cosmos-sdk/x/upgrade"
4747
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
4848
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
49-
packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router"
50-
packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/keeper"
51-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
49+
packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
50+
packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper"
51+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
5252
ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7"
5353
ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/keeper"
5454
ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"

‎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
ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
2525
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
2626
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"

‎app/keepers/modules.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/cosmos/cosmos-sdk/x/staking"
2626
"github.com/cosmos/cosmos-sdk/x/upgrade"
2727
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
28-
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router"
28+
"github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
2929
ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7"
3030
ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"
3131
ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee"
@@ -91,6 +91,6 @@ var AppModuleBasics = []module.AppModuleBasic{
9191
consensus.AppModuleBasic{},
9292
groupmodule.AppModuleBasic{},
9393
ibchooks.AppModuleBasic{},
94-
router.AppModuleBasic{},
94+
packetforward.AppModuleBasic{},
9595
buildermodule.AppModuleBasic{},
9696
}

‎app/modules.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import (
3939
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
4040
"github.com/cosmos/cosmos-sdk/x/upgrade"
4141
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
42-
packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router"
43-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
42+
packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward"
43+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
4444
ibchooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7"
4545
ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
4646
ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts"

‎app/upgrades/v8/constants.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
consensusparamstypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
66
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
77
group "github.com/cosmos/cosmos-sdk/x/group"
8-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
8+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
99
ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
1010
ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"
1111
oracletypes "github.com/persistenceOne/persistence-sdk/v2/x/oracle/types"

‎app/upgrades/v8/legacy_subspaces.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
1717
slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
1818
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
19-
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types"
19+
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types"
2020
icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
2121
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
2222
ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"

‎go.mod‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ require (
1111
github.com/CosmWasm/wasmvm v1.2.4
1212
github.com/cometbft/cometbft v0.37.2
1313
github.com/cometbft/cometbft-db v0.9.1
14-
github.com/cosmos/cosmos-sdk v0.47.3
15-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230523193151-73dea436e53f
14+
github.com/cosmos/cosmos-sdk v0.47.5
15+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.2-0.20240307225840-3d1ded976e33
1616
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20230706221116-a1e480497c12
17-
github.com/cosmos/ibc-go/v7 v7.1.0
17+
github.com/cosmos/ibc-go/v7 v7.3.1
1818
github.com/gorilla/mux v1.8.1
1919
github.com/persistenceOne/persistence-sdk/v2 v2.1.1
2020
github.com/persistenceOne/pstake-native/v2 v2.11.0
@@ -36,7 +36,7 @@ require (
3636
cloud.google.com/go/storage v1.30.1 // indirect
3737
cosmossdk.io/core v0.6.1 // indirect
3838
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
39-
cosmossdk.io/log v1.2.0 // indirect
39+
cosmossdk.io/log v1.2.1 // indirect
4040
filippo.io/edwards25519 v1.0.0 // indirect
4141
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
4242
github.com/99designs/keyring v1.2.2 // indirect
@@ -203,7 +203,6 @@ replace (
203203
replace (
204204
github.com/CosmWasm/wasmd => github.com/persistenceOne/wasmd v0.40.2-lsm3
205205
github.com/cosmos/cosmos-sdk => github.com/persistenceOne/cosmos-sdk v0.47.3-lsm5
206-
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 => github.com/persistenceOne/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20240109170424-f4a8f29910eb
207206
github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 => github.com/persistenceOne/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240109170424-f4a8f29910eb
208207
github.com/cosmos/ibc-go/v7 => github.com/persistenceOne/ibc-go/v7 v7.2.0-lsm3
209208
github.com/skip-mev/pob => github.com/persistenceOne/pob v1.0.3-lsm3

‎go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98ok
199199
cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU=
200200
cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
201201
cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U=
202-
cosmossdk.io/log v1.2.0 h1:BbykkDsutXPSy8RojFB3KZEWyvMsToLy0ykb/ZhsLqQ=
203-
cosmossdk.io/log v1.2.0/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4=
202+
cosmossdk.io/log v1.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk=
203+
cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4=
204204
cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig=
205205
cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0=
206206
cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw=
@@ -407,6 +407,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK
407407
github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek=
408408
github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38=
409409
github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
410+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.2-0.20240307225840-3d1ded976e33 h1:5/dbALdSYkREvsDaFpHZqKD6YBLhotSaVUTNqSp/1l0=
411+
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.2-0.20240307225840-3d1ded976e33/go.mod h1:GGUJN4LnB3J1Luu4kxTklQLbW69So3QXUndSalB003s=
410412
github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
411413
github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0=
412414
github.com/cosmos/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo=
@@ -1013,8 +1015,6 @@ github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNc
10131015
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
10141016
github.com/persistenceOne/cosmos-sdk v0.47.3-lsm5 h1:z5k9M81ogHgaMyLck7GVzfdNYvn03ZTXsCpQDzy69eQ=
10151017
github.com/persistenceOne/cosmos-sdk v0.47.3-lsm5/go.mod h1:4oxikyyHyEe1wlYQFMGITfW/r01wYtfj8yjwru7bSWE=
1016-
github.com/persistenceOne/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20240109170424-f4a8f29910eb h1:diFYtzQUDh2WKIy21ywl45rWidpVbd0jAKcR0ddlndw=
1017-
github.com/persistenceOne/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20240109170424-f4a8f29910eb/go.mod h1:v+x4hTcShRZylXZNsK5zXFQ8QMV448rbIY4e9HDXBkY=
10181018
github.com/persistenceOne/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240109170424-f4a8f29910eb h1:p0eVmgkvqjwWpqxn1YtKRj+tVa1+3B3JELK+riYSHQM=
10191019
github.com/persistenceOne/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240109170424-f4a8f29910eb/go.mod h1:fbwFAk6oxuKiFvp5SLCItT34A1+F5LjGcMNOTuU8h4c=
10201020
github.com/persistenceOne/ibc-go/v7 v7.2.0-lsm3 h1:U4NsRXpg9VHCFVyrk1JfG+sIA3frtZIWbtNmmumjta8=
@@ -1243,6 +1243,8 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe
12431243
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
12441244
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
12451245
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
1246+
go.uber.org/mock v0.2.0 h1:TaP3xedm7JaAgScZO7tlvlKrqT0p7I6OsdGB5YNSMDU=
1247+
go.uber.org/mock v0.2.0/go.mod h1:J0y0rp9L3xiff1+ZBfKxlC1fz2+aO16tw0tsDOixfuM=
12461248
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
12471249
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
12481250
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=

‎interchaintest/lsm_halt_fork_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func TestPersistenceLSMHaltFork(t *testing.T) {
114114
require.Len(t, validators, validatorsCount, "validator returned must match count of validators created")
115115

116116
// Bond first user
117-
firstUserBondAmount := sdk.NewInt(100_000_000_000)
117+
firstUserBondAmount := math.NewInt(100_000_000_000)
118118
firstUserBondCoins := sdk.NewCoin(testDenom, firstUserBondAmount)
119119
txHash, err := chainNode.ExecTx(ctx, firstUser.KeyName(),
120120
"staking", "delegate", validators[0].OperatorAddress, firstUserBondCoins.String(),
@@ -167,7 +167,7 @@ func TestPersistenceLSMHaltFork(t *testing.T) {
167167
checkCtx, cancelFn = context.WithTimeout(context.Background(), 15*time.Second)
168168

169169
// Create second user delegation
170-
secondUserBondAmount := sdk.NewInt(88_000_000_000) // 88k magic number to tell from 100k that comes from A
170+
secondUserBondAmount := math.NewInt(88_000_000_000) // 88k magic number to tell from 100k that comes from A
171171
secondUserBondCoins := sdk.NewCoin(testDenom, secondUserBondAmount)
172172
_, err = chainNode.ExecTx(checkCtx, secondUser.KeyName(),
173173
"staking", "delegate", validators[0].OperatorAddress, secondUserBondCoins.String(),

0 commit comments

Comments
 (0)