Skip to content

Commit 699e936

Browse files
sainoesainoe
committed
* Bump CometBFT to v1.x-inj and Cosmos-SDK v0.50.9-comet1-inj
* Upgrade 08-wasm light client * Fix 07-tendermint light client tests
1 parent cdd88f4 commit 699e936

File tree

16 files changed

+356
-932
lines changed

16 files changed

+356
-932
lines changed

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ require (
227227

228228
replace (
229229
// Use Cosmos SDK v0.50.9-comet1-inj (283af470e9) submodules
230+
cosmossdk.io/core => github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a
230231
cosmossdk.io/store => github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a
231232
cosmossdk.io/x/circuit => github.com/InjectiveLabs/cosmos-sdk/x/circuit v0.1.2-0.20250317211017-283af470e91a
232233
cosmossdk.io/x/evidence => github.com/InjectiveLabs/cosmos-sdk/x/evidence v0.50.6-inj-0.0.20250317211017-283af470e91a
@@ -240,4 +241,4 @@ replace (
240241
github.com/cosmos/ibc-go/modules/capability => ./modules/capability
241242

242243
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
243-
)
244+
)

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ cosmossdk.io/client/v2 v2.0.0-beta.3 h1:+TTuH0DwQYsUq2JFAl3fDZzKq5gQG7nt3dAattkj
192192
cosmossdk.io/client/v2 v2.0.0-beta.3/go.mod h1:CZcL41HpJPOOayTCO28j8weNBQprG+SRiKX39votypo=
193193
cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s=
194194
cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
195-
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7 h1:hOzi4yo2Fc7h3mod+xX4m4QA4+Uq+PkFRjY/yalZ0B8=
196-
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7/go.mod h1:3v0JJNNd8ye0cOvJ+wUUvE7Ke0d2qxnNIDcXd5mziHk=
197195
cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=
198196
cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
199197
cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
@@ -243,6 +241,8 @@ github.com/InjectiveLabs/cometbft/api v1.0.1-0.20250315062455-e9e4c8a0ecb9 h1:9Q
243241
github.com/InjectiveLabs/cometbft/api v1.0.1-0.20250315062455-e9e4c8a0ecb9/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8=
244242
github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj h1:TNWCwLzMd7vKD5Hjdk9r94XQF6XhYHT6FcDotgNHOfQ=
245243
github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj/go.mod h1:MGKV8JsuyywQANlUdWMhIylvmSqvG7vPnAQAKtwRemg=
244+
github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a h1:cbD03irmR4QmuoMw9b9j7jkMEZEraNN2dwVibzuLYV4=
245+
github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a/go.mod h1:Pt8kHbk0fuWppYCQsV0744igFFNTD+WTChutUvlu8UA=
246246
github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a h1:XSpvwO6OrbrnRHD268tU40KpjnXxErVroN3Jr+NmNI0=
247247
github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a/go.mod h1:7bsXnzsjjjVOaOwTJTQxEvRbE/ubuDRYPpwoPvCGitA=
248248
github.com/InjectiveLabs/cosmos-sdk/x/circuit v0.1.2-0.20250317211017-283af470e91a h1:TOFFHSiWiVw54omdzOrSb4KXGVXUEsIkTHM+lszMIiY=

‎modules/apps/callbacks/go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ replace github.com/cosmos/ibc-go/modules/capability => ../../capability
232232

233233
replace (
234234
// Use Cosmos SDK v0.50.9-comet1-inj (283af470e9) submodules
235+
cosmossdk.io/core => github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a
235236
cosmossdk.io/store => github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a
236237
cosmossdk.io/x/circuit => github.com/InjectiveLabs/cosmos-sdk/x/circuit v0.1.2-0.20250317211017-283af470e91a
237238
cosmossdk.io/x/evidence => github.com/InjectiveLabs/cosmos-sdk/x/evidence v0.50.6-inj-0.0.20250317211017-283af470e91a
@@ -244,4 +245,4 @@ replace (
244245
github.com/cosmos/cosmos-sdk => github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj
245246

246247
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
247-
)
248+
)

‎modules/apps/callbacks/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ cosmossdk.io/client/v2 v2.0.0-beta.3 h1:+TTuH0DwQYsUq2JFAl3fDZzKq5gQG7nt3dAattkj
192192
cosmossdk.io/client/v2 v2.0.0-beta.3/go.mod h1:CZcL41HpJPOOayTCO28j8weNBQprG+SRiKX39votypo=
193193
cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s=
194194
cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
195-
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7 h1:hOzi4yo2Fc7h3mod+xX4m4QA4+Uq+PkFRjY/yalZ0B8=
196-
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7/go.mod h1:3v0JJNNd8ye0cOvJ+wUUvE7Ke0d2qxnNIDcXd5mziHk=
197195
cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=
198196
cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
199197
cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
@@ -243,6 +241,8 @@ github.com/InjectiveLabs/cometbft/api v1.0.1-0.20250315062455-e9e4c8a0ecb9 h1:9Q
243241
github.com/InjectiveLabs/cometbft/api v1.0.1-0.20250315062455-e9e4c8a0ecb9/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8=
244242
github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj h1:TNWCwLzMd7vKD5Hjdk9r94XQF6XhYHT6FcDotgNHOfQ=
245243
github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj/go.mod h1:MGKV8JsuyywQANlUdWMhIylvmSqvG7vPnAQAKtwRemg=
244+
github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a h1:cbD03irmR4QmuoMw9b9j7jkMEZEraNN2dwVibzuLYV4=
245+
github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a/go.mod h1:Pt8kHbk0fuWppYCQsV0744igFFNTD+WTChutUvlu8UA=
246246
github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a h1:XSpvwO6OrbrnRHD268tU40KpjnXxErVroN3Jr+NmNI0=
247247
github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a/go.mod h1:7bsXnzsjjjVOaOwTJTQxEvRbE/ubuDRYPpwoPvCGitA=
248248
github.com/InjectiveLabs/cosmos-sdk/x/circuit v0.1.2-0.20250317211017-283af470e91a h1:TOFFHSiWiVw54omdzOrSb4KXGVXUEsIkTHM+lszMIiY=

‎modules/apps/callbacks/testing/simapp/app.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ func (app *SimApp) setPostHandler() {
832832
func (app *SimApp) Name() string { return app.BaseApp.Name() }
833833

834834
// PreBlocker application updates every pre block
835-
func (app *SimApp) PreBlocker(ctx sdk.Context, _ *abci.RequestFinalizeBlock) (*sdk.ResponsePreBlock, error) {
835+
func (app *SimApp) PreBlocker(ctx sdk.Context, _ *abci.FinalizeBlockRequest) (*sdk.ResponsePreBlock, error) {
836836
return app.ModuleManager.PreBlock(ctx)
837837
}
838838

@@ -852,7 +852,7 @@ func (app *SimApp) Configurator() module.Configurator {
852852
}
853853

854854
// InitChainer application update at chain initialization
855-
func (app *SimApp) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.ResponseInitChain, error) {
855+
func (app *SimApp) InitChainer(ctx sdk.Context, req *abci.InitChainRequest) (*abci.InitChainResponse, error) {
856856
var genesisState GenesisState
857857
if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
858858
panic(err)

‎modules/capability/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ require (
184184
replace (
185185
// Use Cosmos SDK v0.50.9-comet1-inj (283af470e9) store
186186
cosmossdk.io/store => github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a
187-
187+
cosmossdk.io/core => github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a
188188
// Use CometBFT v1.0.1 with Mempool lanes and DOG
189189
github.com/cometbft/cometbft => github.com/InjectiveLabs/cometbft v1.0.2-0.20250315062455-e9e4c8a0ecb9
190190
github.com/cometbft/cometbft/api => github.com/InjectiveLabs/cometbft/api v1.0.1-0.20250315062455-e9e4c8a0ecb9
191191
github.com/cosmos/cosmos-sdk => github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj
192-
)
192+
)

‎modules/capability/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ cosmossdk.io/api v0.7.5 h1:eMPTReoNmGUm8DeiQL9DyM8sYDjEhWzL1+nLbI9DqtQ=
44
cosmossdk.io/api v0.7.5/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38=
55
cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s=
66
cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0=
7-
cosmossdk.io/core v0.11.1 h1:h9WfBey7NAiFfIcUhDVNS503I2P2HdZLebJlUIs8LPA=
8-
cosmossdk.io/core v0.11.1/go.mod h1:OJzxcdC+RPrgGF8NJZR2uoQr56tc7gfBKhiKeDO7hH0=
97
cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050=
108
cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8=
119
cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0=
@@ -51,6 +49,8 @@ github.com/InjectiveLabs/cometbft/api v1.0.1-0.20250315062455-e9e4c8a0ecb9 h1:9Q
5149
github.com/InjectiveLabs/cometbft/api v1.0.1-0.20250315062455-e9e4c8a0ecb9/go.mod h1:Ivh6nSCTJPQOyfQo8dgnyu/T88it092sEqSrZSmTQN8=
5250
github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj h1:TNWCwLzMd7vKD5Hjdk9r94XQF6XhYHT6FcDotgNHOfQ=
5351
github.com/InjectiveLabs/cosmos-sdk v0.50.9-comet1-inj/go.mod h1:MGKV8JsuyywQANlUdWMhIylvmSqvG7vPnAQAKtwRemg=
52+
github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a h1:cbD03irmR4QmuoMw9b9j7jkMEZEraNN2dwVibzuLYV4=
53+
github.com/InjectiveLabs/cosmos-sdk/core v0.8.1-0.20250317211017-283af470e91a/go.mod h1:Pt8kHbk0fuWppYCQsV0744igFFNTD+WTChutUvlu8UA=
5454
github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a h1:XSpvwO6OrbrnRHD268tU40KpjnXxErVroN3Jr+NmNI0=
5555
github.com/InjectiveLabs/cosmos-sdk/store v1.1.1-0.20250317211017-283af470e91a/go.mod h1:7bsXnzsjjjVOaOwTJTQxEvRbE/ubuDRYPpwoPvCGitA=
5656
github.com/InjectiveLabs/metrics v0.0.10 h1:BoOwXnCtRRIPmq06jcI20pXZYE758eusaCI5jDOoN4U=

‎modules/light-clients/07-tendermint/header_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ func (suite *TendermintTestSuite) TestHeaderValidateBasic() {
4848
header.ValidatorSet = nil
4949
}, false},
5050
{"ValidatorSetFromProto failed", func() {
51-
header.ValidatorSet.Validators[0].PubKey = cmtprotocrypto.PublicKey{}
51+
header.ValidatorSet.Validators[0].PubKey = &cmtprotocrypto.PublicKey{}
52+
header.ValidatorSet.Validators[0].PubKeyBytes = []byte{}
5253
}, false},
5354
{"header validator hash does not equal hash of validator set", func() {
5455
// use chainB's randomly generated validator set

0 commit comments

Comments
 (0)