Skip to content

Commit 3b929a5

Browse files
faddatfaddat
authored
Merge branch 'main' into dependabot/go_modules/github.com/cosmos/gogoproto-1.4.4
2 parents 51a672e + de11ce0 commit 3b929a5

File tree

7 files changed

+54
-47
lines changed

7 files changed

+54
-47
lines changed

‎.github/workflows/build_docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Docker Buildx
2020
uses: docker/setup-buildx-action@v2
2121
- name: Build without push
22-
uses: docker/build-push-action@v3
22+
uses: docker/build-push-action@v4
2323
with:
2424
context: .
2525
platforms: linux/amd64

‎.github/workflows/price-feeder-docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
password: ${{ secrets.GITHUB_TOKEN }}
3636

3737
- name: Build and push
38-
uses: docker/build-push-action@v3
38+
uses: docker/build-push-action@v4
3939
with:
4040
context: .
4141
file: price-feeder/price-feeder.Dockerfile

‎.github/workflows/push-docker-images.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
-
6565
name: Build and push
6666
id: build_push_image
67-
uses: docker/build-push-action@v3
67+
uses: docker/build-push-action@v4
6868
with:
6969
file: Dockerfile
7070
context: .
@@ -107,7 +107,7 @@ jobs:
107107
-
108108
name: Build and push
109109
id: build_push_e2e_image
110-
uses: docker/build-push-action@v3
110+
uses: docker/build-push-action@v4
111111
with:
112112
file: tests/e2e/initialization/Dockerfile
113113
context: .
@@ -151,7 +151,7 @@ jobs:
151151
-
152152
name: Build and push
153153
id: build_push_e2e_init_image
154-
uses: docker/build-push-action@v3
154+
uses: docker/build-push-action@v4
155155
with:
156156
file: tests/e2e/initialization/init.Dockerfile
157157
context: .

‎go.mod‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/spf13/cobra v1.6.1
2020
github.com/strangelove-ventures/packet-forward-middleware/v4 v4.0.1-0.20230115230008-9d283c08227d
2121
github.com/stretchr/testify v1.8.1
22-
github.com/tendermint/tendermint v0.34.24
22+
github.com/tendermint/tendermint v0.34.25
2323
github.com/tendermint/tm-db v0.6.8-0.20220506192307-f628bb5dc95b
2424
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef
2525
google.golang.org/grpc v1.52.3
@@ -29,6 +29,8 @@ require (
2929
)
3030

