Skip to content

Commit 9666e38

Browse files
cool-developecool-develope
authored
Merge branch 'main' into baseapp/listener
2 parents b41a60b + bf95c81 commit 9666e38

File tree

78 files changed

+545
-1878
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+545
-1878
lines changed

‎SECURITY.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,8 @@ If you follow these guidelines when reporting an issue to us, we commit to:
5757

5858
### More information
5959

60-
* See [TIMELINE.md] for an example timeline of a disclosure.
61-
* See [DISCLOSURE.md] to see more into the inner workings of the disclosure
62-
process.
6360
* See [EXAMPLES.md] for some of the examples that we are interested in for the
6461
bug bounty program.
6562

6663
[h1]: https://hackerone.com/cosmos
67-
[TIMELINE.md]: https://github.com/cosmos/security/blob/main/TIMELINE.md
68-
[DISCLOSURE.md]: https://github.com/cosmos/security/blob/main/DISCLOSURE.md
69-
[EXAMPLES.md]: https://github.com/cosmos/security/blob/main/EXAMPLES.md
64+
[EXAMPLES.md]: https://github.com/interchainio/security/blob/main/resources/CLASSIFICATION_MATRIX.md#real-world-examples

‎baseapp/options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func (app *BaseApp) SetPrepareProposal(handler sdk.PrepareProposalHandler) {
367367
app.prepareProposal = handler
368368
}
369369

370-
// SetCheckTx sets the checkTx function for the BaseApp.
370+
// SetCheckTxHandler sets the checkTx function for the BaseApp.
371371
func (app *BaseApp) SetCheckTxHandler(handler sdk.CheckTxHandler) {
372372
if app.sealed {
373373
panic("SetCheckTx() on sealed BaseApp")

‎client/v2/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ require (
127127
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
128128
github.com/prometheus/client_golang v1.20.4 // indirect
129129
github.com/prometheus/client_model v0.6.1 // indirect
130-
github.com/prometheus/common v0.59.1 // indirect
130+
github.com/prometheus/common v0.60.0 // indirect
131131
github.com/prometheus/procfs v0.15.1 // indirect
132132
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
133133
github.com/rogpeppe/go-internal v1.12.0 // indirect

‎client/v2/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
424424
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
425425
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
426426
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
427-
github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
428-
github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
427+
github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA=
428+
github.com/prometheus/common v0.60.0/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
429429
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
430430
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
431431
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=

‎docs/architecture/adr-069-gov-improvements.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
## Status
88

9-
ACCEPTED
9+
ACCEPTED - Implemented
1010

1111
## Abstract
1212

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/mdp/qrterminal/v3 v3.2.0
4646
github.com/muesli/termenv v0.15.2
4747
github.com/prometheus/client_golang v1.20.4
48-
github.com/prometheus/common v0.59.1
48+
github.com/prometheus/common v0.60.0
4949
github.com/rs/zerolog v1.33.0
5050
github.com/spf13/cast v1.7.0
5151
github.com/spf13/cobra v1.8.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
411411
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
412412
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
413413
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
414-
github.com/prometheus/common v0.59.1 h1:LXb1quJHWm1P6wq/U824uxYi4Sg0oGvNeUm1z5dJoX0=
415-
github.com/prometheus/common v0.59.1/go.mod h1:GpWM7dewqmVYcd7SmRaiWVe9SSqjf0UrwnYnpEZNuT0=
414+
github.com/prometheus/common v0.60.0 h1:+V9PAREWNvJMAuJ1x1BaWl9dewMW4YrHZQbx0sJNllA=
415+
github.com/prometheus/common v0.60.0/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
416416
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
417417
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
418418
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=

‎orm/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ require (
5050
github.com/kr/pretty v0.3.1 // indirect
5151
github.com/kr/text v0.2.0 // indirect
5252
github.com/linxGnu/grocksdb v1.8.12 // indirect
53-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
53+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5454
github.com/onsi/gomega v1.20.0 // indirect
5555
github.com/pkg/errors v0.9.1 // indirect
5656
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
57-
github.com/prometheus/client_golang v1.12.0 // indirect
58-
github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a // indirect
59-
github.com/prometheus/common v0.32.1 // indirect
60-
github.com/prometheus/procfs v0.7.3 // indirect
57+
github.com/prometheus/client_golang v1.20.4 // indirect
58+
github.com/prometheus/client_model v0.6.1 // indirect
59+
github.com/prometheus/common v0.60.0 // indirect
60+
github.com/prometheus/procfs v0.15.1 // indirect
6161
github.com/rogpeppe/go-internal v1.12.0 // indirect
6262
github.com/spf13/cast v1.7.0 // indirect
6363
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect

0 commit comments

Comments
 (0)