Skip to content

Commit 420ab19

Browse files
SpicyLemonSpicyLemon
authoredJun 12, 2024··
Bump the SDK to v0.50.7-pio-1 (from v0.50.5-pio-3). (#2026)
* [1760]: Switch to a local version of the SDK that is based on v0.50.7. * [1760]: Bump cosmossdk.io/x/upgrade to v0.1.3 (from v0.1.1). * [1760]: Bump cosmossdk.io/x/feegrant to v0.1.1 (from v0.1.0). * [1760]: Bump cosmossdk.io/x/evidence to v0.1.1 (from v0.1.0). * [1760]: Add call to SetBankKeeper when creating the feegrant keeper. * [1760]: Change the expected mempool.max-txs value to -1 (from 5000) because the SDK change the default. * [1760]: Add call to SetBankKeeper when creating the authz keeper too. * [1760]: Bump the sdk version to v0.50.7-pio-1 (from v0.50.5-pio-3). * [1760]: Add links to changelog entries. * [1760]: Update the upgrade-test.sh script to be usable on this version. * [1760]: Update bank module proto which had an addition in v0.50.7. * [1760]: Add changelog entry about the upgrade-test script fix.
·
v1.21.1dwedul-v1.20.0-rc2-fixed
1 parent ba03fc5 commit 420ab19

File tree

9 files changed

+142
-75
lines changed

9 files changed

+142
-75
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ bin/
44
build/
55
config/
66
!cmd/provenanced/config/
7+
!third_party/**/config/
78
data/
89
.idea/
910
*.swp

‎CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
104104
* Breakdown internal/helpers into multiple internal packages [#2019](https://github.com/provenance-io/provenance/pull/2019).
105105
* Update `app.New` to get the home directory, invariant check period, and skip-upgrade heights from the appOptions instead of arguments [#2015](https://github.com/provenance-io/provenance/pull/2015).
106106
* Simplify the module lists (e.g. `SetOrderEndBlockers`) by removing unneeded entries [#2015](https://github.com/provenance-io/provenance/pull/2015).
107+
* Update the `upgrade-test.sh` script to work with v0.50 commands [#2026](https://github.com/provenance-io/provenance/pull/2026).
107108

108109
### Client Breaking
109110

@@ -130,7 +131,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
130131
- Bump `bufbuild/buf-lint-action` from 1.1.0 to 1.1.1 ([#1895](https://github.com/provenance-io/provenance/pull/1895))
131132
- Bump `bufbuild/buf-setup-action` from 1.30.0 to 1.32.2 ([#1904](https://github.com/provenance-io/provenance/pull/1904), [#1949](https://github.com/provenance-io/provenance/pull/1949), [#1979](https://github.com/provenance-io/provenance/pull/1979), [#1990](https://github.com/provenance-io/provenance/pull/1990), [#2011](https://github.com/provenance-io/provenance/pull/2011))
132133
- Bump `github.com/cometbft/cometbft` from 0.38.5 to 0.38.7 ([#1912](https://github.com/provenance-io/provenance/pull/1912), [#1959](https://github.com/provenance-io/provenance/pull/1959))
133-
- Bump `cosmossdk.io/x/upgrade` from 0.1.0 to 0.1.1 ([#1913](https://github.com/provenance-io/provenance/pull/1913))
134+
- Bump `cosmossdk.io/x/upgrade` from 0.1.0 to 0.1.3 ([#1913](https://github.com/provenance-io/provenance/pull/1913), [#2026](https://github.com/provenance-io/provenance/pull/2026))
134135
- Bump `github.com/hashicorp/go-metrics` from 0.5.2 to 0.5.3 ([#1914](https://github.com/provenance-io/provenance/pull/1914))
135136
- Bump `peter-evans/create-pull-request` from 6.0.2 to 6.0.5 ([#1929](https://github.com/provenance-io/provenance/pull/1929), [#1940](https://github.com/provenance-io/provenance/pull/1940), [#1955](https://github.com/provenance-io/provenance/pull/1955))
136137
- Bump `cosmossdk.io/x/tx` from 0.13.1 to 0.13.3 ([#1928](https://github.com/provenance-io/provenance/pull/1928), [#1944](https://github.com/provenance-io/provenance/pull/1944))
@@ -145,6 +146,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
145146
- Bump `github.com/spf13/viper` from 1.18.2 to 1.19.0 ([#2020](https://github.com/provenance-io/provenance/pull/2020))
146147
- Bump `github.com/cosmos/gogoproto` from 1.4.12 to 1.5.0 ([#2024](https://github.com/provenance-io/provenance/pull/2024))
147148
- Bump `cosmossdk.io/api` from 0.7.4 to 0.7.5 ([#2025](https://github.com/provenance-io/provenance/pull/2025))
149+
- Bump `github.com/cosmos/cosmos-sdk` from 0.50.5-pio-3 to 0.50.7-pio-1 [#2026](https://github.com/provenance-io/provenance/pull/2026)
150+
- Bump `cosmossdk.io/store` from 1.0.2 to 1.1.0 [#2026](https://github.com/provenance-io/provenance/pull/2026)
151+
- Bump `cosmossdk.io/x/feegrant` from 0.1.0 to 0.1.1 [#2026](https://github.com/provenance-io/provenance/pull/2026)
152+
- Bump `cosmossdk.io/x/evidence` from 0.1.0 to 0.1.1 [#2026](https://github.com/provenance-io/provenance/pull/2026)
148153

149154
---
150155

‎app/app.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ func New(
477477
app.CrisisKeeper = crisiskeeper.NewKeeper(appCodec, runtime.NewKVStoreService(keys[crisistypes.StoreKey]), invCheckPeriod,
478478
app.BankKeeper, authtypes.FeeCollectorName, govAuthority, app.AccountKeeper.AddressCodec())
479479

480-
app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, runtime.NewKVStoreService(keys[feegrant.StoreKey]), app.AccountKeeper)
480+
app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, runtime.NewKVStoreService(keys[feegrant.StoreKey]), app.AccountKeeper).SetBankKeeper(app.BankKeeper)
481481

482482
// get skipUpgradeHeights from the app options
483483
skipUpgradeHeights := make(map[int64]bool)
@@ -505,7 +505,7 @@ func New(
505505
stakingtypes.NewMultiStakingHooks(restrictHooks, app.DistrKeeper.Hooks(), app.SlashingKeeper.Hooks()),
506506
)
507507

508-
app.AuthzKeeper = authzkeeper.NewKeeper(runtime.NewKVStoreService(keys[authzkeeper.StoreKey]), appCodec, app.BaseApp.MsgServiceRouter(), app.AccountKeeper)
508+
app.AuthzKeeper = authzkeeper.NewKeeper(runtime.NewKVStoreService(keys[authzkeeper.StoreKey]), appCodec, app.BaseApp.MsgServiceRouter(), app.AccountKeeper).SetBankKeeper(app.BankKeeper)
509509

510510
app.GroupKeeper = groupkeeper.NewKeeper(keys[group.StoreKey], appCodec, app.BaseApp.MsgServiceRouter(), app.AccountKeeper, group.DefaultConfig())
511511

‎cmd/provenanced/cmd/config_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ grpc.address="localhost:9090"
292292
grpc.enable=true
293293
grpc.max-recv-msg-size=10485760
294294
grpc.max-send-msg-size=2147483647
295-
mempool.max-txs=5000
295+
mempool.max-txs=-1
296296
state-sync.snapshot-interval=0
297297
state-sync.snapshot-keep-recent=2
298298
streaming.abci.keys=[]
@@ -464,7 +464,7 @@ func (s *ConfigTestSuite) TestConfigGetMulti() {
464464
s.makeAppConfigHeaderLines(),
465465
`min-retain-blocks=0`,
466466
`grpc.address="localhost:9090"`,
467-
`mempool.max-txs=5000`,
467+
`mempool.max-txs=-1`,
468468
""),
469469
},
470470
{
@@ -509,7 +509,7 @@ func (s *ConfigTestSuite) TestConfigGetMulti() {
509509
keys: []string{"mempool"},
510510
expected: s.makeMultiLine(
511511
s.makeAppConfigHeaderLines(),
512-
`mempool.max-txs=5000`,
512+
`mempool.max-txs=-1`,
513513
"",
514514
s.makeCMTConfigHeaderLines(),
515515
`mempool.broadcast=true`,
@@ -687,7 +687,7 @@ func (s *ConfigTestSuite) TestConfigChanged() {
687687
args: []string{"changed", "mempool"},
688688
out: s.makeMultiLine(
689689
s.makeAppDiffHeaderLines(),
690-
`mempool.max-txs=5000 (same as default)`,
690+
`mempool.max-txs=-1 (same as default)`,
691691
"",
692692
s.makeCMTDiffHeaderLines(),
693693
`mempool.broadcast=true (same as default)`,

‎go.mod

+15-15
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ require (
1010
cosmossdk.io/errors v1.0.1
1111
cosmossdk.io/log v1.3.1
1212
cosmossdk.io/math v1.3.0
13-
cosmossdk.io/store v1.0.2
14-
cosmossdk.io/x/evidence v0.1.0
15-
cosmossdk.io/x/feegrant v0.1.0
13+
cosmossdk.io/store v1.1.0
14+
cosmossdk.io/x/evidence v0.1.1
15+
cosmossdk.io/x/feegrant v0.1.1
1616
cosmossdk.io/x/tx v0.13.3
17-
cosmossdk.io/x/upgrade v0.1.1
17+
cosmossdk.io/x/upgrade v0.1.3
1818
github.com/CosmWasm/wasmd v0.50.0
1919
github.com/CosmWasm/wasmvm v1.5.0
2020
github.com/cometbft/cometbft v0.38.7
2121
github.com/cometbft/cometbft-db v0.9.1
2222
github.com/cosmos/cosmos-db v1.0.2
2323
github.com/cosmos/cosmos-proto v1.0.0-beta.5
24-
github.com/cosmos/cosmos-sdk v0.50.5
24+
github.com/cosmos/cosmos-sdk v0.50.7
2525
github.com/cosmos/go-bip39 v1.0.0
2626
github.com/cosmos/gogoproto v1.5.0
2727
github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.0
@@ -40,7 +40,7 @@ require (
4040
github.com/spf13/pflag v1.0.5
4141
github.com/spf13/viper v1.19.0
4242
github.com/stretchr/testify v1.9.0
43-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
43+
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0
4444
golang.org/x/text v0.16.0
4545
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
4646
google.golang.org/grpc v1.64.0
@@ -69,7 +69,7 @@ require (
6969
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
7070
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
7171
github.com/cespare/xxhash v1.1.0 // indirect
72-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
72+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7373
github.com/chzyer/readline v1.5.1 // indirect
7474
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
7575
github.com/cockroachdb/errors v1.11.1 // indirect
@@ -79,7 +79,7 @@ require (
7979
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
8080
github.com/cosmos/btcutil v1.0.5 // indirect
8181
github.com/cosmos/gogogateway v1.2.0 // indirect
82-
github.com/cosmos/iavl v1.0.1 // indirect
82+
github.com/cosmos/iavl v1.1.2 // indirect
8383
github.com/cosmos/ics23/go v0.10.0 // indirect
8484
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
8585
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
@@ -143,7 +143,7 @@ require (
143143
github.com/kr/text v0.2.0 // indirect
144144
github.com/lib/pq v1.10.7 // indirect
145145
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
146-
github.com/linxGnu/grocksdb v1.8.12 // indirect
146+
github.com/linxGnu/grocksdb v1.8.14 // indirect
147147
github.com/magiconair/properties v1.8.7 // indirect
148148
github.com/manifoldco/promptui v0.9.0 // indirect
149149
github.com/mattn/go-colorable v0.1.13 // indirect
@@ -157,13 +157,13 @@ require (
157157
github.com/oklog/run v1.1.0 // indirect
158158
github.com/opencontainers/go-digest v1.0.0 // indirect
159159
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
160-
github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect
160+
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 // indirect
161161
github.com/pkg/errors v0.9.1 // indirect
162162
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
163-
github.com/prometheus/client_golang v1.18.0 // indirect
164-
github.com/prometheus/client_model v0.6.0 // indirect
165-
github.com/prometheus/common v0.47.0 // indirect
166-
github.com/prometheus/procfs v0.12.0 // indirect
163+
github.com/prometheus/client_golang v1.19.0 // indirect
164+
github.com/prometheus/client_model v0.6.1 // indirect
165+
github.com/prometheus/common v0.52.2 // indirect
166+
github.com/prometheus/procfs v0.13.0 // indirect
167167
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
168168
github.com/rogpeppe/go-internal v1.12.0 // indirect
169169
github.com/rs/cors v1.10.1 // indirect
@@ -212,7 +212,7 @@ replace (
212212
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
213213
// This is required for https://github.com/provenance-io/provenance/issues/1414
214214
github.com/CosmWasm/wasmd => github.com/provenance-io/wasmd v0.50.0-pio-2
215-
github.com/cosmos/cosmos-sdk => github.com/provenance-io/cosmos-sdk v0.50.5-pio-3
215+
github.com/cosmos/cosmos-sdk => github.com/provenance-io/cosmos-sdk v0.50.7-pio-1
216216

217217
// TODO[1760]: Update once async-icq creates tag with our changes https://github.com/cosmos/ibc-apps/pull/168
218218
github.com/cosmos/ibc-apps/modules/async-icq/v8 => github.com/provenance-io/ibc-apps/modules/async-icq/v8 v8.0.0-prov-1

‎go.sum

+28-28
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,20 @@ cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI=
200200
cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM=
201201
cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE=
202202
cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k=
203-
cosmossdk.io/store v1.0.2 h1:lSg5BTvJBHUDwswNNyeh4K/CbqiHER73VU4nDNb8uk0=
204-
cosmossdk.io/store v1.0.2/go.mod h1:EFtENTqVTuWwitGW1VwaBct+yDagk7oG/axBMPH+FXs=
203+
cosmossdk.io/store v1.1.0 h1:LnKwgYMc9BInn9PhpTFEQVbL9UK475G2H911CGGnWHk=
204+
cosmossdk.io/store v1.1.0/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng=
205205
cosmossdk.io/x/circuit v0.1.0 h1:IAej8aRYeuOMritczqTlljbUVHq1E85CpBqaCTwYgXs=
206206
cosmossdk.io/x/circuit v0.1.0/go.mod h1:YDzblVE8+E+urPYQq5kq5foRY/IzhXovSYXb4nwd39w=
207-
cosmossdk.io/x/evidence v0.1.0 h1:J6OEyDl1rbykksdGynzPKG5R/zm6TacwW2fbLTW4nCk=
208-
cosmossdk.io/x/evidence v0.1.0/go.mod h1:hTaiiXsoiJ3InMz1uptgF0BnGqROllAN8mwisOMMsfw=
209-
cosmossdk.io/x/feegrant v0.1.0 h1:c7s3oAq/8/UO0EiN1H5BIjwVntujVTkYs35YPvvrdQk=
210-
cosmossdk.io/x/feegrant v0.1.0/go.mod h1:4r+FsViJRpcZif/yhTn+E0E6OFfg4n0Lx+6cCtnZElU=
207+
cosmossdk.io/x/evidence v0.1.1 h1:Ks+BLTa3uftFpElLTDp9L76t2b58htjVbSZ86aoK/E4=
208+
cosmossdk.io/x/evidence v0.1.1/go.mod h1:OoDsWlbtuyqS70LY51aX8FBTvguQqvFrt78qL7UzeNc=
209+
cosmossdk.io/x/feegrant v0.1.1 h1:EKFWOeo/pup0yF0svDisWWKAA9Zags6Zd0P3nRvVvw8=
210+
cosmossdk.io/x/feegrant v0.1.1/go.mod h1:2GjVVxX6G2fta8LWj7pC/ytHjryA6MHAJroBWHFNiEQ=
211211
cosmossdk.io/x/nft v0.1.0 h1:VhcsFiEK33ODN27kxKLa0r/CeFd8laBfbDBwYqCyYCM=
212212
cosmossdk.io/x/nft v0.1.0/go.mod h1:ec4j4QAO4mJZ+45jeYRnW7awLHby1JZANqe1hNZ4S3g=
213213
cosmossdk.io/x/tx v0.13.3 h1:Ha4mNaHmxBc6RMun9aKuqul8yHiL78EKJQ8g23Zf73g=
214214
cosmossdk.io/x/tx v0.13.3/go.mod h1:I8xaHv0rhUdIvIdptKIqzYy27+n2+zBVaxO6fscFhys=
215-
cosmossdk.io/x/upgrade v0.1.1 h1:aoPe2gNvH+Gwt/Pgq3dOxxQVU3j5P6Xf+DaUJTDZATc=
216-
cosmossdk.io/x/upgrade v0.1.1/go.mod h1:MNLptLPcIFK9CWt7Ra//8WUZAxweyRDNcbs5nkOcQy0=
215+
cosmossdk.io/x/upgrade v0.1.3 h1:q4XpXc6zp0dX6x74uBtfN6+J7ikaQev5Bla6Q0ADLK8=
216+
cosmossdk.io/x/upgrade v0.1.3/go.mod h1:jOdQhnaY5B8CDUoUbed23/Lre0Dk+r6BMQE40iKlVVQ=
217217
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
218218
filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek=
219219
filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
@@ -294,8 +294,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
294294
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
295295
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
296296
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
297-
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
298-
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
297+
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
298+
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
299299
github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
300300
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
301301
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
@@ -362,8 +362,8 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ
362362
github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
363363
github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52o=
364364
github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I=
365-
github.com/cosmos/iavl v1.0.1 h1:D+mYbcRO2wptYzOM1Hxl9cpmmHU1ZEt9T2Wv5nZTeUw=
366-
github.com/cosmos/iavl v1.0.1/go.mod h1:8xIUkgVvwvVrBu81scdPty+/Dx9GqwHnAvXz4cwF7RY=
365+
github.com/cosmos/iavl v1.1.2 h1:zL9FK7C4L/P4IF1Dm5fIwz0WXCnn7Bp1M2FxH0ayM7Y=
366+
github.com/cosmos/iavl v1.1.2/go.mod h1:jLeUvm6bGT1YutCaL2fIar/8vGUE8cPZvh/gXEWDaDM=
367367
github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE=
368368
github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco=
369369
github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM=
@@ -750,8 +750,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6
750750
github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
751751
github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
752752
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
753-
github.com/linxGnu/grocksdb v1.8.12 h1:1/pCztQUOa3BX/1gR3jSZDoaKFpeHFvQ1XrqZpSvZVo=
754-
github.com/linxGnu/grocksdb v1.8.12/go.mod h1:xZCIb5Muw+nhbDK4Y5UJuOrin5MceOuiXkVUR7vp4WY=
753+
github.com/linxGnu/grocksdb v1.8.14 h1:HTgyYalNwBSG/1qCQUIott44wU5b2Y9Kr3z7SK5OfGQ=
754+
github.com/linxGnu/grocksdb v1.8.14/go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA=
755755
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
756756
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
757757
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
@@ -858,8 +858,8 @@ github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6
858858
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
859859
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
860860
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
861-
github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA=
862-
github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
861+
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67 h1:jik8PHtAIsPlCRJjJzl4udgEf7hawInF9texMeO2jrU=
862+
github.com/petermattis/goid v0.0.0-20231207134359-e60b3f734c67/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
863863
github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
864864
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
865865
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
@@ -880,34 +880,34 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
880880
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
881881
github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
882882
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
883-
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
884-
github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
883+
github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
884+
github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
885885
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
886886
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
887887
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
888888
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
889889
github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
890890
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
891-
github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
892-
github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
891+
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
892+
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
893893
github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
894894
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
895895
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
896896
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
897897
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
898898
github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
899-
github.com/prometheus/common v0.47.0 h1:p5Cz0FNHo7SnWOmWmoRozVcjEp0bIVU8cV7OShpjL1k=
900-
github.com/prometheus/common v0.47.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
899+
github.com/prometheus/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck=
900+
github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q=
901901
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
902902
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
903903
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
904904
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
905905
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
906906
github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
907-
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
908-
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
909-
github.com/provenance-io/cosmos-sdk v0.50.5-pio-3 h1:QwJ4feMM43a9fu2YZ1oSHd1wqEIsANDdqXKsoOin85Q=
910-
github.com/provenance-io/cosmos-sdk v0.50.5-pio-3/go.mod h1:oV/k6GJgXV9QPoM2fsYDPPsyPBgQbdotv532O6Mz1OQ=
907+
github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o=
908+
github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g=
909+
github.com/provenance-io/cosmos-sdk v0.50.7-pio-1 h1:A4WC4LzcQj6jh+WdIIP4OIN3DCSW1t5qONtkYrJ77jg=
910+
github.com/provenance-io/cosmos-sdk v0.50.7-pio-1/go.mod h1:84xDDJEHttRT7NDGwBaUOLVOMN0JNE9x7NbsYIxXs1s=
911911
github.com/provenance-io/ibc-apps/modules/async-icq/v8 v8.0.0-prov-1 h1:p+7pxHB0ukO2aow+M6uW9gHgeQl7YJyYGyMSKHZ5My8=
912912
github.com/provenance-io/ibc-apps/modules/async-icq/v8 v8.0.0-prov-1/go.mod h1:tObW9uxibh5Z22CtOaHVeTDotCSMyc/2B4MrYdaViBo=
913913
github.com/provenance-io/ibc-go/v8 v8.2.1-pio-1 h1:Vmf8Q6qnI3eeyUjV5NsMJsT127diiGuzW+653wj4Y1s=
@@ -1102,8 +1102,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
11021102
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
11031103
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
11041104
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
1105-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
1106-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
1105+
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8=
1106+
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
11071107
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
11081108
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
11091109
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

‎scripts/upgrade-test.sh

+59-24
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,76 @@ prov="${PROV:-build/provenanced}"
3131
deposit="${DEPOSIT:-10000000nhash}"
3232
gasPrices="${GAS_PRICES:-1905nhash}"
3333
gas="${GAS:-auto}"
34-
gasAdj="${GAS_ADJUSTMENT:-1.5}"
34+
gasAdj="${GAS_ADJUSTMENT:-1.6}"
3535
gasArgs="--gas-prices=$gasPrices --gas=$gas"
3636
if [ "$gas" == 'auto' ]; then
3737
gasArgs="$gasArgs --gas-adjustment=$gasAdj"
3838
fi
3939
heightPlus="${HEIGHT_PLUS:-40}"
4040

41-
prop_cmd='submit-proposal'
42-
no_val=''
43-
if "$prov" tx gov "$prop_cmd" software-upgrade --help 2>&1 | grep -qF 'proposal.json' > /dev/null 2>&1; then
44-
prop_cmd='submit-legacy-proposal'
45-
no_val='--no-validate'
46-
fi
47-
48-
4941
valAddr="$( "$prov" keys list --output json | jq -r '.[] | select( .name == "validator" ) | .address' )"
50-
curHeight="$( "$prov" status | jq -r '.SyncInfo.latest_block_height' )"
42+
curHeight="$( "$prov" status | jq -r '.sync_info // .SyncInfo | .latest_block_height' )"
5143
targetHeight="$(( curHeight + heightPlus ))"
5244

53-
propRes="$( "$prov" tx gov "$prop_cmd" software-upgrade "$color" \
54-
--title "Upgrade for $color" \
55-
--description "Upgrading provenance to $color" \
56-
--upgrade-info="$color" \
57-
--upgrade-height "$targetHeight" \
58-
--deposit "$deposit" \
59-
--from "$valAddr" \
60-
$gasArgs $no_val \
61-
--yes )"
45+
# There are three different versions of the submit-upgrade command that this script can handle.
46+
# 1. (v1.19+): provenanced tx upgrade software-upgrade | provenanced query wait-tx
47+
# 2. (v1.13 to v1.18): provenanced tx gov submit-legacy-proposal software-upgrade
48+
# 3. (up to v1.12): provenanced tx gov submit-proposal software-upgrade
49+
50+
if "$prov" query --help 2>&1 | grep -qF 'wait-tx' > /dev/null 2>&1; then
51+
# As of sdk version v0.50.7, there's a bug in the wait-tx command where it doesn't properly parse the
52+
# tx output as json, but it does work as yaml. We ultimately need it as json, though (to get the proposal id).
53+
# So we output the tx as yaml and pipe that to wait-tx which we have output as json.
54+
propRes="$( "$prov" tx upgrade software-upgrade "$color" \
55+
--title "Upgrade for $color" \
56+
--summary "Upgrading provenance to $color" \
57+
--upgrade-info="$color" \
58+
--upgrade-height "$targetHeight" \
59+
--no-validate \
60+
--deposit "$deposit" \
61+
--from "$valAddr" \
62+
$gasArgs $no_val \
63+
--yes \
64+
--broadcast-mode sync \
65+
--output text \
66+
| "$prov" query wait-tx --output json )"
6267

63-
propId="$( tail -n 1 <<< "$propRes" | jq -r '.logs[0].events[] | select( .type == "submit_proposal" ) | .attributes[] | select( .key == "proposal_id" ) | .value' )"
68+
propId="$( tail -n 1 <<< "$propRes" | jq -r '.events[] | select( .type == "submit_proposal" ) | .attributes[] | select( .key == "proposal_id" ) | .value' )"
6469

65-
"$prov" tx gov vote "$propId" yes \
66-
--from "$valAddr" \
67-
$gasArgs \
68-
--yes
70+
"$prov" tx gov vote "$propId" yes \
71+
--from "$valAddr" \
72+
$gasArgs \
73+
--yes \
74+
--broadcast-mode sync \
75+
--output yaml \
76+
| "$prov" query wait-tx --output json
77+
else
78+
prop_cmd='submit-proposal'
79+
no_val=''
80+
if "$prov" tx gov "$prop_cmd" software-upgrade --help 2>&1 | grep -qF 'proposal.json' > /dev/null 2>&1; then
81+
prop_cmd='submit-legacy-proposal'
82+
no_val='--no-validate'
83+
fi
84+
85+
propRes="$( "$prov" tx gov "$prop_cmd" software-upgrade "$color" \
86+
--title "Upgrade for $color" \
87+
--description "Upgrading provenance to $color" \
88+
--upgrade-info="$color" \
89+
--upgrade-height "$targetHeight" \
90+
--deposit "$deposit" \
91+
--from "$valAddr" \
92+
$gasArgs $no_val \
93+
--yes \
94+
--broadcast-mode block \
95+
--output json )"
96+
97+
propId="$( tail -n 1 <<< "$propRes" | jq -r '.logs[0].events[] | select( .type == "submit_proposal" ) | .attributes[] | select( .key == "proposal_id" ) | .value' )"
98+
99+
"$prov" tx gov vote "$propId" yes \
100+
--from "$valAddr" \
101+
$gasArgs \
102+
--yes
103+
fi
69104

70105
"$prov" query gov tally "$propId"
71106

‎third_party/proto/cosmos/bank/module/v1/module.proto

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,10 @@ message Module {
1717

1818
// authority defines the custom module authority. If not set, defaults to the governance module.
1919
string authority = 2;
20-
}
20+
21+
// restrictions_order specifies the order of send restrictions and should be
22+
// a list of module names which provide a send restriction instance. If no
23+
// order is provided, then restrictions will be applied in alphabetical order
24+
// of module names.
25+
repeated string restrictions_order = 3;
26+
}

‎third_party/proto/cosmos/tx/config/v1/config.proto

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
syntax = "proto3";
2+
3+
package cosmos.tx.config.v1;
4+
5+
import "cosmos/app/v1alpha1/module.proto";
6+
7+
// Config is the config object of the x/auth/tx package.
8+
message Config {
9+
option (cosmos.app.v1alpha1.module) = {
10+
go_import: "github.com/cosmos/cosmos-sdk/x/auth/tx"
11+
};
12+
13+
// skip_ante_handler defines whether the ante handler registration should be skipped in case an app wants to override
14+
// this functionality.
15+
bool skip_ante_handler = 1;
16+
17+
// skip_post_handler defines whether the post handler registration should be skipped in case an app wants to override
18+
// this functionality.
19+
bool skip_post_handler = 2;
20+
}

0 commit comments

Comments
 (0)
Please sign in to comment.