Skip to content

Commit 46335fb

Browse files
jmank88pavel-raykov
jmank88
and
pavel-raykov
authored
bump cosmos-sdk; remove cometbft (#16639)
* bump cosmos-sdk; remove cometbft; bump geth; remove replace * make generate * Minor --------- Co-authored-by: pavel-raykov <[email protected]>
1 parent c547030 commit 46335fb

29 files changed

+989
-980
lines changed

‎core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
burn_from_mint_token_pool: ../../../contracts/solc/ccip/BurnFromMintTokenPool/BurnFromMintTokenPool.sol/BurnFromMintTokenPool.abi.json ../../../contracts/solc/ccip/BurnFromMintTokenPool/BurnFromMintTokenPool.sol/BurnFromMintTokenPool.bin ae4e15dc926517092d46e108cd5e24863d58e689444ce310bb00c1390f711ba9
33
burn_mint_token_pool: ../../../contracts/solc/ccip/BurnMintTokenPool/BurnMintTokenPool.sol/BurnMintTokenPool.abi.json ../../../contracts/solc/ccip/BurnMintTokenPool/BurnMintTokenPool.sol/BurnMintTokenPool.bin 7360dc05306d51b247abdf9a3aa8704847b1f4fb91fdb822a2dfc54e1d86cda1
44
burn_to_address_mint_token_pool: ../../../contracts/solc/ccip/BurnToAddressMintTokenPool/BurnToAddressMintTokenPool.sol/BurnToAddressMintTokenPool.abi.json ../../../contracts/solc/ccip/BurnToAddressMintTokenPool/BurnToAddressMintTokenPool.sol/BurnToAddressMintTokenPool.bin ca4d24535b7c8a9cff9ca0ff96a41b8410b0e055059e45152e3e49a7c40a6656

‎core/gethwrappers/data-feeds/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
bundle_aggregator_proxy: ../../../contracts/solc/data-feeds/BundleAggregatorProxy/BundleAggregatorProxy.sol/BundleAggregatorProxy.abi.json ../../../contracts/solc/data-feeds/BundleAggregatorProxy/BundleAggregatorProxy.sol/BundleAggregatorProxy.bin b28fb697d1d846523f4552143dc7fb162054d3d387d110c02500203b7cd08b7c
33
data_feeds_cache: ../../../contracts/solc/data-feeds/DataFeedsCache/DataFeedsCache.sol/DataFeedsCache.abi.json ../../../contracts/solc/data-feeds/DataFeedsCache/DataFeedsCache.sol/DataFeedsCache.bin dc334adf5274f87e5c05e5e6e794b22b1e313d6e8fda18e33699ab07e993cc27

‎core/gethwrappers/functions/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
functions: ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRequest.abi ../../../contracts/solc/v0.8.19/functions/v1_X/FunctionsRequest.bin 3c972870b0afeb6d73a29ebb182f24956a2cebb127b21c4f867d1ecf19a762db
33
functions_allow_list: ../../../contracts/solc/v0.8.19/functions/v1_X/TermsOfServiceAllowList.abi ../../../contracts/solc/v0.8.19/functions/v1_X/TermsOfServiceAllowList.bin 6581a3e82c8a6b5532addb8278ff520d18f38c2be4ac07ed0ad9ccc2e6825e48
44
functions_billing_registry_events_mock: ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsBillingRegistryEventsMock.abi ../../../contracts/solc/v0.8.6/functions/v0_0_0/FunctionsBillingRegistryEventsMock.bin 50deeb883bd9c3729702be335c0388f9d8553bab4be5e26ecacac496a89e2b77

‎core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
aggregator_v2v3_interface: ../../contracts/solc/v0.8.6/AggregatorV2V3Interface/AggregatorV2V3Interface.abi ../../contracts/solc/v0.8.6/AggregatorV2V3Interface/AggregatorV2V3Interface.bin 95e8814b408bb05bf21742ef580d98698b7db6a9bac6a35c3de12b23aec4ee28
33
arbitrum_module: ../../contracts/solc/v0.8.19/ArbitrumModule/ArbitrumModule.abi ../../contracts/solc/v0.8.19/ArbitrumModule/ArbitrumModule.bin 12a7bad1f887d832d101a73ae279a91a90c93fd72befea9983e85eff493f62f4
44
authorized_forwarder: ../../contracts/solc/v0.8.19/AuthorizedForwarder/AuthorizedForwarder.abi ../../contracts/solc/v0.8.19/AuthorizedForwarder/AuthorizedForwarder.bin 8ea76c883d460f8353a45a493f2aebeb5a2d9a7b4619d1bc4fff5fb590bb3e10

‎core/gethwrappers/keystone/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
balance_reader: ../../../contracts/solc/v0.8.24/BalanceReader/BalanceReader.abi ../../../contracts/solc/v0.8.24/BalanceReader/BalanceReader.bin 8824fe0d750f400e5dc8c5fd367bd0d8b335ea24500c38323bdec987e8ac4827
33
capabilities_registry: ../../../contracts/solc/v0.8.24/CapabilitiesRegistry/CapabilitiesRegistry.abi ../../../contracts/solc/v0.8.24/CapabilitiesRegistry/CapabilitiesRegistry.bin 07e0115065e833b29352017fe808dd149952b0b7fe73d0af87020966d2ece57c
44
feeds_consumer: ../../../contracts/solc/v0.8.24/KeystoneFeedsConsumer/KeystoneFeedsConsumer.abi ../../../contracts/solc/v0.8.24/KeystoneFeedsConsumer/KeystoneFeedsConsumer.bin 6ac5b12eff3b022a35c3c40d5ed0285bf9bfec0e3669a4b12307332a216048ca

‎core/gethwrappers/llo-feeds/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
channel_config_store: ../../../contracts/solc/v0.8.19/llo-feeds/v0.5.0/configuration/ChannelConfigStore/ChannelConfigStore.abi ../../../contracts/solc/v0.8.19/llo-feeds/v0.5.0/configuration/ChannelConfigStore/ChannelConfigStore.bin 3fafe83ea21d50488f5533962f62683988ffa6fd1476dccbbb9040be2369cb37
33
channel_config_store_v0_5_0: ../../../contracts/solc/v0.8.19/llo-feeds/v0.5.0/configuration/ChannelConfigStore/ChannelConfigStore.abi ../../../contracts/solc/v0.8.19/llo-feeds/v0.5.0/configuration/ChannelConfigStore/ChannelConfigStore.bin 3fafe83ea21d50488f5533962f62683988ffa6fd1476dccbbb9040be2369cb37
44
channel_config_verifier_proxy: ../../../contracts/solc/v0.8.19/ChannelVerifierProxy/ChannelVerifierProxy.abi ../../../contracts/solc/v0.8.19/ChannelVerifierProxy/ChannelVerifierProxy.bin 655658e5f61dfadfe3268de04f948b7e690ad03ca45676e645d6cd6018154661

‎core/gethwrappers/operatorforwarder/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
authorized_forwarder: ../../../contracts/solc/v0.8.19/AuthorizedForwarder/AuthorizedForwarder.abi ../../../contracts/solc/v0.8.19/AuthorizedForwarder/AuthorizedForwarder.bin 8ea76c883d460f8353a45a493f2aebeb5a2d9a7b4619d1bc4fff5fb590bb3e10
33
authorized_receiver: ../../../contracts/solc/v0.8.19/AuthorizedReceiver/AuthorizedReceiver.abi ../../../contracts/solc/v0.8.19/AuthorizedReceiver/AuthorizedReceiver.bin 18e8969ba3234b027e1b16c11a783aca58d0ea5c2361010ec597f134b7bf1c4f
44
link_token_receiver: ../../../contracts/solc/v0.8.19/LinkTokenReceiver/LinkTokenReceiver.abi ../../../contracts/solc/v0.8.19/LinkTokenReceiver/LinkTokenReceiver.bin 839552e2bea179bdf2591805422fb33769c1646d5a014a00fc2c0cd9c03ef229

‎core/gethwrappers/shared/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
aggregator_v3_interface: ../../../contracts/solc/shared/AggregatorV3Interface/AggregatorV3Interface.sol/AggregatorV3Interface.abi.json ../../../contracts/solc/shared/AggregatorV3Interface/AggregatorV3Interface.sol/AggregatorV3Interface.bin 0294226c10dd4b77239d85074fcf05c39c5cbf513b45bb07f966a8733457d2cb
33
burn_mint_erc20: ../../../contracts/solc/shared/BurnMintERC20/BurnMintERC20.sol/BurnMintERC20.abi.json ../../../contracts/solc/shared/BurnMintERC20/BurnMintERC20.sol/BurnMintERC20.bin 161d4fc00d3bd8759a82a11d2d0946653ed06853e67359049ac4176288090d22
44
burn_mint_erc677: ../../../contracts/solc/shared/BurnMintERC677/BurnMintERC677.sol/BurnMintERC677.abi.json ../../../contracts/solc/shared/BurnMintERC677/BurnMintERC677.sol/BurnMintERC677.bin c510542f105686f93e6287a66a6466c10cd576781063fc787ef365b4a47f5cb8

‎core/gethwrappers/workflow/generation/generated-wrapper-dependency-versions-do-not-edit.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
GETH_VERSION: 1.15.0
1+
GETH_VERSION: 1.15.3
22
workflow_registry_wrapper: ../../../contracts/solc/v0.8.24/WorkflowRegistry/WorkflowRegistry.abi ../../../contracts/solc/v0.8.24/WorkflowRegistry/WorkflowRegistry.bin 6384706f1c2cecc49b8f42dbb9a1bed450c3a7ae576aaaa3c50237b52c7e676e

‎core/scripts/go.mod

+28-25
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
require (
1818
github.com/docker/docker v27.4.1+incompatible
1919
github.com/docker/go-connections v0.5.0
20-
github.com/ethereum/go-ethereum v1.15.0
20+
github.com/ethereum/go-ethereum v1.15.3
2121
github.com/gkampitakis/go-snaps v0.5.4
2222
github.com/google/go-cmp v0.6.0
2323
github.com/google/uuid v1.6.0
@@ -52,16 +52,22 @@ require (
5252
)
5353

5454
require (
55+
cosmossdk.io/api v0.7.6 // indirect
56+
cosmossdk.io/collections v0.4.0 // indirect
57+
cosmossdk.io/core v0.11.0 // indirect
58+
cosmossdk.io/depinject v1.1.0 // indirect
5559
cosmossdk.io/errors v1.0.1 // indirect
56-
cosmossdk.io/math v1.3.0 // indirect
60+
cosmossdk.io/log v1.4.1 // indirect
61+
cosmossdk.io/math v1.4.0 // indirect
62+
cosmossdk.io/store v1.1.1 // indirect
63+
cosmossdk.io/x/tx v0.13.7 // indirect
5764
dario.cat/mergo v1.0.1 // indirect
5865
filippo.io/edwards25519 v1.1.0 // indirect
5966
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
6067
github.com/99designs/keyring v1.2.1 // indirect
6168
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
6269
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
63-
github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect
64-
github.com/DataDog/zstd v1.5.2 // indirect
70+
github.com/DataDog/zstd v1.5.5 // indirect
6571
github.com/Depado/ginprom v1.8.0 // indirect
6672
github.com/Masterminds/semver/v3 v3.3.1 // indirect
6773
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -105,7 +111,6 @@ require (
105111
github.com/bytedance/sonic/loader v0.2.0 // indirect
106112
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
107113
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
108-
github.com/cespare/xxhash v1.1.0 // indirect
109114
github.com/cespare/xxhash/v2 v2.3.0 // indirect
110115
github.com/cloudwego/base64x v0.1.4 // indirect
111116
github.com/cloudwego/iasm v0.2.0 // indirect
@@ -116,19 +121,20 @@ require (
116121
github.com/cockroachdb/redact v1.1.5 // indirect
117122
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
118123
github.com/coder/websocket v1.8.12 // indirect
119-
github.com/cometbft/cometbft v0.37.5 // indirect
120-
github.com/cometbft/cometbft-db v0.8.0 // indirect
121-
github.com/confio/ics23/go v0.9.0 // indirect
124+
github.com/cometbft/cometbft v0.38.12 // indirect
125+
github.com/cometbft/cometbft-db v1.0.1 // indirect
122126
github.com/consensys/bavard v0.1.22 // indirect
123127
github.com/consensys/gnark-crypto v0.14.0 // indirect
124128
github.com/containerd/log v0.1.0 // indirect
125129
github.com/containerd/platforms v0.2.1 // indirect
126130
github.com/cosmos/btcutil v1.0.5 // indirect
131+
github.com/cosmos/cosmos-db v1.1.1 // indirect
127132
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
128-
github.com/cosmos/cosmos-sdk v0.47.11 // indirect
133+
github.com/cosmos/cosmos-sdk v0.50.12 // indirect
129134
github.com/cosmos/go-bip39 v1.0.0 // indirect
130-
github.com/cosmos/gogoproto v1.4.11 // indirect
131-
github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect
135+
github.com/cosmos/gogoproto v1.7.0 // indirect
136+
github.com/cosmos/ics23/go v0.11.0 // indirect
137+
github.com/cosmos/ledger-cosmos-go v0.14.0 // indirect
132138
github.com/cpuguy83/dockercfg v0.3.2 // indirect
133139
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
134140
github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
@@ -138,9 +144,8 @@ require (
138144
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
139145
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
140146
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
141-
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
142-
github.com/dgraph-io/ristretto v0.1.1 // indirect
143-
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
147+
github.com/dgraph-io/badger/v4 v4.3.0 // indirect
148+
github.com/dgraph-io/ristretto v0.1.2-0.20240116140435-c67e07994f91 // indirect
144149
github.com/distribution/reference v0.6.0 // indirect
145150
github.com/docker/go-units v0.5.0 // indirect
146151
github.com/dominikbraun/graph v0.23.0 // indirect
@@ -196,11 +201,11 @@ require (
196201
github.com/gogo/protobuf v1.3.3 // indirect
197202
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
198203
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
199-
github.com/golang/glog v1.2.3 // indirect
204+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
200205
github.com/golang/protobuf v1.5.4 // indirect
201206
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
202207
github.com/google/btree v1.1.3 // indirect
203-
github.com/google/flatbuffers v24.3.25+incompatible // indirect
208+
github.com/google/flatbuffers v24.12.23+incompatible // indirect
204209
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
205210
github.com/google/go-tpm v0.9.0 // indirect
206211
github.com/google/gofuzz v1.2.0 // indirect
@@ -218,14 +223,14 @@ require (
218223
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
219224
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
220225
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
221-
github.com/gtank/merlin v0.1.1 // indirect
222-
github.com/gtank/ristretto255 v0.1.2 // indirect
223226
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 // indirect
224227
github.com/hashicorp/consul/sdk v0.16.1 // indirect
225228
github.com/hashicorp/go-bexpr v0.1.10 // indirect
226229
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
227230
github.com/hashicorp/go-envparse v0.1.0 // indirect
228231
github.com/hashicorp/go-hclog v1.6.3 // indirect
232+
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
233+
github.com/hashicorp/go-metrics v0.5.3 // indirect
229234
github.com/hashicorp/go-plugin v1.6.3 // indirect
230235
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
231236
github.com/hashicorp/golang-lru v1.0.2 // indirect
@@ -264,8 +269,7 @@ require (
264269
github.com/leanovate/gopter v0.2.11 // indirect
265270
github.com/leodido/go-urn v1.4.0 // indirect
266271
github.com/lib/pq v1.10.9 // indirect
267-
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
268-
github.com/linxGnu/grocksdb v1.7.16 // indirect
272+
github.com/linxGnu/grocksdb v1.9.3 // indirect
269273
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
270274
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
271275
github.com/magiconair/properties v1.8.7 // indirect
@@ -277,7 +281,6 @@ require (
277281
github.com/mattn/go-runewidth v0.0.16 // indirect
278282
github.com/mfridman/interpolate v0.0.2 // indirect
279283
github.com/miekg/dns v1.1.63 // indirect
280-
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
281284
github.com/mitchellh/go-homedir v1.1.0 // indirect
282285
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
283286
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -297,6 +300,7 @@ require (
297300
github.com/mr-tron/base58 v1.2.0 // indirect
298301
github.com/mtibben/percent v0.2.1 // indirect
299302
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
303+
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
300304
github.com/oklog/run v1.1.0 // indirect
301305
github.com/onsi/ginkgo/v2 v2.20.1 // indirect
302306
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -361,7 +365,7 @@ require (
361365
github.com/streamingfast/logging v0.0.0-20230608130331-f22c91403091 // indirect
362366
github.com/stretchr/objx v0.5.2 // indirect
363367
github.com/subosito/gotenv v1.6.0 // indirect
364-
github.com/supranational/blst v0.3.13 // indirect
368+
github.com/supranational/blst v0.3.14 // indirect
365369
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
366370
github.com/tendermint/go-amino v0.16.0 // indirect
367371
github.com/testcontainers/testcontainers-go v0.35.0 // indirect
@@ -389,6 +393,7 @@ require (
389393
go.dedis.ch/kyber/v3 v3.1.0 // indirect
390394
go.etcd.io/bbolt v1.4.0 // indirect
391395
go.mongodb.org/mongo-driver v1.17.0 // indirect
396+
go.opencensus.io v0.24.0 // indirect
392397
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
393398
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.49.0 // indirect
394399
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect
@@ -436,6 +441,7 @@ require (
436441
gopkg.in/ini.v1 v1.67.0 // indirect
437442
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
438443
gopkg.in/yaml.v2 v2.4.0 // indirect
444+
gotest.tools/v3 v3.5.1 // indirect
439445
k8s.io/klog/v2 v2.130.1 // indirect
440446
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect
441447
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
@@ -447,9 +453,6 @@ require (
447453
)
448454

449455
replace (
450-
// geth wants v2.3.4 but that is incompatible with github.com/cometbft/cometbft v0.37.5 which when bumped is incompatible with github.com/cosmos/cosmos-sdk
451-
// This line can be removed after these imports are bumped or removed.
452-
github.com/btcsuite/btcd/btcec/v2 => github.com/btcsuite/btcd/btcec/v2 v2.3.2
453456
// replicating the replace directive on cosmos SDK
454457
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
455458
github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264

0 commit comments

Comments
 (0)