Skip to content

Commit 15be850

Browse files
tomtautomtau
committed
Problem: missing ICA messages in the upgrade plan (#905)
Solution: added the missing staking messages and ICS721 to the allowlist, plus changed the ugprade plan name * fix upgrade test plan name * added unjail to the upgrade plan's AllowMessages
1 parent b5a283e commit 15be850

File tree

7 files changed

+44
-30
lines changed

7 files changed

+44
-30
lines changed

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
*December 6, 2022*
4+
5+
## v4.2.0
6+
The upgrade plan name was changed to "v4.2.0" (from "v4.0.0") which adds several other
7+
messages to the ICA allowlist (missing staking messages and ICS721).
8+
9+
### Improvements
10+
- [905](https://github.com/crypto-org-chain/chain-main/pull/905) ics23 was bumped to the official 0.9 release.
11+
312
*December 1, 2022*
413

514
## v4.1.3

‎app/app.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ func New(
698698
// upgrade.
699699
app.setPostHandler()
700700

701-
planName := "v4.0.0"
701+
planName := "v4.2.0"
702702
app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
703703
// the minimal commission rate of 5% (0.05)
704704
// (default is needed to be set because of SDK store migrations that set the param)
@@ -746,10 +746,15 @@ func New(
746746
"/cosmos.gov.v1beta1.MsgSubmitProposal",
747747
"/cosmos.gov.v1beta1.MsgDeposit",
748748
"/cosmos.gov.v1beta1.MsgVote",
749+
"/cosmos.staking.v1beta1.MsgCreateValidator",
750+
"/cosmos.staking.v1beta1.MsgEditValidator",
749751
"/cosmos.staking.v1beta1.MsgDelegate",
750752
"/cosmos.staking.v1beta1.MsgUndelegate",
751753
"/cosmos.staking.v1beta1.MsgBeginRedelegate",
754+
"/cosmos.staking.v1beta1.MsgCancelUnbondingDelegation",
755+
"/cosmos.slashing.v1beta1.MsgUnjail",
752756
"/ibc.applications.transfer.v1.MsgTransfer",
757+
"/chainmain.nft_transfer.v1.MsgTransfer",
753758
"/chainmain.nft.v1.MsgBurnNFT",
754759
"/chainmain.nft.v1.MsgEditNFT",
755760
"/chainmain.nft.v1.MsgIssueDenom",

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
5151
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
5252
github.com/coinbase/rosetta-sdk-go v0.7.9 // indirect
53-
github.com/confio/ics23/go v0.7.0 // indirect
53+
github.com/confio/ics23/go v0.9.0 // indirect
5454
github.com/cosmos/btcutil v1.0.4 // indirect
5555
github.com/cosmos/go-bip39 v1.0.0 // indirect
5656
github.com/cosmos/gorocksdb v1.2.0 // indirect
@@ -145,12 +145,12 @@ require (
145145
github.com/zondax/ledger-go v0.12.2 // indirect
146146
go.etcd.io/bbolt v1.3.6 // indirect
147147
go.opencensus.io v0.23.0 // indirect
148-
golang.org/x/crypto v0.1.0 // indirect
148+
golang.org/x/crypto v0.2.0 // indirect
149149
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
150-
golang.org/x/net v0.1.0 // indirect
150+
golang.org/x/net v0.2.0 // indirect
151151
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
152-
golang.org/x/sys v0.1.0 // indirect
153-
golang.org/x/term v0.1.0 // indirect
152+
golang.org/x/sys v0.2.0 // indirect
153+
golang.org/x/term v0.2.0 // indirect
154154
golang.org/x/text v0.4.0 // indirect
155155
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
156156
google.golang.org/api v0.93.0 // indirect
@@ -165,7 +165,7 @@ replace (
165165
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
166166

167167
// Ref: https://forum.cosmos.network/t/ibc-security-advisory-dragonberry/7702
168-
github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
168+
github.com/confio/ics23/go => github.com/confio/ics23/go v0.9.0
169169
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.7-0.20221130150212-85d6f66de543
170170
github.com/cosmos/ledger-cosmos-go => github.com/cosmos/ledger-cosmos-go v0.11.2-0.20220719170349-e736b9afa7d1
171171

‎go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE
212212
github.com/coinbase/kryptology v1.8.0/go.mod h1:RYXOAPdzOGUe3qlSFkMGn58i3xUA8hmxYHksuq+8ciI=
213213
github.com/coinbase/rosetta-sdk-go v0.7.9 h1:lqllBjMnazTjIqYrOGv8h8jxjg9+hJazIGZr9ZvoCcA=
214214
github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M=
215+
github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4=
216+
github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
215217
github.com/confluentinc/bincover v0.1.0 h1:M4Gfj4rCXuUQVe8TqT/VXcAMjLyvN81oDRy79fjSv3o=
216218
github.com/confluentinc/bincover v0.1.0/go.mod h1:qeI1wx0RxdGTZtrJY0HVlgJ4NqC/X2Z+fHbvy87tgHE=
217219
github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
@@ -231,8 +233,6 @@ github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hk
231233
github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw=
232234
github.com/cosmos/cosmos-sdk v0.46.7-0.20221130150212-85d6f66de543 h1:PXkFIqT6WhdnKUffKBozFvcy2+5xFLwmJtyDqgXs1fc=
233235
github.com/cosmos/cosmos-sdk v0.46.7-0.20221130150212-85d6f66de543/go.mod h1:B2j/SQkKvs/hUbXTmKxGwBnShJHvlxtVEbvTYNPwfrU=
234-
github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k=
235-
github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30=
236236
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
237237
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
238238
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
@@ -1048,8 +1048,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
10481048
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
10491049
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
10501050
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1051-
golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
1052-
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
1051+
golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE=
1052+
golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
10531053
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
10541054
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
10551055
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1155,8 +1155,8 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su
11551155
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
11561156
golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
11571157
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
1158-
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
1159-
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
1158+
golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
1159+
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
11601160
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
11611161
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
11621162
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1295,13 +1295,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
12951295
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
12961296
golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
12971297
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1298-
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
1299-
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1298+
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
1299+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13001300
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
13011301
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
13021302
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
1303-
golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw=
1304-
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
1303+
golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
1304+
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
13051305
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13061306
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
13071307
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎gomod2nix.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ schema = 3
6969
version = "v0.7.9"
7070
hash = "sha256-ZWIXIXcHGjeCNgMrpXymry8/8esDDauGFfF/+gEoO1Y="
7171
[mod."github.com/confio/ics23/go"]
72-
version = "v0.8.0"
73-
hash = "sha256-mFKxFHp7RaE1L5NdtH9H9px2Cy6I5uOZVnFOgE8Nrew="
74-
replaced = "github.com/cosmos/cosmos-sdk/ics23/go"
72+
version = "v0.9.0"
73+
hash = "sha256-guD8w7YygfUp7lpTAUyXQuCPx8F3lXkcg+yR5+JOCbk="
74+
replaced = "github.com/confio/ics23/go"
7575
[mod."github.com/confluentinc/bincover"]
7676
version = "v0.1.0"
7777
hash = "sha256-bMCtvBFSR8edk3gzCKSXCrR2a0LXBsJAlR5WjPZdKBE="
@@ -414,23 +414,23 @@ schema = 3
414414
version = "v0.23.0"
415415
hash = "sha256-R3O9GyNtv6j0ic7s+2xkLLaLzbJEop0Otj1nJDFBjsg="
416416
[mod."golang.org/x/crypto"]
417-
version = "v0.1.0"
418-
hash = "sha256-0oZWBSiW5Pd/2a1p2beuoelDe0CpfXZhrg/qPduJlYs="
417+
version = "v0.2.0"
418+
hash = "sha256-7xbZm2rKYVl71Hcm4HIT8lN4ZxpcbaOt8a7vkq13VM0="
419419
[mod."golang.org/x/exp"]
420420
version = "v0.0.0-20220722155223-a9213eeb770e"
421421
hash = "sha256-kNgzydWRpjm0sZl4uXEs3LX5L0xjJtJRAFf/CTlYUN4="
422422
[mod."golang.org/x/net"]
423-
version = "v0.1.0"
424-
hash = "sha256-SrThFBg6sqGYpiN1E3d1SilJxbKkQhSZXPmAFoMAA/I="
423+
version = "v0.2.0"
424+
hash = "sha256-0MqnHDdLkkau6k7hlWD9MzIoAFROvxulyT+KzZkSXOs="
425425
[mod."golang.org/x/oauth2"]
426426
version = "v0.0.0-20220622183110-fd043fe589d2"
427427
hash = "sha256-VLffpTpx3DlUzXB8mKiJfFzm4ZmgnLSUuLB5Ir0WQUg="
428428
[mod."golang.org/x/sys"]
429-
version = "v0.1.0"
430-
hash = "sha256-nZbEJ/2PuWrDLD4ujeVvcFGoIsfVoIH/Lcp4FjD7hpU="
429+
version = "v0.2.0"
430+
hash = "sha256-N6yfQH7R2gfcvyWTQZbxWuSNyVy6hAxiab2WFzgAykI="
431431
[mod."golang.org/x/term"]
432-
version = "v0.1.0"
433-
hash = "sha256-UWnNsJIj5nXsuzlPWQ1NyHQuHStaDacMVkFbJ4pnxXk="
432+
version = "v0.2.0"
433+
hash = "sha256-azcllZ0o/9TurqX9udaJ0o9yxqSoI0/bSJsvQQLYIQc="
434434
[mod."golang.org/x/text"]
435435
version = "v0.4.0"
436436
hash = "sha256-JvyMygdmTvWg7xhbnUB9MMk6WcYXJt8DAj4DYl82Pys="

‎integration_tests/test_upgrade.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def assert_commission(adr, expected):
370370
assert raw_log[0]["events"][0]["type"] == "issue_denom"
371371

372372
target_height = cluster.block_height() + 30
373-
upgrade(cluster, "v4.0.0", target_height, cosmos_sdk_46=False)
373+
upgrade(cluster, "v4.2.0", target_height, cosmos_sdk_46=False)
374374

375375
cli = cluster.cosmos_cli()
376376

‎integration_tests/upgrade-test.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ pkgs.linkFarm "upgrade-test-package" [
99
{ name = "genesis"; path = released; }
1010
{ name = "v2.0.0"; path = released2; }
1111
{ name = "v3.0.0"; path = released3; }
12-
{ name = "v4.0.0"; path = current; }
12+
{ name = "v4.2.0"; path = current; }
1313
]

0 commit comments

Comments
 (0)