3131
require (
32+
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
33+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
3234
github.com/tendermint/btcd v0.1.1 // indirect
3335
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect
3436
)
@@ -146,14 +148,14 @@ require (
146148
github.com/zondax/ledger-go v0.14.1 // indirect
147149
go.etcd.io/bbolt v1.3.6 // indirect
148150
go.opencensus.io v0.24.0 // indirect
149-
golang.org/x/crypto v0.2.0 // indirect
151+
golang.org/x/crypto v0.4.0 // indirect
150152
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
151-
golang.org/x/mod v0.6.0 // indirect
153+
golang.org/x/mod v0.7.0 // indirect
152154
golang.org/x/net v0.4.0 // indirect
153155
golang.org/x/sys v0.3.0 // indirect
154156
golang.org/x/term v0.3.0 // indirect
155157
golang.org/x/text v0.5.0 // indirect
156-
golang.org/x/tools v0.2.0 // indirect
158+
golang.org/x/tools v0.4.0 // indirect
157159
gopkg.in/ini.v1 v1.67.0 // indirect
158160
nhooyr.io/websocket v1.8.7 // indirect
159161
)
@@ -174,7 +176,7 @@ replace (
174176
// use cosmos-flavored protocol buffers
175177
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
176178
// Informal Tendermint fork due to hostile takeover
177-
github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.24
179+
github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.25
178180
// use grpc version that's compatible with cosmos-flavored protocol buffers
179181
google.golang.org/grpc => google.golang.org/grpc v1.33.2
180182

‎go.sum‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,15 @@ github.com/btcsuite/btcd v0.22.2 h1:vBZ+lGGd1XubpOWO67ITJpAEsICWhA0YzqkcpkgNBfo=
130130
github.com/btcsuite/btcd v0.22.2/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
131131
github.com/btcsuite/btcd/btcec/v2 v2.1.2/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
132132
github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
133+
github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
134+
github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ=
133135
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
134136
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
135137
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
136138
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
137139
github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
138140
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
139141
github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
140-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
141142
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
142143
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
143144
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
@@ -234,6 +235,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
234235
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
235236
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
236237
github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
238+
github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
237239
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
238240
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
239241
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
@@ -543,8 +545,8 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y
543545
github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE=
544546
github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0=
545547
github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po=
546-
github.com/informalsystems/tendermint v0.34.24 h1:2beNEg5tp+U5oj/Md+0xDBsMHGbdue31T3OrstS6xS0=
547-
github.com/informalsystems/tendermint v0.34.24/go.mod h1:rXVrl4OYzmIa1I91av3iLv2HS0fGSiucyW9J4aMTpKI=
548+
github.com/informalsystems/tendermint v0.34.25 h1:KlTF1ECfJI2KmM1w1YGai5hoLJ0ZOKjVwGAaElEBPtE=
549+
github.com/informalsystems/tendermint v0.34.25/go.mod h1:TCGT4eRe5OW979YKVTpFOM57B4YkN+7FSDWpsgzAGwY=
548550
github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
549551
github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
550552
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -1008,8 +1010,8 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
10081010
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
10091011
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
10101012
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1011-
golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE=
1012-
golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
1013+
golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
1014+
golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
10131015
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
10141016
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
10151017
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1050,8 +1052,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
10501052
golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
10511053
golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
10521054
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
1053-
golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
1054-
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
1055+
golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
1056+
golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
10551057
golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
10561058
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
10571059
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1129,6 +1131,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
11291131
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11301132
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11311133
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1134+
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
11321135
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
11331136
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
11341137
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1299,8 +1302,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
12991302
golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
13001303
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
13011304
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
1302-
golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
1303-
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
1305+
golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4=
1306+
golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
13041307
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13051308
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13061309
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎price-feeder/go.mod‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ require (
1717
github.com/spf13/cobra v1.6.1
1818
github.com/spf13/viper v1.14.0
1919
github.com/stretchr/testify v1.8.1
20-
github.com/tendermint/tendermint v0.34.24
20+
github.com/tendermint/tendermint v0.34.25
2121
golang.org/x/sync v0.1.0
22-
golang.org/x/term v0.2.0
22+
golang.org/x/term v0.3.0
2323
google.golang.org/grpc v1.51.0
2424
gopkg.in/yaml.v3 v3.0.1
2525
)
@@ -55,6 +55,7 @@ require (
5555
github.com/breml/bidichk v0.2.3 // indirect
5656
github.com/breml/errchkjson v0.3.0 // indirect
5757
github.com/btcsuite/btcd v0.22.2 // indirect
58+
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
5859
github.com/butuzov/ireturn v0.1.1 // indirect
5960
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
6061
github.com/cespare/xxhash v1.1.0 // indirect
@@ -78,6 +79,7 @@ require (
7879
github.com/daixiang0/gci v0.8.1 // indirect
7980
github.com/danieljoos/wincred v1.1.2 // indirect
8081
github.com/davecgh/go-spew v1.1.1 // indirect
82+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
8183
github.com/denis-tingaikin/go-header v0.4.3 // indirect
8284
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
8385
github.com/dgraph-io/badger/v3 v3.2103.2 // indirect
@@ -150,7 +152,6 @@ require (
150152
github.com/hashicorp/hcl v1.0.0 // indirect
151153
github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect
152154
github.com/hexops/gotextdiff v1.0.3 // indirect
153-
github.com/ignite-hq/cli v0.22.1 // indirect
154155
github.com/improbable-eng/grpc-web v0.15.0 // indirect
155156
github.com/inconshreveable/mousetrap v1.0.1 // indirect
156157
github.com/jgautheron/goconst v1.5.1 // indirect
@@ -264,14 +265,14 @@ require (
264265
go.uber.org/goleak v1.1.12 // indirect
265266
go.uber.org/multierr v1.8.0 // indirect
266267
go.uber.org/zap v1.23.0 // indirect
267-
golang.org/x/crypto v0.2.0 // indirect
268+
golang.org/x/crypto v0.4.0 // indirect
268269
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
269270
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
270-
golang.org/x/mod v0.6.0 // indirect
271-
golang.org/x/net v0.2.0 // indirect
272-
golang.org/x/sys v0.2.0 // indirect
273-
golang.org/x/text v0.4.0 // indirect
274-
golang.org/x/tools v0.2.0 // indirect
271+
golang.org/x/mod v0.7.0 // indirect
272+
golang.org/x/net v0.4.0 // indirect
273+
golang.org/x/sys v0.3.0 // indirect
274+
golang.org/x/text v0.5.0 // indirect
275+
golang.org/x/tools v0.4.0 // indirect
275276
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
276277
google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect
277278
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -287,4 +288,5 @@ require (
287288
replace (
288289
github.com/CosmosContracts/juno/v12 => ../
289290
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
291+
github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.25
290292
)

0 commit comments

Comments
 (0)