From 597511a5925f59d797b4b8e241daa68ee288ea39 Mon Sep 17 00:00:00 2001 From: Troy Kessler Date: Thu, 18 Apr 2024 11:33:00 +0200 Subject: [PATCH] feat: created github.com/KYVENetwork/cometbft/v38 --- .../bug-fixes/2774-bitarray-unmarshal-json.md | 2 +- .../152-rename-binary-docker.md | 2 +- .../breaking-changes/211-deprecate-tmhome.md | 2 +- .../breaking-changes/360-update-to-go-119.md | 2 +- .../383-txindexer-fix-slash-parsing.md | 2 +- .../bug-fixes/386-quick-fix-needproofblock.md | 2 +- .../dependencies/160-tmdb-to-cometbftdb.md | 2 +- .../dependencies/165-bump-tmloadtest.md | 2 +- .../136-remove-tm-signer-harness.md | 2 +- .../improvements/204-version-commit-hash.md | 2 +- .../improvements/314-prio-mempool-badtxlog.md | 2 +- .changelog/v0.34.27/summary.md | 2 +- .../breaking-changes/211-deprecate-tmhome.md | 2 +- .../230-p2p-peer-msg-type-and-metric.md | 2 +- .../breaking-changes/385-update-to-go1.20.md | 2 +- .../409-deprecate-blocksyncmode.md | 2 +- .../382-txindexer-fix-slash-parsing.md | 4 +- .../bug-fixes/386-quick-fix-needproofblock.md | 2 +- .../77-kvindexer-fix-evattribute-indexing.md | 2 +- .../136-remove-tm-signer-harness.md | 2 +- .../230-p2p-peer-msg-type-and-metric.md | 2 +- .changelog/v0.37.0/summary.md | 2 +- .../v0.38.0/breaking-changes/1113-rm-upnp.md | 2 +- .../breaking-changes/1120-node-api-cleanup.md | 2 +- .../1270-executor_extend_vote.md | 2 +- .../260-remove-priority-mempool-config.md | 2 +- .../260-remove-priority-mempool-proto.md | 2 +- .../260-remove-priority-mempool.md | 2 +- .../v0.38.0/breaking-changes/558-tm10011.md | 2 +- ...state-indexerevent-remove-function-type.md | 2 +- .../797-kvindexer-support-for-big-numbers.md | 2 +- .../797-pubsub-support-for-big-numbers.md | 2 +- .../980-max-size-more-control.md | 2 +- ...forwardport-default-kvindexer-behaviour.md | 2 +- .../496-error-on-applyblock-should-panic.md | 2 +- .../bug-fixes/524-rename-peerstate-tojson.md | 2 +- .../bug-fixes/575-fix-light-client-panic.md | 2 +- ...ake-case-json-for-exec-tx-result-fields.md | 2 +- .../865-fix-peerstate-marshaljson.md | 2 +- .../bug-fixes/890-mempool-fix-cache.md | 2 +- .../650-deprecate-grpc-broadcast-api.md | 4 +- ...introduce-newconnsynclocalclientcreator.md | 2 +- .../improvements/1210-close-evidence-db.md | 2 +- .../improvements/1264-log-app-hash-as-hex.md | 2 +- .../improvements/543-metrics-for-blocksync.md | 2 +- .../638-json-rpc-error-message.md | 2 +- .../654-rpc-rm-response-data-logs.md | 2 +- .../v0.38.0/improvements/797-pubsub-float.md | 2 +- .../857-make-handshake-cancelable.md | 2 +- .../896-consensus-metric-duplicates.md | 2 +- .../improvements/980-max-size-more-control.md | 2 +- ...-indexer-respect-height-params-on-query.md | 2 +- .../1512-metric-mempool-size-bytes.md | 2 +- .../1558-experimental-gossip-limiting.md | 10 +- .../v0.38.2/bug-fixes/1654-semaphore-wait.md | 2 +- .../v0.38.2/features/1643-nop-mempool.md | 4 +- .../0000-asa-2024-001-fix-validate.md | 2 +- .../1687-consensus-fix-block-validation.md | 2 +- ...749-light-client-attack-verify-all-sigs.md | 2 +- .../bug-fixes/1825-false-on-nil-key.md | 2 +- .../1879-blocksync-wait-for-pool-routine.md | 2 +- .../bug-fixes/642-clist-mempool-data-races.md | 2 +- .../1715-validate-validator-address.md | 2 +- ...increase-abci-socket-message-size-limit.md | 2 +- .../improvements/1735-batch-save-state.md | 2 +- .../improvements/1755-batch-save-block.md | 2 +- .../improvements/1900-httpproxy-from-env.md | 2 +- .../improvements/1902-rpc-default-port.md | 2 +- .../1921-crypto-merkle-innerHash.md | 2 +- .changelog/v0.38.3/summary.md | 2 +- .../2065-e2e-vote-ext-activation.md | 2 +- .changelog/v0.38.4/summary.md | 2 +- .../2093-metric-chain-size-bytes.md | 2 +- .../2047-privval-retry-accepting-conn.md | 2 +- .../bug-fixes/2136-fix-state-rollback.md | 2 +- .../features/2362-e2e-block-max-bytes.md | 2 +- ...c-avoid-double-calling-block-from-proto.md | 2 +- .../improvements/2094-e2e-load-max-txs.md | 2 +- .../2434-jsonrpc-websocket-basic-auth.md | 2 +- .../2467-decrease-n-of-requested-blocks.md | 2 +- .../2475-blocksync-2nd-request.md | 2 +- .../2475-blocksync-no-block-response.md | 2 +- .../improvements/2475-blocksync-sort-peers.md | 2 +- .github/ISSUE_TEMPLATE/bug-report.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/issue_template.md | 2 +- .github/workflows/pre-release.yml | 2 +- .github/workflows/release.yml | 2 +- .goreleaser.yml | 2 +- CHANGELOG.md | 174 ++-- CONTRIBUTING.md | 8 +- DOCKER/README.md | 10 +- Makefile | 8 +- README.md | 42 +- RELEASES.md | 18 +- STYLE_GUIDE.md | 8 +- UPGRADING.md | 2 +- abci/README.md | 2 +- abci/client/client.go | 6 +- abci/client/grpc_client.go | 6 +- abci/client/grpc_client_test.go | 8 +- abci/client/local_client.go | 6 +- abci/client/mocks/client.go | 6 +- abci/client/socket_client.go | 8 +- abci/client/socket_client_test.go | 10 +- abci/cmd/abci-cli/abci-cli.go | 20 +- abci/example/kvstore/helpers.go | 8 +- abci/example/kvstore/kvstore.go | 10 +- abci/example/kvstore/kvstore_test.go | 10 +- abci/server/grpc_server.go | 6 +- abci/server/server.go | 4 +- abci/server/socket_server.go | 10 +- abci/tests/benchmarks/parallel/parallel.go | 4 +- abci/tests/benchmarks/simple/simple.go | 4 +- abci/tests/client_server_test.go | 6 +- abci/tests/server/client.go | 6 +- abci/types/messages.go | 2 +- abci/types/messages_test.go | 2 +- abci/types/mocks/application.go | 2 +- abci/types/pubkey.go | 6 +- abci/types/types.pb.go | 758 +++++++++--------- abci/types/types_test.go | 4 +- abci/version/version.go | 2 +- blocksync/metrics.go | 2 +- blocksync/msgs.go | 6 +- blocksync/msgs_test.go | 6 +- blocksync/pool.go | 12 +- blocksync/pool_test.go | 8 +- blocksync/reactor.go | 12 +- blocksync/reactor_test.go | 24 +- cmd/cometbft/commands/compact.go | 6 +- cmd/cometbft/commands/debug/debug.go | 2 +- cmd/cometbft/commands/debug/dump.go | 6 +- cmd/cometbft/commands/debug/kill.go | 6 +- cmd/cometbft/commands/debug/util.go | 4 +- cmd/cometbft/commands/gen_node_key.go | 4 +- cmd/cometbft/commands/gen_validator.go | 4 +- cmd/cometbft/commands/init.go | 14 +- cmd/cometbft/commands/inspect.go | 12 +- cmd/cometbft/commands/light.go | 16 +- cmd/cometbft/commands/reindex_event.go | 26 +- cmd/cometbft/commands/reindex_event_test.go | 14 +- cmd/cometbft/commands/replay.go | 2 +- cmd/cometbft/commands/reset.go | 6 +- cmd/cometbft/commands/reset_test.go | 4 +- cmd/cometbft/commands/rollback.go | 12 +- cmd/cometbft/commands/root.go | 8 +- cmd/cometbft/commands/root_test.go | 6 +- cmd/cometbft/commands/run_node.go | 6 +- cmd/cometbft/commands/show_node_id.go | 2 +- cmd/cometbft/commands/show_validator.go | 6 +- cmd/cometbft/commands/testnet.go | 14 +- cmd/cometbft/commands/version.go | 2 +- cmd/cometbft/main.go | 10 +- cmd/priv_val_server/main.go | 10 +- common.mk | 2 +- config/config.go | 4 +- config/config_test.go | 2 +- config/db.go | 4 +- config/toml.go | 2 +- config/toml_test.go | 4 +- consensus/README.md | 2 +- consensus/byzantine_test.go | 30 +- consensus/common_test.go | 40 +- consensus/invalid_test.go | 16 +- consensus/mempool_test.go | 12 +- consensus/metrics.go | 4 +- consensus/msgs.go | 14 +- consensus/msgs_test.go | 14 +- consensus/reactor.go | 42 +- consensus/reactor_test.go | 44 +- consensus/replay.go | 12 +- consensus/replay_file.go | 14 +- consensus/replay_stubs.go | 10 +- consensus/replay_test.go | 30 +- consensus/state.go | 38 +- consensus/state_test.go | 28 +- consensus/ticker.go | 4 +- consensus/types/height_vote_set.go | 10 +- consensus/types/height_vote_set_test.go | 14 +- consensus/types/peer_round_state.go | 4 +- consensus/types/round_state.go | 4 +- consensus/wal.go | 20 +- consensus/wal_generator.go | 20 +- consensus/wal_test.go | 12 +- crypto/README.md | 20 +- crypto/batch/batch.go | 6 +- crypto/crypto.go | 6 +- crypto/ed25519/bench_test.go | 4 +- crypto/ed25519/ed25519.go | 10 +- crypto/ed25519/ed25519_test.go | 4 +- crypto/encoding/codec.go | 10 +- crypto/example_test.go | 2 +- crypto/internal/benchmarking/bench.go | 2 +- crypto/merkle/hash.go | 2 +- crypto/merkle/proof.go | 4 +- crypto/merkle/proof_op.go | 2 +- crypto/merkle/proof_test.go | 4 +- crypto/merkle/proof_value.go | 4 +- crypto/merkle/rfc6962_test.go | 2 +- crypto/merkle/tree_test.go | 6 +- crypto/random_test.go | 2 +- crypto/secp256k1/secp256k1.go | 8 +- crypto/secp256k1/secp256k1_test.go | 4 +- crypto/sr25519/batch.go | 2 +- crypto/sr25519/bench_test.go | 4 +- crypto/sr25519/encoding.go | 6 +- crypto/sr25519/privkey.go | 2 +- crypto/sr25519/pubkey.go | 4 +- crypto/sr25519/sr25519_test.go | 4 +- crypto/tmhash/hash_test.go | 2 +- crypto/xsalsa20symmetric/symmetric.go | 2 +- crypto/xsalsa20symmetric/symmetric_test.go | 2 +- docs/README.md | 2 +- docs/app-dev/abci-cli.md | 4 +- docs/architecture/adr-111-nop-mempool.md | 14 +- docs/architecture/adr-template.md | 4 +- .../tendermint-core/adr-024-sign-bytes.md | 102 +-- docs/core/block-structure.md | 4 +- docs/core/block-sync.md | 4 +- docs/core/how-to-read-logs.md | 10 +- docs/core/light-client.md | 6 +- docs/core/running-in-production.md | 4 +- docs/core/subscription.md | 8 +- docs/core/using-cometbft.md | 22 +- docs/guides/go-built-in.md | 30 +- docs/guides/go.md | 22 +- docs/guides/install.md | 6 +- docs/introduction/README.md | 4 +- docs/networks/docker-compose.md | 4 +- docs/qa/CometBFT-QA-37.md | 2 +- docs/qa/CometBFT-QA-38.md | 10 +- docs/qa/method.md | 12 +- .../rfc/rfc-100-abci-vote-extension-propag.md | 12 +- evidence/doc.go | 2 +- evidence/mocks/block_store.go | 2 +- evidence/pool.go | 10 +- evidence/pool_test.go | 20 +- evidence/reactor.go | 10 +- evidence/reactor_test.go | 22 +- evidence/services.go | 2 +- evidence/verify.go | 4 +- evidence/verify_test.go | 24 +- go.mod | 11 +- inspect/inspect.go | 22 +- inspect/inspect_test.go | 22 +- inspect/rpc/rpc.go | 14 +- internal/indexer/indexer_utils.go | 2 +- internal/test/block.go | 8 +- internal/test/commit.go | 4 +- internal/test/config.go | 10 +- internal/test/factory_test.go | 2 +- internal/test/genesis.go | 2 +- internal/test/params.go | 2 +- internal/test/tx.go | 2 +- internal/test/validator.go | 2 +- libs/autofile/autofile.go | 2 +- libs/autofile/autofile_test.go | 2 +- libs/autofile/cmd/logjack.go | 4 +- libs/autofile/group.go | 2 +- libs/autofile/group_test.go | 4 +- libs/bits/bit_array.go | 6 +- libs/bits/bit_array_test.go | 4 +- libs/cli/flags/log_level.go | 2 +- libs/cli/flags/log_level_test.go | 4 +- libs/clist/clist.go | 2 +- libs/clist/clist_test.go | 2 +- libs/cmap/cmap.go | 2 +- libs/events/Makefile | 2 +- libs/events/README.md | 2 +- libs/events/events.go | 4 +- libs/events/events_test.go | 2 +- libs/flowrate/flowrate.go | 2 +- libs/json/decoder_test.go | 2 +- libs/json/encoder_test.go | 2 +- libs/json/helpers_test.go | 2 +- libs/json/structs.go | 2 +- libs/json/types.go | 2 +- libs/log/filter_test.go | 2 +- libs/log/lazy.go | 2 +- libs/log/tm_logger_test.go | 2 +- libs/log/tmfmt_logger_test.go | 2 +- libs/log/tracing_logger_test.go | 2 +- libs/os/os.go | 2 +- libs/protoio/io_test.go | 2 +- libs/pubsub/example_test.go | 6 +- libs/pubsub/pubsub.go | 4 +- libs/pubsub/pubsub_test.go | 6 +- libs/pubsub/query/bench_test.go | 2 +- libs/pubsub/query/query.go | 4 +- libs/pubsub/query/query_test.go | 10 +- libs/pubsub/query/syntax/syntax_test.go | 2 +- libs/pubsub/subscription.go | 2 +- libs/rand/random.go | 4 +- libs/service/service.go | 2 +- libs/tempfile/tempfile.go | 2 +- libs/tempfile/tempfile_test.go | 2 +- libs/test/mutate.go | 2 +- libs/timer/throttle_timer.go | 2 +- libs/timer/throttle_timer_test.go | 2 +- light/client.go | 14 +- light/client_benchmark_test.go | 10 +- light/client_test.go | 14 +- light/detector.go | 4 +- light/detector_test.go | 12 +- light/doc.go | 4 +- light/errors.go | 2 +- light/example_test.go | 14 +- light/helpers_test.go | 16 +- light/provider/http/http.go | 10 +- light/provider/http/http_test.go | 14 +- light/provider/mock/deadmock.go | 4 +- light/provider/mock/mock.go | 4 +- light/provider/provider.go | 2 +- light/proxy/proxy.go | 12 +- light/proxy/routes.go | 14 +- light/rpc/client.go | 18 +- light/rpc/mocks/light_client.go | 2 +- light/setup.go | 6 +- light/store/db/db.go | 8 +- light/store/db/db_test.go | 12 +- light/store/store.go | 2 +- light/trust_options.go | 2 +- light/verifier.go | 4 +- light/verifier_test.go | 6 +- mempool/bench_test.go | 4 +- mempool/cache.go | 4 +- mempool/cache_test.go | 8 +- mempool/clist_mempool.go | 16 +- mempool/clist_mempool_test.go | 24 +- mempool/ids.go | 4 +- mempool/ids_test.go | 2 +- mempool/mempool.go | 4 +- mempool/mempoolTx.go | 2 +- mempool/mocks/mempool.go | 6 +- mempool/nop_mempool.go | 8 +- mempool/nop_mempool_test.go | 2 +- mempool/reactor.go | 12 +- mempool/reactor_test.go | 22 +- mempool/tx.go | 2 +- node/node.go | 50 +- node/node_test.go | 34 +- node/setup.go | 46 +- p2p/base_reactor.go | 4 +- p2p/conn/conn_notgo110.go | 2 +- p2p/conn/connection.go | 18 +- p2p/conn/connection_test.go | 8 +- p2p/conn/evil_secret_connection_test.go | 10 +- p2p/conn/secret_connection.go | 16 +- p2p/conn/secret_connection_test.go | 12 +- p2p/conn_set.go | 2 +- p2p/fuzz.go | 6 +- p2p/key.go | 8 +- p2p/key_test.go | 4 +- p2p/mock/peer.go | 8 +- p2p/mock/reactor.go | 6 +- p2p/mocks/peer.go | 6 +- p2p/netaddress.go | 2 +- p2p/node_info.go | 8 +- p2p/node_info_test.go | 2 +- p2p/peer.go | 8 +- p2p/peer_set.go | 2 +- p2p/peer_set_test.go | 4 +- p2p/peer_test.go | 16 +- p2p/pex/addrbook.go | 14 +- p2p/pex/addrbook_test.go | 8 +- p2p/pex/bench_test.go | 2 +- p2p/pex/errors.go | 2 +- p2p/pex/file.go | 2 +- p2p/pex/known_address.go | 2 +- p2p/pex/pex_reactor.go | 14 +- p2p/pex/pex_reactor_test.go | 10 +- p2p/switch.go | 10 +- p2p/switch_test.go | 12 +- p2p/test_util.go | 16 +- p2p/transport.go | 8 +- p2p/transport_test.go | 8 +- p2p/types.go | 4 +- privval/file.go | 20 +- privval/file_test.go | 18 +- privval/msgs.go | 2 +- privval/msgs_test.go | 16 +- privval/retry_signer_client.go | 6 +- privval/signer_client.go | 10 +- privval/signer_client_test.go | 14 +- privval/signer_dialer_endpoint.go | 4 +- privval/signer_endpoint.go | 8 +- privval/signer_listener_endpoint.go | 8 +- privval/signer_listener_endpoint_test.go | 10 +- privval/signer_requestHandler.go | 12 +- privval/signer_server.go | 8 +- privval/socket_dialers.go | 6 +- privval/socket_dialers_test.go | 2 +- privval/socket_listeners.go | 4 +- privval/socket_listeners_test.go | 2 +- privval/utils.go | 6 +- proto/README.md | 10 +- .../v38}/abci/types.proto | 26 +- .../v38}/blocksync/message.go | 2 +- .../v38}/blocksync/types.pb.go | 97 +-- .../v38}/blocksync/types.proto | 12 +- .../v38}/consensus/message.go | 2 +- .../v38}/consensus/types.pb.go | 177 ++-- .../v38}/consensus/types.proto | 32 +- .../v38}/consensus/wal.pb.go | 121 +-- .../v38}/consensus/wal.proto | 10 +- .../v38}/crypto/keys.pb.go | 48 +- .../v38}/crypto/keys.proto | 4 +- .../v38}/crypto/proof.pb.go | 77 +- .../v38}/crypto/proof.proto | 4 +- .../v38}/libs/bits/types.pb.go | 40 +- proto/cometbft/v38/libs/bits/types.proto | 9 + .../v38}/mempool/message.go | 2 +- .../v38}/mempool/types.pb.go | 49 +- .../v38}/mempool/types.proto | 4 +- .../v38}/p2p/conn.pb.go | 90 ++- .../v38}/p2p/conn.proto | 8 +- proto/{tendermint => cometbft/v38}/p2p/pex.go | 0 .../v38}/p2p/pex.pb.go | 65 +- .../v38}/p2p/pex.proto | 6 +- .../v38}/p2p/types.pb.go | 89 +- .../v38}/p2p/types.proto | 4 +- .../v38}/privval/types.pb.go | 161 ++-- .../v38}/privval/types.proto | 18 +- .../v38}/rpc/grpc/types.pb.go | 95 ++- .../v38}/rpc/grpc/types.proto | 10 +- .../v38}/state/types.pb.go | 185 ++--- .../v38}/state/types.proto | 40 +- .../v38}/statesync/message.go | 2 +- .../v38}/statesync/types.pb.go | 90 ++- .../v38}/statesync/types.proto | 4 +- .../v38}/store/types.pb.go | 37 +- proto/cometbft/v38/store/types.proto | 9 + .../v38}/types/block.pb.go | 50 +- .../v38}/types/block.proto | 10 +- .../v38}/types/canonical.pb.go | 124 +-- .../v38}/types/canonical.proto | 6 +- .../v38}/types/events.pb.go | 41 +- .../v38}/types/events.proto | 4 +- .../v38}/types/evidence.pb.go | 109 +-- .../v38}/types/evidence.proto | 16 +- .../v38}/types/params.pb.go | 126 +-- .../v38}/types/params.proto | 4 +- .../v38}/types/types.pb.go | 290 +++---- .../v38}/types/types.proto | 22 +- .../v38}/types/validator.pb.go | 101 +-- .../v38}/types/validator.proto | 10 +- .../v38}/version/types.pb.go | 48 +- .../v38}/version/types.proto | 4 +- proto/tendermint/libs/bits/types.proto | 9 - proto/tendermint/store/types.proto | 9 - proxy/app_conn.go | 4 +- proxy/app_conn_test.go | 10 +- proxy/client.go | 10 +- proxy/mocks/app_conn_consensus.go | 2 +- proxy/mocks/app_conn_mempool.go | 4 +- proxy/mocks/app_conn_query.go | 2 +- proxy/mocks/app_conn_snapshot.go | 2 +- proxy/mocks/client_creator.go | 2 +- proxy/multi_app_conn.go | 8 +- proxy/multi_app_conn_test.go | 4 +- proxy/version.go | 4 +- rpc/client/event_test.go | 10 +- rpc/client/evidence_test.go | 22 +- rpc/client/examples_test.go | 8 +- rpc/client/helpers.go | 2 +- rpc/client/helpers_test.go | 6 +- rpc/client/http/http.go | 20 +- rpc/client/interface.go | 8 +- rpc/client/local/local.go | 20 +- rpc/client/main_test.go | 6 +- rpc/client/mock/client.go | 14 +- rpc/client/mock/status.go | 4 +- rpc/client/mock/status_test.go | 6 +- rpc/client/mocks/client.go | 10 +- rpc/client/rpc_test.go | 24 +- rpc/core/abci.go | 10 +- rpc/core/blocks.go | 14 +- rpc/core/blocks_test.go | 10 +- rpc/core/consensus.go | 10 +- rpc/core/dev.go | 4 +- rpc/core/doc.go | 2 +- rpc/core/env.go | 22 +- rpc/core/events.go | 8 +- rpc/core/evidence.go | 6 +- rpc/core/health.go | 4 +- rpc/core/mempool.go | 10 +- rpc/core/net.go | 6 +- rpc/core/net_test.go | 8 +- rpc/core/routes.go | 2 +- rpc/core/status.go | 10 +- rpc/core/tx.go | 12 +- rpc/core/types/responses.go | 12 +- rpc/core/types/responses_test.go | 2 +- rpc/grpc/api.go | 6 +- rpc/grpc/client_server.go | 4 +- rpc/grpc/grpc_test.go | 6 +- rpc/grpc/types.pb.go | 95 ++- rpc/jsonrpc/client/decode.go | 4 +- rpc/jsonrpc/client/encode.go | 2 +- rpc/jsonrpc/client/http_json_client.go | 4 +- rpc/jsonrpc/client/http_uri_client.go | 2 +- rpc/jsonrpc/client/integration_test.go | 2 +- rpc/jsonrpc/client/ws_client.go | 10 +- rpc/jsonrpc/client/ws_client_test.go | 6 +- rpc/jsonrpc/doc.go | 2 +- rpc/jsonrpc/jsonrpc_test.go | 12 +- rpc/jsonrpc/server/http_json_handler.go | 6 +- rpc/jsonrpc/server/http_json_handler_test.go | 4 +- rpc/jsonrpc/server/http_server.go | 4 +- rpc/jsonrpc/server/http_server_test.go | 4 +- rpc/jsonrpc/server/http_uri_handler.go | 6 +- rpc/jsonrpc/server/parse_test.go | 4 +- rpc/jsonrpc/server/rpc_func.go | 2 +- rpc/jsonrpc/server/ws_handler.go | 6 +- rpc/jsonrpc/server/ws_handler_test.go | 4 +- rpc/jsonrpc/test/main.go | 8 +- rpc/jsonrpc/types/types.go | 2 +- rpc/openapi/openapi.yaml | 12 +- rpc/test/helpers.go | 26 +- scripts/dist.sh | 2 +- scripts/json2wal/main.go | 6 +- scripts/linkify_changelog.py | 6 +- .../metricsdiff/metricsdiff_test.go | 2 +- scripts/metricsgen/metricsgen_test.go | 2 +- scripts/qa/reporting/latency_throughput.py | 2 +- scripts/wal2json/main.go | 4 +- spec/abci/README.md | 2 +- spec/abci/abci++_app_requirements.md | 8 +- spec/abci/abci++_client_server.md | 4 +- spec/abci/abci++_comet_expected_behavior.md | 4 +- spec/consensus/consensus.md | 8 +- spec/consensus/light-client/accountability.md | 2 +- spec/consensus/light-client/detection.md | 2 +- spec/consensus/light-client/verification.md | 2 +- .../pbts-sysmodel_001_draft.md | 2 +- .../tla/TendermintPBT_001_draft.tla | 114 +-- spec/consensus/wal.md | 4 +- spec/core/data_structures.md | 6 +- spec/core/encoding.md | 2 +- spec/light-client/README.md | 6 +- .../attacks/Isolation_001_draft.tla | 14 +- .../attacks/isolate-attackers_001_draft.md | 32 +- .../attacks/isolate-attackers_002_reviewed.md | 34 +- .../attacks/notes-on-evidence-handling.md | 10 +- .../detection/LCDetector_003_draft.tla | 16 +- .../detection/detection_001_reviewed.md | 24 +- .../detection/detection_003_reviewed.md | 50 +- .../supervisor/supervisor_001_draft.md | 20 +- .../supervisor/supervisor_002_draft.md | 12 +- .../verification_001_published.md | 62 +- .../verification/verification_002_draft.md | 52 +- spec/p2p/README.md | 8 +- spec/p2p/implementation/README.md | 4 +- spec/p2p/implementation/switch.md | 6 +- spec/p2p/implementation/transport.md | 6 +- spec/p2p/implementation/types.md | 2 +- spec/p2p/legacy-docs/README.md | 2 +- spec/p2p/reactor-api/README.md | 2 +- spec/p2p/reactor-api/p2p-api.md | 8 +- spec/p2p/reactor-api/reactor.md | 4 +- spec/p2p/reactor-api/reactor.qnt | 4 +- spec/rpc/README.md | 18 +- state/execution.go | 16 +- state/execution_test.go | 40 +- state/export_test.go | 4 +- state/helpers_test.go | 18 +- state/indexer/block.go | 6 +- state/indexer/block/indexer.go | 16 +- state/indexer/block/kv/kv.go | 14 +- state/indexer/block/kv/kv_test.go | 8 +- state/indexer/block/kv/util.go | 8 +- state/indexer/block/null/null.go | 8 +- state/indexer/mocks/block_indexer.go | 6 +- state/indexer/query_range.go | 4 +- state/indexer/sink/psql/backport.go | 10 +- state/indexer/sink/psql/backport_test.go | 4 +- state/indexer/sink/psql/psql.go | 6 +- state/indexer/sink/psql/psql_test.go | 8 +- state/mocks/block_store.go | 4 +- state/mocks/evidence_pool.go | 4 +- state/mocks/store.go | 6 +- state/rollback.go | 6 +- state/rollback_test.go | 18 +- state/services.go | 2 +- state/state.go | 10 +- state/state_test.go | 14 +- state/store.go | 12 +- state/store_test.go | 12 +- state/tx_filter.go | 4 +- state/tx_filter_test.go | 6 +- state/txindex/indexer.go | 6 +- state/txindex/indexer_service.go | 6 +- state/txindex/indexer_service_test.go | 12 +- state/txindex/kv/kv.go | 16 +- state/txindex/kv/kv_bench_test.go | 6 +- state/txindex/kv/kv_test.go | 10 +- state/txindex/kv/utils.go | 8 +- state/txindex/mocks/tx_indexer.go | 8 +- state/txindex/null/null.go | 8 +- state/validation.go | 4 +- state/validation_test.go | 24 +- statesync/chunks.go | 4 +- statesync/chunks_test.go | 2 +- statesync/messages.go | 2 +- statesync/messages_test.go | 6 +- statesync/mocks/state_provider.go | 4 +- statesync/reactor.go | 16 +- statesync/reactor_test.go | 12 +- statesync/snapshots.go | 4 +- statesync/snapshots_test.go | 4 +- statesync/stateprovider.go | 24 +- statesync/syncer.go | 20 +- statesync/syncer_test.go | 30 +- store/store.go | 12 +- store/store_test.go | 18 +- test/app/grpc_client.go | 4 +- test/e2e/app/app.go | 20 +- test/e2e/app/snapshots.go | 2 +- test/e2e/generator/generate.go | 4 +- test/e2e/generator/generate_test.go | 2 +- test/e2e/generator/main.go | 2 +- test/e2e/node/config.go | 2 +- test/e2e/node/main.go | 34 +- .../pkg/infra/digitalocean/digitalocean.go | 6 +- test/e2e/pkg/infra/docker/docker.go | 6 +- test/e2e/pkg/infra/provider.go | 2 +- test/e2e/pkg/testnet.go | 10 +- test/e2e/runner/benchmark.go | 4 +- test/e2e/runner/cleanup.go | 8 +- test/e2e/runner/evidence.go | 20 +- test/e2e/runner/load.go | 10 +- test/e2e/runner/main.go | 12 +- test/e2e/runner/perturb.go | 8 +- test/e2e/runner/rpc.go | 8 +- test/e2e/runner/setup.go | 16 +- test/e2e/runner/start.go | 6 +- test/e2e/runner/test.go | 4 +- test/e2e/runner/wait.go | 4 +- test/e2e/tests/app_test.go | 4 +- test/e2e/tests/block_test.go | 2 +- test/e2e/tests/e2e_test.go | 8 +- test/e2e/tests/net_test.go | 2 +- test/e2e/tests/validator_test.go | 4 +- test/fuzz/mempool/checktx.go | 8 +- test/fuzz/mempool/fuzz_test.go | 2 +- test/fuzz/tests/mempool_test.go | 10 +- test/fuzz/tests/p2p_secretconnection_test.go | 6 +- test/fuzz/tests/rpc_jsonrpc_server_test.go | 6 +- test/loadtime/Makefile | 2 +- test/loadtime/cmd/load/main.go | 2 +- test/loadtime/cmd/report/main.go | 4 +- test/loadtime/payload/payload.proto | 2 +- test/loadtime/payload/payload_test.go | 2 +- test/loadtime/report/report.go | 4 +- test/loadtime/report/report_test.go | 6 +- test/test_cover.sh | 2 +- types/block.go | 22 +- types/block_meta.go | 2 +- types/block_meta_test.go | 4 +- types/block_test.go | 20 +- types/canonical.go | 4 +- types/canonical_test.go | 6 +- types/encoding_helper.go | 2 +- types/event_bus.go | 8 +- types/event_bus_test.go | 6 +- types/events.go | 30 +- types/evidence.go | 24 +- types/evidence_test.go | 12 +- types/genesis.go | 10 +- types/genesis_test.go | 14 +- types/light.go | 2 +- types/light_test.go | 6 +- types/params.go | 8 +- types/params_test.go | 2 +- types/part_set.go | 14 +- types/part_set_test.go | 4 +- types/priv_validator.go | 6 +- types/proposal.go | 8 +- types/proposal_test.go | 8 +- types/protobuf.go | 8 +- types/protobuf_test.go | 8 +- types/results.go | 4 +- types/results_test.go | 2 +- types/signable.go | 4 +- types/signed_msg_type.go | 2 +- types/test_util.go | 6 +- types/tx.go | 8 +- types/tx_test.go | 6 +- types/validation.go | 6 +- types/validation_test.go | 4 +- types/validator.go | 8 +- types/validator_set.go | 6 +- types/validator_set_test.go | 10 +- types/vote.go | 8 +- types/vote_set.go | 8 +- types/vote_set_test.go | 8 +- types/vote_test.go | 12 +- 699 files changed, 4359 insertions(+), 4327 deletions(-) rename proto/{tendermint => cometbft/v38}/abci/types.proto (96%) rename proto/{tendermint => cometbft/v38}/blocksync/message.go (97%) rename proto/{tendermint => cometbft/v38}/blocksync/types.pb.go (90%) rename proto/{tendermint => cometbft/v38}/blocksync/types.proto (72%) rename proto/{tendermint => cometbft/v38}/consensus/message.go (98%) rename proto/{tendermint => cometbft/v38}/consensus/types.pb.go (91%) rename proto/{tendermint => cometbft/v38}/consensus/types.proto (68%) rename proto/{tendermint => cometbft/v38}/consensus/wal.pb.go (86%) rename proto/{tendermint => cometbft/v38}/consensus/wal.proto (81%) rename proto/{tendermint => cometbft/v38}/crypto/keys.pb.go (88%) rename proto/{tendermint => cometbft/v38}/crypto/keys.proto (71%) rename proto/{tendermint => cometbft/v38}/crypto/proof.pb.go (90%) rename proto/{tendermint => cometbft/v38}/crypto/proof.proto (87%) rename proto/{tendermint => cometbft/v38}/libs/bits/types.pb.go (84%) create mode 100644 proto/cometbft/v38/libs/bits/types.proto rename proto/{tendermint => cometbft/v38}/mempool/message.go (93%) rename proto/{tendermint => cometbft/v38}/mempool/types.pb.go (86%) rename proto/{tendermint => cometbft/v38}/mempool/types.proto (51%) rename proto/{tendermint => cometbft/v38}/p2p/conn.pb.go (88%) rename proto/{tendermint => cometbft/v38}/p2p/conn.proto (67%) rename proto/{tendermint => cometbft/v38}/p2p/pex.go (100%) rename proto/{tendermint => cometbft/v38}/p2p/pex.pb.go (87%) rename proto/{tendermint => cometbft/v38}/p2p/pex.proto (64%) rename proto/{tendermint => cometbft/v38}/p2p/types.pb.go (88%) rename proto/{tendermint => cometbft/v38}/p2p/types.proto (89%) rename proto/{tendermint => cometbft/v38}/privval/types.pb.go (90%) rename proto/{tendermint => cometbft/v38}/privval/types.proto (78%) rename proto/{tendermint => cometbft/v38}/rpc/grpc/types.pb.go (85%) rename proto/{tendermint => cometbft/v38}/rpc/grpc/types.proto (71%) rename proto/{tendermint => cometbft/v38}/state/types.pb.go (88%) rename proto/{tendermint => cometbft/v38}/state/types.proto (68%) rename proto/{tendermint => cometbft/v38}/statesync/message.go (96%) rename proto/{tendermint => cometbft/v38}/statesync/types.pb.go (91%) rename proto/{tendermint => cometbft/v38}/statesync/types.proto (84%) rename proto/{tendermint => cometbft/v38}/store/types.pb.go (81%) create mode 100644 proto/cometbft/v38/store/types.proto rename proto/{tendermint => cometbft/v38}/types/block.pb.go (82%) rename proto/{tendermint => cometbft/v38}/types/block.proto (50%) rename proto/{tendermint => cometbft/v38}/types/canonical.pb.go (87%) rename proto/{tendermint => cometbft/v38}/types/canonical.proto (92%) rename proto/{tendermint => cometbft/v38}/types/events.pb.go (82%) rename proto/{tendermint => cometbft/v38}/types/events.proto (51%) rename proto/{tendermint => cometbft/v38}/types/evidence.pb.go (86%) rename proto/{tendermint => cometbft/v38}/types/evidence.proto (71%) rename proto/{tendermint => cometbft/v38}/types/params.pb.go (89%) rename proto/{tendermint => cometbft/v38}/types/params.proto (96%) rename proto/{tendermint => cometbft/v38}/types/types.pb.go (90%) rename proto/{tendermint => cometbft/v38}/types/types.proto (90%) rename proto/{tendermint => cometbft/v38}/types/validator.pb.go (84%) rename proto/{tendermint => cometbft/v38}/types/validator.proto (79%) rename proto/{tendermint => cometbft/v38}/version/types.pb.go (85%) rename proto/{tendermint => cometbft/v38}/version/types.proto (83%) delete mode 100644 proto/tendermint/libs/bits/types.proto delete mode 100644 proto/tendermint/store/types.proto diff --git a/.changelog/unreleased/bug-fixes/2774-bitarray-unmarshal-json.md b/.changelog/unreleased/bug-fixes/2774-bitarray-unmarshal-json.md index 1c51af49d26..e2475929b0c 100644 --- a/.changelog/unreleased/bug-fixes/2774-bitarray-unmarshal-json.md +++ b/.changelog/unreleased/bug-fixes/2774-bitarray-unmarshal-json.md @@ -1,2 +1,2 @@ - [`bits`] prevent `BitArray.UnmarshalJSON` from crashing on 0 bits - ([\#2774](https://github.com/cometbft/cometbft/pull/2774)) + ([\#2774](https://github.com/KYVENetwork/cometbft/v38/pull/2774)) diff --git a/.changelog/v0.34.27/breaking-changes/152-rename-binary-docker.md b/.changelog/v0.34.27/breaking-changes/152-rename-binary-docker.md index 3870f96f927..e79a9bd4b78 100644 --- a/.changelog/v0.34.27/breaking-changes/152-rename-binary-docker.md +++ b/.changelog/v0.34.27/breaking-changes/152-rename-binary-docker.md @@ -1,2 +1,2 @@ - Rename binary to `cometbft` and Docker image to `cometbft/cometbft` - ([\#152](https://github.com/cometbft/cometbft/pull/152)) + ([\#152](https://github.com/KYVENetwork/cometbft/v38/pull/152)) diff --git a/.changelog/v0.34.27/breaking-changes/211-deprecate-tmhome.md b/.changelog/v0.34.27/breaking-changes/211-deprecate-tmhome.md index d2bded0f279..11a74016c76 100644 --- a/.changelog/v0.34.27/breaking-changes/211-deprecate-tmhome.md +++ b/.changelog/v0.34.27/breaking-changes/211-deprecate-tmhome.md @@ -1,3 +1,3 @@ - The `TMHOME` environment variable was renamed to `CMTHOME`, and all environment variables starting with `TM_` are instead prefixed with `CMT_` - ([\#211](https://github.com/cometbft/cometbft/issues/211)) + ([\#211](https://github.com/KYVENetwork/cometbft/v38/issues/211)) diff --git a/.changelog/v0.34.27/breaking-changes/360-update-to-go-119.md b/.changelog/v0.34.27/breaking-changes/360-update-to-go-119.md index 97fafda93bb..f453e07513f 100644 --- a/.changelog/v0.34.27/breaking-changes/360-update-to-go-119.md +++ b/.changelog/v0.34.27/breaking-changes/360-update-to-go-119.md @@ -1,2 +1,2 @@ - Use Go 1.19 to build CometBFT, since Go 1.18 has reached end-of-life. - ([\#360](https://github.com/cometbft/cometbft/issues/360)) + ([\#360](https://github.com/KYVENetwork/cometbft/v38/issues/360)) diff --git a/.changelog/v0.34.27/bug-fixes/383-txindexer-fix-slash-parsing.md b/.changelog/v0.34.27/bug-fixes/383-txindexer-fix-slash-parsing.md index c08824da9d7..67467caa580 100644 --- a/.changelog/v0.34.27/bug-fixes/383-txindexer-fix-slash-parsing.md +++ b/.changelog/v0.34.27/bug-fixes/383-txindexer-fix-slash-parsing.md @@ -1,3 +1,3 @@ - `[state/kvindexer]` Resolved crashes when event values contained slashes, introduced after adding event sequences. - (\#[383](https://github.com/cometbft/cometbft/pull/383): @jmalicevic) + (\#[383](https://github.com/KYVENetwork/cometbft/v38/pull/383): @jmalicevic) diff --git a/.changelog/v0.34.27/bug-fixes/386-quick-fix-needproofblock.md b/.changelog/v0.34.27/bug-fixes/386-quick-fix-needproofblock.md index d3d2f5b7387..f773c29f2e6 100644 --- a/.changelog/v0.34.27/bug-fixes/386-quick-fix-needproofblock.md +++ b/.changelog/v0.34.27/bug-fixes/386-quick-fix-needproofblock.md @@ -1,6 +1,6 @@ - `[consensus]` Short-term fix for the case when `needProofBlock` cannot find previous block meta by defaulting to the creation of a new proof block. - ([\#386](https://github.com/cometbft/cometbft/pull/386): @adizere) + ([\#386](https://github.com/KYVENetwork/cometbft/v38/pull/386): @adizere) - Special thanks to the [Vega.xyz](https://vega.xyz/) team, and in particular to Zohar (@ze97286), for reporting the problem and working with us to get to a fix. diff --git a/.changelog/v0.34.27/dependencies/160-tmdb-to-cometbftdb.md b/.changelog/v0.34.27/dependencies/160-tmdb-to-cometbftdb.md index e4c1351312c..12605ec1480 100644 --- a/.changelog/v0.34.27/dependencies/160-tmdb-to-cometbftdb.md +++ b/.changelog/v0.34.27/dependencies/160-tmdb-to-cometbftdb.md @@ -1,3 +1,3 @@ - Replace [tm-db](https://github.com/tendermint/tm-db) with [cometbft-db](https://github.com/cometbft/cometbft-db) - ([\#160](https://github.com/cometbft/cometbft/pull/160)) \ No newline at end of file + ([\#160](https://github.com/KYVENetwork/cometbft/v38/pull/160)) diff --git a/.changelog/v0.34.27/dependencies/165-bump-tmloadtest.md b/.changelog/v0.34.27/dependencies/165-bump-tmloadtest.md index 175163ac004..85148eacf2f 100644 --- a/.changelog/v0.34.27/dependencies/165-bump-tmloadtest.md +++ b/.changelog/v0.34.27/dependencies/165-bump-tmloadtest.md @@ -1,2 +1,2 @@ - Bump tm-load-test to v1.3.0 to remove implicit dependency on Tendermint Core - ([\#165](https://github.com/cometbft/cometbft/pull/165)) \ No newline at end of file + ([\#165](https://github.com/KYVENetwork/cometbft/v38/pull/165)) diff --git a/.changelog/v0.34.27/improvements/136-remove-tm-signer-harness.md b/.changelog/v0.34.27/improvements/136-remove-tm-signer-harness.md index 6eb6c2158c2..8a996ef18cc 100644 --- a/.changelog/v0.34.27/improvements/136-remove-tm-signer-harness.md +++ b/.changelog/v0.34.27/improvements/136-remove-tm-signer-harness.md @@ -1,2 +1,2 @@ - `[tools/tm-signer-harness]` Remove the folder as it is unused - ([\#136](https://github.com/cometbft/cometbft/issues/136)) \ No newline at end of file + ([\#136](https://github.com/KYVENetwork/cometbft/v38/issues/136)) diff --git a/.changelog/v0.34.27/improvements/204-version-commit-hash.md b/.changelog/v0.34.27/improvements/204-version-commit-hash.md index 675a1a2924b..442572e5a8e 100644 --- a/.changelog/v0.34.27/improvements/204-version-commit-hash.md +++ b/.changelog/v0.34.27/improvements/204-version-commit-hash.md @@ -1,2 +1,2 @@ - Append the commit hash to the version of CometBFT being built - ([\#204](https://github.com/cometbft/cometbft/pull/204)) \ No newline at end of file + ([\#204](https://github.com/KYVENetwork/cometbft/v38/pull/204)) diff --git a/.changelog/v0.34.27/improvements/314-prio-mempool-badtxlog.md b/.changelog/v0.34.27/improvements/314-prio-mempool-badtxlog.md index ba4ac031e20..0e59e42100f 100644 --- a/.changelog/v0.34.27/improvements/314-prio-mempool-badtxlog.md +++ b/.changelog/v0.34.27/improvements/314-prio-mempool-badtxlog.md @@ -1,3 +1,3 @@ - `[mempool/v1]` Suppress "rejected bad transaction" in priority mempool logs by reducing log level from info to debug - ([\#314](https://github.com/cometbft/cometbft/pull/314): @JayT106) + ([\#314](https://github.com/KYVENetwork/cometbft/v38/pull/314): @JayT106) diff --git a/.changelog/v0.34.27/summary.md b/.changelog/v0.34.27/summary.md index e4a13db501b..66bd04875d6 100644 --- a/.changelog/v0.34.27/summary.md +++ b/.changelog/v0.34.27/summary.md @@ -9,7 +9,7 @@ our [upgrading guidelines](./UPGRADING.md). If you have any questions, comments, concerns or feedback on this release, we would love to hear from you! Please contact us via [GitHub -Discussions](https://github.com/cometbft/cometbft/discussions), +Discussions](https://github.com/KYVENetwork/cometbft/v38/discussions), [Discord](https://discord.gg/cosmosnetwork) (in the `#cometbft` channel) or [Telegram](https://t.me/CometBFT). diff --git a/.changelog/v0.37.0/breaking-changes/211-deprecate-tmhome.md b/.changelog/v0.37.0/breaking-changes/211-deprecate-tmhome.md index 547fc4e2d54..f6bcc3e38dd 100644 --- a/.changelog/v0.37.0/breaking-changes/211-deprecate-tmhome.md +++ b/.changelog/v0.37.0/breaking-changes/211-deprecate-tmhome.md @@ -1,2 +1,2 @@ - The `TMHOME` environment variable was renamed to `CMTHOME`, and all environment variables starting with `TM_` are instead prefixed with `CMT_` - ([\#211](https://github.com/cometbft/cometbft/issues/211)) \ No newline at end of file + ([\#211](https://github.com/KYVENetwork/cometbft/v38/issues/211)) diff --git a/.changelog/v0.37.0/breaking-changes/230-p2p-peer-msg-type-and-metric.md b/.changelog/v0.37.0/breaking-changes/230-p2p-peer-msg-type-and-metric.md index 5e7d11eae66..cd84bb34fa1 100644 --- a/.changelog/v0.37.0/breaking-changes/230-p2p-peer-msg-type-and-metric.md +++ b/.changelog/v0.37.0/breaking-changes/230-p2p-peer-msg-type-and-metric.md @@ -1,4 +1,4 @@ - `[p2p]` Reactor `Send`, `TrySend` and `Receive` renamed to `SendEnvelope`, `TrySendEnvelope` and `ReceiveEnvelope` to allow metrics to be appended to messages and measure bytes sent/received. - ([\#230](https://github.com/cometbft/cometbft/pull/230)) + ([\#230](https://github.com/KYVENetwork/cometbft/v38/pull/230)) diff --git a/.changelog/v0.37.0/breaking-changes/385-update-to-go1.20.md b/.changelog/v0.37.0/breaking-changes/385-update-to-go1.20.md index 5e9ea3386ac..ba6bfe70025 100644 --- a/.changelog/v0.37.0/breaking-changes/385-update-to-go1.20.md +++ b/.changelog/v0.37.0/breaking-changes/385-update-to-go1.20.md @@ -1,2 +1,2 @@ - Bump minimum Go version to 1.20 - ([\#385](https://github.com/cometbft/cometbft/issues/385)) \ No newline at end of file + ([\#385](https://github.com/KYVENetwork/cometbft/v38/issues/385)) diff --git a/.changelog/v0.37.0/breaking-changes/409-deprecate-blocksyncmode.md b/.changelog/v0.37.0/breaking-changes/409-deprecate-blocksyncmode.md index a32707ad37d..c81a7e0d9b2 100644 --- a/.changelog/v0.37.0/breaking-changes/409-deprecate-blocksyncmode.md +++ b/.changelog/v0.37.0/breaking-changes/409-deprecate-blocksyncmode.md @@ -2,4 +2,4 @@ `block_sync`. ([\#9259](https://github.com/tendermint/tendermint/pull/9259)) At the same time, `block_sync` is also deprecated. In the next release, BlocSync will always be enabled and `block_sync` will be removed. - ([\#409](https://github.com/cometbft/cometbft/issues/409)) \ No newline at end of file + ([\#409](https://github.com/KYVENetwork/cometbft/v38/issues/409)) diff --git a/.changelog/v0.37.0/bug-fixes/382-txindexer-fix-slash-parsing.md b/.changelog/v0.37.0/bug-fixes/382-txindexer-fix-slash-parsing.md index 8537c9d7377..f3d79896f04 100644 --- a/.changelog/v0.37.0/bug-fixes/382-txindexer-fix-slash-parsing.md +++ b/.changelog/v0.37.0/bug-fixes/382-txindexer-fix-slash-parsing.md @@ -1,4 +1,4 @@ - `[state/kvindexer]` Resolved crashes when event values contained slashes, introduced after adding event sequences in - [\#77](https://github.com/cometbft/cometbft/pull/77). @jmalicevic - ([\#382](https://github.com/cometbft/cometbft/pull/382)) + [\#77](https://github.com/KYVENetwork/cometbft/v38/pull/77). @jmalicevic + ([\#382](https://github.com/KYVENetwork/cometbft/v38/pull/382)) diff --git a/.changelog/v0.37.0/bug-fixes/386-quick-fix-needproofblock.md b/.changelog/v0.37.0/bug-fixes/386-quick-fix-needproofblock.md index 2180086ce97..a1e1e904af9 100644 --- a/.changelog/v0.37.0/bug-fixes/386-quick-fix-needproofblock.md +++ b/.changelog/v0.37.0/bug-fixes/386-quick-fix-needproofblock.md @@ -1,2 +1,2 @@ -- `[consensus]` ([\#386](https://github.com/cometbft/cometbft/pull/386)) Short-term fix for the case when `needProofBlock` cannot find previous block meta by defaulting to the creation of a new proof block. (@adizere) +- `[consensus]` ([\#386](https://github.com/KYVENetwork/cometbft/v38/pull/386)) Short-term fix for the case when `needProofBlock` cannot find previous block meta by defaulting to the creation of a new proof block. (@adizere) - Special thanks to the [Vega.xyz](https://vega.xyz/) team, and in particular to Zohar (@ze97286), for reporting the problem and working with us to get to a fix. diff --git a/.changelog/v0.37.0/bug-fixes/77-kvindexer-fix-evattribute-indexing.md b/.changelog/v0.37.0/bug-fixes/77-kvindexer-fix-evattribute-indexing.md index 2d35d7e99d7..705c00f39be 100644 --- a/.changelog/v0.37.0/bug-fixes/77-kvindexer-fix-evattribute-indexing.md +++ b/.changelog/v0.37.0/bug-fixes/77-kvindexer-fix-evattribute-indexing.md @@ -1,4 +1,4 @@ - `[state/kvindexer]` Fixed the default behaviour of the kvindexer to index and query attributes by events in which they occur. In 0.34.25 this was mitigated by a separated RPC flag. @jmalicevic - ([\#77](https://github.com/cometbft/cometbft/pull/77)) + ([\#77](https://github.com/KYVENetwork/cometbft/v38/pull/77)) diff --git a/.changelog/v0.37.0/improvements/136-remove-tm-signer-harness.md b/.changelog/v0.37.0/improvements/136-remove-tm-signer-harness.md index 6eb6c2158c2..8a996ef18cc 100644 --- a/.changelog/v0.37.0/improvements/136-remove-tm-signer-harness.md +++ b/.changelog/v0.37.0/improvements/136-remove-tm-signer-harness.md @@ -1,2 +1,2 @@ - `[tools/tm-signer-harness]` Remove the folder as it is unused - ([\#136](https://github.com/cometbft/cometbft/issues/136)) \ No newline at end of file + ([\#136](https://github.com/KYVENetwork/cometbft/v38/issues/136)) diff --git a/.changelog/v0.37.0/improvements/230-p2p-peer-msg-type-and-metric.md b/.changelog/v0.37.0/improvements/230-p2p-peer-msg-type-and-metric.md index 6eeede4c728..cd84bb34fa1 100644 --- a/.changelog/v0.37.0/improvements/230-p2p-peer-msg-type-and-metric.md +++ b/.changelog/v0.37.0/improvements/230-p2p-peer-msg-type-and-metric.md @@ -1,4 +1,4 @@ - `[p2p]` Reactor `Send`, `TrySend` and `Receive` renamed to `SendEnvelope`, `TrySendEnvelope` and `ReceiveEnvelope` to allow metrics to be appended to messages and measure bytes sent/received. - ([\#230](https://github.com/cometbft/cometbft/pull/230)) \ No newline at end of file + ([\#230](https://github.com/KYVENetwork/cometbft/v38/pull/230)) diff --git a/.changelog/v0.37.0/summary.md b/.changelog/v0.37.0/summary.md index b96e98f5e96..4e44c43558b 100644 --- a/.changelog/v0.37.0/summary.md +++ b/.changelog/v0.37.0/summary.md @@ -19,7 +19,7 @@ the v0.37 release. We'd love your feedback on this release! Please reach out to us via one of our communication channels, such as [GitHub -Discussions](https://github.com/cometbft/cometbft/discussions), with any of your +Discussions](https://github.com/KYVENetwork/cometbft/v38/discussions), with any of your questions, comments and/or concerns. See below for more details. diff --git a/.changelog/v0.38.0/breaking-changes/1113-rm-upnp.md b/.changelog/v0.38.0/breaking-changes/1113-rm-upnp.md index bb95f20c082..5793693a7e7 100644 --- a/.changelog/v0.38.0/breaking-changes/1113-rm-upnp.md +++ b/.changelog/v0.38.0/breaking-changes/1113-rm-upnp.md @@ -1,2 +1,2 @@ - `[p2p]` Remove UPnP functionality - ([\#1113](https://github.com/cometbft/cometbft/issues/1113)) \ No newline at end of file + ([\#1113](https://github.com/KYVENetwork/cometbft/v38/issues/1113)) diff --git a/.changelog/v0.38.0/breaking-changes/1120-node-api-cleanup.md b/.changelog/v0.38.0/breaking-changes/1120-node-api-cleanup.md index 8c049370997..bd262f1ecc8 100644 --- a/.changelog/v0.38.0/breaking-changes/1120-node-api-cleanup.md +++ b/.changelog/v0.38.0/breaking-changes/1120-node-api-cleanup.md @@ -1,3 +1,3 @@ - `[node]` Removed `ConsensusState()` accessor from `Node` struct - all access to consensus state should go via the reactor - ([\#1120](https://github.com/cometbft/cometbft/pull/1120)) + ([\#1120](https://github.com/KYVENetwork/cometbft/v38/pull/1120)) diff --git a/.changelog/v0.38.0/breaking-changes/1270-executor_extend_vote.md b/.changelog/v0.38.0/breaking-changes/1270-executor_extend_vote.md index 975c8f8232e..213bcebf59c 100644 --- a/.changelog/v0.38.0/breaking-changes/1270-executor_extend_vote.md +++ b/.changelog/v0.38.0/breaking-changes/1270-executor_extend_vote.md @@ -1,3 +1,3 @@ - `[state]` Signature of `ExtendVote` changed in `BlockExecutor`. It now includes the block whose precommit will be extended, an the state object. - ([\#1270](https://github.com/cometbft/cometbft/pull/1270)) + ([\#1270](https://github.com/KYVENetwork/cometbft/v38/pull/1270)) diff --git a/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-config.md b/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-config.md index c989879b9e4..19f2f34270a 100644 --- a/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-config.md +++ b/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-config.md @@ -1,2 +1,2 @@ - `[config]` Remove `Version` field from `MempoolConfig`. - ([\#260](https://github.com/cometbft/cometbft/issues/260)) + ([\#260](https://github.com/KYVENetwork/cometbft/v38/issues/260)) diff --git a/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-proto.md b/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-proto.md index 042001178b3..aa8c5050e36 100644 --- a/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-proto.md +++ b/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool-proto.md @@ -1,2 +1,2 @@ - `[protobuf]` Remove fields `sender`, `priority`, and `mempool_error` from - `ResponseCheckTx`. ([\#260](https://github.com/cometbft/cometbft/issues/260)) + `ResponseCheckTx`. ([\#260](https://github.com/KYVENetwork/cometbft/v38/issues/260)) diff --git a/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool.md b/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool.md index e76a567afeb..12f89e9f1f8 100644 --- a/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool.md +++ b/.changelog/v0.38.0/breaking-changes/260-remove-priority-mempool.md @@ -1,2 +1,2 @@ - `[mempool]` Remove priority mempool. - ([\#260](https://github.com/cometbft/cometbft/issues/260)) + ([\#260](https://github.com/KYVENetwork/cometbft/v38/issues/260)) diff --git a/.changelog/v0.38.0/breaking-changes/558-tm10011.md b/.changelog/v0.38.0/breaking-changes/558-tm10011.md index d1b9fca4aba..c17861bbf77 100644 --- a/.changelog/v0.38.0/breaking-changes/558-tm10011.md +++ b/.changelog/v0.38.0/breaking-changes/558-tm10011.md @@ -1,2 +1,2 @@ - `[crypto/merkle]` Do not allow verification of Merkle Proofs against empty trees (`nil` root). `Proof.ComputeRootHash` now panics when it encounters an error, but `Proof.Verify` does not panic - ([\#558](https://github.com/cometbft/cometbft/issues/558)) + ([\#558](https://github.com/KYVENetwork/cometbft/v38/issues/558)) diff --git a/.changelog/v0.38.0/breaking-changes/774-state-indexerevent-remove-function-type.md b/.changelog/v0.38.0/breaking-changes/774-state-indexerevent-remove-function-type.md index 22a3b9fc5a3..76c32453652 100644 --- a/.changelog/v0.38.0/breaking-changes/774-state-indexerevent-remove-function-type.md +++ b/.changelog/v0.38.0/breaking-changes/774-state-indexerevent-remove-function-type.md @@ -1,3 +1,3 @@ - `[state/kvindexer]` Remove the function type from the event key stored in the database. This should be breaking only for people who forked CometBFT and interact directly with the indexers kvstore. - ([\#774](https://github.com/cometbft/cometbft/pull/774)) \ No newline at end of file + ([\#774](https://github.com/KYVENetwork/cometbft/v38/pull/774)) diff --git a/.changelog/v0.38.0/breaking-changes/797-kvindexer-support-for-big-numbers.md b/.changelog/v0.38.0/breaking-changes/797-kvindexer-support-for-big-numbers.md index e64e2775d34..3485f5d3aad 100644 --- a/.changelog/v0.38.0/breaking-changes/797-kvindexer-support-for-big-numbers.md +++ b/.changelog/v0.38.0/breaking-changes/797-kvindexer-support-for-big-numbers.md @@ -1,3 +1,3 @@ - `[kvindexer]` Added support for big integers and big floats in the kvindexer. Breaking changes: function `Number` in package `libs/pubsub/query/syntax` changed its return value. - ([\#797](https://github.com/cometbft/cometbft/pull/797)) + ([\#797](https://github.com/KYVENetwork/cometbft/v38/pull/797)) diff --git a/.changelog/v0.38.0/breaking-changes/797-pubsub-support-for-big-numbers.md b/.changelog/v0.38.0/breaking-changes/797-pubsub-support-for-big-numbers.md index 33778282eaf..2ad380d2122 100644 --- a/.changelog/v0.38.0/breaking-changes/797-pubsub-support-for-big-numbers.md +++ b/.changelog/v0.38.0/breaking-changes/797-pubsub-support-for-big-numbers.md @@ -1,3 +1,3 @@ - `[pubsub]` Added support for big integers and big floats in the pubsub event query system. Breaking changes: function `Number` in package `libs/pubsub/query/syntax` changed its return value. - ([\#797](https://github.com/cometbft/cometbft/pull/797)) + ([\#797](https://github.com/KYVENetwork/cometbft/v38/pull/797)) diff --git a/.changelog/v0.38.0/breaking-changes/980-max-size-more-control.md b/.changelog/v0.38.0/breaking-changes/980-max-size-more-control.md index e4354e3cb05..56a4c987094 100644 --- a/.changelog/v0.38.0/breaking-changes/980-max-size-more-control.md +++ b/.changelog/v0.38.0/breaking-changes/980-max-size-more-control.md @@ -6,4 +6,4 @@ If that is the case, the application MUST make sure that the total size of transactions returned in `ResponsePrepareProposal.txs` does not exceed `RequestPrepareProposal.max_tx_bytes`, otherwise CometBFT will panic. - ([\#980](https://github.com/cometbft/cometbft/issues/980)) \ No newline at end of file + ([\#980](https://github.com/KYVENetwork/cometbft/v38/issues/980)) diff --git a/.changelog/v0.38.0/bug-fixes/423-forwardport-default-kvindexer-behaviour.md b/.changelog/v0.38.0/bug-fixes/423-forwardport-default-kvindexer-behaviour.md index 0563a981af6..37f46bc53c1 100644 --- a/.changelog/v0.38.0/bug-fixes/423-forwardport-default-kvindexer-behaviour.md +++ b/.changelog/v0.38.0/bug-fixes/423-forwardport-default-kvindexer-behaviour.md @@ -1,2 +1,2 @@ - `[kvindexer]` Forward porting the fixes done to the kvindexer in 0.37 in PR \#77 - ([\#423](https://github.com/cometbft/cometbft/pull/423)) \ No newline at end of file + ([\#423](https://github.com/KYVENetwork/cometbft/v38/pull/423)) diff --git a/.changelog/v0.38.0/bug-fixes/496-error-on-applyblock-should-panic.md b/.changelog/v0.38.0/bug-fixes/496-error-on-applyblock-should-panic.md index 55e9c874f8c..cfb34a63e66 100644 --- a/.changelog/v0.38.0/bug-fixes/496-error-on-applyblock-should-panic.md +++ b/.changelog/v0.38.0/bug-fixes/496-error-on-applyblock-should-panic.md @@ -1,2 +1,2 @@ - `[consensus]` Unexpected error conditions in `ApplyBlock` are non-recoverable, so ignoring the error and carrying on is a bug. We replaced a `return` that disregarded the error by a `panic`. - ([\#496](https://github.com/cometbft/cometbft/pull/496)) \ No newline at end of file + ([\#496](https://github.com/KYVENetwork/cometbft/v38/pull/496)) diff --git a/.changelog/v0.38.0/bug-fixes/524-rename-peerstate-tojson.md b/.changelog/v0.38.0/bug-fixes/524-rename-peerstate-tojson.md index b9a43b3ce4e..559d87bb7d4 100644 --- a/.changelog/v0.38.0/bug-fixes/524-rename-peerstate-tojson.md +++ b/.changelog/v0.38.0/bug-fixes/524-rename-peerstate-tojson.md @@ -1,2 +1,2 @@ - `[consensus]` Rename `(*PeerState).ToJSON` to `MarshalJSON` to fix a logging data race - ([\#524](https://github.com/cometbft/cometbft/pull/524)) + ([\#524](https://github.com/KYVENetwork/cometbft/v38/pull/524)) diff --git a/.changelog/v0.38.0/bug-fixes/575-fix-light-client-panic.md b/.changelog/v0.38.0/bug-fixes/575-fix-light-client-panic.md index 0ec55b923fb..0989e2d160d 100644 --- a/.changelog/v0.38.0/bug-fixes/575-fix-light-client-panic.md +++ b/.changelog/v0.38.0/bug-fixes/575-fix-light-client-panic.md @@ -3,4 +3,4 @@ not yet have any data. The light client will now, correctly, not panic _and_ keep the node in its list of providers in the same way it would if it queried a node starting from height zero that does not yet have data - ([\#575](https://github.com/cometbft/cometbft/issues/575)) \ No newline at end of file + ([\#575](https://github.com/KYVENetwork/cometbft/v38/issues/575)) diff --git a/.changelog/v0.38.0/bug-fixes/855-snake-case-json-for-exec-tx-result-fields.md b/.changelog/v0.38.0/bug-fixes/855-snake-case-json-for-exec-tx-result-fields.md index 27f5fe53512..2341567aac6 100644 --- a/.changelog/v0.38.0/bug-fixes/855-snake-case-json-for-exec-tx-result-fields.md +++ b/.changelog/v0.38.0/bug-fixes/855-snake-case-json-for-exec-tx-result-fields.md @@ -1,2 +1,2 @@ - `[abci]` Restore the snake_case naming in JSON serialization of - `ExecTxResult` ([\#855](https://github.com/cometbft/cometbft/issues/855)). + `ExecTxResult` ([\#855](https://github.com/KYVENetwork/cometbft/v38/issues/855)). diff --git a/.changelog/v0.38.0/bug-fixes/865-fix-peerstate-marshaljson.md b/.changelog/v0.38.0/bug-fixes/865-fix-peerstate-marshaljson.md index 318bda315c5..191fec02f91 100644 --- a/.changelog/v0.38.0/bug-fixes/865-fix-peerstate-marshaljson.md +++ b/.changelog/v0.38.0/bug-fixes/865-fix-peerstate-marshaljson.md @@ -1,2 +1,2 @@ - `[consensus]` Avoid recursive call after rename to (*PeerState).MarshalJSON - ([\#863](https://github.com/cometbft/cometbft/pull/863)) + ([\#863](https://github.com/KYVENetwork/cometbft/v38/pull/863)) diff --git a/.changelog/v0.38.0/bug-fixes/890-mempool-fix-cache.md b/.changelog/v0.38.0/bug-fixes/890-mempool-fix-cache.md index 78ade6f4c1c..1fe0e2a3de5 100644 --- a/.changelog/v0.38.0/bug-fixes/890-mempool-fix-cache.md +++ b/.changelog/v0.38.0/bug-fixes/890-mempool-fix-cache.md @@ -1,2 +1,2 @@ - `[mempool/clist_mempool]` Prevent a transaction to appear twice in the mempool - ([\#890](https://github.com/cometbft/cometbft/pull/890): @otrack) + ([\#890](https://github.com/KYVENetwork/cometbft/v38/pull/890): @otrack) diff --git a/.changelog/v0.38.0/deprecations/650-deprecate-grpc-broadcast-api.md b/.changelog/v0.38.0/deprecations/650-deprecate-grpc-broadcast-api.md index 7ab623a6998..f1732480df1 100644 --- a/.changelog/v0.38.0/deprecations/650-deprecate-grpc-broadcast-api.md +++ b/.changelog/v0.38.0/deprecations/650-deprecate-grpc-broadcast-api.md @@ -1,4 +1,4 @@ - `[rpc/grpc]` Mark the gRPC broadcast API as deprecated. It will be superseded by a broader API as part of - [\#81](https://github.com/cometbft/cometbft/issues/81) - ([\#650](https://github.com/cometbft/cometbft/issues/650)) \ No newline at end of file + [\#81](https://github.com/KYVENetwork/cometbft/v38/issues/81) + ([\#650](https://github.com/KYVENetwork/cometbft/v38/issues/650)) diff --git a/.changelog/v0.38.0/features/9830-proxy-introduce-newconnsynclocalclientcreator.md b/.changelog/v0.38.0/features/9830-proxy-introduce-newconnsynclocalclientcreator.md index a7c8a0f69fc..683a8437a02 100644 --- a/.changelog/v0.38.0/features/9830-proxy-introduce-newconnsynclocalclientcreator.md +++ b/.changelog/v0.38.0/features/9830-proxy-introduce-newconnsynclocalclientcreator.md @@ -2,4 +2,4 @@ clients to have the same concurrency model as remote clients (i.e. one mutex per client "connection", for each of the four ABCI "connections"). ([tendermint/tendermint\#9830](https://github.com/tendermint/tendermint/pull/9830) - and [\#1145](https://github.com/cometbft/cometbft/pull/1145)) + and [\#1145](https://github.com/KYVENetwork/cometbft/v38/pull/1145)) diff --git a/.changelog/v0.38.0/improvements/1210-close-evidence-db.md b/.changelog/v0.38.0/improvements/1210-close-evidence-db.md index e32bc87dbe1..47e21489eca 100644 --- a/.changelog/v0.38.0/improvements/1210-close-evidence-db.md +++ b/.changelog/v0.38.0/improvements/1210-close-evidence-db.md @@ -1 +1 @@ -- `[node]` Close evidence.db OnStop ([cometbft/cometbft\#1210](https://github.com/cometbft/cometbft/pull/1210): @chillyvee) +- `[node]` Close evidence.db OnStop ([cometbft/cometbft\#1210](https://github.com/KYVENetwork/cometbft/v38/pull/1210): @chillyvee) diff --git a/.changelog/v0.38.0/improvements/1264-log-app-hash-as-hex.md b/.changelog/v0.38.0/improvements/1264-log-app-hash-as-hex.md index 2e530c73895..11325ffcee9 100644 --- a/.changelog/v0.38.0/improvements/1264-log-app-hash-as-hex.md +++ b/.changelog/v0.38.0/improvements/1264-log-app-hash-as-hex.md @@ -1,2 +1,2 @@ - `[state]` Make logging `block_app_hash` and `app_hash` consistent by logging them both as hex. - ([\#1264](https://github.com/cometbft/cometbft/pull/1264)) + ([\#1264](https://github.com/KYVENetwork/cometbft/v38/pull/1264)) diff --git a/.changelog/v0.38.0/improvements/543-metrics-for-blocksync.md b/.changelog/v0.38.0/improvements/543-metrics-for-blocksync.md index 824e20df9c1..b882f5ef4e9 100644 --- a/.changelog/v0.38.0/improvements/543-metrics-for-blocksync.md +++ b/.changelog/v0.38.0/improvements/543-metrics-for-blocksync.md @@ -1,2 +1,2 @@ - `[blocksync]` Generate new metrics during BlockSync - ([\#543](https://github.com/cometbft/cometbft/pull/543)) \ No newline at end of file + ([\#543](https://github.com/KYVENetwork/cometbft/v38/pull/543)) diff --git a/.changelog/v0.38.0/improvements/638-json-rpc-error-message.md b/.changelog/v0.38.0/improvements/638-json-rpc-error-message.md index 6922091fd25..4be68aa4be9 100644 --- a/.changelog/v0.38.0/improvements/638-json-rpc-error-message.md +++ b/.changelog/v0.38.0/improvements/638-json-rpc-error-message.md @@ -1,3 +1,3 @@ - `[jsonrpc/client]` Improve the error message for client errors stemming from bad HTTP responses. - ([cometbft/cometbft\#638](https://github.com/cometbft/cometbft/pull/638)) + ([cometbft/cometbft\#638](https://github.com/KYVENetwork/cometbft/v38/pull/638)) diff --git a/.changelog/v0.38.0/improvements/654-rpc-rm-response-data-logs.md b/.changelog/v0.38.0/improvements/654-rpc-rm-response-data-logs.md index 3fddfee8e71..a11b2ee0eaa 100644 --- a/.changelog/v0.38.0/improvements/654-rpc-rm-response-data-logs.md +++ b/.changelog/v0.38.0/improvements/654-rpc-rm-response-data-logs.md @@ -1,3 +1,3 @@ - `[rpc]` Remove response data from response failure logs in order to prevent large quantities of log data from being produced - ([\#654](https://github.com/cometbft/cometbft/issues/654)) \ No newline at end of file + ([\#654](https://github.com/KYVENetwork/cometbft/v38/issues/654)) diff --git a/.changelog/v0.38.0/improvements/797-pubsub-float.md b/.changelog/v0.38.0/improvements/797-pubsub-float.md index c3d1a878554..3af3dbc75c5 100644 --- a/.changelog/v0.38.0/improvements/797-pubsub-float.md +++ b/.changelog/v0.38.0/improvements/797-pubsub-float.md @@ -1,3 +1,3 @@ - `[pubsub/kvindexer]` Numeric query conditions and event values are represented as big floats with default precision of 125. Integers are read as "big ints" and represented with as many bits as they need when converting to floats. - ([\#797](https://github.com/cometbft/cometbft/pull/797)) + ([\#797](https://github.com/KYVENetwork/cometbft/v38/pull/797)) diff --git a/.changelog/v0.38.0/improvements/857-make-handshake-cancelable.md b/.changelog/v0.38.0/improvements/857-make-handshake-cancelable.md index 16b447f6d23..ef7ccb67af6 100644 --- a/.changelog/v0.38.0/improvements/857-make-handshake-cancelable.md +++ b/.changelog/v0.38.0/improvements/857-make-handshake-cancelable.md @@ -1 +1 @@ -- `[node]` Make handshake cancelable ([cometbft/cometbft\#857](https://github.com/cometbft/cometbft/pull/857)) +- `[node]` Make handshake cancelable ([cometbft/cometbft\#857](https://github.com/KYVENetwork/cometbft/v38/pull/857)) diff --git a/.changelog/v0.38.0/improvements/896-consensus-metric-duplicates.md b/.changelog/v0.38.0/improvements/896-consensus-metric-duplicates.md index 5661da834a9..e337cb1792b 100644 --- a/.changelog/v0.38.0/improvements/896-consensus-metric-duplicates.md +++ b/.changelog/v0.38.0/improvements/896-consensus-metric-duplicates.md @@ -1,2 +1,2 @@ - `[consensus]` New metrics (counters) to track duplicate votes and block parts. - ([\#896](https://github.com/cometbft/cometbft/pull/896)) \ No newline at end of file + ([\#896](https://github.com/KYVENetwork/cometbft/v38/pull/896)) diff --git a/.changelog/v0.38.0/improvements/980-max-size-more-control.md b/.changelog/v0.38.0/improvements/980-max-size-more-control.md index e319779984c..0c23ba29a4a 100644 --- a/.changelog/v0.38.0/improvements/980-max-size-more-control.md +++ b/.changelog/v0.38.0/improvements/980-max-size-more-control.md @@ -2,4 +2,4 @@ to gain more control on the max size of transactions in a block. It also allows the application to have visibility on all transactions in the mempool at `PrepareProposal` time. - ([\#980](https://github.com/cometbft/cometbft/pull/980)) \ No newline at end of file + ([\#980](https://github.com/KYVENetwork/cometbft/v38/pull/980)) diff --git a/.changelog/v0.38.1/bug-fixes/1529-indexer-respect-height-params-on-query.md b/.changelog/v0.38.1/bug-fixes/1529-indexer-respect-height-params-on-query.md index d12f3eda536..73777633d59 100644 --- a/.changelog/v0.38.1/bug-fixes/1529-indexer-respect-height-params-on-query.md +++ b/.changelog/v0.38.1/bug-fixes/1529-indexer-respect-height-params-on-query.md @@ -1,2 +1,2 @@ - `[state/indexer]` Respect both height params while querying for events - ([\#1529](https://github.com/cometbft/cometbft/pull/1529)) + ([\#1529](https://github.com/KYVENetwork/cometbft/v38/pull/1529)) diff --git a/.changelog/v0.38.1/features/1512-metric-mempool-size-bytes.md b/.changelog/v0.38.1/features/1512-metric-mempool-size-bytes.md index b935dc40842..45458a2eaea 100644 --- a/.changelog/v0.38.1/features/1512-metric-mempool-size-bytes.md +++ b/.changelog/v0.38.1/features/1512-metric-mempool-size-bytes.md @@ -1,2 +1,2 @@ - `[metrics]` Add metric for mempool size in bytes `SizeBytes`. - ([\#1512](https://github.com/cometbft/cometbft/pull/1512)) \ No newline at end of file + ([\#1512](https://github.com/KYVENetwork/cometbft/v38/pull/1512)) diff --git a/.changelog/v0.38.1/improvements/1558-experimental-gossip-limiting.md b/.changelog/v0.38.1/improvements/1558-experimental-gossip-limiting.md index 6931cef8274..e8dccfed3da 100644 --- a/.changelog/v0.38.1/improvements/1558-experimental-gossip-limiting.md +++ b/.changelog/v0.38.1/improvements/1558-experimental-gossip-limiting.md @@ -1,9 +1,9 @@ - `[mempool]` Add experimental feature to limit the number of persistent peers and non-persistent peers to which the node gossip transactions. - ([\#1558](https://github.com/cometbft/cometbft/pull/1558)) - ([\#1584](https://github.com/cometbft/cometbft/pull/1584)) + ([\#1558](https://github.com/KYVENetwork/cometbft/v38/pull/1558)) + ([\#1584](https://github.com/KYVENetwork/cometbft/v38/pull/1584)) - `[config]` Add mempool parameters `experimental_max_gossip_connections_to_persistent_peers` and `experimental_max_gossip_connections_to_non_persistent_peers` for limiting the number of peers to - which the node gossip transactions. - ([\#1558](https://github.com/cometbft/cometbft/pull/1558)) - ([\#1584](https://github.com/cometbft/cometbft/pull/1584)) + which the node gossip transactions. + ([\#1558](https://github.com/KYVENetwork/cometbft/v38/pull/1558)) + ([\#1584](https://github.com/KYVENetwork/cometbft/v38/pull/1584)) diff --git a/.changelog/v0.38.2/bug-fixes/1654-semaphore-wait.md b/.changelog/v0.38.2/bug-fixes/1654-semaphore-wait.md index 9d0fb80adcc..bdd02e00b0c 100644 --- a/.changelog/v0.38.2/bug-fixes/1654-semaphore-wait.md +++ b/.changelog/v0.38.2/bug-fixes/1654-semaphore-wait.md @@ -1,3 +1,3 @@ - `[mempool]` Avoid infinite wait in transaction sending routine when using experimental parameters to limiting transaction gossiping to peers - ([\#1654](https://github.com/cometbft/cometbft/pull/1654)) \ No newline at end of file + ([\#1654](https://github.com/KYVENetwork/cometbft/v38/pull/1654)) diff --git a/.changelog/v0.38.2/features/1643-nop-mempool.md b/.changelog/v0.38.2/features/1643-nop-mempool.md index e12ec43fc1a..b6eeedbd026 100644 --- a/.changelog/v0.38.2/features/1643-nop-mempool.md +++ b/.changelog/v0.38.2/features/1643-nop-mempool.md @@ -1,4 +1,4 @@ -- `[mempool]` Add `nop` mempool ([\#1643](https://github.com/cometbft/cometbft/pull/1643)) +- `[mempool]` Add `nop` mempool ([\#1643](https://github.com/KYVENetwork/cometbft/v38/pull/1643)) If you want to use it, change mempool's `type` to `nop`: @@ -14,4 +14,4 @@ # for storing, disseminating and proposing txs). "create_empty_blocks=false" # is not supported. type = "nop" - ``` \ No newline at end of file + ``` diff --git a/.changelog/v0.38.3/bug-fixes/0000-asa-2024-001-fix-validate.md b/.changelog/v0.38.3/bug-fixes/0000-asa-2024-001-fix-validate.md index 35340fe71cf..289f31a5691 100644 --- a/.changelog/v0.38.3/bug-fixes/0000-asa-2024-001-fix-validate.md +++ b/.changelog/v0.38.3/bug-fixes/0000-asa-2024-001-fix-validate.md @@ -1,2 +1,2 @@ - `[consensus]` Fix for "Validation of `VoteExtensionsEnableHeight` can cause chain halt" - ([ASA-2024-001](https://github.com/cometbft/cometbft/security/advisories/GHSA-qr8r-m495-7hc4)) + ([ASA-2024-001](https://github.com/KYVENetwork/cometbft/v38/security/advisories/GHSA-qr8r-m495-7hc4)) diff --git a/.changelog/v0.38.3/bug-fixes/1687-consensus-fix-block-validation.md b/.changelog/v0.38.3/bug-fixes/1687-consensus-fix-block-validation.md index 778f0b538b4..44a22b5cec5 100644 --- a/.changelog/v0.38.3/bug-fixes/1687-consensus-fix-block-validation.md +++ b/.changelog/v0.38.3/bug-fixes/1687-consensus-fix-block-validation.md @@ -1,3 +1,3 @@ - `[mempool]` The calculation method of tx size returned by calling proxyapp should be consistent with that of mempool - ([\#1687](https://github.com/cometbft/cometbft/pull/1687)) + ([\#1687](https://github.com/KYVENetwork/cometbft/v38/pull/1687)) diff --git a/.changelog/v0.38.3/bug-fixes/1749-light-client-attack-verify-all-sigs.md b/.changelog/v0.38.3/bug-fixes/1749-light-client-attack-verify-all-sigs.md index 1115c4d195a..11bb931f175 100644 --- a/.changelog/v0.38.3/bug-fixes/1749-light-client-attack-verify-all-sigs.md +++ b/.changelog/v0.38.3/bug-fixes/1749-light-client-attack-verify-all-sigs.md @@ -1,4 +1,4 @@ - `[evidence]` When `VerifyCommitLight` & `VerifyCommitLightTrusting` are called as part of evidence verification, all signatures present in the evidence must be verified - ([\#1749](https://github.com/cometbft/cometbft/pull/1749)) + ([\#1749](https://github.com/KYVENetwork/cometbft/v38/pull/1749)) diff --git a/.changelog/v0.38.3/bug-fixes/1825-false-on-nil-key.md b/.changelog/v0.38.3/bug-fixes/1825-false-on-nil-key.md index dcd466a39e7..4016cb3670a 100644 --- a/.changelog/v0.38.3/bug-fixes/1825-false-on-nil-key.md +++ b/.changelog/v0.38.3/bug-fixes/1825-false-on-nil-key.md @@ -1,3 +1,3 @@ - `[crypto]` `SupportsBatchVerifier` returns false if public key is nil instead of dereferencing nil. - ([\#1825](https://github.com/cometbft/cometbft/pull/1825)) \ No newline at end of file + ([\#1825](https://github.com/KYVENetwork/cometbft/v38/pull/1825)) diff --git a/.changelog/v0.38.3/bug-fixes/1879-blocksync-wait-for-pool-routine.md b/.changelog/v0.38.3/bug-fixes/1879-blocksync-wait-for-pool-routine.md index e4122368287..de73dd4d6ea 100644 --- a/.changelog/v0.38.3/bug-fixes/1879-blocksync-wait-for-pool-routine.md +++ b/.changelog/v0.38.3/bug-fixes/1879-blocksync-wait-for-pool-routine.md @@ -1,2 +1,2 @@ - `[blocksync]` wait for `poolRoutine` to stop in `(*Reactor).OnStop` - ([\#1879](https://github.com/cometbft/cometbft/pull/1879)) + ([\#1879](https://github.com/KYVENetwork/cometbft/v38/pull/1879)) diff --git a/.changelog/v0.38.3/bug-fixes/642-clist-mempool-data-races.md b/.changelog/v0.38.3/bug-fixes/642-clist-mempool-data-races.md index 037bbc9550f..8e5cf6036ec 100644 --- a/.changelog/v0.38.3/bug-fixes/642-clist-mempool-data-races.md +++ b/.changelog/v0.38.3/bug-fixes/642-clist-mempool-data-races.md @@ -1,2 +1,2 @@ - `[mempool]` Fix data races in `CListMempool` by making atomic the types of `height`, `txsBytes`, and - `notifiedTxsAvailable`. ([\#642](https://github.com/cometbft/cometbft/pull/642)) + `notifiedTxsAvailable`. ([\#642](https://github.com/KYVENetwork/cometbft/v38/pull/642)) diff --git a/.changelog/v0.38.3/improvements/1715-validate-validator-address.md b/.changelog/v0.38.3/improvements/1715-validate-validator-address.md index ec7f2c7da6a..792a9408675 100644 --- a/.changelog/v0.38.3/improvements/1715-validate-validator-address.md +++ b/.changelog/v0.38.3/improvements/1715-validate-validator-address.md @@ -1 +1 @@ -- `[types]` Validate `Validator#Address` in `ValidateBasic` ([\#1715](https://github.com/cometbft/cometbft/pull/1715)) +- `[types]` Validate `Validator#Address` in `ValidateBasic` ([\#1715](https://github.com/KYVENetwork/cometbft/v38/pull/1715)) diff --git a/.changelog/v0.38.3/improvements/1730-increase-abci-socket-message-size-limit.md b/.changelog/v0.38.3/improvements/1730-increase-abci-socket-message-size-limit.md index 5246eb57f08..4eccc19e350 100644 --- a/.changelog/v0.38.3/improvements/1730-increase-abci-socket-message-size-limit.md +++ b/.changelog/v0.38.3/improvements/1730-increase-abci-socket-message-size-limit.md @@ -1 +1 @@ -- `[abci]` Increase ABCI socket message size limit to 2GB ([\#1730](https://github.com/cometbft/cometbft/pull/1730): @troykessler) +- `[abci]` Increase ABCI socket message size limit to 2GB ([\#1730](https://github.com/KYVENetwork/cometbft/v38/pull/1730): @troykessler) diff --git a/.changelog/v0.38.3/improvements/1735-batch-save-state.md b/.changelog/v0.38.3/improvements/1735-batch-save-state.md index 721380f6041..82a3a1269cb 100644 --- a/.changelog/v0.38.3/improvements/1735-batch-save-state.md +++ b/.changelog/v0.38.3/improvements/1735-batch-save-state.md @@ -1 +1 @@ -- `[state]` Save the state using a single DB batch ([\#1735](https://github.com/cometbft/cometbft/pull/1735)) +- `[state]` Save the state using a single DB batch ([\#1735](https://github.com/KYVENetwork/cometbft/v38/pull/1735)) diff --git a/.changelog/v0.38.3/improvements/1755-batch-save-block.md b/.changelog/v0.38.3/improvements/1755-batch-save-block.md index 22f15cdb423..0c129765549 100644 --- a/.changelog/v0.38.3/improvements/1755-batch-save-block.md +++ b/.changelog/v0.38.3/improvements/1755-batch-save-block.md @@ -1,2 +1,2 @@ - `[store]` Save block using a single DB batch if block is less than 640kB, otherwise each block part is saved individually - ([\#1755](https://github.com/cometbft/cometbft/pull/1755)) + ([\#1755](https://github.com/KYVENetwork/cometbft/v38/pull/1755)) diff --git a/.changelog/v0.38.3/improvements/1900-httpproxy-from-env.md b/.changelog/v0.38.3/improvements/1900-httpproxy-from-env.md index fd654ef7ba0..662f3300b5c 100644 --- a/.changelog/v0.38.3/improvements/1900-httpproxy-from-env.md +++ b/.changelog/v0.38.3/improvements/1900-httpproxy-from-env.md @@ -1,2 +1,2 @@ - `[rpc]` Support setting proxy from env to `DefaultHttpClient`. - ([\#1900](https://github.com/cometbft/cometbft/pull/1900)) + ([\#1900](https://github.com/KYVENetwork/cometbft/v38/pull/1900)) diff --git a/.changelog/v0.38.3/improvements/1902-rpc-default-port.md b/.changelog/v0.38.3/improvements/1902-rpc-default-port.md index b321bed5394..eb9681a196d 100644 --- a/.changelog/v0.38.3/improvements/1902-rpc-default-port.md +++ b/.changelog/v0.38.3/improvements/1902-rpc-default-port.md @@ -1 +1 @@ -- `[rpc]` Use default port for HTTP(S) URLs when there is no explicit port ([\#1903](https://github.com/cometbft/cometbft/pull/1903)) +- `[rpc]` Use default port for HTTP(S) URLs when there is no explicit port ([\#1903](https://github.com/KYVENetwork/cometbft/v38/pull/1903)) diff --git a/.changelog/v0.38.3/improvements/1921-crypto-merkle-innerHash.md b/.changelog/v0.38.3/improvements/1921-crypto-merkle-innerHash.md index d3c9dac2cba..c25daa2bc80 100644 --- a/.changelog/v0.38.3/improvements/1921-crypto-merkle-innerHash.md +++ b/.changelog/v0.38.3/improvements/1921-crypto-merkle-innerHash.md @@ -1 +1 @@ -- `[crypto/merkle]` faster calculation of hashes ([#1921](https://github.com/cometbft/cometbft/pull/1921)) +- `[crypto/merkle]` faster calculation of hashes ([#1921](https://github.com/KYVENetwork/cometbft/v38/pull/1921)) diff --git a/.changelog/v0.38.3/summary.md b/.changelog/v0.38.3/summary.md index 4282c85ad1d..12eaa0bbcce 100644 --- a/.changelog/v0.38.3/summary.md +++ b/.changelog/v0.38.3/summary.md @@ -1,7 +1,7 @@ *January 17, 2024* This release addresses a high impact security issue reported in advisory -([ASA-2024-001](https://github.com/cometbft/cometbft/security/advisories/GHSA-qr8r-m495-7hc4)). +([ASA-2024-001](https://github.com/KYVENetwork/cometbft/v38/security/advisories/GHSA-qr8r-m495-7hc4)). There are other non-security bugs fixes that have been addressed since `v0.38.2` was released, as well as some improvements. Please check the list below for further details. diff --git a/.changelog/v0.38.4/improvements/2065-e2e-vote-ext-activation.md b/.changelog/v0.38.4/improvements/2065-e2e-vote-ext-activation.md index 9ced3a5da72..17149aa2358 100644 --- a/.changelog/v0.38.4/improvements/2065-e2e-vote-ext-activation.md +++ b/.changelog/v0.38.4/improvements/2065-e2e-vote-ext-activation.md @@ -2,4 +2,4 @@ vote extension activation via `InitChain` and `FinalizeBlock`. Also, extend the manifest generator to produce different values of this new option - ([\#2065](https://github.com/cometbft/cometbft/pull/2065)) + ([\#2065](https://github.com/KYVENetwork/cometbft/v38/pull/2065)) diff --git a/.changelog/v0.38.4/summary.md b/.changelog/v0.38.4/summary.md index 0a8b339c9e8..e18e8ad79bc 100644 --- a/.changelog/v0.38.4/summary.md +++ b/.changelog/v0.38.4/summary.md @@ -2,7 +2,7 @@ This release is aimed at those projects that have a dependency on CometBFT, release line `v0.38.x`, and make use of function `SaveBlockStoreState` in package -`github.com/cometbft/cometbft/store`. This function changed its signature in `v0.38.3`. +`github.com/KYVENetwork/cometbft/v38/store`. This function changed its signature in `v0.38.3`. This new release reverts the signature change so that upgrading to the latest release of CometBFT on `v0.38.x` does not require any change in the code depending on CometBFT. diff --git a/.changelog/v0.38.5/improvements/2093-metric-chain-size-bytes.md b/.changelog/v0.38.5/improvements/2093-metric-chain-size-bytes.md index afba958e3b7..5c53229ec3b 100644 --- a/.changelog/v0.38.5/improvements/2093-metric-chain-size-bytes.md +++ b/.changelog/v0.38.5/improvements/2093-metric-chain-size-bytes.md @@ -1,2 +1,2 @@ - `[consensus]` Add `chain_size_bytes` metric for measuring the size of the blockchain in bytes - ([\#2093](https://github.com/cometbft/cometbft/pull/2093)) + ([\#2093](https://github.com/KYVENetwork/cometbft/v38/pull/2093)) diff --git a/.changelog/v0.38.6/bug-fixes/2047-privval-retry-accepting-conn.md b/.changelog/v0.38.6/bug-fixes/2047-privval-retry-accepting-conn.md index 45260721c8b..91df84ee188 100644 --- a/.changelog/v0.38.6/bug-fixes/2047-privval-retry-accepting-conn.md +++ b/.changelog/v0.38.6/bug-fixes/2047-privval-retry-accepting-conn.md @@ -1 +1 @@ -- `[privval]` Retry accepting a connection ([\#2047](https://github.com/cometbft/cometbft/pull/2047)) +- `[privval]` Retry accepting a connection ([\#2047](https://github.com/KYVENetwork/cometbft/v38/pull/2047)) diff --git a/.changelog/v0.38.6/bug-fixes/2136-fix-state-rollback.md b/.changelog/v0.38.6/bug-fixes/2136-fix-state-rollback.md index 55cbfe51ed4..ca31e2558d5 100644 --- a/.changelog/v0.38.6/bug-fixes/2136-fix-state-rollback.md +++ b/.changelog/v0.38.6/bug-fixes/2136-fix-state-rollback.md @@ -1,2 +1,2 @@ - `[state]` Fix rollback to a specific height - ([\#2136](https://github.com/cometbft/cometbft/pull/2136)) + ([\#2136](https://github.com/KYVENetwork/cometbft/v38/pull/2136)) diff --git a/.changelog/v0.38.6/features/2362-e2e-block-max-bytes.md b/.changelog/v0.38.6/features/2362-e2e-block-max-bytes.md index a3b007c3f96..50e713e8955 100644 --- a/.changelog/v0.38.6/features/2362-e2e-block-max-bytes.md +++ b/.changelog/v0.38.6/features/2362-e2e-block-max-bytes.md @@ -1,2 +1,2 @@ - `[e2e]` Add `block_max_bytes` option to the manifest file. - ([\#2362](https://github.com/cometbft/cometbft/pull/2362)) \ No newline at end of file + ([\#2362](https://github.com/KYVENetwork/cometbft/v38/pull/2362)) diff --git a/.changelog/v0.38.6/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md b/.changelog/v0.38.6/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md index 7251221be18..0a1176e7c8e 100644 --- a/.changelog/v0.38.6/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md +++ b/.changelog/v0.38.6/improvements/2016-blocksync-avoid-double-calling-block-from-proto.md @@ -1,2 +1,2 @@ - `[blocksync]` Avoid double-calling `types.BlockFromProto` for performance - reasons ([\#2016](https://github.com/cometbft/cometbft/pull/2016)) + reasons ([\#2016](https://github.com/KYVENetwork/cometbft/v38/pull/2016)) diff --git a/.changelog/v0.38.6/improvements/2094-e2e-load-max-txs.md b/.changelog/v0.38.6/improvements/2094-e2e-load-max-txs.md index 31ca79cfe3b..99509333ea7 100644 --- a/.changelog/v0.38.6/improvements/2094-e2e-load-max-txs.md +++ b/.changelog/v0.38.6/improvements/2094-e2e-load-max-txs.md @@ -1,2 +1,2 @@ - `[e2e]` Add manifest option `load_max_txs` to limit the number of transactions generated by the - `load` command. ([\#2094](https://github.com/cometbft/cometbft/pull/2094)) + `load` command. ([\#2094](https://github.com/KYVENetwork/cometbft/v38/pull/2094)) diff --git a/.changelog/v0.38.6/improvements/2434-jsonrpc-websocket-basic-auth.md b/.changelog/v0.38.6/improvements/2434-jsonrpc-websocket-basic-auth.md index e4db7c06c7d..a351217da26 100644 --- a/.changelog/v0.38.6/improvements/2434-jsonrpc-websocket-basic-auth.md +++ b/.changelog/v0.38.6/improvements/2434-jsonrpc-websocket-basic-auth.md @@ -1 +1 @@ -- `[jsonrpc]` enable HTTP basic auth in websocket client ([#2434](https://github.com/cometbft/cometbft/pull/2434)) +- `[jsonrpc]` enable HTTP basic auth in websocket client ([#2434](https://github.com/KYVENetwork/cometbft/v38/pull/2434)) diff --git a/.changelog/v0.38.6/improvements/2467-decrease-n-of-requested-blocks.md b/.changelog/v0.38.6/improvements/2467-decrease-n-of-requested-blocks.md index 3b5ea17ce5a..1a0a7d3e590 100644 --- a/.changelog/v0.38.6/improvements/2467-decrease-n-of-requested-blocks.md +++ b/.changelog/v0.38.6/improvements/2467-decrease-n-of-requested-blocks.md @@ -1,3 +1,3 @@ - `[blocksync]` make the max number of downloaded blocks dynamic. Previously it was a const 600. Now it's `peersCount * maxPendingRequestsPerPeer (20)` - [\#2467](https://github.com/cometbft/cometbft/pull/2467) + [\#2467](https://github.com/KYVENetwork/cometbft/v38/pull/2467) diff --git a/.changelog/v0.38.6/improvements/2475-blocksync-2nd-request.md b/.changelog/v0.38.6/improvements/2475-blocksync-2nd-request.md index 67614a8e35f..12a858c6dce 100644 --- a/.changelog/v0.38.6/improvements/2475-blocksync-2nd-request.md +++ b/.changelog/v0.38.6/improvements/2475-blocksync-2nd-request.md @@ -1,3 +1,3 @@ - `[blocksync]` Request a block from peer B if we are approaching pool's height (less than 50 blocks) and the current peer A is slow in sending us the - block [\#2475](https://github.com/cometbft/cometbft/pull/2475) + block [\#2475](https://github.com/KYVENetwork/cometbft/v38/pull/2475) diff --git a/.changelog/v0.38.6/improvements/2475-blocksync-no-block-response.md b/.changelog/v0.38.6/improvements/2475-blocksync-no-block-response.md index d01b3679866..b5c882e0d85 100644 --- a/.changelog/v0.38.6/improvements/2475-blocksync-no-block-response.md +++ b/.changelog/v0.38.6/improvements/2475-blocksync-no-block-response.md @@ -1,3 +1,3 @@ - `[blocksync]` Request the block N from peer B immediately after getting `NoBlockResponse` from peer A - [\#2475](https://github.com/cometbft/cometbft/pull/2475) + [\#2475](https://github.com/KYVENetwork/cometbft/v38/pull/2475) diff --git a/.changelog/v0.38.6/improvements/2475-blocksync-sort-peers.md b/.changelog/v0.38.6/improvements/2475-blocksync-sort-peers.md index 5c544401ba6..bb45b53345c 100644 --- a/.changelog/v0.38.6/improvements/2475-blocksync-sort-peers.md +++ b/.changelog/v0.38.6/improvements/2475-blocksync-sort-peers.md @@ -1,2 +1,2 @@ - `[blocksync]` Sort peers by download rate (the fastest peer is picked first) - [\#2475](https://github.com/cometbft/cometbft/pull/2475) + [\#2475](https://github.com/KYVENetwork/cometbft/v38/pull/2475) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 6afb939c09d..3b422ef347c 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -8,7 +8,7 @@ labels: bug, needs-triage Please fill in as much of the template below as you can. If you have general questions, please create a new discussion: -https://github.com/cometbft/cometbft/discussions +https://github.com/KYVENetwork/cometbft/v38/discussions Be ready for followup questions, and please respond in a timely manner. We might ask you to provide additional logs and data (CometBFT & App). diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 872b674a9ca..6e13f9c430a 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: true contact_links: - name: Ask a question - url: https://github.com/cometbft/cometbft/discussions + url: https://github.com/KYVENetwork/cometbft/v38/discussions about: Please ask and answer questions here diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 852aa44b461..511bb8e85f3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -10,7 +10,7 @@ discussion with the team prior to submitting substantial pull requests. The team can be reached via GitHub Discussions or the Cosmos Network Discord server in the #cometbft channel. GitHub Discussions is preferred over Discord as it allows us to keep track of conversations topically. -https://github.com/cometbft/cometbft/discussions +https://github.com/KYVENetwork/cometbft/v38/discussions If the work in this PR is not aligned with the team's current priorities, please be advised that it may take some time before it is merged - especially if it has diff --git a/.github/issue_template.md b/.github/issue_template.md index 4514e4abf04..aa39e97a489 100644 --- a/.github/issue_template.md +++ b/.github/issue_template.md @@ -5,6 +5,6 @@ labels: needs-triage diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 53bfebd459e..216d84d9588 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -40,7 +40,7 @@ jobs: - name: Generate release notes run: | VERSION="${GITHUB_REF#refs/tags/}" - CHANGELOG_URL="https://github.com/cometbft/cometbft/blob/${VERSION}/CHANGELOG.md" + CHANGELOG_URL="https://github.com/KYVENetwork/cometbft/v38/blob/${VERSION}/CHANGELOG.md" echo "See the [CHANGELOG](${CHANGELOG_URL}) for changes available in this pre-release, but not yet officially released." > ../release_notes.md - name: Release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eeac6710be0..d1da2322854 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: run: | VERSION="${GITHUB_REF#refs/tags/}" VERSION_REF="${VERSION//[\.]/}" - CHANGELOG_URL="https://github.com/cometbft/cometbft/blob/${VERSION}/CHANGELOG.md#${VERSION_REF}" + CHANGELOG_URL="https://github.com/KYVENetwork/cometbft/v38/blob/${VERSION}/CHANGELOG.md#${VERSION_REF}" echo "See the [CHANGELOG](${CHANGELOG_URL}) for this release." > ../release_notes.md - name: Release diff --git a/.goreleaser.yml b/.goreleaser.yml index da0b5e23053..d1401161685 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -8,7 +8,7 @@ builds: - id: "cometbft" main: ./cmd/cometbft/main.go ldflags: - - -s -w -X github.com/cometbft/cometbft/version.TMCoreSemVer={{ .Version }} + - -s -w -X github.com/KYVENetwork/cometbft/v38/version.TMCoreSemVer={{ .Version }} env: - CGO_ENABLED=0 goos: diff --git a/CHANGELOG.md b/CHANGELOG.md index d61fc5b646e..a415dc9edf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,33 +10,33 @@ improvements to the block sync in collaboration with the ### BUG FIXES -- `[privval]` Retry accepting a connection ([\#2047](https://github.com/cometbft/cometbft/pull/2047)) +- `[privval]` Retry accepting a connection ([\#2047](https://github.com/KYVENetwork/cometbft/v38/pull/2047)) - `[state]` Fix rollback to a specific height - ([\#2136](https://github.com/cometbft/cometbft/pull/2136)) + ([\#2136](https://github.com/KYVENetwork/cometbft/v38/pull/2136)) ### FEATURES - `[e2e]` Add `block_max_bytes` option to the manifest file. - ([\#2362](https://github.com/cometbft/cometbft/pull/2362)) + ([\#2362](https://github.com/KYVENetwork/cometbft/v38/pull/2362)) ### IMPROVEMENTS - `[blocksync]` Avoid double-calling `types.BlockFromProto` for performance - reasons ([\#2016](https://github.com/cometbft/cometbft/pull/2016)) + reasons ([\#2016](https://github.com/KYVENetwork/cometbft/v38/pull/2016)) - `[e2e]` Add manifest option `load_max_txs` to limit the number of transactions generated by the - `load` command. ([\#2094](https://github.com/cometbft/cometbft/pull/2094)) -- `[jsonrpc]` enable HTTP basic auth in websocket client ([#2434](https://github.com/cometbft/cometbft/pull/2434)) + `load` command. ([\#2094](https://github.com/KYVENetwork/cometbft/v38/pull/2094)) +- `[jsonrpc]` enable HTTP basic auth in websocket client ([#2434](https://github.com/KYVENetwork/cometbft/v38/pull/2434)) - `[blocksync]` make the max number of downloaded blocks dynamic. Previously it was a const 600. Now it's `peersCount * maxPendingRequestsPerPeer (20)` - [\#2467](https://github.com/cometbft/cometbft/pull/2467) + [\#2467](https://github.com/KYVENetwork/cometbft/v38/pull/2467) - `[blocksync]` Request a block from peer B if we are approaching pool's height (less than 50 blocks) and the current peer A is slow in sending us the - block [\#2475](https://github.com/cometbft/cometbft/pull/2475) + block [\#2475](https://github.com/KYVENetwork/cometbft/v38/pull/2475) - `[blocksync]` Request the block N from peer B immediately after getting `NoBlockResponse` from peer A - [\#2475](https://github.com/cometbft/cometbft/pull/2475) + [\#2475](https://github.com/KYVENetwork/cometbft/v38/pull/2475) - `[blocksync]` Sort peers by download rate (the fastest peer is picked first) - [\#2475](https://github.com/cometbft/cometbft/pull/2475) + [\#2475](https://github.com/KYVENetwork/cometbft/v38/pull/2475) ## v0.38.5 @@ -53,7 +53,7 @@ for it). The goal of this release is to accept again all "noop" updates, like `v ### IMPROVEMENTS - `[consensus]` Add `chain_size_bytes` metric for measuring the size of the blockchain in bytes - ([\#2093](https://github.com/cometbft/cometbft/pull/2093)) + ([\#2093](https://github.com/KYVENetwork/cometbft/v38/pull/2093)) ## v0.38.4 @@ -61,7 +61,7 @@ for it). The goal of this release is to accept again all "noop" updates, like `v This release is aimed at those projects that have a dependency on CometBFT, release line `v0.38.x`, and make use of function `SaveBlockStoreState` in package -`github.com/cometbft/cometbft/store`. This function changed its signature in `v0.38.3`. +`github.com/KYVENetwork/cometbft/v38/store`. This function changed its signature in `v0.38.3`. This new release reverts the signature change so that upgrading to the latest release of CometBFT on `v0.38.x` does not require any change in the code depending on CometBFT. @@ -71,14 +71,14 @@ of CometBFT on `v0.38.x` does not require any change in the code depending on Co vote extension activation via `InitChain` and `FinalizeBlock`. Also, extend the manifest generator to produce different values of this new option - ([\#2065](https://github.com/cometbft/cometbft/pull/2065)) + ([\#2065](https://github.com/KYVENetwork/cometbft/v38/pull/2065)) ## v0.38.3 *January 17, 2024* This release addresses a high impact security issue reported in advisory -([ASA-2024-001](https://github.com/cometbft/cometbft/security/advisories/GHSA-qr8r-m495-7hc4)). +([ASA-2024-001](https://github.com/KYVENetwork/cometbft/v38/security/advisories/GHSA-qr8r-m495-7hc4)). There are other non-security bugs fixes that have been addressed since `v0.38.2` was released, as well as some improvements. Please check the list below for further details. @@ -86,31 +86,31 @@ Please check the list below for further details. ### BUG FIXES - `[consensus]` Fix for "Validation of `VoteExtensionsEnableHeight` can cause chain halt" - ([ASA-2024-001](https://github.com/cometbft/cometbft/security/advisories/GHSA-qr8r-m495-7hc4)) + ([ASA-2024-001](https://github.com/KYVENetwork/cometbft/v38/security/advisories/GHSA-qr8r-m495-7hc4)) - `[mempool]` Fix data races in `CListMempool` by making atomic the types of `height`, `txsBytes`, and - `notifiedTxsAvailable`. ([\#642](https://github.com/cometbft/cometbft/pull/642)) + `notifiedTxsAvailable`. ([\#642](https://github.com/KYVENetwork/cometbft/v38/pull/642)) - `[mempool]` The calculation method of tx size returned by calling proxyapp should be consistent with that of mempool - ([\#1687](https://github.com/cometbft/cometbft/pull/1687)) + ([\#1687](https://github.com/KYVENetwork/cometbft/v38/pull/1687)) - `[evidence]` When `VerifyCommitLight` & `VerifyCommitLightTrusting` are called as part of evidence verification, all signatures present in the evidence must be verified - ([\#1749](https://github.com/cometbft/cometbft/pull/1749)) + ([\#1749](https://github.com/KYVENetwork/cometbft/v38/pull/1749)) - `[crypto]` `SupportsBatchVerifier` returns false if public key is nil instead of dereferencing nil. - ([\#1825](https://github.com/cometbft/cometbft/pull/1825)) + ([\#1825](https://github.com/KYVENetwork/cometbft/v38/pull/1825)) - `[blocksync]` wait for `poolRoutine` to stop in `(*Reactor).OnStop` - ([\#1879](https://github.com/cometbft/cometbft/pull/1879)) + ([\#1879](https://github.com/KYVENetwork/cometbft/v38/pull/1879)) ### IMPROVEMENTS -- `[types]` Validate `Validator#Address` in `ValidateBasic` ([\#1715](https://github.com/cometbft/cometbft/pull/1715)) -- `[abci]` Increase ABCI socket message size limit to 2GB ([\#1730](https://github.com/cometbft/cometbft/pull/1730): @troykessler) -- `[state]` Save the state using a single DB batch ([\#1735](https://github.com/cometbft/cometbft/pull/1735)) +- `[types]` Validate `Validator#Address` in `ValidateBasic` ([\#1715](https://github.com/KYVENetwork/cometbft/v38/pull/1715)) +- `[abci]` Increase ABCI socket message size limit to 2GB ([\#1730](https://github.com/KYVENetwork/cometbft/v38/pull/1730): @troykessler) +- `[state]` Save the state using a single DB batch ([\#1735](https://github.com/KYVENetwork/cometbft/v38/pull/1735)) - `[store]` Save block using a single DB batch if block is less than 640kB, otherwise each block part is saved individually - ([\#1755](https://github.com/cometbft/cometbft/pull/1755)) + ([\#1755](https://github.com/KYVENetwork/cometbft/v38/pull/1755)) - `[rpc]` Support setting proxy from env to `DefaultHttpClient`. - ([\#1900](https://github.com/cometbft/cometbft/pull/1900)) -- `[rpc]` Use default port for HTTP(S) URLs when there is no explicit port ([\#1903](https://github.com/cometbft/cometbft/pull/1903)) -- `[crypto/merkle]` faster calculation of hashes ([#1921](https://github.com/cometbft/cometbft/pull/1921)) + ([\#1900](https://github.com/KYVENetwork/cometbft/v38/pull/1900)) +- `[rpc]` Use default port for HTTP(S) URLs when there is no explicit port ([\#1903](https://github.com/KYVENetwork/cometbft/v38/pull/1903)) +- `[crypto/merkle]` faster calculation of hashes ([#1921](https://github.com/KYVENetwork/cometbft/v38/pull/1921)) ## v0.38.2 @@ -125,11 +125,11 @@ Also fixes a small bug in the mempool for an experimental feature. - `[mempool]` Avoid infinite wait in transaction sending routine when using experimental parameters to limiting transaction gossiping to peers - ([\#1654](https://github.com/cometbft/cometbft/pull/1654)) + ([\#1654](https://github.com/KYVENetwork/cometbft/v38/pull/1654)) ### FEATURES -- `[mempool]` Add `nop` mempool ([\#1643](https://github.com/cometbft/cometbft/pull/1643)) +- `[mempool]` Add `nop` mempool ([\#1643](https://github.com/KYVENetwork/cometbft/v38/pull/1643)) If you want to use it, change mempool's `type` to `nop`: @@ -158,24 +158,24 @@ gossip. ### BUG FIXES - `[state/indexer]` Respect both height params while querying for events - ([\#1529](https://github.com/cometbft/cometbft/pull/1529)) + ([\#1529](https://github.com/KYVENetwork/cometbft/v38/pull/1529)) ### FEATURES - `[metrics]` Add metric for mempool size in bytes `SizeBytes`. - ([\#1512](https://github.com/cometbft/cometbft/pull/1512)) + ([\#1512](https://github.com/KYVENetwork/cometbft/v38/pull/1512)) ### IMPROVEMENTS - `[mempool]` Add experimental feature to limit the number of persistent peers and non-persistent peers to which the node gossip transactions. - ([\#1558](https://github.com/cometbft/cometbft/pull/1558)) - ([\#1584](https://github.com/cometbft/cometbft/pull/1584)) + ([\#1558](https://github.com/KYVENetwork/cometbft/v38/pull/1558)) + ([\#1584](https://github.com/KYVENetwork/cometbft/v38/pull/1584)) - `[config]` Add mempool parameters `experimental_max_gossip_connections_to_persistent_peers` and `experimental_max_gossip_connections_to_non_persistent_peers` for limiting the number of peers to - which the node gossip transactions. - ([\#1558](https://github.com/cometbft/cometbft/pull/1558)) - ([\#1584](https://github.com/cometbft/cometbft/pull/1584)) + which the node gossip transactions. + ([\#1558](https://github.com/KYVENetwork/cometbft/v38/pull/1558)) + ([\#1584](https://github.com/KYVENetwork/cometbft/v38/pull/1584)) ## v0.38.0 @@ -196,25 +196,25 @@ See the [specification](./spec/abci/) for more details on ABCI 2.0. ### BREAKING CHANGES - `[mempool]` Remove priority mempool. - ([\#260](https://github.com/cometbft/cometbft/issues/260)) + ([\#260](https://github.com/KYVENetwork/cometbft/v38/issues/260)) - `[config]` Remove `Version` field from `MempoolConfig`. - ([\#260](https://github.com/cometbft/cometbft/issues/260)) + ([\#260](https://github.com/KYVENetwork/cometbft/v38/issues/260)) - `[protobuf]` Remove fields `sender`, `priority`, and `mempool_error` from - `ResponseCheckTx`. ([\#260](https://github.com/cometbft/cometbft/issues/260)) + `ResponseCheckTx`. ([\#260](https://github.com/KYVENetwork/cometbft/v38/issues/260)) - `[crypto/merkle]` Do not allow verification of Merkle Proofs against empty trees (`nil` root). `Proof.ComputeRootHash` now panics when it encounters an error, but `Proof.Verify` does not panic - ([\#558](https://github.com/cometbft/cometbft/issues/558)) + ([\#558](https://github.com/KYVENetwork/cometbft/v38/issues/558)) - `[state/kvindexer]` Remove the function type from the event key stored in the database. This should be breaking only for people who forked CometBFT and interact directly with the indexers kvstore. - ([\#774](https://github.com/cometbft/cometbft/pull/774)) + ([\#774](https://github.com/KYVENetwork/cometbft/v38/pull/774)) - `[rpc]` Removed `begin_block_events` and `end_block_events` from `BlockResultsResponse`. The events are merged into one field called `finalize_block_events`. ([\#9427](https://github.com/tendermint/tendermint/issues/9427)) - `[pubsub]` Added support for big integers and big floats in the pubsub event query system. Breaking changes: function `Number` in package `libs/pubsub/query/syntax` changed its return value. - ([\#797](https://github.com/cometbft/cometbft/pull/797)) + ([\#797](https://github.com/KYVENetwork/cometbft/v38/pull/797)) - `[kvindexer]` Added support for big integers and big floats in the kvindexer. Breaking changes: function `Number` in package `libs/pubsub/query/syntax` changed its return value. - ([\#797](https://github.com/cometbft/cometbft/pull/797)) + ([\#797](https://github.com/KYVENetwork/cometbft/v38/pull/797)) - `[mempool]` Application can now set `ConsensusParams.Block.MaxBytes` to -1 to have visibility on all transactions in the mempool at `PrepareProposal` time. @@ -223,19 +223,19 @@ for people who forked CometBFT and interact directly with the indexers kvstore. If that is the case, the application MUST make sure that the total size of transactions returned in `ResponsePrepareProposal.txs` does not exceed `RequestPrepareProposal.max_tx_bytes`, otherwise CometBFT will panic. - ([\#980](https://github.com/cometbft/cometbft/issues/980)) + ([\#980](https://github.com/KYVENetwork/cometbft/v38/issues/980)) - `[node/state]` Add Go API to bootstrap block store and state store to a height. Make sure block sync starts syncing from bootstrapped height. ([\#1057](https://github.com/tendermint/tendermint/pull/#1057)) (@yihuang) - `[state/store]` Added Go functions to save height at which offline state sync is performed. ([\#1057](https://github.com/tendermint/tendermint/pull/#1057)) (@jmalicevic) - `[p2p]` Remove UPnP functionality - ([\#1113](https://github.com/cometbft/cometbft/issues/1113)) + ([\#1113](https://github.com/KYVENetwork/cometbft/v38/issues/1113)) - `[node]` Removed `ConsensusState()` accessor from `Node` struct - all access to consensus state should go via the reactor - ([\#1120](https://github.com/cometbft/cometbft/pull/1120)) + ([\#1120](https://github.com/KYVENetwork/cometbft/v38/pull/1120)) - `[state]` Signature of `ExtendVote` changed in `BlockExecutor`. It now includes the block whose precommit will be extended, an the state object. - ([\#1270](https://github.com/cometbft/cometbft/pull/1270)) + ([\#1270](https://github.com/KYVENetwork/cometbft/v38/pull/1270)) - `[state]` Move pruneBlocks from node/state to state/execution. ([\#6541](https://github.com/tendermint/tendermint/pull/6541)) - `[abci]` Move `app_hash` parameter from `Commit` to `FinalizeBlock` @@ -260,23 +260,23 @@ for people who forked CometBFT and interact directly with the indexers kvstore. ### BUG FIXES - `[kvindexer]` Forward porting the fixes done to the kvindexer in 0.37 in PR \#77 - ([\#423](https://github.com/cometbft/cometbft/pull/423)) + ([\#423](https://github.com/KYVENetwork/cometbft/v38/pull/423)) - `[consensus]` Unexpected error conditions in `ApplyBlock` are non-recoverable, so ignoring the error and carrying on is a bug. We replaced a `return` that disregarded the error by a `panic`. - ([\#496](https://github.com/cometbft/cometbft/pull/496)) + ([\#496](https://github.com/KYVENetwork/cometbft/v38/pull/496)) - `[consensus]` Rename `(*PeerState).ToJSON` to `MarshalJSON` to fix a logging data race - ([\#524](https://github.com/cometbft/cometbft/pull/524)) + ([\#524](https://github.com/KYVENetwork/cometbft/v38/pull/524)) - `[light]` Fixed an edge case where a light client would panic when attempting to query a node that (1) has started from a non-zero height and (2) does not yet have any data. The light client will now, correctly, not panic _and_ keep the node in its list of providers in the same way it would if it queried a node starting from height zero that does not yet have data - ([\#575](https://github.com/cometbft/cometbft/issues/575)) + ([\#575](https://github.com/KYVENetwork/cometbft/v38/issues/575)) - `[abci]` Restore the snake_case naming in JSON serialization of - `ExecTxResult` ([\#855](https://github.com/cometbft/cometbft/issues/855)). + `ExecTxResult` ([\#855](https://github.com/KYVENetwork/cometbft/v38/issues/855)). - `[consensus]` Avoid recursive call after rename to (*PeerState).MarshalJSON - ([\#863](https://github.com/cometbft/cometbft/pull/863)) + ([\#863](https://github.com/KYVENetwork/cometbft/v38/pull/863)) - `[mempool/clist_mempool]` Prevent a transaction to appear twice in the mempool - ([\#890](https://github.com/cometbft/cometbft/pull/890): @otrack) + ([\#890](https://github.com/KYVENetwork/cometbft/v38/pull/890): @otrack) - `[docker]` Ensure Docker image uses consistent version of Go. ([\#9462](https://github.com/tendermint/tendermint/pull/9462)) - `[abci-cli]` Fix broken abci-cli help command. @@ -286,8 +286,8 @@ for people who forked CometBFT and interact directly with the indexers kvstore. - `[rpc/grpc]` Mark the gRPC broadcast API as deprecated. It will be superseded by a broader API as part of - [\#81](https://github.com/cometbft/cometbft/issues/81) - ([\#650](https://github.com/cometbft/cometbft/issues/650)) + [\#81](https://github.com/KYVENetwork/cometbft/v38/issues/81) + ([\#650](https://github.com/KYVENetwork/cometbft/v38/issues/650)) ### FEATURES @@ -297,7 +297,7 @@ for people who forked CometBFT and interact directly with the indexers kvstore. clients to have the same concurrency model as remote clients (i.e. one mutex per client "connection", for each of the four ABCI "connections"). ([tendermint/tendermint\#9830](https://github.com/tendermint/tendermint/pull/9830) - and [\#1145](https://github.com/cometbft/cometbft/pull/1145)) + and [\#1145](https://github.com/KYVENetwork/cometbft/v38/pull/1145)) - `[proxy]` Introduce `NewUnsyncLocalClientCreator`, which allows local ABCI clients to have the same concurrency model as remote clients (i.e. one mutex per client "connection", for each of the four ABCI "connections"). @@ -307,27 +307,27 @@ for people who forked CometBFT and interact directly with the indexers kvstore. ### IMPROVEMENTS - `[blocksync]` Generate new metrics during BlockSync - ([\#543](https://github.com/cometbft/cometbft/pull/543)) + ([\#543](https://github.com/KYVENetwork/cometbft/v38/pull/543)) - `[jsonrpc/client]` Improve the error message for client errors stemming from bad HTTP responses. - ([cometbft/cometbft\#638](https://github.com/cometbft/cometbft/pull/638)) + ([cometbft/cometbft\#638](https://github.com/KYVENetwork/cometbft/v38/pull/638)) - `[rpc]` Remove response data from response failure logs in order to prevent large quantities of log data from being produced - ([\#654](https://github.com/cometbft/cometbft/issues/654)) + ([\#654](https://github.com/KYVENetwork/cometbft/v38/issues/654)) - `[pubsub/kvindexer]` Numeric query conditions and event values are represented as big floats with default precision of 125. Integers are read as "big ints" and represented with as many bits as they need when converting to floats. - ([\#797](https://github.com/cometbft/cometbft/pull/797)) -- `[node]` Make handshake cancelable ([cometbft/cometbft\#857](https://github.com/cometbft/cometbft/pull/857)) + ([\#797](https://github.com/KYVENetwork/cometbft/v38/pull/797)) +- `[node]` Make handshake cancelable ([cometbft/cometbft\#857](https://github.com/KYVENetwork/cometbft/v38/pull/857)) - `[consensus]` New metrics (counters) to track duplicate votes and block parts. - ([\#896](https://github.com/cometbft/cometbft/pull/896)) + ([\#896](https://github.com/KYVENetwork/cometbft/v38/pull/896)) - `[mempool]` Application can now set `ConsensusParams.Block.MaxBytes` to -1 to gain more control on the max size of transactions in a block. It also allows the application to have visibility on all transactions in the mempool at `PrepareProposal` time. - ([\#980](https://github.com/cometbft/cometbft/pull/980)) -- `[node]` Close evidence.db OnStop ([cometbft/cometbft\#1210](https://github.com/cometbft/cometbft/pull/1210): @chillyvee) + ([\#980](https://github.com/KYVENetwork/cometbft/v38/pull/980)) +- `[node]` Close evidence.db OnStop ([cometbft/cometbft\#1210](https://github.com/KYVENetwork/cometbft/v38/pull/1210): @chillyvee) - `[state]` Make logging `block_app_hash` and `app_hash` consistent by logging them both as hex. - ([\#1264](https://github.com/cometbft/cometbft/pull/1264)) + ([\#1264](https://github.com/KYVENetwork/cometbft/v38/pull/1264)) - `[crypto/merkle]` Improve HashAlternatives performance ([\#6443](https://github.com/tendermint/tendermint/pull/6443)) - `[p2p/pex]` Improve addrBook.hash performance @@ -360,7 +360,7 @@ the v0.37 release. We'd love your feedback on this release! Please reach out to us via one of our communication channels, such as [GitHub -Discussions](https://github.com/cometbft/cometbft/discussions), with any of your +Discussions](https://github.com/KYVENetwork/cometbft/v38/discussions), with any of your questions, comments and/or concerns. See below for more details. @@ -368,13 +368,13 @@ See below for more details. ### BREAKING CHANGES - The `TMHOME` environment variable was renamed to `CMTHOME`, and all environment variables starting with `TM_` are instead prefixed with `CMT_` - ([\#211](https://github.com/cometbft/cometbft/issues/211)) + ([\#211](https://github.com/KYVENetwork/cometbft/v38/issues/211)) - `[p2p]` Reactor `Send`, `TrySend` and `Receive` renamed to `SendEnvelope`, `TrySendEnvelope` and `ReceiveEnvelope` to allow metrics to be appended to messages and measure bytes sent/received. - ([\#230](https://github.com/cometbft/cometbft/pull/230)) + ([\#230](https://github.com/KYVENetwork/cometbft/v38/pull/230)) - Bump minimum Go version to 1.20 - ([\#385](https://github.com/cometbft/cometbft/issues/385)) + ([\#385](https://github.com/KYVENetwork/cometbft/v38/issues/385)) - `[abci]` Make length delimiter encoding consistent (`uint64`) between ABCI and P2P wire-level protocols ([\#5783](https://github.com/tendermint/tendermint/pull/5783)) @@ -422,12 +422,12 @@ See below for more details. - `[state/kvindexer]` Fixed the default behaviour of the kvindexer to index and query attributes by events in which they occur. In 0.34.25 this was mitigated by a separated RPC flag. @jmalicevic - ([\#77](https://github.com/cometbft/cometbft/pull/77)) + ([\#77](https://github.com/KYVENetwork/cometbft/v38/pull/77)) - `[state/kvindexer]` Resolved crashes when event values contained slashes, introduced after adding event sequences in - [\#77](https://github.com/cometbft/cometbft/pull/77). @jmalicevic - ([\#382](https://github.com/cometbft/cometbft/pull/382)) -- `[consensus]` ([\#386](https://github.com/cometbft/cometbft/pull/386)) Short-term fix for the case when `needProofBlock` cannot find previous block meta by defaulting to the creation of a new proof block. (@adizere) + [\#77](https://github.com/KYVENetwork/cometbft/v38/pull/77). @jmalicevic + ([\#382](https://github.com/KYVENetwork/cometbft/v38/pull/382)) +- `[consensus]` ([\#386](https://github.com/KYVENetwork/cometbft/v38/pull/386)) Short-term fix for the case when `needProofBlock` cannot find previous block meta by defaulting to the creation of a new proof block. (@adizere) - Special thanks to the [Vega.xyz](https://vega.xyz/) team, and in particular to Zohar (@ze97286), for reporting the problem and working with us to get to a fix. - `[docker]` enable cross platform build using docker buildx ([\#9073](https://github.com/tendermint/tendermint/pull/9073)) @@ -453,11 +453,11 @@ See below for more details. - `[e2e]` Add functionality for uncoordinated (minor) upgrades ([\#56](https://github.com/tendermint/tendermint/pull/56)) - `[tools/tm-signer-harness]` Remove the folder as it is unused - ([\#136](https://github.com/cometbft/cometbft/issues/136)) + ([\#136](https://github.com/KYVENetwork/cometbft/v38/issues/136)) - `[p2p]` Reactor `Send`, `TrySend` and `Receive` renamed to `SendEnvelope`, `TrySendEnvelope` and `ReceiveEnvelope` to allow metrics to be appended to messages and measure bytes sent/received. - ([\#230](https://github.com/cometbft/cometbft/pull/230)) + ([\#230](https://github.com/KYVENetwork/cometbft/v38/pull/230)) - `[abci]` Added `AbciVersion` to `RequestInfo` allowing applications to check ABCI version when connecting to CometBFT. ([\#5706](https://github.com/tendermint/tendermint/pull/5706)) @@ -489,7 +489,7 @@ our [upgrading guidelines](./UPGRADING.md). If you have any questions, comments, concerns or feedback on this release, we would love to hear from you! Please contact us via [GitHub -Discussions](https://github.com/cometbft/cometbft/discussions), +Discussions](https://github.com/KYVENetwork/cometbft/v38/discussions), [Discord](https://discord.gg/cosmosnetwork) (in the `#cometbft` channel) or [Telegram](https://t.me/CometBFT). @@ -499,12 +499,12 @@ to this release! ### BREAKING CHANGES - Rename binary to `cometbft` and Docker image to `cometbft/cometbft` - ([\#152](https://github.com/cometbft/cometbft/pull/152)) + ([\#152](https://github.com/KYVENetwork/cometbft/v38/pull/152)) - The `TMHOME` environment variable was renamed to `CMTHOME`, and all environment variables starting with `TM_` are instead prefixed with `CMT_` - ([\#211](https://github.com/cometbft/cometbft/issues/211)) + ([\#211](https://github.com/KYVENetwork/cometbft/v38/issues/211)) - Use Go 1.19 to build CometBFT, since Go 1.18 has reached end-of-life. - ([\#360](https://github.com/cometbft/cometbft/issues/360)) + ([\#360](https://github.com/KYVENetwork/cometbft/v38/issues/360)) ### BUG FIXES @@ -513,10 +513,10 @@ to this release! ([\#4](https://github.com/informalsystems/tendermint/pull/4)) - `[state/kvindexer]` Resolved crashes when event values contained slashes, introduced after adding event sequences. - (\#[383](https://github.com/cometbft/cometbft/pull/383): @jmalicevic) + (\#[383](https://github.com/KYVENetwork/cometbft/v38/pull/383): @jmalicevic) - `[consensus]` Short-term fix for the case when `needProofBlock` cannot find previous block meta by defaulting to the creation of a new proof block. - ([\#386](https://github.com/cometbft/cometbft/pull/386): @adizere) + ([\#386](https://github.com/KYVENetwork/cometbft/v38/pull/386): @adizere) - Special thanks to the [Vega.xyz](https://vega.xyz/) team, and in particular to Zohar (@ze97286), for reporting the problem and working with us to get to a fix. @@ -530,9 +530,9 @@ to this release! - Replace [tm-db](https://github.com/tendermint/tm-db) with [cometbft-db](https://github.com/cometbft/cometbft-db) - ([\#160](https://github.com/cometbft/cometbft/pull/160)) + ([\#160](https://github.com/KYVENetwork/cometbft/v38/pull/160)) - Bump tm-load-test to v1.3.0 to remove implicit dependency on Tendermint Core - ([\#165](https://github.com/cometbft/cometbft/pull/165)) + ([\#165](https://github.com/KYVENetwork/cometbft/v38/pull/165)) - `[crypto]` Update to use btcec v2 and the latest btcutil ([tendermint/tendermint\#9787](https://github.com/tendermint/tendermint/pull/9787): @wcsiu) @@ -548,12 +548,12 @@ to this release! - `[e2e]` Add functionality for uncoordinated (minor) upgrades ([\#56](https://github.com/tendermint/tendermint/pull/56)) - `[tools/tm-signer-harness]` Remove the folder as it is unused - ([\#136](https://github.com/cometbft/cometbft/issues/136)) + ([\#136](https://github.com/KYVENetwork/cometbft/v38/issues/136)) - Append the commit hash to the version of CometBFT being built - ([\#204](https://github.com/cometbft/cometbft/pull/204)) + ([\#204](https://github.com/KYVENetwork/cometbft/v38/pull/204)) - `[mempool/v1]` Suppress "rejected bad transaction" in priority mempool logs by reducing log level from info to debug - ([\#314](https://github.com/cometbft/cometbft/pull/314): @JayT106) + ([\#314](https://github.com/KYVENetwork/cometbft/v38/pull/314): @JayT106) - `[consensus]` Add `consensus_block_gossip_parts_received` and `consensus_step_duration_seconds` metrics in order to aid in investigating the impact of database compaction on consensus performance diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 812e329e679..01f50f45940 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,14 +9,14 @@ CometBFT project or a potential fork. When targeting the main CometBFT project, the following process leads to the best chance of landing changes in `main`. All work on the code base should be motivated by a [GitHub -Issue](https://github.com/cometbft/cometbft/issues). -[Search](https://github.com/cometbft/cometbft/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) +Issue](https://github.com/KYVENetwork/cometbft/v38/issues). +[Search](https://github.com/KYVENetwork/cometbft/v38/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) is a good place to start when looking for places to contribute. If you would like to work on an issue which already exists, please indicate so by leaving a comment. All new contributions should start with a [GitHub -Issue](https://github.com/cometbft/cometbft/issues/new/choose). The issue helps +Issue](https://github.com/KYVENetwork/cometbft/v38/issues/new/choose). The issue helps capture the problem you're trying to solve and allows for early feedback. Once the issue is created the process can proceed in different directions depending on how well defined the problem and potential solution are. If the change is @@ -25,7 +25,7 @@ heartfelt emoji. If the issue would benefit from thorough discussion, maintainers may request that you create a [Request For -Comment](https://github.com/cometbft/cometbft/tree/main/docs/rfc) in the +Comment](https://github.com/KYVENetwork/cometbft/v38/tree/main/docs/rfc) in the CometBFT repo. Discussion at the RFC stage will build collective understanding of the dimensions of the problems and help structure conversations around trade-offs. diff --git a/DOCKER/README.md b/DOCKER/README.md index 33a6bd1021a..5d65b930128 100644 --- a/DOCKER/README.md +++ b/DOCKER/README.md @@ -4,7 +4,7 @@ DockerHub tags for official releases are [here](https://hub.docker.com/r/cometbft/cometbft/tags/). The "latest" tag will always point to the highest version number. -Official releases can be found [here](https://github.com/cometbft/cometbft/releases). +Official releases can be found [here](https://github.com/KYVENetwork/cometbft/v38/releases). The Dockerfile for CometBFT is not expected to change in the near future. The main file used for all builds can be found [here](https://raw.githubusercontent.com/cometbft/cometbft/main/DOCKER/Dockerfile). @@ -13,7 +13,7 @@ Respective versioned files can be found at `https://raw.githubusercontent.com/co ## Quick reference - **Where to get help:** -- **Where to file issues:** +- **Where to file issues:** - **Supported Docker versions:** [the latest release](https://github.com/moby/moby/releases) (down to 1.6 on a best-effort basis) ## CometBFT @@ -37,7 +37,7 @@ docker run -it --rm -v "/tmp:/cometbft" cometbft/cometbft node --proxy_app=kvsto ## Local cluster -To run a 4-node network, see the `Makefile` in the root of [the repo](https://github.com/cometbft/cometbft/blob/v0.38.x/Makefile) and run: +To run a 4-node network, see the `Makefile` in the root of [the repo](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/Makefile) and run: ```sh make build-linux @@ -49,8 +49,8 @@ Note that this will build and use a different image than the ones provided here. ## License -- CometBFT's license is [Apache 2.0](https://github.com/cometbft/cometbft/blob/v0.38.x/LICENSE). +- CometBFT's license is [Apache 2.0](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/LICENSE). ## Contributing -Contributions are most welcome! See the [contributing file](https://github.com/cometbft/cometbft/blob/v0.38.x/CONTRIBUTING.md) for more information. +Contributions are most welcome! See the [contributing file](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/CONTRIBUTING.md) for more information. diff --git a/Makefile b/Makefile index a1c0109623e..b9939c0554c 100644 --- a/Makefile +++ b/Makefile @@ -136,8 +136,8 @@ endif proto-gen: check-proto-deps @echo "Generating Protobuf files" @go run github.com/bufbuild/buf/cmd/buf generate - @mv ./proto/tendermint/abci/types.pb.go ./abci/types/ - @cp ./proto/tendermint/rpc/grpc/types.pb.go ./rpc/grpc + @mv ./proto/cometbft/v38/abci/types.pb.go ./abci/types/ + @cp ./proto/cometbft/v38/rpc/grpc/types.pb.go ./rpc/grpc .PHONY: proto-gen # These targets are provided for convenience and are intended for local @@ -208,7 +208,7 @@ go.sum: go.mod draw_deps: @# requires brew install graphviz or apt-get install graphviz go get github.com/RobotsAndPencils/goviz - @goviz -i github.com/cometbft/cometbft/cmd/cometbft -d 3 | dot -Tpng -o dependency-graph.png + @goviz -i github.com/KYVENetwork/cometbft/v38/cmd/cometbft -d 3 | dot -Tpng -o dependency-graph.png .PHONY: draw_deps get_deps_bin_size: @@ -253,7 +253,7 @@ lint: @go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run .PHONY: lint -# https://github.com/cometbft/cometbft/pull/1925#issuecomment-1875127862 +# https://github.com/KYVENetwork/cometbft/v38/pull/1925#issuecomment-1875127862 # Revisit using lint-format after CometBFT v1 release and/or after 2024-06-01. #lint-format: # @go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run --fix diff --git a/README.md b/README.md index 9dffcb6974f..5d035ef447e 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,13 @@ Complete documentation can be found on the ## Releases Please do not depend on `main` as your production branch. Use -[releases](https://github.com/cometbft/cometbft/releases) instead. +[releases](https://github.com/KYVENetwork/cometbft/v38/releases) instead. If you intend to run CometBFT in production, we're happy to help. To contact us, in order of preference: - [Create a new discussion on - GitHub](https://github.com/cometbft/cometbft/discussions) + GitHub](https://github.com/KYVENetwork/cometbft/v38/discussions) - Reach out to us via [Telegram](https://t.me/CometBFT) - [Join the Cosmos Network Discord](https://discord.gg/cosmosnetwork) and discuss in @@ -170,7 +170,7 @@ maintains [cometbft.com](https://cometbft.com). [smr]: https://en.wikipedia.org/wiki/State_machine_replication [Blockchain]: https://en.wikipedia.org/wiki/Blockchain [version-badge]: https://img.shields.io/github/v/release/cometbft/cometbft.svg -[version-url]: https://github.com/cometbft/cometbft/releases/latest +[version-url]: https://github.com/KYVENetwork/cometbft/v38/releases/latest [api-badge]: https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 [api-url]: https://pkg.go.dev/github.com/cometbft/cometbft [go-badge]: https://img.shields.io/badge/go-1.20-blue.svg @@ -178,23 +178,23 @@ maintains [cometbft.com](https://cometbft.com). [discord-badge]: https://img.shields.io/discord/669268347736686612.svg [discord-url]: https://discord.gg/cosmosnetwork [license-badge]: https://img.shields.io/github/license/cometbft/cometbft.svg -[license-url]: https://github.com/cometbft/cometbft/blob/main/LICENSE -[sg-badge]: https://sourcegraph.com/github.com/cometbft/cometbft/-/badge.svg +[license-url]: https://github.com/KYVENetwork/cometbft/v38/blob/main/LICENSE +[sg-badge]: https://sourcegraph.com/github.com/KYVENetwork/cometbft/v38/-/badge.svg [sg-url]: https://sourcegraph.com/github.com/cometbft/cometbft?badge -[tests-url]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml -[tests-url-v038x]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml?query=branch%3Av0.38.x -[tests-url-v037x]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml?query=branch%3Av0.37.x -[tests-url-v034x]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml?query=branch%3Av0.34.x -[tests-badge]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml/badge.svg?branch=main -[tests-badge-v038x]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml/badge.svg?branch=v0.38.x -[tests-badge-v037x]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml/badge.svg?branch=v0.37.x -[tests-badge-v034x]: https://github.com/cometbft/cometbft/actions/workflows/tests.yml/badge.svg?branch=v0.34.x -[lint-badge]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml/badge.svg?branch=main -[lint-badge-v034x]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml/badge.svg?branch=v0.34.x -[lint-badge-v037x]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml/badge.svg?branch=v0.37.x -[lint-badge-v038x]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml/badge.svg?branch=v0.38.x -[lint-url]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml -[lint-url-v034x]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml?query=branch%3Av0.34.x -[lint-url-v037x]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml?query=branch%3Av0.37.x -[lint-url-v038x]: https://github.com/cometbft/cometbft/actions/workflows/lint.yml?query=branch%3Av0.38.x +[tests-url]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml +[tests-url-v038x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml?query=branch%3Av0.38.x +[tests-url-v037x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml?query=branch%3Av0.37.x +[tests-url-v034x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml?query=branch%3Av0.34.x +[tests-badge]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml/badge.svg?branch=main +[tests-badge-v038x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml/badge.svg?branch=v0.38.x +[tests-badge-v037x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml/badge.svg?branch=v0.37.x +[tests-badge-v034x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/tests.yml/badge.svg?branch=v0.34.x +[lint-badge]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml/badge.svg?branch=main +[lint-badge-v034x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml/badge.svg?branch=v0.34.x +[lint-badge-v037x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml/badge.svg?branch=v0.37.x +[lint-badge-v038x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml/badge.svg?branch=v0.38.x +[lint-url]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml +[lint-url-v034x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml?query=branch%3Av0.34.x +[lint-url-v037x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml?query=branch%3Av0.37.x +[lint-url-v038x]: https://github.com/KYVENetwork/cometbft/v38/actions/workflows/lint.yml?query=branch%3Av0.38.x [tm-core]: https://github.com/tendermint/tendermint diff --git a/RELEASES.md b/RELEASES.md index a4ca108a993..15ac097fa06 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -70,15 +70,15 @@ the 0.38.x line. The following links are to always point to `main`, regardless of where they occur in the codebase: - * `https://github.com/cometbft/cometbft/blob/main/LICENSE` + * `https://github.com/KYVENetwork/cometbft/v38/blob/main/LICENSE` Be sure to search for all of the following links and replace `main` with your corresponding branch label or version (e.g. `v0.38.x` or `v0.38`): - * `github.com/cometbft/cometbft/blob/main` -> - `github.com/cometbft/cometbft/blob/v0.38.x` - * `github.com/cometbft/cometbft/tree/main` -> - `github.com/cometbft/cometbft/tree/v0.38.x` + * `github.com/KYVENetwork/cometbft/v38/blob/main` -> + `github.com/KYVENetwork/cometbft/v38/blob/v0.38.x` + * `github.com/KYVENetwork/cometbft/v38/tree/main` -> + `github.com/KYVENetwork/cometbft/v38/tree/v0.38.x` * `docs.cometbft.com/main` -> `docs.cometbft.com/v0.38` Once you have updated all of the relevant documentation: @@ -109,13 +109,13 @@ After doing these steps, go back to `main` and do the following: 2. Add a new section to the Mergify config (`.github/mergify.yml`) to enable the backport bot to work on this branch, and add a corresponding `backport-to-v0.38.x` - [label](https://github.com/cometbft/cometbft/labels) so the bot can be triggered. + [label](https://github.com/KYVENetwork/cometbft/v38/labels) so the bot can be triggered. 3. Add a new section to the Dependabot config (`.github/dependabot.yml`) to enable automatic update of Go dependencies on this branch. Copy and edit one of the existing branch configurations to set the correct `target-branch`. -[e2e]: https://github.com/cometbft/cometbft/blob/main/.github/workflows/e2e-nightly-main.yml +[e2e]: https://github.com/KYVENetwork/cometbft/v38/blob/main/.github/workflows/e2e-nightly-main.yml ## Pre-releases @@ -157,7 +157,7 @@ backport branch (see above). Otherwise: 1. Start from the backport branch (e.g. `v0.38.x`). 2. Run the integration tests and the E2E nightlies (which can be triggered from the GitHub UI; - e.g., ). + e.g., ). 3. Prepare the pre-release documentation: * Build the changelog with [unclog] _without_ doing an unclog release, and commit the built changelog. This ensures that all changelog entries appear @@ -273,7 +273,7 @@ operators. ### Nightly End-To-End Tests The CometBFT team maintains [a set of end-to-end -tests](https://github.com/cometbft/cometbft/blob/main/test/e2e/README.md#L1) +tests](https://github.com/KYVENetwork/cometbft/v38/blob/main/test/e2e/README.md#L1) that run each night on the latest commit of the project and on the code in the tip of each supported backport branch. These tests start a network of containerized CometBFT processes and run automated checks that the network diff --git a/STYLE_GUIDE.md b/STYLE_GUIDE.md index 5eeceb6c84f..a17461b2e95 100644 --- a/STYLE_GUIDE.md +++ b/STYLE_GUIDE.md @@ -77,12 +77,12 @@ Sometimes it's necessary to rename libraries to avoid naming collisions or ambig * Separate imports into blocks - one for the standard lib, one for external libs and one for application libs. * Here are some common library labels for consistency: * dbm "github.com/cometbft/cometbft-db" - * cmtcmd "github.com/cometbft/cometbft/cmd/cometbft/commands" - * cmtcfg "github.com/cometbft/cometbft/config" - * cmttypes "github.com/cometbft/cometbft/types" + * cmtcmd "github.com/KYVENetwork/cometbft/v38/cmd/cometbft/commands" + * cmtcfg "github.com/KYVENetwork/cometbft/v38/config" + * cmttypes "github.com/KYVENetwork/cometbft/v38/types" * Never use anonymous imports (the `.`), for example, `cmtlibs/common` or anything else. * When importing a pkg from the `cmt/libs` directory, prefix the pkg alias with cmt. - * cmtbits "github.com/cometbft/cometbft/libs/bits" + * cmtbits "github.com/KYVENetwork/cometbft/v38/libs/bits" * tip: Use the `_` library import to import a library for initialization effects (side effects) ## Dependencies diff --git a/UPGRADING.md b/UPGRADING.md index 4f1e4cb3d15..6f4a4ee6883 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -146,6 +146,6 @@ please see the [Tendermint Core upgrading instructions][tmupgrade]. [v03424]: https://github.com/tendermint/tendermint/releases/tag/v0.34.24 [v03425]: https://github.com/informalsystems/tendermint/releases/tag/v0.34.25 [v03426]: https://github.com/informalsystems/tendermint/releases/tag/v0.34.26 -[discussions]: https://github.com/cometbft/cometbft/discussions +[discussions]: https://github.com/KYVENetwork/cometbft/v38/discussions [tmupgrade]: https://github.com/tendermint/tendermint/blob/35581cf54ec436b8c37fabb43fdaa3f48339a170/UPGRADING.md [go120]: https://go.dev/blog/go1.20 diff --git a/abci/README.md b/abci/README.md index fbe09878ae6..6404aa56085 100644 --- a/abci/README.md +++ b/abci/README.md @@ -18,7 +18,7 @@ To get up and running quickly, see the [getting started guide](../docs/app-dev/g A detailed description of the ABCI methods and message types is contained in: -- [The main spec](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/abci/README.md) +- [The main spec](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/abci/README.md) - [A protobuf file](../proto/tendermint/types/types.proto) - [A Go interface](./types/application.go) diff --git a/abci/client/client.go b/abci/client/client.go index 2802ab7d510..7061137f3b1 100644 --- a/abci/client/client.go +++ b/abci/client/client.go @@ -5,9 +5,9 @@ import ( "fmt" "sync" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) const ( diff --git a/abci/client/grpc_client.go b/abci/client/grpc_client.go index 926e679d687..2ca27549ba7 100644 --- a/abci/client/grpc_client.go +++ b/abci/client/grpc_client.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) var _ Client = (*grpcClient)(nil) diff --git a/abci/client/grpc_client_test.go b/abci/client/grpc_client_test.go index ff57d782bf8..fb64b99448f 100644 --- a/abci/client/grpc_client_test.go +++ b/abci/client/grpc_client_test.go @@ -14,11 +14,11 @@ import ( "golang.org/x/net/context" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" - abciserver "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/abci/types" + abciserver "github.com/KYVENetwork/cometbft/v38/abci/server" + "github.com/KYVENetwork/cometbft/v38/abci/types" ) func TestGRPC(t *testing.T) { diff --git a/abci/client/local_client.go b/abci/client/local_client.go index 63345a56265..43905a1f5e9 100644 --- a/abci/client/local_client.go +++ b/abci/client/local_client.go @@ -3,9 +3,9 @@ package abcicli import ( "context" - types "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + types "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // NOTE: use defer to unlock mutex because Application might panic (e.g., in diff --git a/abci/client/mocks/client.go b/abci/client/mocks/client.go index 6494bdb5db7..05aba60ade8 100644 --- a/abci/client/mocks/client.go +++ b/abci/client/mocks/client.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - abcicli "github.com/cometbft/cometbft/abci/client" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" - log "github.com/cometbft/cometbft/libs/log" + log "github.com/KYVENetwork/cometbft/v38/libs/log" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/KYVENetwork/cometbft/v38/abci/types" ) // Client is an autogenerated mock type for the Client type diff --git a/abci/client/socket_client.go b/abci/client/socket_client.go index 47382e31292..6b0211c744c 100644 --- a/abci/client/socket_client.go +++ b/abci/client/socket_client.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/libs/timer" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/libs/timer" ) const ( diff --git a/abci/client/socket_client_test.go b/abci/client/socket_client_test.go index f4bade22934..8c7dc5268ff 100644 --- a/abci/client/socket_client_test.go +++ b/abci/client/socket_client_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/abci/types" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/server" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) func TestCalls(t *testing.T) { diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go index 17d9230105d..d408f404359 100644 --- a/abci/cmd/abci-cli/abci-cli.go +++ b/abci/cmd/abci-cli/abci-cli.go @@ -11,16 +11,16 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/abci/server" - servertest "github.com/cometbft/cometbft/abci/tests/server" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/abci/version" - "github.com/cometbft/cometbft/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/abci/server" + servertest "github.com/KYVENetwork/cometbft/v38/abci/tests/server" + "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/abci/version" + "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" ) // client is a global variable so it can be reused by the console diff --git a/abci/example/kvstore/helpers.go b/abci/example/kvstore/helpers.go index 8f9575191e0..06b9d9e2965 100644 --- a/abci/example/kvstore/helpers.go +++ b/abci/example/kvstore/helpers.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/abci/types" - cryptoencoding "github.com/cometbft/cometbft/crypto/encoding" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cryptoencoding "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" ) // RandVal creates one random validator, with a key derived diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index b403d0c9fa3..d99ee56fe67 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -12,11 +12,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/abci/types" - cryptoencoding "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/log" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cryptoencoding "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cryptoproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/version" ) var ( diff --git a/abci/example/kvstore/kvstore_test.go b/abci/example/kvstore/kvstore_test.go index 60ef73fe1b8..5fe25ddb17b 100644 --- a/abci/example/kvstore/kvstore_test.go +++ b/abci/example/kvstore/kvstore_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" - abcicli "github.com/cometbft/cometbft/abci/client" - abciserver "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/abci/types" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + abciserver "github.com/KYVENetwork/cometbft/v38/abci/server" + "github.com/KYVENetwork/cometbft/v38/abci/types" ) const ( diff --git a/abci/server/grpc_server.go b/abci/server/grpc_server.go index e0eaefa648e..90fc01ad743 100644 --- a/abci/server/grpc_server.go +++ b/abci/server/grpc_server.go @@ -6,9 +6,9 @@ import ( "google.golang.org/grpc" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) type GRPCServer struct { diff --git a/abci/server/server.go b/abci/server/server.go index 0577b504558..602486739a1 100644 --- a/abci/server/server.go +++ b/abci/server/server.go @@ -10,8 +10,8 @@ package server import ( "fmt" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) // NewServer is a utility function for out of process applications to set up either a socket or diff --git a/abci/server/socket_server.go b/abci/server/socket_server.go index d0b919200c7..219f71a523b 100644 --- a/abci/server/socket_server.go +++ b/abci/server/socket_server.go @@ -10,11 +10,11 @@ import ( "os" "runtime" - "github.com/cometbft/cometbft/abci/types" - cmtlog "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtlog "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // SocketServer is the server-side implementation of the TSP (Tendermint Socket Protocol) diff --git a/abci/tests/benchmarks/parallel/parallel.go b/abci/tests/benchmarks/parallel/parallel.go index 974ba381538..4c794a08d16 100644 --- a/abci/tests/benchmarks/parallel/parallel.go +++ b/abci/tests/benchmarks/parallel/parallel.go @@ -5,8 +5,8 @@ import ( "fmt" "log" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" ) func main() { diff --git a/abci/tests/benchmarks/simple/simple.go b/abci/tests/benchmarks/simple/simple.go index 2aaa056d068..0443097c229 100644 --- a/abci/tests/benchmarks/simple/simple.go +++ b/abci/tests/benchmarks/simple/simple.go @@ -7,8 +7,8 @@ import ( "log" "reflect" - "github.com/cometbft/cometbft/abci/types" - cmtnet "github.com/cometbft/cometbft/libs/net" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" ) func main() { diff --git a/abci/tests/client_server_test.go b/abci/tests/client_server_test.go index 79737a203c0..68cc30ad152 100644 --- a/abci/tests/client_server_test.go +++ b/abci/tests/client_server_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/assert" - abciclient "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - abciserver "github.com/cometbft/cometbft/abci/server" + abciclient "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abciserver "github.com/KYVENetwork/cometbft/v38/abci/server" ) func TestClientServerNoAddrPrefix(t *testing.T) { diff --git a/abci/tests/server/client.go b/abci/tests/server/client.go index 9c33c8eb7d2..50d3a4c4774 100644 --- a/abci/tests/server/client.go +++ b/abci/tests/server/client.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/types" - cmtrand "github.com/cometbft/cometbft/libs/rand" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) func InitChain(ctx context.Context, client abcicli.Client) error { diff --git a/abci/types/messages.go b/abci/types/messages.go index 44d2f956838..b43ae38c984 100644 --- a/abci/types/messages.go +++ b/abci/types/messages.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/libs/protoio" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" ) const ( diff --git a/abci/types/messages_test.go b/abci/types/messages_test.go index 624096cbec8..09bc455a049 100644 --- a/abci/types/messages_test.go +++ b/abci/types/messages_test.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/assert" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) func TestMarshalJSON(t *testing.T) { diff --git a/abci/types/mocks/application.go b/abci/types/mocks/application.go index b7f0b51ded0..142589017dc 100644 --- a/abci/types/mocks/application.go +++ b/abci/types/mocks/application.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/KYVENetwork/cometbft/v38/abci/types" mock "github.com/stretchr/testify/mock" ) diff --git a/abci/types/pubkey.go b/abci/types/pubkey.go index 8341c0898d3..da75bb91778 100644 --- a/abci/types/pubkey.go +++ b/abci/types/pubkey.go @@ -3,9 +3,9 @@ package types import ( fmt "fmt" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/crypto/secp256k1" ) func Ed25519ValidatorUpdate(pk []byte, power int64) ValidatorUpdate { diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 203aeeeb313..76cd8b419a1 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -1,18 +1,17 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/abci/types.proto +// source: cometbft/v38/abci/types.proto package types import ( context "context" fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" + crypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + types1 "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -56,7 +55,7 @@ func (x CheckTxType) String() string { } func (CheckTxType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{0} + return fileDescriptor_20001f7d3f447b81, []int{0} } type MisbehaviorType int32 @@ -84,7 +83,7 @@ func (x MisbehaviorType) String() string { } func (MisbehaviorType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{1} + return fileDescriptor_20001f7d3f447b81, []int{1} } type ResponseOfferSnapshot_Result int32 @@ -121,7 +120,7 @@ func (x ResponseOfferSnapshot_Result) String() string { } func (ResponseOfferSnapshot_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{27, 0} + return fileDescriptor_20001f7d3f447b81, []int{27, 0} } type ResponseApplySnapshotChunk_Result int32 @@ -158,7 +157,7 @@ func (x ResponseApplySnapshotChunk_Result) String() string { } func (ResponseApplySnapshotChunk_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29, 0} + return fileDescriptor_20001f7d3f447b81, []int{29, 0} } type ResponseProcessProposal_ProposalStatus int32 @@ -186,7 +185,7 @@ func (x ResponseProcessProposal_ProposalStatus) String() string { } func (ResponseProcessProposal_ProposalStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31, 0} + return fileDescriptor_20001f7d3f447b81, []int{31, 0} } type ResponseVerifyVoteExtension_VerifyStatus int32 @@ -218,7 +217,7 @@ func (x ResponseVerifyVoteExtension_VerifyStatus) String() string { } func (ResponseVerifyVoteExtension_VerifyStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33, 0} + return fileDescriptor_20001f7d3f447b81, []int{33, 0} } type Request struct { @@ -246,7 +245,7 @@ func (m *Request) Reset() { *m = Request{} } func (m *Request) String() string { return proto.CompactTextString(m) } func (*Request) ProtoMessage() {} func (*Request) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{0} + return fileDescriptor_20001f7d3f447b81, []int{0} } func (m *Request) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -496,7 +495,7 @@ func (m *RequestEcho) Reset() { *m = RequestEcho{} } func (m *RequestEcho) String() string { return proto.CompactTextString(m) } func (*RequestEcho) ProtoMessage() {} func (*RequestEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{1} + return fileDescriptor_20001f7d3f447b81, []int{1} } func (m *RequestEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -539,7 +538,7 @@ func (m *RequestFlush) Reset() { *m = RequestFlush{} } func (m *RequestFlush) String() string { return proto.CompactTextString(m) } func (*RequestFlush) ProtoMessage() {} func (*RequestFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{2} + return fileDescriptor_20001f7d3f447b81, []int{2} } func (m *RequestFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -579,7 +578,7 @@ func (m *RequestInfo) Reset() { *m = RequestInfo{} } func (m *RequestInfo) String() string { return proto.CompactTextString(m) } func (*RequestInfo) ProtoMessage() {} func (*RequestInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{3} + return fileDescriptor_20001f7d3f447b81, []int{3} } func (m *RequestInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -649,7 +648,7 @@ func (m *RequestInitChain) Reset() { *m = RequestInitChain{} } func (m *RequestInitChain) String() string { return proto.CompactTextString(m) } func (*RequestInitChain) ProtoMessage() {} func (*RequestInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{4} + return fileDescriptor_20001f7d3f447b81, []int{4} } func (m *RequestInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -731,7 +730,7 @@ func (m *RequestQuery) Reset() { *m = RequestQuery{} } func (m *RequestQuery) String() string { return proto.CompactTextString(m) } func (*RequestQuery) ProtoMessage() {} func (*RequestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{5} + return fileDescriptor_20001f7d3f447b81, []int{5} } func (m *RequestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -790,14 +789,14 @@ func (m *RequestQuery) GetProve() bool { type RequestCheckTx struct { Tx []byte `protobuf:"bytes,1,opt,name=tx,proto3" json:"tx,omitempty"` - Type CheckTxType `protobuf:"varint,2,opt,name=type,proto3,enum=tendermint.abci.CheckTxType" json:"type,omitempty"` + Type CheckTxType `protobuf:"varint,2,opt,name=type,proto3,enum=cometbft.v38.abci.CheckTxType" json:"type,omitempty"` } func (m *RequestCheckTx) Reset() { *m = RequestCheckTx{} } func (m *RequestCheckTx) String() string { return proto.CompactTextString(m) } func (*RequestCheckTx) ProtoMessage() {} func (*RequestCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{6} + return fileDescriptor_20001f7d3f447b81, []int{6} } func (m *RequestCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -847,7 +846,7 @@ func (m *RequestCommit) Reset() { *m = RequestCommit{} } func (m *RequestCommit) String() string { return proto.CompactTextString(m) } func (*RequestCommit) ProtoMessage() {} func (*RequestCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{7} + return fileDescriptor_20001f7d3f447b81, []int{7} } func (m *RequestCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -884,7 +883,7 @@ func (m *RequestListSnapshots) Reset() { *m = RequestListSnapshots{} } func (m *RequestListSnapshots) String() string { return proto.CompactTextString(m) } func (*RequestListSnapshots) ProtoMessage() {} func (*RequestListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{8} + return fileDescriptor_20001f7d3f447b81, []int{8} } func (m *RequestListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -923,7 +922,7 @@ func (m *RequestOfferSnapshot) Reset() { *m = RequestOfferSnapshot{} } func (m *RequestOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*RequestOfferSnapshot) ProtoMessage() {} func (*RequestOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{9} + return fileDescriptor_20001f7d3f447b81, []int{9} } func (m *RequestOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -977,7 +976,7 @@ func (m *RequestLoadSnapshotChunk) Reset() { *m = RequestLoadSnapshotChu func (m *RequestLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestLoadSnapshotChunk) ProtoMessage() {} func (*RequestLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{10} + return fileDescriptor_20001f7d3f447b81, []int{10} } func (m *RequestLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1038,7 +1037,7 @@ func (m *RequestApplySnapshotChunk) Reset() { *m = RequestApplySnapshotC func (m *RequestApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*RequestApplySnapshotChunk) ProtoMessage() {} func (*RequestApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{11} + return fileDescriptor_20001f7d3f447b81, []int{11} } func (m *RequestApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1107,7 +1106,7 @@ func (m *RequestPrepareProposal) Reset() { *m = RequestPrepareProposal{} func (m *RequestPrepareProposal) String() string { return proto.CompactTextString(m) } func (*RequestPrepareProposal) ProtoMessage() {} func (*RequestPrepareProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{12} + return fileDescriptor_20001f7d3f447b81, []int{12} } func (m *RequestPrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1209,7 +1208,7 @@ func (m *RequestProcessProposal) Reset() { *m = RequestProcessProposal{} func (m *RequestProcessProposal) String() string { return proto.CompactTextString(m) } func (*RequestProcessProposal) ProtoMessage() {} func (*RequestProcessProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{13} + return fileDescriptor_20001f7d3f447b81, []int{13} } func (m *RequestProcessProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1314,7 +1313,7 @@ func (m *RequestExtendVote) Reset() { *m = RequestExtendVote{} } func (m *RequestExtendVote) String() string { return proto.CompactTextString(m) } func (*RequestExtendVote) ProtoMessage() {} func (*RequestExtendVote) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{14} + return fileDescriptor_20001f7d3f447b81, []int{14} } func (m *RequestExtendVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1413,7 +1412,7 @@ func (m *RequestVerifyVoteExtension) Reset() { *m = RequestVerifyVoteExt func (m *RequestVerifyVoteExtension) String() string { return proto.CompactTextString(m) } func (*RequestVerifyVoteExtension) ProtoMessage() {} func (*RequestVerifyVoteExtension) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{15} + return fileDescriptor_20001f7d3f447b81, []int{15} } func (m *RequestVerifyVoteExtension) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1487,7 +1486,7 @@ func (m *RequestFinalizeBlock) Reset() { *m = RequestFinalizeBlock{} } func (m *RequestFinalizeBlock) String() string { return proto.CompactTextString(m) } func (*RequestFinalizeBlock) ProtoMessage() {} func (*RequestFinalizeBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{16} + return fileDescriptor_20001f7d3f447b81, []int{16} } func (m *RequestFinalizeBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1599,7 +1598,7 @@ func (m *Response) Reset() { *m = Response{} } func (m *Response) String() string { return proto.CompactTextString(m) } func (*Response) ProtoMessage() {} func (*Response) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{17} + return fileDescriptor_20001f7d3f447b81, []int{17} } func (m *Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1862,7 +1861,7 @@ func (m *ResponseException) Reset() { *m = ResponseException{} } func (m *ResponseException) String() string { return proto.CompactTextString(m) } func (*ResponseException) ProtoMessage() {} func (*ResponseException) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{18} + return fileDescriptor_20001f7d3f447b81, []int{18} } func (m *ResponseException) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1906,7 +1905,7 @@ func (m *ResponseEcho) Reset() { *m = ResponseEcho{} } func (m *ResponseEcho) String() string { return proto.CompactTextString(m) } func (*ResponseEcho) ProtoMessage() {} func (*ResponseEcho) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{19} + return fileDescriptor_20001f7d3f447b81, []int{19} } func (m *ResponseEcho) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1949,7 +1948,7 @@ func (m *ResponseFlush) Reset() { *m = ResponseFlush{} } func (m *ResponseFlush) String() string { return proto.CompactTextString(m) } func (*ResponseFlush) ProtoMessage() {} func (*ResponseFlush) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{20} + return fileDescriptor_20001f7d3f447b81, []int{20} } func (m *ResponseFlush) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1990,7 +1989,7 @@ func (m *ResponseInfo) Reset() { *m = ResponseInfo{} } func (m *ResponseInfo) String() string { return proto.CompactTextString(m) } func (*ResponseInfo) ProtoMessage() {} func (*ResponseInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{21} + return fileDescriptor_20001f7d3f447b81, []int{21} } func (m *ResponseInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2064,7 +2063,7 @@ func (m *ResponseInitChain) Reset() { *m = ResponseInitChain{} } func (m *ResponseInitChain) String() string { return proto.CompactTextString(m) } func (*ResponseInitChain) ProtoMessage() {} func (*ResponseInitChain) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{22} + return fileDescriptor_20001f7d3f447b81, []int{22} } func (m *ResponseInitChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2131,7 +2130,7 @@ func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } func (m *ResponseQuery) String() string { return proto.CompactTextString(m) } func (*ResponseQuery) ProtoMessage() {} func (*ResponseQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{23} + return fileDescriptor_20001f7d3f447b81, []int{23} } func (m *ResponseQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2238,7 +2237,7 @@ func (m *ResponseCheckTx) Reset() { *m = ResponseCheckTx{} } func (m *ResponseCheckTx) String() string { return proto.CompactTextString(m) } func (*ResponseCheckTx) ProtoMessage() {} func (*ResponseCheckTx) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{24} + return fileDescriptor_20001f7d3f447b81, []int{24} } func (m *ResponseCheckTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2331,7 +2330,7 @@ func (m *ResponseCommit) Reset() { *m = ResponseCommit{} } func (m *ResponseCommit) String() string { return proto.CompactTextString(m) } func (*ResponseCommit) ProtoMessage() {} func (*ResponseCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{25} + return fileDescriptor_20001f7d3f447b81, []int{25} } func (m *ResponseCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2375,7 +2374,7 @@ func (m *ResponseListSnapshots) Reset() { *m = ResponseListSnapshots{} } func (m *ResponseListSnapshots) String() string { return proto.CompactTextString(m) } func (*ResponseListSnapshots) ProtoMessage() {} func (*ResponseListSnapshots) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{26} + return fileDescriptor_20001f7d3f447b81, []int{26} } func (m *ResponseListSnapshots) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2412,14 +2411,14 @@ func (m *ResponseListSnapshots) GetSnapshots() []*Snapshot { } type ResponseOfferSnapshot struct { - Result ResponseOfferSnapshot_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseOfferSnapshot_Result" json:"result,omitempty"` + Result ResponseOfferSnapshot_Result `protobuf:"varint,1,opt,name=result,proto3,enum=cometbft.v38.abci.ResponseOfferSnapshot_Result" json:"result,omitempty"` } func (m *ResponseOfferSnapshot) Reset() { *m = ResponseOfferSnapshot{} } func (m *ResponseOfferSnapshot) String() string { return proto.CompactTextString(m) } func (*ResponseOfferSnapshot) ProtoMessage() {} func (*ResponseOfferSnapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{27} + return fileDescriptor_20001f7d3f447b81, []int{27} } func (m *ResponseOfferSnapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2463,7 +2462,7 @@ func (m *ResponseLoadSnapshotChunk) Reset() { *m = ResponseLoadSnapshotC func (m *ResponseLoadSnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseLoadSnapshotChunk) ProtoMessage() {} func (*ResponseLoadSnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{28} + return fileDescriptor_20001f7d3f447b81, []int{28} } func (m *ResponseLoadSnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2500,7 +2499,7 @@ func (m *ResponseLoadSnapshotChunk) GetChunk() []byte { } type ResponseApplySnapshotChunk struct { - Result ResponseApplySnapshotChunk_Result `protobuf:"varint,1,opt,name=result,proto3,enum=tendermint.abci.ResponseApplySnapshotChunk_Result" json:"result,omitempty"` + Result ResponseApplySnapshotChunk_Result `protobuf:"varint,1,opt,name=result,proto3,enum=cometbft.v38.abci.ResponseApplySnapshotChunk_Result" json:"result,omitempty"` RefetchChunks []uint32 `protobuf:"varint,2,rep,packed,name=refetch_chunks,json=refetchChunks,proto3" json:"refetch_chunks,omitempty"` RejectSenders []string `protobuf:"bytes,3,rep,name=reject_senders,json=rejectSenders,proto3" json:"reject_senders,omitempty"` } @@ -2509,7 +2508,7 @@ func (m *ResponseApplySnapshotChunk) Reset() { *m = ResponseApplySnapsho func (m *ResponseApplySnapshotChunk) String() string { return proto.CompactTextString(m) } func (*ResponseApplySnapshotChunk) ProtoMessage() {} func (*ResponseApplySnapshotChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{29} + return fileDescriptor_20001f7d3f447b81, []int{29} } func (m *ResponseApplySnapshotChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2567,7 +2566,7 @@ func (m *ResponsePrepareProposal) Reset() { *m = ResponsePrepareProposal func (m *ResponsePrepareProposal) String() string { return proto.CompactTextString(m) } func (*ResponsePrepareProposal) ProtoMessage() {} func (*ResponsePrepareProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{30} + return fileDescriptor_20001f7d3f447b81, []int{30} } func (m *ResponsePrepareProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2604,14 +2603,14 @@ func (m *ResponsePrepareProposal) GetTxs() [][]byte { } type ResponseProcessProposal struct { - Status ResponseProcessProposal_ProposalStatus `protobuf:"varint,1,opt,name=status,proto3,enum=tendermint.abci.ResponseProcessProposal_ProposalStatus" json:"status,omitempty"` + Status ResponseProcessProposal_ProposalStatus `protobuf:"varint,1,opt,name=status,proto3,enum=cometbft.v38.abci.ResponseProcessProposal_ProposalStatus" json:"status,omitempty"` } func (m *ResponseProcessProposal) Reset() { *m = ResponseProcessProposal{} } func (m *ResponseProcessProposal) String() string { return proto.CompactTextString(m) } func (*ResponseProcessProposal) ProtoMessage() {} func (*ResponseProcessProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{31} + return fileDescriptor_20001f7d3f447b81, []int{31} } func (m *ResponseProcessProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2655,7 +2654,7 @@ func (m *ResponseExtendVote) Reset() { *m = ResponseExtendVote{} } func (m *ResponseExtendVote) String() string { return proto.CompactTextString(m) } func (*ResponseExtendVote) ProtoMessage() {} func (*ResponseExtendVote) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{32} + return fileDescriptor_20001f7d3f447b81, []int{32} } func (m *ResponseExtendVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2692,14 +2691,14 @@ func (m *ResponseExtendVote) GetVoteExtension() []byte { } type ResponseVerifyVoteExtension struct { - Status ResponseVerifyVoteExtension_VerifyStatus `protobuf:"varint,1,opt,name=status,proto3,enum=tendermint.abci.ResponseVerifyVoteExtension_VerifyStatus" json:"status,omitempty"` + Status ResponseVerifyVoteExtension_VerifyStatus `protobuf:"varint,1,opt,name=status,proto3,enum=cometbft.v38.abci.ResponseVerifyVoteExtension_VerifyStatus" json:"status,omitempty"` } func (m *ResponseVerifyVoteExtension) Reset() { *m = ResponseVerifyVoteExtension{} } func (m *ResponseVerifyVoteExtension) String() string { return proto.CompactTextString(m) } func (*ResponseVerifyVoteExtension) ProtoMessage() {} func (*ResponseVerifyVoteExtension) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{33} + return fileDescriptor_20001f7d3f447b81, []int{33} } func (m *ResponseVerifyVoteExtension) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2754,7 +2753,7 @@ func (m *ResponseFinalizeBlock) Reset() { *m = ResponseFinalizeBlock{} } func (m *ResponseFinalizeBlock) String() string { return proto.CompactTextString(m) } func (*ResponseFinalizeBlock) ProtoMessage() {} func (*ResponseFinalizeBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{34} + return fileDescriptor_20001f7d3f447b81, []int{34} } func (m *ResponseFinalizeBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2827,7 +2826,7 @@ func (m *CommitInfo) Reset() { *m = CommitInfo{} } func (m *CommitInfo) String() string { return proto.CompactTextString(m) } func (*CommitInfo) ProtoMessage() {} func (*CommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{35} + return fileDescriptor_20001f7d3f447b81, []int{35} } func (m *CommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2885,7 +2884,7 @@ func (m *ExtendedCommitInfo) Reset() { *m = ExtendedCommitInfo{} } func (m *ExtendedCommitInfo) String() string { return proto.CompactTextString(m) } func (*ExtendedCommitInfo) ProtoMessage() {} func (*ExtendedCommitInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{36} + return fileDescriptor_20001f7d3f447b81, []int{36} } func (m *ExtendedCommitInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2940,7 +2939,7 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{37} + return fileDescriptor_20001f7d3f447b81, []int{37} } func (m *Event) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2994,7 +2993,7 @@ func (m *EventAttribute) Reset() { *m = EventAttribute{} } func (m *EventAttribute) String() string { return proto.CompactTextString(m) } func (*EventAttribute) ProtoMessage() {} func (*EventAttribute) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{38} + return fileDescriptor_20001f7d3f447b81, []int{38} } func (m *EventAttribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3062,7 +3061,7 @@ func (m *ExecTxResult) Reset() { *m = ExecTxResult{} } func (m *ExecTxResult) String() string { return proto.CompactTextString(m) } func (*ExecTxResult) ProtoMessage() {} func (*ExecTxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{39} + return fileDescriptor_20001f7d3f447b81, []int{39} } func (m *ExecTxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3161,7 +3160,7 @@ func (m *TxResult) Reset() { *m = TxResult{} } func (m *TxResult) String() string { return proto.CompactTextString(m) } func (*TxResult) ProtoMessage() {} func (*TxResult) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{40} + return fileDescriptor_20001f7d3f447b81, []int{40} } func (m *TxResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3228,7 +3227,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{41} + return fileDescriptor_20001f7d3f447b81, []int{41} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3280,7 +3279,7 @@ func (m *ValidatorUpdate) Reset() { *m = ValidatorUpdate{} } func (m *ValidatorUpdate) String() string { return proto.CompactTextString(m) } func (*ValidatorUpdate) ProtoMessage() {} func (*ValidatorUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{42} + return fileDescriptor_20001f7d3f447b81, []int{42} } func (m *ValidatorUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3325,14 +3324,14 @@ func (m *ValidatorUpdate) GetPower() int64 { type VoteInfo struct { Validator Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator"` - BlockIdFlag types1.BlockIDFlag `protobuf:"varint,3,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag types1.BlockIDFlag `protobuf:"varint,3,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.v38.types.BlockIDFlag" json:"block_id_flag,omitempty"` } func (m *VoteInfo) Reset() { *m = VoteInfo{} } func (m *VoteInfo) String() string { return proto.CompactTextString(m) } func (*VoteInfo) ProtoMessage() {} func (*VoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{43} + return fileDescriptor_20001f7d3f447b81, []int{43} } func (m *VoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3383,14 +3382,14 @@ type ExtendedVoteInfo struct { // Vote extension signature created by CometBFT ExtensionSignature []byte `protobuf:"bytes,4,opt,name=extension_signature,json=extensionSignature,proto3" json:"extension_signature,omitempty"` // block_id_flag indicates whether the validator voted for a block, nil, or did not vote at all - BlockIdFlag types1.BlockIDFlag `protobuf:"varint,5,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag types1.BlockIDFlag `protobuf:"varint,5,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.v38.types.BlockIDFlag" json:"block_id_flag,omitempty"` } func (m *ExtendedVoteInfo) Reset() { *m = ExtendedVoteInfo{} } func (m *ExtendedVoteInfo) String() string { return proto.CompactTextString(m) } func (*ExtendedVoteInfo) ProtoMessage() {} func (*ExtendedVoteInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{44} + return fileDescriptor_20001f7d3f447b81, []int{44} } func (m *ExtendedVoteInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3448,7 +3447,7 @@ func (m *ExtendedVoteInfo) GetBlockIdFlag() types1.BlockIDFlag { } type Misbehavior struct { - Type MisbehaviorType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.abci.MisbehaviorType" json:"type,omitempty"` + Type MisbehaviorType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.v38.abci.MisbehaviorType" json:"type,omitempty"` // The offending validator Validator Validator `protobuf:"bytes,2,opt,name=validator,proto3" json:"validator"` // The height when the offense occurred @@ -3465,7 +3464,7 @@ func (m *Misbehavior) Reset() { *m = Misbehavior{} } func (m *Misbehavior) String() string { return proto.CompactTextString(m) } func (*Misbehavior) ProtoMessage() {} func (*Misbehavior) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{45} + return fileDescriptor_20001f7d3f447b81, []int{45} } func (m *Misbehavior) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3541,7 +3540,7 @@ func (m *Snapshot) Reset() { *m = Snapshot{} } func (m *Snapshot) String() string { return proto.CompactTextString(m) } func (*Snapshot) ProtoMessage() {} func (*Snapshot) Descriptor() ([]byte, []int) { - return fileDescriptor_252557cfdd89a31a, []int{46} + return fileDescriptor_20001f7d3f447b81, []int{46} } func (m *Snapshot) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3606,263 +3605,264 @@ func (m *Snapshot) GetMetadata() []byte { } func init() { - proto.RegisterEnum("tendermint.abci.CheckTxType", CheckTxType_name, CheckTxType_value) - proto.RegisterEnum("tendermint.abci.MisbehaviorType", MisbehaviorType_name, MisbehaviorType_value) - proto.RegisterEnum("tendermint.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) - proto.RegisterEnum("tendermint.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) - proto.RegisterEnum("tendermint.abci.ResponseProcessProposal_ProposalStatus", ResponseProcessProposal_ProposalStatus_name, ResponseProcessProposal_ProposalStatus_value) - proto.RegisterEnum("tendermint.abci.ResponseVerifyVoteExtension_VerifyStatus", ResponseVerifyVoteExtension_VerifyStatus_name, ResponseVerifyVoteExtension_VerifyStatus_value) - proto.RegisterType((*Request)(nil), "tendermint.abci.Request") - proto.RegisterType((*RequestEcho)(nil), "tendermint.abci.RequestEcho") - proto.RegisterType((*RequestFlush)(nil), "tendermint.abci.RequestFlush") - proto.RegisterType((*RequestInfo)(nil), "tendermint.abci.RequestInfo") - proto.RegisterType((*RequestInitChain)(nil), "tendermint.abci.RequestInitChain") - proto.RegisterType((*RequestQuery)(nil), "tendermint.abci.RequestQuery") - proto.RegisterType((*RequestCheckTx)(nil), "tendermint.abci.RequestCheckTx") - proto.RegisterType((*RequestCommit)(nil), "tendermint.abci.RequestCommit") - proto.RegisterType((*RequestListSnapshots)(nil), "tendermint.abci.RequestListSnapshots") - proto.RegisterType((*RequestOfferSnapshot)(nil), "tendermint.abci.RequestOfferSnapshot") - proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "tendermint.abci.RequestLoadSnapshotChunk") - proto.RegisterType((*RequestApplySnapshotChunk)(nil), "tendermint.abci.RequestApplySnapshotChunk") - proto.RegisterType((*RequestPrepareProposal)(nil), "tendermint.abci.RequestPrepareProposal") - proto.RegisterType((*RequestProcessProposal)(nil), "tendermint.abci.RequestProcessProposal") - proto.RegisterType((*RequestExtendVote)(nil), "tendermint.abci.RequestExtendVote") - proto.RegisterType((*RequestVerifyVoteExtension)(nil), "tendermint.abci.RequestVerifyVoteExtension") - proto.RegisterType((*RequestFinalizeBlock)(nil), "tendermint.abci.RequestFinalizeBlock") - proto.RegisterType((*Response)(nil), "tendermint.abci.Response") - proto.RegisterType((*ResponseException)(nil), "tendermint.abci.ResponseException") - proto.RegisterType((*ResponseEcho)(nil), "tendermint.abci.ResponseEcho") - proto.RegisterType((*ResponseFlush)(nil), "tendermint.abci.ResponseFlush") - proto.RegisterType((*ResponseInfo)(nil), "tendermint.abci.ResponseInfo") - proto.RegisterType((*ResponseInitChain)(nil), "tendermint.abci.ResponseInitChain") - proto.RegisterType((*ResponseQuery)(nil), "tendermint.abci.ResponseQuery") - proto.RegisterType((*ResponseCheckTx)(nil), "tendermint.abci.ResponseCheckTx") - proto.RegisterType((*ResponseCommit)(nil), "tendermint.abci.ResponseCommit") - proto.RegisterType((*ResponseListSnapshots)(nil), "tendermint.abci.ResponseListSnapshots") - proto.RegisterType((*ResponseOfferSnapshot)(nil), "tendermint.abci.ResponseOfferSnapshot") - proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "tendermint.abci.ResponseLoadSnapshotChunk") - proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "tendermint.abci.ResponseApplySnapshotChunk") - proto.RegisterType((*ResponsePrepareProposal)(nil), "tendermint.abci.ResponsePrepareProposal") - proto.RegisterType((*ResponseProcessProposal)(nil), "tendermint.abci.ResponseProcessProposal") - proto.RegisterType((*ResponseExtendVote)(nil), "tendermint.abci.ResponseExtendVote") - proto.RegisterType((*ResponseVerifyVoteExtension)(nil), "tendermint.abci.ResponseVerifyVoteExtension") - proto.RegisterType((*ResponseFinalizeBlock)(nil), "tendermint.abci.ResponseFinalizeBlock") - proto.RegisterType((*CommitInfo)(nil), "tendermint.abci.CommitInfo") - proto.RegisterType((*ExtendedCommitInfo)(nil), "tendermint.abci.ExtendedCommitInfo") - proto.RegisterType((*Event)(nil), "tendermint.abci.Event") - proto.RegisterType((*EventAttribute)(nil), "tendermint.abci.EventAttribute") - proto.RegisterType((*ExecTxResult)(nil), "tendermint.abci.ExecTxResult") - proto.RegisterType((*TxResult)(nil), "tendermint.abci.TxResult") - proto.RegisterType((*Validator)(nil), "tendermint.abci.Validator") - proto.RegisterType((*ValidatorUpdate)(nil), "tendermint.abci.ValidatorUpdate") - proto.RegisterType((*VoteInfo)(nil), "tendermint.abci.VoteInfo") - proto.RegisterType((*ExtendedVoteInfo)(nil), "tendermint.abci.ExtendedVoteInfo") - proto.RegisterType((*Misbehavior)(nil), "tendermint.abci.Misbehavior") - proto.RegisterType((*Snapshot)(nil), "tendermint.abci.Snapshot") -} - -func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } - -var fileDescriptor_252557cfdd89a31a = []byte{ - // 3167 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x73, 0x23, 0xd5, - 0xd5, 0x57, 0xeb, 0xad, 0xa3, 0x87, 0xdb, 0xd7, 0x9e, 0x41, 0x23, 0x06, 0xdb, 0x34, 0x05, 0x0c, - 0x03, 0xd8, 0x7c, 0x9e, 0x6f, 0x78, 0xd4, 0xc0, 0x57, 0x25, 0x6b, 0x34, 0x9f, 0xec, 0x31, 0xb6, - 0x69, 0xcb, 0x43, 0x91, 0x07, 0x4d, 0x5b, 0xba, 0xb2, 0x9a, 0x91, 0xd4, 0x4d, 0xf7, 0x95, 0x91, - 0x59, 0xa5, 0x42, 0x52, 0x95, 0x62, 0x45, 0x55, 0xb2, 0x60, 0x11, 0x16, 0x59, 0x64, 0x93, 0xbf, - 0x20, 0xab, 0x64, 0x93, 0x05, 0x8b, 0x2c, 0x58, 0x66, 0x45, 0x52, 0xb0, 0x63, 0x9b, 0x45, 0xb6, - 0xa9, 0xfb, 0xe8, 0x97, 0xa4, 0xb6, 0xa4, 0x81, 0x2c, 0x52, 0xc9, 0xae, 0xef, 0xe9, 0x73, 0xce, - 0xed, 0x7b, 0xee, 0xb9, 0xe7, 0xf1, 0xeb, 0x0b, 0x8f, 0x13, 0x3c, 0x68, 0x63, 0xbb, 0x6f, 0x0c, - 0xc8, 0x96, 0x7e, 0xda, 0x32, 0xb6, 0xc8, 0x85, 0x85, 0x9d, 0x4d, 0xcb, 0x36, 0x89, 0x89, 0x96, - 0xfc, 0x97, 0x9b, 0xf4, 0x65, 0xe5, 0x89, 0x00, 0x77, 0xcb, 0xbe, 0xb0, 0x88, 0xb9, 0x65, 0xd9, - 0xa6, 0xd9, 0xe1, 0xfc, 0x95, 0xeb, 0x93, 0xaf, 0x1f, 0xe2, 0x0b, 0xa1, 0x2d, 0x24, 0xcc, 0x66, - 0xd9, 0xb2, 0x74, 0x5b, 0xef, 0xbb, 0xaf, 0x37, 0x26, 0x5e, 0x9f, 0xeb, 0x3d, 0xa3, 0xad, 0x13, - 0xd3, 0x16, 0x1c, 0xeb, 0x67, 0xa6, 0x79, 0xd6, 0xc3, 0x5b, 0x6c, 0x74, 0x3a, 0xec, 0x6c, 0x11, - 0xa3, 0x8f, 0x1d, 0xa2, 0xf7, 0x2d, 0xc1, 0xb0, 0x7a, 0x66, 0x9e, 0x99, 0xec, 0x71, 0x8b, 0x3e, - 0x71, 0xaa, 0xf2, 0xc7, 0x1c, 0x64, 0x54, 0xfc, 0xc1, 0x10, 0x3b, 0x04, 0x6d, 0x43, 0x12, 0xb7, - 0xba, 0x66, 0x59, 0xda, 0x90, 0x6e, 0xe4, 0xb7, 0xaf, 0x6f, 0x8e, 0x2d, 0x70, 0x53, 0xf0, 0xd5, - 0x5b, 0x5d, 0xb3, 0x11, 0x53, 0x19, 0x2f, 0xba, 0x0d, 0xa9, 0x4e, 0x6f, 0xe8, 0x74, 0xcb, 0x71, - 0x26, 0xf4, 0x44, 0x94, 0xd0, 0x3d, 0xca, 0xd4, 0x88, 0xa9, 0x9c, 0x9b, 0x4e, 0x65, 0x0c, 0x3a, - 0x66, 0x39, 0x71, 0xf9, 0x54, 0xbb, 0x83, 0x0e, 0x9b, 0x8a, 0xf2, 0xa2, 0x1d, 0x00, 0x63, 0x60, - 0x10, 0xad, 0xd5, 0xd5, 0x8d, 0x41, 0x39, 0xc5, 0x24, 0x9f, 0x8c, 0x96, 0x34, 0x48, 0x8d, 0x32, - 0x36, 0x62, 0x6a, 0xce, 0x70, 0x07, 0xf4, 0x73, 0x3f, 0x18, 0x62, 0xfb, 0xa2, 0x9c, 0xbe, 0xfc, - 0x73, 0xdf, 0xa2, 0x4c, 0xf4, 0x73, 0x19, 0x37, 0x7a, 0x1d, 0xb2, 0xad, 0x2e, 0x6e, 0x3d, 0xd4, - 0xc8, 0xa8, 0x9c, 0x65, 0x92, 0xeb, 0x51, 0x92, 0x35, 0xca, 0xd7, 0x1c, 0x35, 0x62, 0x6a, 0xa6, - 0xc5, 0x1f, 0xd1, 0xab, 0x90, 0x6e, 0x99, 0xfd, 0xbe, 0x41, 0xca, 0x79, 0x26, 0xbb, 0x16, 0x29, - 0xcb, 0xb8, 0x1a, 0x31, 0x55, 0xf0, 0xa3, 0x03, 0x28, 0xf5, 0x0c, 0x87, 0x68, 0xce, 0x40, 0xb7, - 0x9c, 0xae, 0x49, 0x9c, 0x72, 0x81, 0x69, 0x78, 0x3a, 0x4a, 0xc3, 0xbe, 0xe1, 0x90, 0x63, 0x97, - 0xb9, 0x11, 0x53, 0x8b, 0xbd, 0x20, 0x81, 0xea, 0x33, 0x3b, 0x1d, 0x6c, 0x7b, 0x0a, 0xcb, 0xc5, - 0xcb, 0xf5, 0x1d, 0x52, 0x6e, 0x57, 0x9e, 0xea, 0x33, 0x83, 0x04, 0xf4, 0x43, 0x58, 0xe9, 0x99, - 0x7a, 0xdb, 0x53, 0xa7, 0xb5, 0xba, 0xc3, 0xc1, 0xc3, 0x72, 0x89, 0x29, 0x7d, 0x2e, 0xf2, 0x23, - 0x4d, 0xbd, 0xed, 0xaa, 0xa8, 0x51, 0x81, 0x46, 0x4c, 0x5d, 0xee, 0x8d, 0x13, 0xd1, 0xbb, 0xb0, - 0xaa, 0x5b, 0x56, 0xef, 0x62, 0x5c, 0xfb, 0x12, 0xd3, 0x7e, 0x33, 0x4a, 0x7b, 0x95, 0xca, 0x8c, - 0xab, 0x47, 0xfa, 0x04, 0x15, 0x35, 0x41, 0xb6, 0x6c, 0x6c, 0xe9, 0x36, 0xd6, 0x2c, 0xdb, 0xb4, - 0x4c, 0x47, 0xef, 0x95, 0x65, 0xa6, 0xfb, 0xd9, 0x28, 0xdd, 0x47, 0x9c, 0xff, 0x48, 0xb0, 0x37, - 0x62, 0xea, 0x92, 0x15, 0x26, 0x71, 0xad, 0x66, 0x0b, 0x3b, 0x8e, 0xaf, 0x75, 0x79, 0x96, 0x56, - 0xc6, 0x1f, 0xd6, 0x1a, 0x22, 0xa1, 0x3a, 0xe4, 0xf1, 0x88, 0x8a, 0x6b, 0xe7, 0x26, 0xc1, 0x65, - 0xc4, 0x14, 0x2a, 0x91, 0x27, 0x94, 0xb1, 0x3e, 0x30, 0x09, 0x6e, 0xc4, 0x54, 0xc0, 0xde, 0x08, - 0xe9, 0x70, 0xe5, 0x1c, 0xdb, 0x46, 0xe7, 0x82, 0xa9, 0xd1, 0xd8, 0x1b, 0xc7, 0x30, 0x07, 0xe5, - 0x15, 0xa6, 0xf0, 0xf9, 0x28, 0x85, 0x0f, 0x98, 0x10, 0x55, 0x51, 0x77, 0x45, 0x1a, 0x31, 0x75, - 0xe5, 0x7c, 0x92, 0x4c, 0x5d, 0xac, 0x63, 0x0c, 0xf4, 0x9e, 0xf1, 0x11, 0xd6, 0x4e, 0x7b, 0x66, - 0xeb, 0x61, 0x79, 0xf5, 0x72, 0x17, 0xbb, 0x27, 0xb8, 0x77, 0x28, 0x33, 0x75, 0xb1, 0x4e, 0x90, - 0xb0, 0x93, 0x81, 0xd4, 0xb9, 0xde, 0x1b, 0xe2, 0xbd, 0x64, 0x36, 0x29, 0xa7, 0xf6, 0x92, 0xd9, - 0x8c, 0x9c, 0xdd, 0x4b, 0x66, 0x73, 0x32, 0xec, 0x25, 0xb3, 0x20, 0xe7, 0x95, 0x67, 0x21, 0x1f, - 0x08, 0x4c, 0xa8, 0x0c, 0x99, 0x3e, 0x76, 0x1c, 0xfd, 0x0c, 0xb3, 0x38, 0x96, 0x53, 0xdd, 0xa1, - 0x52, 0x82, 0x42, 0x30, 0x18, 0x29, 0x9f, 0x4a, 0x9e, 0x24, 0x8d, 0x33, 0x54, 0xf2, 0x1c, 0xdb, - 0xcc, 0x1c, 0x42, 0x52, 0x0c, 0xd1, 0x53, 0x50, 0x64, 0x4b, 0xd1, 0xdc, 0xf7, 0x34, 0xd8, 0x25, - 0xd5, 0x02, 0x23, 0x3e, 0x10, 0x4c, 0xeb, 0x90, 0xb7, 0xb6, 0x2d, 0x8f, 0x25, 0xc1, 0x58, 0xc0, - 0xda, 0xb6, 0x5c, 0x86, 0x27, 0xa1, 0x40, 0xd7, 0xed, 0x71, 0x24, 0xd9, 0x24, 0x79, 0x4a, 0x13, - 0x2c, 0xca, 0x9f, 0xe3, 0x20, 0x8f, 0x07, 0x30, 0xf4, 0x2a, 0x24, 0x69, 0x2c, 0x17, 0x61, 0xb9, - 0xb2, 0xc9, 0x03, 0xfd, 0xa6, 0x1b, 0xe8, 0x37, 0x9b, 0x6e, 0xa0, 0xdf, 0xc9, 0x7e, 0xf1, 0xd5, - 0x7a, 0xec, 0xd3, 0xbf, 0xae, 0x4b, 0x2a, 0x93, 0x40, 0xd7, 0x68, 0xd8, 0xd2, 0x8d, 0x81, 0x66, - 0xb4, 0xd9, 0x27, 0xe7, 0x68, 0x4c, 0xd2, 0x8d, 0xc1, 0x6e, 0x1b, 0xed, 0x83, 0xdc, 0x32, 0x07, - 0x0e, 0x1e, 0x38, 0x43, 0x47, 0xe3, 0xa9, 0x46, 0x04, 0xe3, 0x50, 0x48, 0xe5, 0x09, 0xaf, 0xe6, - 0x72, 0x1e, 0x31, 0x46, 0x75, 0xa9, 0x15, 0x26, 0xa0, 0x7b, 0x00, 0x5e, 0x3e, 0x72, 0xca, 0xc9, - 0x8d, 0xc4, 0x8d, 0xfc, 0xf6, 0xc6, 0xc4, 0x86, 0x3f, 0x70, 0x59, 0x4e, 0xac, 0xb6, 0x4e, 0xf0, - 0x4e, 0x92, 0x7e, 0xae, 0x1a, 0x90, 0x44, 0xcf, 0xc0, 0x92, 0x6e, 0x59, 0x9a, 0x43, 0x74, 0x82, - 0xb5, 0xd3, 0x0b, 0x82, 0x1d, 0x16, 0xe7, 0x0b, 0x6a, 0x51, 0xb7, 0xac, 0x63, 0x4a, 0xdd, 0xa1, - 0x44, 0xf4, 0x34, 0x94, 0x68, 0x4c, 0x37, 0xf4, 0x9e, 0xd6, 0xc5, 0xc6, 0x59, 0x97, 0xb0, 0x78, - 0x9e, 0x50, 0x8b, 0x82, 0xda, 0x60, 0x44, 0xa5, 0xed, 0xed, 0x38, 0x8b, 0xe7, 0x08, 0x41, 0xb2, - 0xad, 0x13, 0x9d, 0x59, 0xb2, 0xa0, 0xb2, 0x67, 0x4a, 0xb3, 0x74, 0xd2, 0x15, 0xf6, 0x61, 0xcf, - 0xe8, 0x2a, 0xa4, 0x85, 0xda, 0x04, 0x53, 0x2b, 0x46, 0x68, 0x15, 0x52, 0x96, 0x6d, 0x9e, 0x63, - 0xb6, 0x75, 0x59, 0x95, 0x0f, 0x14, 0x15, 0x4a, 0xe1, 0xd8, 0x8f, 0x4a, 0x10, 0x27, 0x23, 0x31, - 0x4b, 0x9c, 0x8c, 0xd0, 0x4b, 0x90, 0xa4, 0x86, 0x64, 0x73, 0x94, 0xa6, 0x64, 0x3b, 0x21, 0xd7, - 0xbc, 0xb0, 0xb0, 0xca, 0x38, 0x95, 0x25, 0x28, 0x86, 0x72, 0x82, 0x72, 0x15, 0x56, 0xa7, 0x85, - 0x78, 0xa5, 0xeb, 0xd1, 0x43, 0xa1, 0x1a, 0xdd, 0x86, 0xac, 0x17, 0xe3, 0xb9, 0xe3, 0x5c, 0x9b, - 0x98, 0xd6, 0x65, 0x56, 0x3d, 0x56, 0xea, 0x31, 0x74, 0x03, 0xba, 0xba, 0xc8, 0xe8, 0x05, 0x35, - 0xa3, 0x5b, 0x56, 0x43, 0x77, 0xba, 0xca, 0x7b, 0x50, 0x8e, 0x8a, 0xdf, 0x01, 0x83, 0x49, 0xcc, - 0xed, 0x5d, 0x83, 0x5d, 0x85, 0x74, 0xc7, 0xb4, 0xfb, 0x3a, 0x61, 0xca, 0x8a, 0xaa, 0x18, 0x51, - 0x43, 0xf2, 0x58, 0x9e, 0x60, 0x64, 0x3e, 0x50, 0x34, 0xb8, 0x16, 0x19, 0xc3, 0xa9, 0x88, 0x31, - 0x68, 0x63, 0x6e, 0xd6, 0xa2, 0xca, 0x07, 0xbe, 0x22, 0xfe, 0xb1, 0x7c, 0x40, 0xa7, 0x75, 0xd8, - 0x5a, 0x99, 0xfe, 0x9c, 0x2a, 0x46, 0xca, 0x67, 0x09, 0xb8, 0x3a, 0x3d, 0x92, 0xa3, 0x0d, 0x28, - 0xf4, 0xf5, 0x91, 0x46, 0x46, 0xc2, 0xed, 0x24, 0xb6, 0xf1, 0xd0, 0xd7, 0x47, 0xcd, 0x11, 0xf7, - 0x39, 0x19, 0x12, 0x64, 0xe4, 0x94, 0xe3, 0x1b, 0x89, 0x1b, 0x05, 0x95, 0x3e, 0xa2, 0x13, 0x58, - 0xee, 0x99, 0x2d, 0xbd, 0xa7, 0xf5, 0x74, 0x87, 0x68, 0x22, 0xc5, 0xf3, 0x43, 0xf4, 0xd4, 0x84, - 0xb1, 0x79, 0x4c, 0xc6, 0x6d, 0xbe, 0x9f, 0x34, 0xe0, 0x08, 0xff, 0x5f, 0x62, 0x3a, 0xf6, 0x75, - 0x77, 0xab, 0xd1, 0x5d, 0xc8, 0xf7, 0x0d, 0xe7, 0x14, 0x77, 0xf5, 0x73, 0xc3, 0xb4, 0xc5, 0x69, - 0x9a, 0x74, 0x9a, 0x37, 0x7d, 0x1e, 0xa1, 0x29, 0x28, 0x16, 0xd8, 0x92, 0x54, 0xc8, 0x87, 0xdd, - 0x68, 0x92, 0x5e, 0x38, 0x9a, 0xbc, 0x04, 0xab, 0x03, 0x3c, 0x22, 0x9a, 0x7f, 0x5e, 0xb9, 0x9f, - 0x64, 0x98, 0xe9, 0x11, 0x7d, 0xe7, 0x9d, 0x70, 0x87, 0xba, 0x0c, 0x7a, 0x8e, 0xe5, 0x42, 0xcb, - 0x74, 0xb0, 0xad, 0xe9, 0xed, 0xb6, 0x8d, 0x1d, 0x87, 0x95, 0x4f, 0x05, 0x96, 0xe0, 0x18, 0xbd, - 0xca, 0xc9, 0xca, 0x2f, 0x82, 0x5b, 0x13, 0xce, 0x7d, 0xc2, 0xf0, 0x92, 0x6f, 0xf8, 0x63, 0x58, - 0x15, 0xf2, 0xed, 0x90, 0xed, 0x79, 0x0d, 0xfa, 0xf8, 0xe4, 0xf9, 0x1a, 0xb7, 0x39, 0x72, 0xc5, - 0xa3, 0xcd, 0x9e, 0x78, 0x34, 0xb3, 0x23, 0x48, 0x32, 0xa3, 0x24, 0x79, 0x88, 0xa1, 0xcf, 0xff, - 0x6e, 0x5b, 0xf1, 0x71, 0x02, 0x96, 0x27, 0x0a, 0x09, 0x6f, 0x61, 0xd2, 0xd4, 0x85, 0xc5, 0xa7, - 0x2e, 0x2c, 0xb1, 0xf0, 0xc2, 0xc4, 0x5e, 0x27, 0x67, 0xef, 0x75, 0xea, 0x7b, 0xdc, 0xeb, 0xf4, - 0xa3, 0xed, 0xf5, 0xbf, 0x74, 0x17, 0x7e, 0x2d, 0x41, 0x25, 0xba, 0xfa, 0x9a, 0xba, 0x1d, 0xcf, - 0xc3, 0xb2, 0xf7, 0x29, 0x9e, 0x7a, 0x1e, 0x18, 0x65, 0xef, 0x85, 0xd0, 0x1f, 0x99, 0xe3, 0x9e, - 0x86, 0xd2, 0x58, 0x6d, 0xc8, 0x5d, 0xb9, 0x78, 0x1e, 0x9c, 0x5f, 0xf9, 0x59, 0xc2, 0x4b, 0x3c, - 0xa1, 0x02, 0x6e, 0xca, 0x69, 0x7d, 0x0b, 0x56, 0xda, 0xb8, 0x65, 0xb4, 0x1f, 0xf5, 0xb0, 0x2e, - 0x0b, 0xe9, 0xff, 0x9e, 0xd5, 0x49, 0x2f, 0xf9, 0x15, 0x40, 0x56, 0xc5, 0x8e, 0x45, 0xeb, 0x31, - 0xb4, 0x03, 0x39, 0x3c, 0x6a, 0x61, 0x8b, 0xb8, 0x25, 0xec, 0xf4, 0x16, 0x81, 0x73, 0xd7, 0x5d, - 0x4e, 0xda, 0x20, 0x7b, 0x62, 0xe8, 0x96, 0xc0, 0x00, 0xa2, 0xdb, 0x79, 0x21, 0x1e, 0x04, 0x01, - 0x5e, 0x76, 0x41, 0x80, 0x44, 0x64, 0x7f, 0xcb, 0xa5, 0xc6, 0x50, 0x80, 0x5b, 0x02, 0x05, 0x48, - 0xce, 0x98, 0x2c, 0x04, 0x03, 0xd4, 0x42, 0x30, 0x40, 0x7a, 0xc6, 0x32, 0x23, 0x70, 0x80, 0x97, - 0x5d, 0x1c, 0x20, 0x33, 0xe3, 0x8b, 0xc7, 0x80, 0x80, 0x37, 0x02, 0x40, 0x40, 0x8e, 0x89, 0x6e, - 0x44, 0x8a, 0x4e, 0x41, 0x02, 0x5e, 0xf3, 0x90, 0x80, 0x42, 0x24, 0x8a, 0x20, 0x84, 0xc7, 0xa1, - 0x80, 0xc3, 0x09, 0x28, 0x80, 0xb7, 0xee, 0xcf, 0x44, 0xaa, 0x98, 0x81, 0x05, 0x1c, 0x4e, 0x60, - 0x01, 0xa5, 0x19, 0x0a, 0x67, 0x80, 0x01, 0x3f, 0x9a, 0x0e, 0x06, 0x44, 0xb7, 0xeb, 0xe2, 0x33, - 0xe7, 0x43, 0x03, 0xb4, 0x08, 0x34, 0x40, 0x8e, 0xec, 0x5c, 0xb9, 0xfa, 0xb9, 0xe1, 0x80, 0x93, - 0x29, 0x70, 0x00, 0x6f, 0xdc, 0x6f, 0x44, 0x2a, 0x9f, 0x03, 0x0f, 0x38, 0x99, 0x82, 0x07, 0xa0, - 0x99, 0x6a, 0x67, 0x02, 0x02, 0xf7, 0xc2, 0x80, 0xc0, 0x4a, 0x44, 0xd5, 0xe9, 0x9f, 0xf6, 0x08, - 0x44, 0xe0, 0x34, 0x0a, 0x11, 0xe0, 0x5d, 0xfb, 0x0b, 0x91, 0x1a, 0x17, 0x80, 0x04, 0x0e, 0x27, - 0x20, 0x81, 0x2b, 0x33, 0x3c, 0x6d, 0x7e, 0x4c, 0x20, 0x25, 0xa7, 0xf7, 0x92, 0xd9, 0xac, 0x9c, - 0xe3, 0x68, 0xc0, 0x5e, 0x32, 0x9b, 0x97, 0x0b, 0xca, 0x73, 0xb4, 0x82, 0x19, 0x8b, 0x73, 0xb4, - 0x57, 0xc0, 0xb6, 0x6d, 0xda, 0xa2, 0xbb, 0xe7, 0x03, 0xe5, 0x06, 0xed, 0x11, 0xfd, 0x98, 0x76, - 0x09, 0x7e, 0xc0, 0x7a, 0xb2, 0x40, 0x1c, 0x53, 0x7e, 0x2f, 0xf9, 0xb2, 0x0c, 0x41, 0x08, 0xf6, - 0x97, 0x39, 0xd1, 0x5f, 0x06, 0x50, 0x85, 0x78, 0x18, 0x55, 0x58, 0x87, 0x3c, 0xed, 0xb5, 0xc6, - 0x00, 0x03, 0xdd, 0xf2, 0x00, 0x83, 0x9b, 0xb0, 0xcc, 0x12, 0x26, 0xc7, 0x1e, 0x44, 0x5a, 0x4a, - 0xb2, 0xb4, 0xb4, 0x44, 0x5f, 0x70, 0xeb, 0xf0, 0xfc, 0xf4, 0x22, 0xac, 0x04, 0x78, 0xbd, 0x1e, - 0x8e, 0x77, 0xcf, 0xb2, 0xc7, 0x5d, 0x15, 0xcd, 0xdc, 0x9f, 0x24, 0xdf, 0x42, 0x3e, 0xd2, 0x30, - 0x0d, 0x14, 0x90, 0xbe, 0x27, 0x50, 0x20, 0xfe, 0xc8, 0xa0, 0x40, 0xb0, 0x27, 0x4d, 0x84, 0x7b, - 0xd2, 0x7f, 0x48, 0xfe, 0x9e, 0x78, 0x2d, 0x7e, 0xcb, 0x6c, 0x63, 0xd1, 0x25, 0xb2, 0x67, 0x5a, - 0x92, 0xf4, 0xcc, 0x33, 0xd1, 0x0b, 0xd2, 0x47, 0xca, 0xe5, 0x25, 0x9e, 0x9c, 0xc8, 0x2b, 0x5e, - 0x83, 0xc9, 0x13, 0xbf, 0x68, 0x30, 0x65, 0x48, 0x3c, 0xc4, 0x1c, 0x2e, 0x2e, 0xa8, 0xf4, 0x91, - 0xf2, 0x31, 0xe7, 0x13, 0x09, 0x9c, 0x0f, 0xd0, 0xab, 0x90, 0x63, 0x60, 0xbf, 0x66, 0x5a, 0x8e, - 0x80, 0x88, 0x43, 0xa5, 0x0d, 0x47, 0xfc, 0x37, 0x8f, 0x28, 0xcf, 0xa1, 0xe5, 0xa8, 0x59, 0x4b, - 0x3c, 0x05, 0x2a, 0x8e, 0x5c, 0xa8, 0xe2, 0xb8, 0x0e, 0x39, 0xfa, 0xf5, 0x8e, 0xa5, 0xb7, 0x70, - 0x19, 0xd8, 0x87, 0xfa, 0x04, 0xe5, 0x77, 0x71, 0x58, 0x1a, 0x4b, 0x34, 0x53, 0xd7, 0xee, 0xba, - 0x64, 0x3c, 0x00, 0x79, 0xcc, 0x67, 0x8f, 0x35, 0x80, 0x33, 0xdd, 0xd1, 0x3e, 0xd4, 0x07, 0x04, - 0xb7, 0x85, 0x51, 0x02, 0x14, 0x54, 0x81, 0x2c, 0x1d, 0x0d, 0x1d, 0xdc, 0x16, 0xe8, 0x8b, 0x37, - 0x46, 0x0d, 0x48, 0xe3, 0x73, 0x3c, 0x20, 0x4e, 0x39, 0xc3, 0xb6, 0xfd, 0xea, 0x64, 0x3b, 0x4c, - 0x5f, 0xef, 0x94, 0xe9, 0x66, 0x7f, 0xfb, 0xd5, 0xba, 0xcc, 0xb9, 0x5f, 0x30, 0xfb, 0x06, 0xc1, - 0x7d, 0x8b, 0x5c, 0xa8, 0x42, 0x3e, 0x6c, 0x85, 0xec, 0x98, 0x15, 0x18, 0x0e, 0x58, 0x70, 0xdb, - 0x7b, 0x6a, 0x53, 0xc3, 0xb4, 0x0d, 0x72, 0xa1, 0x16, 0xfb, 0xb8, 0x6f, 0x99, 0x66, 0x4f, 0xe3, - 0x67, 0xbc, 0x0a, 0xa5, 0x70, 0x5e, 0x45, 0x4f, 0x41, 0xd1, 0xc6, 0x44, 0x37, 0x06, 0x5a, 0xa8, - 0x08, 0x2e, 0x70, 0x22, 0x3f, 0x53, 0x7b, 0xc9, 0xac, 0x24, 0xc7, 0xf7, 0x92, 0xd9, 0xb8, 0x9c, - 0x50, 0x8e, 0xe0, 0xca, 0xd4, 0xbc, 0x8a, 0x5e, 0x81, 0x9c, 0x9f, 0x92, 0x25, 0xb6, 0xda, 0x4b, - 0x90, 0x16, 0x9f, 0x57, 0xf9, 0x83, 0xe4, 0xab, 0x0c, 0x63, 0x37, 0x75, 0x48, 0xdb, 0xd8, 0x19, - 0xf6, 0x38, 0x9a, 0x52, 0xda, 0x7e, 0x71, 0xbe, 0x8c, 0x4c, 0xa9, 0xc3, 0x1e, 0x51, 0x85, 0xb0, - 0xf2, 0x2e, 0xa4, 0x39, 0x05, 0xe5, 0x21, 0x73, 0x72, 0x70, 0xff, 0xe0, 0xf0, 0xed, 0x03, 0x39, - 0x86, 0x00, 0xd2, 0xd5, 0x5a, 0xad, 0x7e, 0xd4, 0x94, 0x25, 0x94, 0x83, 0x54, 0x75, 0xe7, 0x50, - 0x6d, 0xca, 0x71, 0x4a, 0x56, 0xeb, 0x7b, 0xf5, 0x5a, 0x53, 0x4e, 0xa0, 0x65, 0x28, 0xf2, 0x67, - 0xed, 0xde, 0xa1, 0xfa, 0x66, 0xb5, 0x29, 0x27, 0x03, 0xa4, 0xe3, 0xfa, 0xc1, 0xdd, 0xba, 0x2a, - 0xa7, 0x94, 0xff, 0x81, 0x6b, 0x91, 0x39, 0xdc, 0x07, 0x66, 0xa4, 0x00, 0x30, 0xa3, 0x7c, 0x16, - 0xa7, 0x4d, 0x4d, 0x54, 0x62, 0x46, 0x7b, 0x63, 0x0b, 0xdf, 0x5e, 0x20, 0xab, 0x8f, 0xad, 0x9e, - 0xf6, 0x31, 0x36, 0xee, 0x60, 0xd2, 0xea, 0xf2, 0x42, 0x81, 0x47, 0xa0, 0xa2, 0x5a, 0x14, 0x54, - 0x26, 0xe4, 0x70, 0xb6, 0xf7, 0x71, 0x8b, 0x68, 0xdc, 0x89, 0x1c, 0xd6, 0x4c, 0xe4, 0x28, 0x1b, - 0xa5, 0x1e, 0x73, 0xa2, 0xf2, 0xde, 0x42, 0xb6, 0xcc, 0x41, 0x4a, 0xad, 0x37, 0xd5, 0x77, 0xe4, - 0x04, 0x42, 0x50, 0x62, 0x8f, 0xda, 0xf1, 0x41, 0xf5, 0xe8, 0xb8, 0x71, 0x48, 0x6d, 0xb9, 0x02, - 0x4b, 0xae, 0x2d, 0x5d, 0x62, 0x4a, 0x79, 0x1e, 0x1e, 0x8b, 0xa8, 0x2a, 0x26, 0x5b, 0x2a, 0xe5, - 0x37, 0x52, 0x90, 0x3b, 0x5c, 0x19, 0x1c, 0x42, 0xda, 0x21, 0x3a, 0x19, 0x3a, 0xc2, 0x88, 0xaf, - 0xcc, 0x5b, 0x66, 0x6c, 0xba, 0x0f, 0xc7, 0x4c, 0x5c, 0x15, 0x6a, 0x94, 0xdb, 0x50, 0x0a, 0xbf, - 0x89, 0xb6, 0x81, 0xef, 0x44, 0x71, 0xe5, 0x0e, 0xa0, 0xc9, 0xea, 0x63, 0x4a, 0x7b, 0x29, 0x4d, - 0x6b, 0x2f, 0x7f, 0x2b, 0xc1, 0xe3, 0x97, 0x54, 0x1a, 0xe8, 0xad, 0xb1, 0x45, 0xbe, 0xb6, 0x48, - 0x9d, 0xb2, 0xc9, 0x69, 0x63, 0xcb, 0xbc, 0x05, 0x85, 0x20, 0x7d, 0xbe, 0x45, 0x7e, 0x1b, 0xf7, - 0x0f, 0x71, 0xb8, 0x0f, 0xf6, 0x43, 0xa0, 0xf4, 0x1d, 0x43, 0xe0, 0xeb, 0x00, 0x64, 0xa4, 0x71, - 0xb7, 0x76, 0xf3, 0xe8, 0x13, 0x53, 0xf0, 0x45, 0xdc, 0x6a, 0x8e, 0xc4, 0x21, 0xc8, 0x11, 0xf1, - 0xe4, 0xa0, 0xe3, 0x20, 0x28, 0x30, 0x64, 0x39, 0xd6, 0x11, 0x0d, 0xf3, 0xbc, 0xc9, 0xd8, 0x07, - 0x0f, 0x38, 0xd9, 0x41, 0xef, 0xc0, 0x63, 0x63, 0x85, 0x82, 0xa7, 0x3a, 0x39, 0x6f, 0xbd, 0x70, - 0x25, 0x5c, 0x2f, 0xb8, 0xaa, 0x83, 0xd9, 0x3e, 0x15, 0xce, 0xf6, 0xef, 0x00, 0xf8, 0xe0, 0x00, - 0x8d, 0x30, 0xb6, 0x39, 0x1c, 0xb4, 0x99, 0x07, 0xa4, 0x54, 0x3e, 0x40, 0xb7, 0x21, 0x45, 0x3d, - 0xc9, 0xb5, 0xd3, 0x64, 0x28, 0xa6, 0x9e, 0x10, 0x00, 0x17, 0x38, 0xb7, 0x62, 0x00, 0x9a, 0x04, - 0x68, 0x23, 0xa6, 0x78, 0x23, 0x3c, 0xc5, 0x93, 0x91, 0x50, 0xef, 0xf4, 0xa9, 0x3e, 0x82, 0x14, - 0xdb, 0x79, 0x9a, 0x74, 0xd9, 0x5f, 0x01, 0x51, 0x2d, 0xd2, 0x67, 0xf4, 0x63, 0x00, 0x9d, 0x10, - 0xdb, 0x38, 0x1d, 0xfa, 0x13, 0xac, 0x4f, 0xf7, 0x9c, 0xaa, 0xcb, 0xb7, 0x73, 0x5d, 0xb8, 0xd0, - 0xaa, 0x2f, 0x1a, 0x70, 0xa3, 0x80, 0x42, 0xe5, 0x00, 0x4a, 0x61, 0x59, 0xb7, 0xbe, 0xe1, 0xdf, - 0x10, 0xae, 0x6f, 0x78, 0xb9, 0x2a, 0xea, 0x1b, 0xaf, 0x3a, 0x4a, 0xf0, 0x5f, 0x1f, 0x6c, 0xa0, - 0xfc, 0x24, 0x0e, 0x85, 0xa0, 0xe3, 0xfd, 0xe7, 0x95, 0x20, 0xca, 0xcf, 0x25, 0xc8, 0x7a, 0xcb, - 0x0f, 0xff, 0x07, 0x09, 0xfd, 0x38, 0xe2, 0xd6, 0x8b, 0x07, 0x7f, 0x5e, 0xf0, 0xdf, 0x44, 0x09, - 0xef, 0x37, 0xd1, 0x1d, 0x2f, 0xfd, 0x45, 0x01, 0x22, 0x41, 0x5b, 0x0b, 0xaf, 0x72, 0xb3, 0xfd, - 0x1d, 0xc8, 0x79, 0xa7, 0x97, 0x36, 0x1d, 0x2e, 0x70, 0x24, 0x89, 0x33, 0x24, 0x60, 0xbf, 0x55, - 0x48, 0x59, 0xe6, 0x87, 0xe2, 0xcf, 0x48, 0x42, 0xe5, 0x03, 0xa5, 0x0d, 0x4b, 0x63, 0x47, 0x1f, - 0xdd, 0x81, 0x8c, 0x35, 0x3c, 0xd5, 0x5c, 0xe7, 0x18, 0x83, 0xd7, 0xdc, 0x72, 0x76, 0x78, 0xda, - 0x33, 0x5a, 0xf7, 0xf1, 0x85, 0xfb, 0x31, 0xd6, 0xf0, 0xf4, 0x3e, 0xf7, 0x21, 0x3e, 0x4b, 0x3c, - 0x38, 0xcb, 0x2f, 0x25, 0xc8, 0xba, 0x67, 0x02, 0xfd, 0x1f, 0xe4, 0xbc, 0xb0, 0xe2, 0xfd, 0xda, - 0x8c, 0x8c, 0x47, 0x42, 0xbf, 0x2f, 0x82, 0xaa, 0xee, 0x3f, 0x59, 0xa3, 0xad, 0x75, 0x7a, 0x3a, - 0xf7, 0xa5, 0x52, 0xd8, 0x66, 0x3c, 0xf0, 0xb0, 0x78, 0xbc, 0x7b, 0xf7, 0x5e, 0x4f, 0x3f, 0x53, - 0xf3, 0x4c, 0x66, 0xb7, 0x4d, 0x07, 0xa2, 0xb2, 0xfb, 0xbb, 0x04, 0xf2, 0xf8, 0x89, 0xfd, 0xce, - 0x5f, 0x37, 0x99, 0xe6, 0x12, 0x53, 0xd2, 0x1c, 0xda, 0x82, 0x15, 0x8f, 0x43, 0x73, 0x8c, 0xb3, - 0x81, 0x4e, 0x86, 0x36, 0x16, 0x80, 0x24, 0xf2, 0x5e, 0x1d, 0xbb, 0x6f, 0x26, 0x57, 0x9d, 0x7a, - 0xc4, 0x55, 0x7f, 0x1c, 0x87, 0x7c, 0x00, 0x1e, 0x45, 0xff, 0x1b, 0x08, 0x46, 0xa5, 0x29, 0x99, - 0x21, 0xc0, 0xeb, 0xff, 0xa6, 0x0c, 0x9b, 0x29, 0xbe, 0xb8, 0x99, 0xa2, 0x40, 0x68, 0x17, 0x6d, - 0x4d, 0x2e, 0x8c, 0xb6, 0xbe, 0x00, 0x88, 0x98, 0x44, 0xef, 0x69, 0xe7, 0x26, 0x31, 0x06, 0x67, - 0x1a, 0x77, 0x43, 0x1e, 0x3a, 0x64, 0xf6, 0xe6, 0x01, 0x7b, 0x71, 0xc4, 0x3c, 0xf2, 0xa7, 0x12, - 0x64, 0xbd, 0xb2, 0x7b, 0xd1, 0x9f, 0x98, 0x57, 0x21, 0x2d, 0x2a, 0x4b, 0xfe, 0x17, 0x53, 0x8c, - 0xa6, 0xc2, 0xca, 0x15, 0xc8, 0xf6, 0x31, 0xd1, 0x59, 0x1c, 0xe4, 0x59, 0xcd, 0x1b, 0xdf, 0x7c, - 0x0d, 0xf2, 0x81, 0x1f, 0xc0, 0x34, 0x34, 0x1e, 0xd4, 0xdf, 0x96, 0x63, 0x95, 0xcc, 0x27, 0x9f, - 0x6f, 0x24, 0x0e, 0xf0, 0x87, 0xf4, 0x34, 0xab, 0xf5, 0x5a, 0xa3, 0x5e, 0xbb, 0x2f, 0x4b, 0x95, - 0xfc, 0x27, 0x9f, 0x6f, 0x64, 0x54, 0xcc, 0x10, 0xc5, 0x9b, 0xf7, 0x61, 0x69, 0x6c, 0x63, 0xc2, - 0x65, 0x0b, 0x82, 0xd2, 0xdd, 0x93, 0xa3, 0xfd, 0xdd, 0x5a, 0xb5, 0x59, 0xd7, 0x1e, 0x1c, 0x36, - 0xeb, 0xb2, 0x84, 0x1e, 0x83, 0x95, 0xfd, 0xdd, 0xff, 0x6f, 0x34, 0xb5, 0xda, 0xfe, 0x6e, 0xfd, - 0xa0, 0xa9, 0x55, 0x9b, 0xcd, 0x6a, 0xed, 0xbe, 0x1c, 0xdf, 0xfe, 0x3c, 0x0f, 0xc9, 0xea, 0x4e, - 0x6d, 0x17, 0xd5, 0x20, 0xc9, 0xa0, 0x90, 0x4b, 0x6f, 0x80, 0x55, 0x2e, 0xc7, 0x86, 0xd1, 0x3d, - 0x48, 0x31, 0x94, 0x04, 0x5d, 0x7e, 0x25, 0xac, 0x32, 0x03, 0x2c, 0xa6, 0x1f, 0xc3, 0x4e, 0xe4, - 0xa5, 0x77, 0xc4, 0x2a, 0x97, 0x63, 0xc7, 0x68, 0x1f, 0x32, 0x6e, 0x93, 0x3c, 0xeb, 0xe2, 0x56, - 0x65, 0x26, 0xa0, 0x4b, 0x97, 0xc6, 0xc1, 0x86, 0xcb, 0xaf, 0x8f, 0x55, 0x66, 0xa0, 0xca, 0x68, - 0x17, 0xd2, 0xa2, 0x1d, 0x9d, 0x71, 0x23, 0xac, 0x32, 0x0b, 0x27, 0x46, 0x2a, 0xe4, 0x7c, 0x18, - 0x67, 0xf6, 0xa5, 0xb8, 0xca, 0x1c, 0x80, 0x39, 0x7a, 0x17, 0x8a, 0xe1, 0x56, 0x77, 0xbe, 0x5b, - 0x67, 0x95, 0x39, 0x11, 0x69, 0xaa, 0x3f, 0xdc, 0xf7, 0xce, 0x77, 0x0b, 0xad, 0x32, 0x27, 0x40, - 0x8d, 0xde, 0x87, 0xe5, 0xc9, 0xbe, 0x74, 0xfe, 0x4b, 0x69, 0x95, 0x05, 0x20, 0x6b, 0xd4, 0x07, - 0x34, 0xa5, 0x9f, 0x5d, 0xe0, 0x8e, 0x5a, 0x65, 0x11, 0x04, 0x1b, 0xb5, 0x61, 0x69, 0xbc, 0x49, - 0x9c, 0xf7, 0xce, 0x5a, 0x65, 0x6e, 0x34, 0x9b, 0xcf, 0x12, 0x6e, 0x2e, 0xe7, 0xbd, 0xc3, 0x56, - 0x99, 0x1b, 0xdc, 0x46, 0x27, 0x00, 0x81, 0xfe, 0x70, 0x8e, 0x3b, 0x6d, 0x95, 0x79, 0x60, 0x6e, - 0x64, 0xc1, 0xca, 0xb4, 0xc6, 0x71, 0x91, 0x2b, 0x6e, 0x95, 0x85, 0xd0, 0x6f, 0xea, 0xcf, 0xe1, - 0x16, 0x70, 0xbe, 0x2b, 0x6f, 0x95, 0x39, 0x61, 0xf0, 0x9d, 0xea, 0x17, 0x5f, 0xaf, 0x49, 0x5f, - 0x7e, 0xbd, 0x26, 0xfd, 0xed, 0xeb, 0x35, 0xe9, 0xd3, 0x6f, 0xd6, 0x62, 0x5f, 0x7e, 0xb3, 0x16, - 0xfb, 0xcb, 0x37, 0x6b, 0xb1, 0x1f, 0x3c, 0x7b, 0x66, 0x90, 0xee, 0xf0, 0x74, 0xb3, 0x65, 0xf6, - 0xb7, 0x5a, 0x66, 0x1f, 0x93, 0xd3, 0x0e, 0xf1, 0x1f, 0xfc, 0x9b, 0xcb, 0xa7, 0x69, 0x96, 0x41, - 0x6f, 0xfd, 0x33, 0x00, 0x00, 0xff, 0xff, 0x64, 0xd0, 0x90, 0x6e, 0xd9, 0x2c, 0x00, 0x00, + proto.RegisterEnum("cometbft.v38.abci.CheckTxType", CheckTxType_name, CheckTxType_value) + proto.RegisterEnum("cometbft.v38.abci.MisbehaviorType", MisbehaviorType_name, MisbehaviorType_value) + proto.RegisterEnum("cometbft.v38.abci.ResponseOfferSnapshot_Result", ResponseOfferSnapshot_Result_name, ResponseOfferSnapshot_Result_value) + proto.RegisterEnum("cometbft.v38.abci.ResponseApplySnapshotChunk_Result", ResponseApplySnapshotChunk_Result_name, ResponseApplySnapshotChunk_Result_value) + proto.RegisterEnum("cometbft.v38.abci.ResponseProcessProposal_ProposalStatus", ResponseProcessProposal_ProposalStatus_name, ResponseProcessProposal_ProposalStatus_value) + proto.RegisterEnum("cometbft.v38.abci.ResponseVerifyVoteExtension_VerifyStatus", ResponseVerifyVoteExtension_VerifyStatus_name, ResponseVerifyVoteExtension_VerifyStatus_value) + proto.RegisterType((*Request)(nil), "cometbft.v38.abci.Request") + proto.RegisterType((*RequestEcho)(nil), "cometbft.v38.abci.RequestEcho") + proto.RegisterType((*RequestFlush)(nil), "cometbft.v38.abci.RequestFlush") + proto.RegisterType((*RequestInfo)(nil), "cometbft.v38.abci.RequestInfo") + proto.RegisterType((*RequestInitChain)(nil), "cometbft.v38.abci.RequestInitChain") + proto.RegisterType((*RequestQuery)(nil), "cometbft.v38.abci.RequestQuery") + proto.RegisterType((*RequestCheckTx)(nil), "cometbft.v38.abci.RequestCheckTx") + proto.RegisterType((*RequestCommit)(nil), "cometbft.v38.abci.RequestCommit") + proto.RegisterType((*RequestListSnapshots)(nil), "cometbft.v38.abci.RequestListSnapshots") + proto.RegisterType((*RequestOfferSnapshot)(nil), "cometbft.v38.abci.RequestOfferSnapshot") + proto.RegisterType((*RequestLoadSnapshotChunk)(nil), "cometbft.v38.abci.RequestLoadSnapshotChunk") + proto.RegisterType((*RequestApplySnapshotChunk)(nil), "cometbft.v38.abci.RequestApplySnapshotChunk") + proto.RegisterType((*RequestPrepareProposal)(nil), "cometbft.v38.abci.RequestPrepareProposal") + proto.RegisterType((*RequestProcessProposal)(nil), "cometbft.v38.abci.RequestProcessProposal") + proto.RegisterType((*RequestExtendVote)(nil), "cometbft.v38.abci.RequestExtendVote") + proto.RegisterType((*RequestVerifyVoteExtension)(nil), "cometbft.v38.abci.RequestVerifyVoteExtension") + proto.RegisterType((*RequestFinalizeBlock)(nil), "cometbft.v38.abci.RequestFinalizeBlock") + proto.RegisterType((*Response)(nil), "cometbft.v38.abci.Response") + proto.RegisterType((*ResponseException)(nil), "cometbft.v38.abci.ResponseException") + proto.RegisterType((*ResponseEcho)(nil), "cometbft.v38.abci.ResponseEcho") + proto.RegisterType((*ResponseFlush)(nil), "cometbft.v38.abci.ResponseFlush") + proto.RegisterType((*ResponseInfo)(nil), "cometbft.v38.abci.ResponseInfo") + proto.RegisterType((*ResponseInitChain)(nil), "cometbft.v38.abci.ResponseInitChain") + proto.RegisterType((*ResponseQuery)(nil), "cometbft.v38.abci.ResponseQuery") + proto.RegisterType((*ResponseCheckTx)(nil), "cometbft.v38.abci.ResponseCheckTx") + proto.RegisterType((*ResponseCommit)(nil), "cometbft.v38.abci.ResponseCommit") + proto.RegisterType((*ResponseListSnapshots)(nil), "cometbft.v38.abci.ResponseListSnapshots") + proto.RegisterType((*ResponseOfferSnapshot)(nil), "cometbft.v38.abci.ResponseOfferSnapshot") + proto.RegisterType((*ResponseLoadSnapshotChunk)(nil), "cometbft.v38.abci.ResponseLoadSnapshotChunk") + proto.RegisterType((*ResponseApplySnapshotChunk)(nil), "cometbft.v38.abci.ResponseApplySnapshotChunk") + proto.RegisterType((*ResponsePrepareProposal)(nil), "cometbft.v38.abci.ResponsePrepareProposal") + proto.RegisterType((*ResponseProcessProposal)(nil), "cometbft.v38.abci.ResponseProcessProposal") + proto.RegisterType((*ResponseExtendVote)(nil), "cometbft.v38.abci.ResponseExtendVote") + proto.RegisterType((*ResponseVerifyVoteExtension)(nil), "cometbft.v38.abci.ResponseVerifyVoteExtension") + proto.RegisterType((*ResponseFinalizeBlock)(nil), "cometbft.v38.abci.ResponseFinalizeBlock") + proto.RegisterType((*CommitInfo)(nil), "cometbft.v38.abci.CommitInfo") + proto.RegisterType((*ExtendedCommitInfo)(nil), "cometbft.v38.abci.ExtendedCommitInfo") + proto.RegisterType((*Event)(nil), "cometbft.v38.abci.Event") + proto.RegisterType((*EventAttribute)(nil), "cometbft.v38.abci.EventAttribute") + proto.RegisterType((*ExecTxResult)(nil), "cometbft.v38.abci.ExecTxResult") + proto.RegisterType((*TxResult)(nil), "cometbft.v38.abci.TxResult") + proto.RegisterType((*Validator)(nil), "cometbft.v38.abci.Validator") + proto.RegisterType((*ValidatorUpdate)(nil), "cometbft.v38.abci.ValidatorUpdate") + proto.RegisterType((*VoteInfo)(nil), "cometbft.v38.abci.VoteInfo") + proto.RegisterType((*ExtendedVoteInfo)(nil), "cometbft.v38.abci.ExtendedVoteInfo") + proto.RegisterType((*Misbehavior)(nil), "cometbft.v38.abci.Misbehavior") + proto.RegisterType((*Snapshot)(nil), "cometbft.v38.abci.Snapshot") +} + +func init() { proto.RegisterFile("cometbft/v38/abci/types.proto", fileDescriptor_20001f7d3f447b81) } + +var fileDescriptor_20001f7d3f447b81 = []byte{ + // 3182 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4d, 0x70, 0x23, 0xc5, + 0x15, 0xd6, 0xe8, 0x5f, 0x4f, 0x3f, 0x1e, 0xb7, 0xbd, 0x8b, 0x10, 0x60, 0x9b, 0xd9, 0x10, 0x96, + 0x05, 0xec, 0xc4, 0x0b, 0x61, 0x61, 0x0b, 0x88, 0xad, 0xd5, 0xae, 0x6c, 0x2f, 0xb6, 0x77, 0xac, + 0xf5, 0x16, 0xa1, 0xc2, 0x30, 0x96, 0x5a, 0xd6, 0x60, 0x49, 0x33, 0xcc, 0xb4, 0xbc, 0x72, 0x2a, + 0x27, 0x2e, 0xa4, 0xa8, 0x1c, 0xb8, 0xa5, 0x2a, 0x05, 0xa7, 0x1c, 0x72, 0xc9, 0x39, 0x95, 0x63, + 0x8e, 0x1c, 0x39, 0xe6, 0x12, 0x48, 0xc1, 0x2d, 0xc7, 0x5c, 0x52, 0xb9, 0xa5, 0xfa, 0x67, 0x46, + 0x33, 0xd2, 0xe8, 0x6f, 0xd9, 0x1c, 0x52, 0xc9, 0x6d, 0xfa, 0xcd, 0x7b, 0xaf, 0xa7, 0x5f, 0xbf, + 0x7e, 0x3f, 0xdf, 0x34, 0x3c, 0x53, 0x37, 0x3b, 0x98, 0x9c, 0x34, 0xc9, 0xc6, 0xf9, 0xf5, 0x1b, + 0x1b, 0xfa, 0x49, 0xdd, 0xd8, 0x20, 0x17, 0x16, 0x76, 0xd6, 0x2d, 0xdb, 0x24, 0x26, 0x5a, 0x74, + 0x5f, 0xaf, 0x9f, 0x5f, 0xbf, 0xb1, 0x4e, 0x5f, 0x97, 0x56, 0x03, 0x12, 0x75, 0xfb, 0xc2, 0x22, + 0xe6, 0x86, 0x65, 0x9b, 0x66, 0x93, 0xcb, 0x94, 0x56, 0xc2, 0x18, 0xce, 0xf0, 0x85, 0xd0, 0x39, + 0xa4, 0x80, 0xcd, 0xb6, 0x61, 0xe9, 0xb6, 0xde, 0x71, 0x19, 0x94, 0x10, 0x86, 0x73, 0xbd, 0x6d, + 0x34, 0x74, 0x62, 0xda, 0xae, 0x92, 0x53, 0xd3, 0x3c, 0x6d, 0xe3, 0x0d, 0x36, 0x3a, 0xe9, 0x35, + 0x37, 0x88, 0xd1, 0xc1, 0x0e, 0xd1, 0x3b, 0x96, 0x60, 0x58, 0x3e, 0x35, 0x4f, 0x4d, 0xf6, 0xb8, + 0x41, 0x9f, 0x38, 0x55, 0xf9, 0x26, 0x03, 0x29, 0x15, 0x7f, 0xd4, 0xc3, 0x0e, 0x41, 0xaf, 0x40, + 0x1c, 0xd7, 0x5b, 0x66, 0x51, 0x5a, 0x93, 0xae, 0x66, 0x37, 0x57, 0xd6, 0x47, 0x96, 0xba, 0x2e, + 0x38, 0x2b, 0xf5, 0x96, 0x59, 0x8d, 0xa8, 0x8c, 0x1b, 0xbd, 0x06, 0x89, 0x66, 0xbb, 0xe7, 0xb4, + 0x8a, 0x51, 0x26, 0xb6, 0x3a, 0x5e, 0xec, 0x36, 0x65, 0xab, 0x46, 0x54, 0xce, 0x4f, 0xa7, 0x33, + 0xba, 0x4d, 0xb3, 0x18, 0x9b, 0x36, 0xdd, 0x4e, 0xb7, 0xc9, 0xa6, 0xa3, 0xdc, 0xe8, 0x16, 0x80, + 0xd1, 0x35, 0x88, 0x56, 0x6f, 0xe9, 0x46, 0xb7, 0x98, 0x60, 0xb2, 0x57, 0x26, 0xc9, 0x1a, 0xa4, + 0x4c, 0x59, 0xab, 0x11, 0x35, 0x63, 0xb8, 0x03, 0xfa, 0xd1, 0x1f, 0xf5, 0xb0, 0x7d, 0x51, 0x4c, + 0x4e, 0xfb, 0xe8, 0x7b, 0x94, 0x8d, 0x7e, 0x34, 0xe3, 0x47, 0x6f, 0x41, 0xba, 0xde, 0xc2, 0xf5, + 0x33, 0x8d, 0xf4, 0x8b, 0x69, 0x26, 0xfb, 0xec, 0x78, 0xd9, 0x32, 0xe5, 0xac, 0xf5, 0xab, 0x11, + 0x35, 0x55, 0xe7, 0x8f, 0xe8, 0x0d, 0x48, 0xd6, 0xcd, 0x4e, 0xc7, 0x20, 0xc5, 0x2c, 0x93, 0x5e, + 0x9b, 0x20, 0xcd, 0xf8, 0xaa, 0x11, 0x55, 0x48, 0xa0, 0x43, 0x28, 0xb4, 0x0d, 0x87, 0x68, 0x4e, + 0x57, 0xb7, 0x9c, 0x96, 0x49, 0x9c, 0x62, 0x8e, 0xe9, 0x78, 0x7e, 0xbc, 0x8e, 0xbb, 0x86, 0x43, + 0x8e, 0x5c, 0xf6, 0x6a, 0x44, 0xcd, 0xb7, 0xfd, 0x04, 0xaa, 0xd1, 0x6c, 0x36, 0xb1, 0xed, 0xa9, + 0x2c, 0xe6, 0xa7, 0x69, 0x3c, 0xa0, 0xfc, 0xae, 0x06, 0xaa, 0xd1, 0xf4, 0x13, 0xd0, 0xcf, 0x61, + 0xa9, 0x6d, 0xea, 0x0d, 0x4f, 0xa1, 0x56, 0x6f, 0xf5, 0xba, 0x67, 0xc5, 0x02, 0x53, 0xfb, 0xe2, + 0x84, 0x0f, 0x35, 0xf5, 0x86, 0xab, 0xa4, 0x4c, 0x45, 0xaa, 0x11, 0x75, 0xb1, 0x3d, 0x4c, 0x44, + 0x1f, 0xc0, 0xb2, 0x6e, 0x59, 0xed, 0x8b, 0x61, 0xfd, 0x0b, 0x4c, 0xff, 0x4b, 0xe3, 0xf5, 0x6f, + 0x51, 0xa9, 0xe1, 0x09, 0x90, 0x3e, 0x42, 0x45, 0xc7, 0x20, 0x5b, 0x36, 0xb6, 0x74, 0x1b, 0x6b, + 0x96, 0x6d, 0x5a, 0xa6, 0xa3, 0xb7, 0x8b, 0x32, 0xd3, 0xfe, 0xc2, 0x78, 0xed, 0x87, 0x5c, 0xe2, + 0x50, 0x08, 0x54, 0x23, 0xea, 0x82, 0x15, 0x24, 0x71, 0xbd, 0x66, 0x1d, 0x3b, 0xce, 0x40, 0xef, + 0xe2, 0x74, 0xbd, 0x4c, 0x22, 0xa8, 0x37, 0x40, 0x42, 0x77, 0x20, 0x8b, 0xfb, 0x04, 0x77, 0x1b, + 0xda, 0xb9, 0x49, 0x70, 0x11, 0x31, 0x95, 0x3f, 0x98, 0x70, 0x76, 0x19, 0xf3, 0xb1, 0x49, 0x70, + 0x35, 0xa2, 0x02, 0xf6, 0x46, 0xa8, 0x0e, 0x97, 0xce, 0xb1, 0x6d, 0x34, 0x2f, 0x98, 0x22, 0x8d, + 0xbd, 0x71, 0x0c, 0xb3, 0x5b, 0x5c, 0x62, 0x2a, 0x5f, 0x1e, 0xaf, 0xf2, 0x98, 0x89, 0x51, 0x25, + 0x15, 0x57, 0xa8, 0x1a, 0x51, 0x97, 0xce, 0x47, 0xc9, 0xd4, 0xe1, 0x9a, 0x46, 0x57, 0x6f, 0x1b, + 0xbf, 0xc0, 0xda, 0x49, 0xdb, 0xac, 0x9f, 0x15, 0x97, 0xa7, 0x39, 0xdc, 0x6d, 0xc1, 0xbf, 0x4d, + 0xd9, 0xa9, 0xc3, 0x35, 0xfd, 0x84, 0xed, 0x14, 0x24, 0xce, 0xf5, 0x76, 0x0f, 0xef, 0xc6, 0xd3, + 0x71, 0x39, 0xb1, 0x1b, 0x4f, 0xa7, 0xe4, 0xf4, 0x6e, 0x3c, 0x9d, 0x91, 0x61, 0x37, 0x9e, 0x06, + 0x39, 0xab, 0x3c, 0x0f, 0x59, 0x5f, 0xd8, 0x42, 0x45, 0x48, 0x75, 0xb0, 0xe3, 0xe8, 0xa7, 0x98, + 0xc5, 0xb9, 0x8c, 0xea, 0x0e, 0x95, 0x02, 0xe4, 0xfc, 0x81, 0x4a, 0xf9, 0x4c, 0xf2, 0x24, 0x69, + 0x04, 0xa2, 0x92, 0xe7, 0xd8, 0x66, 0x26, 0x11, 0x92, 0x62, 0x88, 0xae, 0x40, 0x9e, 0x2d, 0x46, + 0x73, 0xdf, 0xd3, 0x50, 0x18, 0x57, 0x73, 0x8c, 0x78, 0x2c, 0x98, 0x56, 0x21, 0x6b, 0x6d, 0x5a, + 0x1e, 0x4b, 0x8c, 0xb1, 0x80, 0xb5, 0x69, 0xb9, 0x0c, 0xcf, 0x42, 0x8e, 0xae, 0xdb, 0xe3, 0x88, + 0xb3, 0x49, 0xb2, 0x94, 0x26, 0x58, 0x94, 0xaf, 0xa2, 0x20, 0x0f, 0x07, 0x36, 0x74, 0x03, 0xe2, + 0x34, 0xd6, 0x8b, 0xb0, 0x5d, 0x5a, 0xe7, 0x89, 0x60, 0xdd, 0x4d, 0x04, 0xeb, 0x35, 0x37, 0x11, + 0x6c, 0xa7, 0xbf, 0xfc, 0x7a, 0x35, 0xf2, 0xd9, 0x37, 0xab, 0x92, 0xca, 0x24, 0xd0, 0x93, 0x34, + 0x98, 0xe9, 0x46, 0x57, 0x33, 0x1a, 0xec, 0x93, 0x33, 0x34, 0x4e, 0xe9, 0x46, 0x77, 0xa7, 0x81, + 0xf6, 0x41, 0xae, 0x9b, 0x5d, 0x07, 0x77, 0x9d, 0x9e, 0xa3, 0xf1, 0x64, 0x24, 0x02, 0xf5, 0x50, + 0xb0, 0xe5, 0xc9, 0xb1, 0xec, 0xf2, 0x1e, 0x32, 0x56, 0x75, 0xa1, 0x1e, 0x24, 0xa0, 0x2a, 0x80, + 0x97, 0xb1, 0x9c, 0x62, 0x7c, 0x2d, 0x76, 0x35, 0xbb, 0xa9, 0x84, 0x6c, 0xfa, 0xb1, 0xcb, 0x74, + 0xdf, 0x6a, 0xe8, 0x04, 0x6f, 0xc7, 0xe9, 0x27, 0xab, 0x3e, 0x59, 0xf4, 0x43, 0x58, 0xd0, 0x2d, + 0x4b, 0x73, 0x88, 0x4e, 0xb0, 0x76, 0x72, 0x41, 0xb0, 0xc3, 0xb2, 0x40, 0x4e, 0xcd, 0xeb, 0x96, + 0x75, 0x44, 0xa9, 0xdb, 0x94, 0x88, 0x9e, 0x83, 0x02, 0x8d, 0xf7, 0x86, 0xde, 0xd6, 0x5a, 0xd8, + 0x38, 0x6d, 0x11, 0x16, 0xeb, 0x63, 0x6a, 0x5e, 0x50, 0xab, 0x8c, 0xa8, 0x34, 0xbc, 0x5d, 0x67, + 0x91, 0x1e, 0x21, 0x88, 0x37, 0x74, 0xa2, 0x33, 0x6b, 0xe6, 0x54, 0xf6, 0x4c, 0x69, 0x96, 0x4e, + 0x5a, 0xc2, 0x46, 0xec, 0x19, 0x5d, 0x86, 0xa4, 0x50, 0x1b, 0x63, 0x6a, 0xc5, 0x08, 0x2d, 0x43, + 0xc2, 0xb2, 0xcd, 0x73, 0xcc, 0xb6, 0x2f, 0xad, 0xf2, 0x81, 0x52, 0x83, 0x42, 0x30, 0x27, 0xa0, + 0x02, 0x44, 0x49, 0x5f, 0xcc, 0x12, 0x25, 0x7d, 0xb4, 0x09, 0x71, 0x6a, 0x4a, 0x36, 0x47, 0x21, + 0x34, 0x1b, 0x0a, 0xc9, 0xda, 0x85, 0x85, 0x55, 0xc6, 0xab, 0x2c, 0x40, 0x3e, 0x90, 0x2b, 0x94, + 0xcb, 0xb0, 0x1c, 0x16, 0xf8, 0x95, 0x0f, 0x3d, 0x7a, 0x20, 0x7c, 0xa3, 0xd7, 0x20, 0xed, 0x45, + 0x7e, 0xee, 0x3e, 0x4f, 0x85, 0x4c, 0xec, 0xb2, 0xab, 0x1e, 0x33, 0xf5, 0x1c, 0xba, 0x09, 0x2d, + 0x5d, 0xe4, 0xfd, 0x9c, 0x9a, 0xd2, 0x2d, 0xab, 0xaa, 0x3b, 0x2d, 0xe5, 0x03, 0x28, 0x8e, 0x8b, + 0xe9, 0x3e, 0xa3, 0x49, 0xcc, 0xfd, 0x5d, 0xa3, 0x5d, 0x86, 0x64, 0xd3, 0xb4, 0x3b, 0x3a, 0x61, + 0xca, 0xf2, 0xaa, 0x18, 0x51, 0x63, 0xf2, 0xf8, 0x1e, 0x63, 0x64, 0x3e, 0x50, 0x34, 0x78, 0x72, + 0x6c, 0x54, 0xa7, 0x22, 0x46, 0xb7, 0x81, 0xb9, 0x69, 0xf3, 0x2a, 0x1f, 0x0c, 0x14, 0xf1, 0x8f, + 0xe5, 0x03, 0x3a, 0xad, 0x83, 0xbb, 0x0d, 0x6c, 0x33, 0xfd, 0x19, 0x55, 0x8c, 0x94, 0xcf, 0x63, + 0x70, 0x39, 0x3c, 0xb2, 0xa3, 0x35, 0xc8, 0x75, 0xf4, 0xbe, 0x46, 0xfa, 0xc2, 0xf5, 0x24, 0xb6, + 0xf9, 0xd0, 0xd1, 0xfb, 0xb5, 0x3e, 0xf7, 0x3b, 0x19, 0x62, 0xa4, 0xef, 0x14, 0xa3, 0x6b, 0xb1, + 0xab, 0x39, 0x95, 0x3e, 0xa2, 0x07, 0xb0, 0xd8, 0x36, 0xeb, 0x7a, 0x5b, 0x6b, 0xeb, 0x0e, 0xd1, + 0x44, 0xfa, 0xe7, 0x87, 0xe9, 0xb9, 0x10, 0x73, 0xf3, 0x08, 0x8d, 0x1b, 0x7c, 0x4f, 0x69, 0xe8, + 0x11, 0xa7, 0x60, 0x81, 0x69, 0xb9, 0xab, 0xbb, 0xdb, 0x8d, 0x6e, 0x43, 0xb6, 0x63, 0x38, 0x27, + 0xb8, 0xa5, 0x9f, 0x1b, 0xa6, 0x2d, 0x4e, 0x55, 0x98, 0xeb, 0xbc, 0x33, 0xe0, 0x12, 0xba, 0xfc, + 0x82, 0xbe, 0x6d, 0x49, 0x04, 0x7c, 0xd9, 0x8d, 0x2c, 0xc9, 0xb9, 0x23, 0xcb, 0x8f, 0x60, 0xb9, + 0x8b, 0xfb, 0x44, 0x1b, 0x9c, 0x5b, 0xee, 0x2b, 0x29, 0x66, 0x7e, 0x44, 0xdf, 0x79, 0x27, 0xdd, + 0xa1, 0x6e, 0x83, 0x5e, 0x60, 0xf9, 0xd1, 0x32, 0x1d, 0x6c, 0x6b, 0x7a, 0xa3, 0x61, 0x63, 0xc7, + 0x61, 0x05, 0x56, 0x8e, 0xa5, 0x3c, 0x46, 0xdf, 0xe2, 0x64, 0xe5, 0xd7, 0xfe, 0xed, 0x09, 0x66, + 0x43, 0x61, 0x7c, 0x69, 0x60, 0xfc, 0xfb, 0xb0, 0x2c, 0xe4, 0x1b, 0x01, 0xfb, 0xf3, 0x6a, 0xf5, + 0x99, 0xb0, 0x73, 0x36, 0x6c, 0x77, 0xe4, 0x2a, 0x18, 0x6f, 0xfa, 0xd8, 0xa3, 0x9a, 0x1e, 0x41, + 0x9c, 0x19, 0x26, 0xce, 0xc3, 0x0d, 0x7d, 0xfe, 0x6f, 0xdb, 0x8e, 0x4f, 0x62, 0xb0, 0x38, 0x52, + 0x5c, 0x78, 0x0b, 0x93, 0x42, 0x17, 0x16, 0x0d, 0x5d, 0x58, 0x6c, 0xee, 0x85, 0x89, 0xfd, 0x8e, + 0x4f, 0xdf, 0xef, 0xc4, 0x63, 0xdd, 0xef, 0xe4, 0xa3, 0xee, 0xf7, 0x7f, 0x74, 0x27, 0x3e, 0x97, + 0xa0, 0x34, 0xbe, 0x26, 0x0b, 0xdd, 0x92, 0x17, 0x61, 0xd1, 0xfb, 0x14, 0x4f, 0x3d, 0x0f, 0x92, + 0xb2, 0xf7, 0x42, 0xe8, 0x1f, 0x9b, 0xf3, 0x9e, 0x83, 0xc2, 0x50, 0xcd, 0xc8, 0xdd, 0x39, 0x7f, + 0xee, 0x9f, 0x5f, 0xf9, 0x55, 0xcc, 0x4b, 0x43, 0x81, 0xa2, 0x2e, 0xe4, 0xd4, 0x1e, 0xc1, 0x52, + 0x03, 0xd7, 0x8d, 0xc6, 0xa3, 0x1f, 0xda, 0x45, 0x21, 0xff, 0xff, 0x33, 0x1b, 0xe6, 0x29, 0x7f, + 0x04, 0x48, 0xab, 0xd8, 0xb1, 0x68, 0x95, 0x86, 0x6e, 0x41, 0x06, 0xf7, 0xeb, 0xd8, 0x22, 0x6e, + 0x69, 0x3b, 0xae, 0x81, 0xe0, 0xfc, 0x15, 0x97, 0x97, 0xb6, 0xd4, 0x9e, 0x20, 0x7a, 0x55, 0xa0, + 0x07, 0x93, 0x60, 0x00, 0xa1, 0xc0, 0x0f, 0x1f, 0xdc, 0x70, 0xe1, 0x83, 0xd8, 0x84, 0x7e, 0x98, + 0xcb, 0x0d, 0xe1, 0x07, 0xaf, 0x0a, 0xfc, 0x20, 0x3e, 0x75, 0xc2, 0x00, 0x80, 0x50, 0x09, 0x00, + 0x08, 0xc9, 0xa9, 0xcb, 0x1d, 0x83, 0x20, 0xdc, 0x70, 0x11, 0x84, 0xd4, 0xd4, 0xef, 0x1e, 0x82, + 0x10, 0xde, 0xf6, 0x41, 0x08, 0x19, 0x26, 0xac, 0x4c, 0x10, 0x0e, 0xc1, 0x10, 0x6e, 0x7a, 0x18, + 0x42, 0x6e, 0x02, 0x02, 0x21, 0xc4, 0x87, 0x41, 0x84, 0x7b, 0x23, 0x20, 0x02, 0x6f, 0xf9, 0xaf, + 0x4e, 0x50, 0x32, 0x05, 0x45, 0xb8, 0x37, 0x82, 0x22, 0x14, 0xa6, 0xaa, 0x9c, 0x02, 0x23, 0xbc, + 0x1f, 0x0e, 0x23, 0x4c, 0x6a, 0xf3, 0xc5, 0xa7, 0xce, 0x86, 0x23, 0xe8, 0x63, 0x70, 0x04, 0x79, + 0x42, 0xaf, 0xcb, 0x27, 0x98, 0x19, 0x48, 0x78, 0x10, 0x02, 0x24, 0xf0, 0x86, 0xff, 0xda, 0x04, + 0xf5, 0x33, 0x20, 0x09, 0x0f, 0x42, 0x90, 0x04, 0x34, 0x83, 0xe2, 0xa9, 0x50, 0x42, 0x35, 0x08, + 0x25, 0x2c, 0x8d, 0xad, 0x50, 0x07, 0x91, 0x60, 0x0c, 0x96, 0xd0, 0x18, 0x87, 0x25, 0xf0, 0x6e, + 0x7f, 0x7d, 0x82, 0xce, 0x39, 0xc0, 0x84, 0x7b, 0x23, 0x60, 0xc2, 0xa5, 0xa9, 0x7e, 0x37, 0x3b, + 0x9a, 0x90, 0x90, 0x93, 0xbb, 0xf1, 0x74, 0x5a, 0xce, 0x70, 0x1c, 0x61, 0x37, 0x9e, 0xce, 0xca, + 0x39, 0xe5, 0x05, 0x5a, 0xeb, 0x0c, 0xc5, 0x41, 0xda, 0x5d, 0x60, 0xdb, 0x36, 0x6d, 0x81, 0x0b, + 0xf0, 0x81, 0x72, 0x95, 0x76, 0x96, 0x83, 0x88, 0x37, 0x01, 0x79, 0x60, 0x7d, 0x9c, 0x2f, 0xc6, + 0x29, 0x7f, 0x92, 0x06, 0xb2, 0x0c, 0x7b, 0xf0, 0x77, 0xa5, 0x19, 0xd1, 0x95, 0xfa, 0xf0, 0x88, + 0x68, 0x10, 0x8f, 0x58, 0x85, 0x2c, 0xed, 0xce, 0x86, 0xa0, 0x06, 0xdd, 0xf2, 0xa0, 0x86, 0x6b, + 0xb0, 0xc8, 0xd2, 0x2a, 0x47, 0x2d, 0x44, 0xe2, 0x8a, 0xb3, 0xc4, 0xb5, 0x40, 0x5f, 0x70, 0xeb, + 0xf0, 0x0c, 0xf6, 0x32, 0x2c, 0xf9, 0x78, 0xbd, 0xae, 0x8f, 0xf7, 0xdc, 0xb2, 0xc7, 0xbd, 0x25, + 0xda, 0xbf, 0x2f, 0xa5, 0x81, 0x85, 0x06, 0x18, 0x45, 0x18, 0x9c, 0x20, 0x3d, 0x36, 0x38, 0x21, + 0xfa, 0x3d, 0xe0, 0x04, 0x7f, 0x27, 0x1b, 0x0b, 0x76, 0xb2, 0xff, 0x92, 0x06, 0xfb, 0xe2, 0x81, + 0x03, 0x75, 0xb3, 0x81, 0x45, 0x6f, 0xc9, 0x9e, 0x69, 0xf1, 0xd2, 0x36, 0x4f, 0x45, 0x07, 0x49, + 0x1f, 0x29, 0x97, 0x97, 0x98, 0x32, 0x22, 0xeb, 0x78, 0x6d, 0x29, 0x2f, 0x0f, 0x44, 0x5b, 0x2a, + 0x43, 0xec, 0x0c, 0x73, 0x10, 0x3a, 0xa7, 0xd2, 0x47, 0xca, 0xc7, 0x1c, 0x50, 0xa4, 0x79, 0x3e, + 0x40, 0x6f, 0x40, 0x86, 0xfd, 0x50, 0xd0, 0x4c, 0xcb, 0x11, 0xb0, 0xf3, 0x50, 0x11, 0xc4, 0xff, + 0x2a, 0xac, 0x1f, 0x52, 0xae, 0x03, 0xcb, 0x51, 0xd3, 0x96, 0x78, 0xf2, 0x55, 0x26, 0x99, 0x40, + 0x65, 0xf2, 0x34, 0x64, 0xe8, 0xf7, 0x3b, 0x96, 0x5e, 0xc7, 0x45, 0x60, 0x9f, 0x3a, 0x20, 0x28, + 0x7f, 0x88, 0xc2, 0xc2, 0x50, 0x0a, 0x0a, 0x5d, 0xbd, 0xeb, 0x98, 0x51, 0x1f, 0x5c, 0x32, 0x9b, + 0x45, 0x56, 0x00, 0x4e, 0x75, 0x47, 0x7b, 0xa8, 0x77, 0x09, 0x6e, 0x08, 0xb3, 0xf8, 0x28, 0xa8, + 0x04, 0x69, 0x3a, 0xea, 0x39, 0xb8, 0x21, 0x90, 0x1b, 0x6f, 0x8c, 0x76, 0x21, 0x89, 0xcf, 0x71, + 0x97, 0x38, 0xc5, 0x14, 0xdb, 0xfa, 0x62, 0x58, 0x1b, 0x4d, 0x19, 0xb6, 0x8b, 0x74, 0xc3, 0xff, + 0xfe, 0xf5, 0xaa, 0xcc, 0xf9, 0x5f, 0x32, 0x3b, 0x06, 0xc1, 0x1d, 0x8b, 0x5c, 0xa8, 0x42, 0x43, + 0xd0, 0x0e, 0xe9, 0x21, 0x3b, 0x30, 0x24, 0x31, 0xe7, 0x02, 0x03, 0xd4, 0xaa, 0x86, 0x69, 0x1b, + 0xe4, 0x42, 0xcd, 0x77, 0x70, 0xc7, 0x32, 0xcd, 0xb6, 0xc6, 0xcf, 0xfa, 0x16, 0x14, 0x82, 0x19, + 0x17, 0x5d, 0x81, 0xbc, 0x8d, 0x89, 0x6e, 0x74, 0xb5, 0x40, 0xc9, 0x9c, 0xe3, 0x44, 0x7e, 0xb6, + 0x76, 0xe3, 0x69, 0x49, 0x8e, 0xee, 0xc6, 0xd3, 0x51, 0x39, 0xa6, 0xa8, 0x70, 0x29, 0x34, 0xdf, + 0xa2, 0xd7, 0x21, 0x33, 0x48, 0xd6, 0x12, 0x5b, 0xef, 0x44, 0x94, 0x66, 0xc0, 0xad, 0xfc, 0x59, + 0x1a, 0x28, 0x0d, 0x22, 0x3f, 0x77, 0x20, 0x69, 0x63, 0xa7, 0xd7, 0xe6, 0x48, 0x4c, 0x61, 0x73, + 0x63, 0xd6, 0x5c, 0x4d, 0xa9, 0xbd, 0x36, 0x51, 0x85, 0xb8, 0xf2, 0x3e, 0x24, 0x39, 0x05, 0x65, + 0x21, 0x75, 0x7f, 0x7f, 0x6f, 0xff, 0xe0, 0xc1, 0xbe, 0x1c, 0x41, 0x00, 0xc9, 0xad, 0x72, 0xb9, + 0x72, 0x58, 0x93, 0x25, 0x94, 0x81, 0xc4, 0xd6, 0xf6, 0x81, 0x5a, 0x93, 0xa3, 0x94, 0xac, 0x56, + 0x76, 0x2b, 0xe5, 0x9a, 0x1c, 0x43, 0x8b, 0x90, 0xe7, 0xcf, 0xda, 0xed, 0x03, 0xf5, 0x9d, 0xad, + 0x9a, 0x1c, 0xf7, 0x91, 0x8e, 0x2a, 0xfb, 0xb7, 0x2a, 0xaa, 0x9c, 0x50, 0x7e, 0x0c, 0x4f, 0x8e, + 0xcd, 0xed, 0x03, 0x58, 0x47, 0xf2, 0xc1, 0x3a, 0xca, 0x6f, 0xa3, 0xb4, 0x0d, 0x1a, 0x97, 0xae, + 0xd1, 0xdd, 0xa1, 0xa5, 0xbf, 0x32, 0x57, 0xb6, 0x1f, 0x5a, 0x3f, 0xed, 0x7d, 0x6c, 0xdc, 0xc4, + 0xa4, 0xde, 0xe2, 0x25, 0x04, 0x8f, 0x46, 0x79, 0x35, 0x2f, 0xa8, 0x4c, 0xc8, 0xe1, 0x6c, 0x1f, + 0xe2, 0x3a, 0xd1, 0xb8, 0x2b, 0x39, 0xac, 0xfd, 0xc8, 0x50, 0x36, 0x4a, 0x3d, 0xe2, 0x44, 0xe5, + 0x83, 0xb9, 0xac, 0x99, 0x81, 0x84, 0x5a, 0xa9, 0xa9, 0xef, 0xca, 0x31, 0x84, 0xa0, 0xc0, 0x1e, + 0xb5, 0xa3, 0xfd, 0xad, 0xc3, 0xa3, 0xea, 0x01, 0xb5, 0xe6, 0x12, 0x2c, 0xb8, 0xd6, 0x74, 0x89, + 0x09, 0xe5, 0x45, 0x78, 0x62, 0x4c, 0xad, 0x31, 0xda, 0x86, 0x29, 0xbf, 0x93, 0xfc, 0xdc, 0xc1, + 0x6a, 0xe1, 0x1e, 0x24, 0x1d, 0xa2, 0x93, 0x9e, 0x23, 0xcc, 0xf8, 0xfa, 0xec, 0xc5, 0xc7, 0xba, + 0xfb, 0x70, 0xc4, 0x14, 0xa8, 0x42, 0x91, 0xf2, 0x2a, 0x14, 0x82, 0x6f, 0xc6, 0x5b, 0x61, 0xe0, + 0x48, 0x51, 0xe5, 0x26, 0xa0, 0xd1, 0x8a, 0x24, 0xa4, 0x29, 0x95, 0xc2, 0x9a, 0xd2, 0xdf, 0x4b, + 0xf0, 0xd4, 0x84, 0xda, 0x03, 0x1d, 0x0d, 0x2d, 0xf3, 0xe6, 0x7c, 0xb5, 0xcb, 0x3a, 0xa7, 0x0d, + 0x2d, 0xf4, 0x3a, 0xe4, 0xfc, 0xf4, 0xd9, 0x96, 0xf9, 0x8f, 0xe8, 0xe0, 0x30, 0x07, 0xfb, 0xe7, + 0x41, 0x38, 0x94, 0xbe, 0x77, 0x38, 0x7c, 0x0b, 0x80, 0xf4, 0x35, 0xee, 0xdc, 0x6e, 0x66, 0x5d, + 0x0d, 0x45, 0x29, 0x71, 0xbd, 0xd6, 0x17, 0x87, 0x21, 0x43, 0xc4, 0x93, 0x83, 0xee, 0xfb, 0x01, + 0x85, 0x1e, 0xcb, 0xba, 0x8e, 0x68, 0xb5, 0x67, 0x4f, 0xd0, 0x03, 0xe8, 0x81, 0x93, 0x1d, 0xf4, + 0x1e, 0x3c, 0x31, 0x54, 0x40, 0x78, 0xca, 0xe3, 0xb3, 0xd7, 0x11, 0x97, 0x82, 0x75, 0x84, 0xab, + 0xdc, 0x5f, 0x03, 0x24, 0x82, 0x35, 0xc0, 0x7b, 0x00, 0x03, 0x68, 0x81, 0xc6, 0x1b, 0xdb, 0xec, + 0x75, 0x1b, 0xcc, 0x17, 0x12, 0x2a, 0x1f, 0xa0, 0xd7, 0x20, 0x41, 0x7d, 0xca, 0xb5, 0x56, 0x58, + 0x70, 0xa6, 0x3e, 0xe1, 0x03, 0x27, 0x38, 0xbf, 0x72, 0x06, 0x68, 0x14, 0xec, 0x1d, 0x33, 0xc9, + 0xdb, 0xc1, 0x49, 0xae, 0x4c, 0x00, 0x8e, 0xc3, 0x27, 0xfb, 0x25, 0x24, 0x98, 0x0f, 0xd0, 0x64, + 0xcc, 0xfe, 0x34, 0x88, 0x5a, 0x92, 0x3e, 0x23, 0x0d, 0x40, 0x27, 0xc4, 0x36, 0x4e, 0x7a, 0x83, + 0x29, 0x9e, 0x1d, 0xe7, 0x45, 0x5b, 0x2e, 0xe7, 0xf6, 0xd3, 0xc2, 0x9d, 0x96, 0x07, 0xc2, 0x3e, + 0x97, 0xf2, 0xa9, 0x54, 0xf6, 0xa1, 0x10, 0x94, 0x75, 0x6b, 0x1f, 0xfe, 0x15, 0xc1, 0xda, 0x87, + 0x97, 0xb3, 0xa2, 0xf6, 0xf1, 0x2a, 0xa7, 0x18, 0xff, 0xa1, 0xc2, 0x06, 0xca, 0xc7, 0x51, 0xc8, + 0xf9, 0x5d, 0xf0, 0x7f, 0xb1, 0x38, 0x51, 0x3e, 0x91, 0x20, 0xed, 0x19, 0x20, 0xf8, 0x6f, 0x25, + 0xf0, 0x43, 0x8a, 0xdb, 0x2f, 0xea, 0xff, 0x21, 0xc2, 0x7f, 0x3f, 0xc5, 0xbc, 0xdf, 0x4f, 0x6f, + 0x7a, 0x49, 0x71, 0x3c, 0x9c, 0xe2, 0xb7, 0xb7, 0xf0, 0x2d, 0xb7, 0x0a, 0xb8, 0x09, 0x19, 0xef, + 0x24, 0xd3, 0xc6, 0xc4, 0x85, 0x9f, 0x24, 0x71, 0x9a, 0x04, 0x80, 0xb8, 0x0c, 0x09, 0xcb, 0x7c, + 0x28, 0xfe, 0xb7, 0xc4, 0x54, 0x3e, 0x50, 0x9a, 0xb0, 0x30, 0x14, 0x06, 0xd0, 0x9b, 0x90, 0xb2, + 0x7a, 0x27, 0x9a, 0xeb, 0x20, 0x23, 0x30, 0x9d, 0x5b, 0xee, 0xf6, 0x4e, 0xda, 0x46, 0x7d, 0x0f, + 0x5f, 0xb8, 0x9f, 0x63, 0xf5, 0x4e, 0xf6, 0xb8, 0x27, 0xf1, 0x79, 0xa2, 0xfe, 0x79, 0x7e, 0x23, + 0x41, 0xda, 0x3d, 0x1b, 0xe8, 0xa7, 0x90, 0xf1, 0x82, 0x8c, 0x98, 0xe3, 0xe9, 0x49, 0xf1, 0x49, + 0xcc, 0x30, 0x10, 0x42, 0x65, 0xf7, 0xaf, 0xaf, 0xd1, 0xd0, 0x9a, 0x6d, 0x9d, 0xfb, 0x54, 0x61, + 0xd8, 0x72, 0x3c, 0x10, 0xb1, 0x38, 0xbd, 0x73, 0xeb, 0x76, 0x5b, 0x3f, 0x55, 0xb3, 0x4c, 0x6a, + 0xa7, 0x41, 0x07, 0xa2, 0xf6, 0xfb, 0xa7, 0x04, 0xf2, 0xf0, 0xe9, 0x7d, 0x0c, 0x5f, 0x38, 0x9a, + 0x02, 0x63, 0x21, 0x29, 0x10, 0x6d, 0xc0, 0x92, 0xc7, 0xa1, 0x39, 0xc6, 0x69, 0x57, 0x27, 0x3d, + 0x1b, 0x0b, 0x78, 0x13, 0x79, 0xaf, 0x8e, 0xdc, 0x37, 0xa3, 0x2b, 0x4f, 0x3c, 0xf2, 0xca, 0x3f, + 0x89, 0x42, 0xd6, 0x07, 0xb7, 0xa2, 0x9f, 0xf8, 0x82, 0x53, 0x21, 0x34, 0x63, 0xf8, 0xb8, 0x07, + 0xbf, 0x42, 0x83, 0xc6, 0x8a, 0x3e, 0x8a, 0xb1, 0xc6, 0x81, 0xdb, 0x2e, 0x82, 0x1b, 0x9f, 0x1b, + 0xc1, 0x7d, 0x09, 0x10, 0x31, 0x89, 0xde, 0xd6, 0xce, 0x4d, 0x62, 0x74, 0x4f, 0x35, 0xee, 0x92, + 0x3c, 0x98, 0xc8, 0xec, 0xcd, 0x31, 0x7b, 0x71, 0xc8, 0xbc, 0xf3, 0x63, 0x09, 0xd2, 0x5e, 0x79, + 0x3e, 0xef, 0x8f, 0xd2, 0xcb, 0x90, 0x14, 0xd5, 0x27, 0xff, 0x53, 0x2a, 0x46, 0xa1, 0x50, 0x75, + 0x09, 0xd2, 0x1d, 0x4c, 0x74, 0x16, 0x19, 0x79, 0xb6, 0xf3, 0xc6, 0xd7, 0x5e, 0x87, 0xac, 0xef, + 0x37, 0x33, 0x0d, 0x96, 0xfb, 0x95, 0x07, 0x72, 0xa4, 0x94, 0xfa, 0xf4, 0x8b, 0xb5, 0xd8, 0x3e, + 0x7e, 0x48, 0xcf, 0xb6, 0x5a, 0x29, 0x57, 0x2b, 0xe5, 0x3d, 0x59, 0x2a, 0x65, 0x3f, 0xfd, 0x62, + 0x2d, 0xa5, 0x62, 0x86, 0x4b, 0x5e, 0xdb, 0x83, 0x85, 0xa1, 0xad, 0x09, 0x96, 0x35, 0x08, 0x0a, + 0xb7, 0xee, 0x1f, 0xde, 0xdd, 0x29, 0x6f, 0xd5, 0x2a, 0xda, 0xf1, 0x41, 0xad, 0x22, 0x4b, 0xe8, + 0x09, 0x58, 0xba, 0xbb, 0x73, 0xa7, 0x5a, 0xd3, 0xca, 0x77, 0x77, 0x2a, 0xfb, 0x35, 0x6d, 0xab, + 0x56, 0xdb, 0x2a, 0xef, 0xc9, 0xd1, 0xcd, 0xbf, 0x66, 0x21, 0xbe, 0xb5, 0x5d, 0xde, 0x41, 0x77, + 0x20, 0xce, 0xc0, 0x93, 0x29, 0xb7, 0xd1, 0x4a, 0xd3, 0xf0, 0x66, 0xb4, 0x0b, 0x09, 0x86, 0xad, + 0xa0, 0x69, 0x17, 0xd4, 0x4a, 0x53, 0x21, 0x68, 0xfa, 0x51, 0xec, 0x84, 0x4e, 0xb9, 0xb3, 0x56, + 0x9a, 0x86, 0x49, 0xa3, 0x43, 0x48, 0xb9, 0xcd, 0xf5, 0xf4, 0x6b, 0x64, 0xa5, 0x19, 0x60, 0x62, + 0xba, 0x4c, 0x0e, 0x55, 0x4c, 0xbb, 0xd2, 0x56, 0x9a, 0x8a, 0x58, 0xa3, 0x77, 0x20, 0x29, 0x9a, + 0xd9, 0xa9, 0xb7, 0xd4, 0x4a, 0xd3, 0x31, 0x68, 0x74, 0x0c, 0x99, 0x01, 0x20, 0x34, 0xcb, 0x95, + 0xbd, 0xd2, 0x4c, 0xb0, 0x3c, 0x3a, 0x81, 0x7c, 0xb0, 0x61, 0x9e, 0xf5, 0x3e, 0x5c, 0x69, 0x66, + 0xcc, 0x9b, 0xce, 0x11, 0xec, 0x9f, 0x67, 0xbd, 0x21, 0x57, 0x9a, 0x19, 0x04, 0x47, 0x5d, 0x58, + 0x1c, 0xed, 0x70, 0xe7, 0xb9, 0x32, 0x57, 0x9a, 0x0b, 0x18, 0x47, 0x1f, 0x01, 0x0a, 0xe9, 0x8e, + 0xe7, 0xba, 0x43, 0x57, 0x9a, 0x0f, 0x29, 0x47, 0x2d, 0x58, 0x18, 0x6e, 0x3a, 0x67, 0xbf, 0x55, + 0x57, 0x9a, 0x03, 0x37, 0xe7, 0x33, 0x05, 0x1b, 0xd6, 0xd9, 0xef, 0xd9, 0x95, 0xe6, 0x00, 0xd2, + 0xd1, 0xbb, 0x00, 0xbe, 0xae, 0x73, 0xa6, 0x9b, 0x77, 0xa5, 0xd9, 0x40, 0x75, 0x44, 0x60, 0x29, + 0xac, 0x25, 0x9d, 0xef, 0x2a, 0x5e, 0x69, 0x4e, 0xb4, 0x9d, 0xfa, 0x7a, 0xb0, 0xbd, 0x9c, 0xf5, + 0x72, 0x5e, 0x69, 0x66, 0xe0, 0x7d, 0xbb, 0xfa, 0xe5, 0xb7, 0x2b, 0xd2, 0x57, 0xdf, 0xae, 0x48, + 0x7f, 0xfb, 0x76, 0x45, 0xfa, 0xec, 0xbb, 0x95, 0xc8, 0x57, 0xdf, 0xad, 0x44, 0xfe, 0xf2, 0xdd, + 0x4a, 0xe4, 0x67, 0xeb, 0xa7, 0x06, 0x69, 0xf5, 0x4e, 0xa8, 0xa6, 0x8d, 0xbd, 0x77, 0x8f, 0x2b, + 0xfb, 0x98, 0x3c, 0x34, 0xed, 0xb3, 0x8d, 0x31, 0xd7, 0xb2, 0x4f, 0x92, 0x2c, 0x11, 0x5f, 0xff, + 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xe8, 0x29, 0xa2, 0xb8, 0x2d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3896,16 +3896,16 @@ type ABCIClient interface { } type aBCIClient struct { - cc grpc1.ClientConn + cc *grpc.ClientConn } -func NewABCIClient(cc grpc1.ClientConn) ABCIClient { +func NewABCIClient(cc *grpc.ClientConn) ABCIClient { return &aBCIClient{cc} } func (c *aBCIClient) Echo(ctx context.Context, in *RequestEcho, opts ...grpc.CallOption) (*ResponseEcho, error) { out := new(ResponseEcho) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/Echo", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/Echo", in, out, opts...) if err != nil { return nil, err } @@ -3914,7 +3914,7 @@ func (c *aBCIClient) Echo(ctx context.Context, in *RequestEcho, opts ...grpc.Cal func (c *aBCIClient) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.CallOption) (*ResponseFlush, error) { out := new(ResponseFlush) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/Flush", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/Flush", in, out, opts...) if err != nil { return nil, err } @@ -3923,7 +3923,7 @@ func (c *aBCIClient) Flush(ctx context.Context, in *RequestFlush, opts ...grpc.C func (c *aBCIClient) Info(ctx context.Context, in *RequestInfo, opts ...grpc.CallOption) (*ResponseInfo, error) { out := new(ResponseInfo) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/Info", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/Info", in, out, opts...) if err != nil { return nil, err } @@ -3932,7 +3932,7 @@ func (c *aBCIClient) Info(ctx context.Context, in *RequestInfo, opts ...grpc.Cal func (c *aBCIClient) CheckTx(ctx context.Context, in *RequestCheckTx, opts ...grpc.CallOption) (*ResponseCheckTx, error) { out := new(ResponseCheckTx) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/CheckTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/CheckTx", in, out, opts...) if err != nil { return nil, err } @@ -3941,7 +3941,7 @@ func (c *aBCIClient) CheckTx(ctx context.Context, in *RequestCheckTx, opts ...gr func (c *aBCIClient) Query(ctx context.Context, in *RequestQuery, opts ...grpc.CallOption) (*ResponseQuery, error) { out := new(ResponseQuery) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/Query", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/Query", in, out, opts...) if err != nil { return nil, err } @@ -3950,7 +3950,7 @@ func (c *aBCIClient) Query(ctx context.Context, in *RequestQuery, opts ...grpc.C func (c *aBCIClient) Commit(ctx context.Context, in *RequestCommit, opts ...grpc.CallOption) (*ResponseCommit, error) { out := new(ResponseCommit) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/Commit", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/Commit", in, out, opts...) if err != nil { return nil, err } @@ -3959,7 +3959,7 @@ func (c *aBCIClient) Commit(ctx context.Context, in *RequestCommit, opts ...grpc func (c *aBCIClient) InitChain(ctx context.Context, in *RequestInitChain, opts ...grpc.CallOption) (*ResponseInitChain, error) { out := new(ResponseInitChain) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/InitChain", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/InitChain", in, out, opts...) if err != nil { return nil, err } @@ -3968,7 +3968,7 @@ func (c *aBCIClient) InitChain(ctx context.Context, in *RequestInitChain, opts . func (c *aBCIClient) ListSnapshots(ctx context.Context, in *RequestListSnapshots, opts ...grpc.CallOption) (*ResponseListSnapshots, error) { out := new(ResponseListSnapshots) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/ListSnapshots", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/ListSnapshots", in, out, opts...) if err != nil { return nil, err } @@ -3977,7 +3977,7 @@ func (c *aBCIClient) ListSnapshots(ctx context.Context, in *RequestListSnapshots func (c *aBCIClient) OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot, opts ...grpc.CallOption) (*ResponseOfferSnapshot, error) { out := new(ResponseOfferSnapshot) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/OfferSnapshot", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/OfferSnapshot", in, out, opts...) if err != nil { return nil, err } @@ -3986,7 +3986,7 @@ func (c *aBCIClient) OfferSnapshot(ctx context.Context, in *RequestOfferSnapshot func (c *aBCIClient) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnapshotChunk, opts ...grpc.CallOption) (*ResponseLoadSnapshotChunk, error) { out := new(ResponseLoadSnapshotChunk) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/LoadSnapshotChunk", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/LoadSnapshotChunk", in, out, opts...) if err != nil { return nil, err } @@ -3995,7 +3995,7 @@ func (c *aBCIClient) LoadSnapshotChunk(ctx context.Context, in *RequestLoadSnaps func (c *aBCIClient) ApplySnapshotChunk(ctx context.Context, in *RequestApplySnapshotChunk, opts ...grpc.CallOption) (*ResponseApplySnapshotChunk, error) { out := new(ResponseApplySnapshotChunk) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/ApplySnapshotChunk", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/ApplySnapshotChunk", in, out, opts...) if err != nil { return nil, err } @@ -4004,7 +4004,7 @@ func (c *aBCIClient) ApplySnapshotChunk(ctx context.Context, in *RequestApplySna func (c *aBCIClient) PrepareProposal(ctx context.Context, in *RequestPrepareProposal, opts ...grpc.CallOption) (*ResponsePrepareProposal, error) { out := new(ResponsePrepareProposal) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/PrepareProposal", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/PrepareProposal", in, out, opts...) if err != nil { return nil, err } @@ -4013,7 +4013,7 @@ func (c *aBCIClient) PrepareProposal(ctx context.Context, in *RequestPrepareProp func (c *aBCIClient) ProcessProposal(ctx context.Context, in *RequestProcessProposal, opts ...grpc.CallOption) (*ResponseProcessProposal, error) { out := new(ResponseProcessProposal) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/ProcessProposal", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/ProcessProposal", in, out, opts...) if err != nil { return nil, err } @@ -4022,7 +4022,7 @@ func (c *aBCIClient) ProcessProposal(ctx context.Context, in *RequestProcessProp func (c *aBCIClient) ExtendVote(ctx context.Context, in *RequestExtendVote, opts ...grpc.CallOption) (*ResponseExtendVote, error) { out := new(ResponseExtendVote) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/ExtendVote", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/ExtendVote", in, out, opts...) if err != nil { return nil, err } @@ -4031,7 +4031,7 @@ func (c *aBCIClient) ExtendVote(ctx context.Context, in *RequestExtendVote, opts func (c *aBCIClient) VerifyVoteExtension(ctx context.Context, in *RequestVerifyVoteExtension, opts ...grpc.CallOption) (*ResponseVerifyVoteExtension, error) { out := new(ResponseVerifyVoteExtension) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/VerifyVoteExtension", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/VerifyVoteExtension", in, out, opts...) if err != nil { return nil, err } @@ -4040,7 +4040,7 @@ func (c *aBCIClient) VerifyVoteExtension(ctx context.Context, in *RequestVerifyV func (c *aBCIClient) FinalizeBlock(ctx context.Context, in *RequestFinalizeBlock, opts ...grpc.CallOption) (*ResponseFinalizeBlock, error) { out := new(ResponseFinalizeBlock) - err := c.cc.Invoke(ctx, "/tendermint.abci.ABCI/FinalizeBlock", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.abci.ABCI/FinalizeBlock", in, out, opts...) if err != nil { return nil, err } @@ -4120,7 +4120,7 @@ func (*UnimplementedABCIServer) FinalizeBlock(ctx context.Context, req *RequestF return nil, status.Errorf(codes.Unimplemented, "method FinalizeBlock not implemented") } -func RegisterABCIServer(s grpc1.Server, srv ABCIServer) { +func RegisterABCIServer(s *grpc.Server, srv ABCIServer) { s.RegisterService(&_ABCI_serviceDesc, srv) } @@ -4134,7 +4134,7 @@ func _ABCI_Echo_Handler(srv interface{}, ctx context.Context, dec func(interface } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/Echo", + FullMethod: "/cometbft.v38.abci.ABCI/Echo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).Echo(ctx, req.(*RequestEcho)) @@ -4152,7 +4152,7 @@ func _ABCI_Flush_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/Flush", + FullMethod: "/cometbft.v38.abci.ABCI/Flush", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).Flush(ctx, req.(*RequestFlush)) @@ -4170,7 +4170,7 @@ func _ABCI_Info_Handler(srv interface{}, ctx context.Context, dec func(interface } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/Info", + FullMethod: "/cometbft.v38.abci.ABCI/Info", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).Info(ctx, req.(*RequestInfo)) @@ -4188,7 +4188,7 @@ func _ABCI_CheckTx_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/CheckTx", + FullMethod: "/cometbft.v38.abci.ABCI/CheckTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).CheckTx(ctx, req.(*RequestCheckTx)) @@ -4206,7 +4206,7 @@ func _ABCI_Query_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/Query", + FullMethod: "/cometbft.v38.abci.ABCI/Query", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).Query(ctx, req.(*RequestQuery)) @@ -4224,7 +4224,7 @@ func _ABCI_Commit_Handler(srv interface{}, ctx context.Context, dec func(interfa } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/Commit", + FullMethod: "/cometbft.v38.abci.ABCI/Commit", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).Commit(ctx, req.(*RequestCommit)) @@ -4242,7 +4242,7 @@ func _ABCI_InitChain_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/InitChain", + FullMethod: "/cometbft.v38.abci.ABCI/InitChain", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).InitChain(ctx, req.(*RequestInitChain)) @@ -4260,7 +4260,7 @@ func _ABCI_ListSnapshots_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/ListSnapshots", + FullMethod: "/cometbft.v38.abci.ABCI/ListSnapshots", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).ListSnapshots(ctx, req.(*RequestListSnapshots)) @@ -4278,7 +4278,7 @@ func _ABCI_OfferSnapshot_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/OfferSnapshot", + FullMethod: "/cometbft.v38.abci.ABCI/OfferSnapshot", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).OfferSnapshot(ctx, req.(*RequestOfferSnapshot)) @@ -4296,7 +4296,7 @@ func _ABCI_LoadSnapshotChunk_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/LoadSnapshotChunk", + FullMethod: "/cometbft.v38.abci.ABCI/LoadSnapshotChunk", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).LoadSnapshotChunk(ctx, req.(*RequestLoadSnapshotChunk)) @@ -4314,7 +4314,7 @@ func _ABCI_ApplySnapshotChunk_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/ApplySnapshotChunk", + FullMethod: "/cometbft.v38.abci.ABCI/ApplySnapshotChunk", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).ApplySnapshotChunk(ctx, req.(*RequestApplySnapshotChunk)) @@ -4332,7 +4332,7 @@ func _ABCI_PrepareProposal_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/PrepareProposal", + FullMethod: "/cometbft.v38.abci.ABCI/PrepareProposal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).PrepareProposal(ctx, req.(*RequestPrepareProposal)) @@ -4350,7 +4350,7 @@ func _ABCI_ProcessProposal_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/ProcessProposal", + FullMethod: "/cometbft.v38.abci.ABCI/ProcessProposal", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).ProcessProposal(ctx, req.(*RequestProcessProposal)) @@ -4368,7 +4368,7 @@ func _ABCI_ExtendVote_Handler(srv interface{}, ctx context.Context, dec func(int } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/ExtendVote", + FullMethod: "/cometbft.v38.abci.ABCI/ExtendVote", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).ExtendVote(ctx, req.(*RequestExtendVote)) @@ -4386,7 +4386,7 @@ func _ABCI_VerifyVoteExtension_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/VerifyVoteExtension", + FullMethod: "/cometbft.v38.abci.ABCI/VerifyVoteExtension", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).VerifyVoteExtension(ctx, req.(*RequestVerifyVoteExtension)) @@ -4404,7 +4404,7 @@ func _ABCI_FinalizeBlock_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.abci.ABCI/FinalizeBlock", + FullMethod: "/cometbft.v38.abci.ABCI/FinalizeBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ABCIServer).FinalizeBlock(ctx, req.(*RequestFinalizeBlock)) @@ -4413,7 +4413,7 @@ func _ABCI_FinalizeBlock_Handler(srv interface{}, ctx context.Context, dec func( } var _ABCI_serviceDesc = grpc.ServiceDesc{ - ServiceName: "tendermint.abci.ABCI", + ServiceName: "cometbft.v38.abci.ABCI", HandlerType: (*ABCIServer)(nil), Methods: []grpc.MethodDesc{ { @@ -4482,7 +4482,7 @@ var _ABCI_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tendermint/abci/types.proto", + Metadata: "cometbft/v38/abci/types.proto", } func (m *Request) Marshal() (dAtA []byte, err error) { @@ -5028,7 +5028,7 @@ func (m *RequestInitChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n18, err18 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n18, err18 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err18 != nil { return 0, err18 } @@ -5328,7 +5328,7 @@ func (m *RequestPrepareProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x3a } - n20, err20 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n20, err20 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err20 != nil { return 0, err20 } @@ -5416,7 +5416,7 @@ func (m *RequestProcessProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x3a } - n22, err22 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n22, err22 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err22 != nil { return 0, err22 } @@ -5539,7 +5539,7 @@ func (m *RequestExtendVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x22 } } - n25, err25 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n25, err25 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err25 != nil { return 0, err25 } @@ -5645,7 +5645,7 @@ func (m *RequestFinalizeBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n26, err26 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n26, err26 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err26 != nil { return 0, err26 } @@ -7333,7 +7333,7 @@ func (m *Misbehavior) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - n54, err54 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n54, err54 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err54 != nil { return 0, err54 } @@ -7682,7 +7682,7 @@ func (m *RequestInitChain) Size() (n int) { } var l int _ = l - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.ChainId) if l > 0 { @@ -7846,7 +7846,7 @@ func (m *RequestPrepareProposal) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.NextValidatorsHash) if l > 0 { @@ -7886,7 +7886,7 @@ func (m *RequestProcessProposal) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.NextValidatorsHash) if l > 0 { @@ -7912,7 +7912,7 @@ func (m *RequestExtendVote) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) if len(m.Txs) > 0 { for _, b := range m.Txs { @@ -7990,7 +7990,7 @@ func (m *RequestFinalizeBlock) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = len(m.NextValidatorsHash) if l > 0 { @@ -8766,7 +8766,7 @@ func (m *Misbehavior) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) if m.TotalVotingPower != 0 { n += 1 + sovTypes(uint64(m.TotalVotingPower)) @@ -9758,7 +9758,7 @@ func (m *RequestInitChain) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -10853,7 +10853,7 @@ func (m *RequestPrepareProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11156,7 +11156,7 @@ func (m *RequestProcessProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11360,7 +11360,7 @@ func (m *RequestExtendVote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11933,7 +11933,7 @@ func (m *RequestFinalizeBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -16300,7 +16300,7 @@ func (m *Misbehavior) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/abci/types/types_test.go b/abci/types/types_test.go index 9c4e62d4c2a..b540c5ccb8f 100644 --- a/abci/types/types_test.go +++ b/abci/types/types_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" ) func TestHashAndProveResults(t *testing.T) { diff --git a/abci/version/version.go b/abci/version/version.go index 96f27e03b7c..96806a30b3b 100644 --- a/abci/version/version.go +++ b/abci/version/version.go @@ -1,7 +1,7 @@ package version import ( - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/version" ) // TODO: eliminate this after some version refactor diff --git a/blocksync/metrics.go b/blocksync/metrics.go index f120b4f7c44..129af3332ce 100644 --- a/blocksync/metrics.go +++ b/blocksync/metrics.go @@ -1,7 +1,7 @@ package blocksync import ( - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" "github.com/go-kit/kit/metrics" ) diff --git a/blocksync/msgs.go b/blocksync/msgs.go index d4f49ef6fb5..ef0458a9a1e 100644 --- a/blocksync/msgs.go +++ b/blocksync/msgs.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/gogoproto/proto" - bcproto "github.com/cometbft/cometbft/proto/tendermint/blocksync" - "github.com/cometbft/cometbft/types" + bcproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/blocksync" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( @@ -31,7 +31,7 @@ func ValidateMsg(pb proto.Message) error { } case *bcproto.BlockResponse: // Avoid double-calling `types.BlockFromProto` for performance reasons. - // See https://github.com/cometbft/cometbft/issues/1964 + // See https://github.com/KYVENetwork/cometbft/v38/issues/1964 return nil case *bcproto.NoBlockResponse: if msg.Height < 0 { diff --git a/blocksync/msgs_test.go b/blocksync/msgs_test.go index 1100771e8a4..82686fe58b0 100644 --- a/blocksync/msgs_test.go +++ b/blocksync/msgs_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/blocksync" - bcproto "github.com/cometbft/cometbft/proto/tendermint/blocksync" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/blocksync" + bcproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/blocksync" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestBcBlockRequestMessageValidateBasic(t *testing.T) { diff --git a/blocksync/pool.go b/blocksync/pool.go index a32b6126ef7..d49005d3625 100644 --- a/blocksync/pool.go +++ b/blocksync/pool.go @@ -8,12 +8,12 @@ import ( "sync/atomic" "time" - flow "github.com/cometbft/cometbft/libs/flowrate" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/types" + flow "github.com/KYVENetwork/cometbft/v38/libs/flowrate" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/types" ) /* diff --git a/blocksync/pool_test.go b/blocksync/pool_test.go index 275f2fd1fa5..e5cab78c6ac 100644 --- a/blocksync/pool_test.go +++ b/blocksync/pool_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/types" ) func init() { diff --git a/blocksync/reactor.go b/blocksync/reactor.go index 5acd6069314..7516d77523e 100644 --- a/blocksync/reactor.go +++ b/blocksync/reactor.go @@ -6,12 +6,12 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - bcproto "github.com/cometbft/cometbft/proto/tendermint/blocksync" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + bcproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/blocksync" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/blocksync/reactor_test.go b/blocksync/reactor_test.go index cd6e640ab75..681d87c41f9 100644 --- a/blocksync/reactor_test.go +++ b/blocksync/reactor_test.go @@ -13,18 +13,18 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - mpmocks "github.com/cometbft/cometbft/mempool/mocks" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + mpmocks "github.com/KYVENetwork/cometbft/v38/mempool/mocks" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) var config *cfg.Config diff --git a/cmd/cometbft/commands/compact.go b/cmd/cometbft/commands/compact.go index 327e1dbca68..34a4465d0ed 100644 --- a/cmd/cometbft/commands/compact.go +++ b/cmd/cometbft/commands/compact.go @@ -10,7 +10,7 @@ import ( "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) var CompactGoLevelDBCmd = &cobra.Command{ @@ -18,8 +18,8 @@ var CompactGoLevelDBCmd = &cobra.Command{ Aliases: []string{"experimental_compact_goleveldb"}, Short: "force compacts the CometBFT storage engine (only GoLevelDB supported)", Long: ` -This is a temporary utility command that performs a force compaction on the state -and blockstores to reduce disk space for a pruning node. This should only be run +This is a temporary utility command that performs a force compaction on the state +and blockstores to reduce disk space for a pruning node. This should only be run once the node has stopped. This command will likely be omitted in the future after the planned refactor to the storage engine. diff --git a/cmd/cometbft/commands/debug/debug.go b/cmd/cometbft/commands/debug/debug.go index 0d9430e89ec..36eee46b959 100644 --- a/cmd/cometbft/commands/debug/debug.go +++ b/cmd/cometbft/commands/debug/debug.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) var ( diff --git a/cmd/cometbft/commands/debug/dump.go b/cmd/cometbft/commands/debug/dump.go index 8db59080ea8..07bf8f1533e 100644 --- a/cmd/cometbft/commands/debug/dump.go +++ b/cmd/cometbft/commands/debug/dump.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/cli" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" ) var dumpCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/debug/kill.go b/cmd/cometbft/commands/debug/kill.go index 90d84cf9eb7..2bb1b2c3292 100644 --- a/cmd/cometbft/commands/debug/kill.go +++ b/cmd/cometbft/commands/debug/kill.go @@ -13,9 +13,9 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/cli" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" ) var killCmd = &cobra.Command{ diff --git a/cmd/cometbft/commands/debug/util.go b/cmd/cometbft/commands/debug/util.go index 0972a03a1da..618b78eccdf 100644 --- a/cmd/cometbft/commands/debug/util.go +++ b/cmd/cometbft/commands/debug/util.go @@ -9,8 +9,8 @@ import ( "path" "path/filepath" - cfg "github.com/cometbft/cometbft/config" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" + cfg "github.com/KYVENetwork/cometbft/v38/config" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" ) // dumpStatus gets node status state dump from the CometBFT RPC and writes it diff --git a/cmd/cometbft/commands/gen_node_key.go b/cmd/cometbft/commands/gen_node_key.go index 7954257c9e6..8cd3afc4491 100644 --- a/cmd/cometbft/commands/gen_node_key.go +++ b/cmd/cometbft/commands/gen_node_key.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/p2p" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/p2p" ) // GenNodeKeyCmd allows the generation of a node key. It prints node's ID to diff --git a/cmd/cometbft/commands/gen_validator.go b/cmd/cometbft/commands/gen_validator.go index 072b26576dd..81d56dece0f 100644 --- a/cmd/cometbft/commands/gen_validator.go +++ b/cmd/cometbft/commands/gen_validator.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/privval" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/privval" ) // GenValidatorCmd allows the generation of a keypair for a diff --git a/cmd/cometbft/commands/init.go b/cmd/cometbft/commands/init.go index 8bb572d3303..780af007e2d 100644 --- a/cmd/cometbft/commands/init.go +++ b/cmd/cometbft/commands/init.go @@ -5,13 +5,13 @@ import ( "github.com/spf13/cobra" - cfg "github.com/cometbft/cometbft/config" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) // InitFilesCmd initializes a fresh CometBFT instance. diff --git a/cmd/cometbft/commands/inspect.go b/cmd/cometbft/commands/inspect.go index 2d4c5948094..d01a9c2f7fe 100644 --- a/cmd/cometbft/commands/inspect.go +++ b/cmd/cometbft/commands/inspect.go @@ -8,12 +8,12 @@ import ( "github.com/spf13/cobra" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/inspect" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer/block" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/inspect" + "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/indexer/block" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" ) // InspectCmd is the command for starting an inspect server. diff --git a/cmd/cometbft/commands/light.go b/cmd/cometbft/commands/light.go index 490075f486b..1dd5de08b5a 100644 --- a/cmd/cometbft/commands/light.go +++ b/cmd/cometbft/commands/light.go @@ -15,14 +15,14 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/light" - lproxy "github.com/cometbft/cometbft/light/proxy" - lrpc "github.com/cometbft/cometbft/light/rpc" - dbs "github.com/cometbft/cometbft/light/store/db" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/light" + lproxy "github.com/KYVENetwork/cometbft/v38/light/proxy" + lrpc "github.com/KYVENetwork/cometbft/v38/light/rpc" + dbs "github.com/KYVENetwork/cometbft/v38/light/store/db" + rpcserver "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" ) // LightCmd represents the base command when called without any subcommands diff --git a/cmd/cometbft/commands/reindex_event.go b/cmd/cometbft/commands/reindex_event.go index e59e60bd30e..d92a1208cd4 100644 --- a/cmd/cometbft/commands/reindex_event.go +++ b/cmd/cometbft/commands/reindex_event.go @@ -9,16 +9,16 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcitypes "github.com/cometbft/cometbft/abci/types" - cmtcfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/progressbar" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - "github.com/cometbft/cometbft/state/indexer/sink/psql" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/kv" - "github.com/cometbft/cometbft/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtcfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/progressbar" + "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + blockidxkv "github.com/KYVENetwork/cometbft/v38/state/indexer/block/kv" + "github.com/KYVENetwork/cometbft/v38/state/indexer/sink/psql" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/state/txindex/kv" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( @@ -37,9 +37,9 @@ var ReIndexEventCmd = &cobra.Command{ Short: "reindex events to the event store backends", Long: ` reindex-event is an offline tooling to re-index block and tx events to the eventsinks, -you can run this command when the event store backend dropped/disconnected or you want to -replace the backend. The default start-height is 0, meaning the tooling will start -reindex from the base block height(inclusive); and the default end-height is 0, meaning +you can run this command when the event store backend dropped/disconnected or you want to +replace the backend. The default start-height is 0, meaning the tooling will start +reindex from the base block height(inclusive); and the default end-height is 0, meaning the tooling will reindex until the latest block height(inclusive). User can omit either or both arguments. diff --git a/cmd/cometbft/commands/reindex_event_test.go b/cmd/cometbft/commands/reindex_event_test.go index 2fc684ef579..8544e852b59 100644 --- a/cmd/cometbft/commands/reindex_event_test.go +++ b/cmd/cometbft/commands/reindex_event_test.go @@ -11,13 +11,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcitypes "github.com/cometbft/cometbft/abci/types" - cmtcfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - blockmocks "github.com/cometbft/cometbft/state/indexer/mocks" - "github.com/cometbft/cometbft/state/mocks" - txmocks "github.com/cometbft/cometbft/state/txindex/mocks" - "github.com/cometbft/cometbft/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtcfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/internal/test" + blockmocks "github.com/KYVENetwork/cometbft/v38/state/indexer/mocks" + "github.com/KYVENetwork/cometbft/v38/state/mocks" + txmocks "github.com/KYVENetwork/cometbft/v38/state/txindex/mocks" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/cmd/cometbft/commands/replay.go b/cmd/cometbft/commands/replay.go index 93c3c179651..fa2e36e70e1 100644 --- a/cmd/cometbft/commands/replay.go +++ b/cmd/cometbft/commands/replay.go @@ -3,7 +3,7 @@ package commands import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/consensus" + "github.com/KYVENetwork/cometbft/v38/consensus" ) // ReplayCmd allows replaying of messages from the WAL. diff --git a/cmd/cometbft/commands/reset.go b/cmd/cometbft/commands/reset.go index bfd11821046..70e0996abbd 100644 --- a/cmd/cometbft/commands/reset.go +++ b/cmd/cometbft/commands/reset.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/privval" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/privval" ) // ResetAllCmd removes the database of this CometBFT core diff --git a/cmd/cometbft/commands/reset_test.go b/cmd/cometbft/commands/reset_test.go index 0006e78498c..91281a18b32 100644 --- a/cmd/cometbft/commands/reset_test.go +++ b/cmd/cometbft/commands/reset_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/privval" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/privval" ) func Test_ResetAll(t *testing.T) { diff --git a/cmd/cometbft/commands/rollback.go b/cmd/cometbft/commands/rollback.go index 0471a0a0597..cdf02963eae 100644 --- a/cmd/cometbft/commands/rollback.go +++ b/cmd/cometbft/commands/rollback.go @@ -8,10 +8,10 @@ import ( dbm "github.com/cometbft/cometbft-db" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" ) var removeBlock = false @@ -27,8 +27,8 @@ var RollbackStateCmd = &cobra.Command{ A state rollback is performed to recover from an incorrect application state transition, when CometBFT has persisted an incorrect app hash and is thus unable to make progress. Rollback overwrites a state at height n with the state at height n - 1. -The application should also roll back to height n - 1. If the --hard flag is not used, -no blocks will be removed so upon restarting CometBFT the transactions in block n will be +The application should also roll back to height n - 1. If the --hard flag is not used, +no blocks will be removed so upon restarting CometBFT the transactions in block n will be re-executed against the application. Using --hard will also remove block n. This can be done multiple times. `, diff --git a/cmd/cometbft/commands/root.go b/cmd/cometbft/commands/root.go index c21b415758d..932b7b72a9d 100644 --- a/cmd/cometbft/commands/root.go +++ b/cmd/cometbft/commands/root.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - cmtflags "github.com/cometbft/cometbft/libs/cli/flags" - "github.com/cometbft/cometbft/libs/log" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/cli" + cmtflags "github.com/KYVENetwork/cometbft/v38/libs/cli/flags" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) var ( diff --git a/cmd/cometbft/commands/root_test.go b/cmd/cometbft/commands/root_test.go index 5213d940c84..8d876ec4ebd 100644 --- a/cmd/cometbft/commands/root_test.go +++ b/cmd/cometbft/commands/root_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - cmtos "github.com/cometbft/cometbft/libs/os" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/cli" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" ) // clearConfig clears env vars, the given root dir, and resets viper. diff --git a/cmd/cometbft/commands/run_node.go b/cmd/cometbft/commands/run_node.go index d4a94214070..4f447c98af4 100644 --- a/cmd/cometbft/commands/run_node.go +++ b/cmd/cometbft/commands/run_node.go @@ -9,9 +9,9 @@ import ( "github.com/spf13/cobra" - cfg "github.com/cometbft/cometbft/config" - cmtos "github.com/cometbft/cometbft/libs/os" - nm "github.com/cometbft/cometbft/node" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + nm "github.com/KYVENetwork/cometbft/v38/node" ) var ( diff --git a/cmd/cometbft/commands/show_node_id.go b/cmd/cometbft/commands/show_node_id.go index 17bc0ed20c4..c311048eb5c 100644 --- a/cmd/cometbft/commands/show_node_id.go +++ b/cmd/cometbft/commands/show_node_id.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) // ShowNodeIDCmd dumps node's ID to the standard output. diff --git a/cmd/cometbft/commands/show_validator.go b/cmd/cometbft/commands/show_validator.go index 5dc4af83ec9..46cc2e0260c 100644 --- a/cmd/cometbft/commands/show_validator.go +++ b/cmd/cometbft/commands/show_validator.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/privval" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/privval" ) // ShowValidatorCmd adds capabilities for showing the validator info. diff --git a/cmd/cometbft/commands/testnet.go b/cmd/cometbft/commands/testnet.go index 6870876d101..176a79a97f4 100644 --- a/cmd/cometbft/commands/testnet.go +++ b/cmd/cometbft/commands/testnet.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/bytes" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) var ( diff --git a/cmd/cometbft/commands/version.go b/cmd/cometbft/commands/version.go index 020b69da034..9bf2cf4a9c2 100644 --- a/cmd/cometbft/commands/version.go +++ b/cmd/cometbft/commands/version.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/version" ) // VersionCmd ... diff --git a/cmd/cometbft/main.go b/cmd/cometbft/main.go index 908f2a939d5..321891a2eda 100644 --- a/cmd/cometbft/main.go +++ b/cmd/cometbft/main.go @@ -4,11 +4,11 @@ import ( "os" "path/filepath" - cmd "github.com/cometbft/cometbft/cmd/cometbft/commands" - "github.com/cometbft/cometbft/cmd/cometbft/commands/debug" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cli" - nm "github.com/cometbft/cometbft/node" + cmd "github.com/KYVENetwork/cometbft/v38/cmd/cometbft/commands" + "github.com/KYVENetwork/cometbft/v38/cmd/cometbft/commands/debug" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/cli" + nm "github.com/KYVENetwork/cometbft/v38/node" ) func main() { diff --git a/cmd/priv_val_server/main.go b/cmd/priv_val_server/main.go index fa2edc9342f..d8c21e3a943 100644 --- a/cmd/priv_val_server/main.go +++ b/cmd/priv_val_server/main.go @@ -5,12 +5,12 @@ import ( "os" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - cmtos "github.com/cometbft/cometbft/libs/os" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" - "github.com/cometbft/cometbft/privval" + "github.com/KYVENetwork/cometbft/v38/privval" ) func main() { diff --git a/common.mk b/common.mk index 2ab35eaf1d0..f3d38903672 100644 --- a/common.mk +++ b/common.mk @@ -3,7 +3,7 @@ BUILD_TAGS ?= cometbft COMMIT_HASH := $(shell git rev-parse --short HEAD) -LD_FLAGS = -X github.com/cometbft/cometbft/version.TMGitCommitHash=$(COMMIT_HASH) +LD_FLAGS = -X github.com/KYVENetwork/cometbft/v38/version.TMGitCommitHash=$(COMMIT_HASH) BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)" # allow users to pass additional flags via the conventional LDFLAGS variable LD_FLAGS += $(LDFLAGS) diff --git a/config/config.go b/config/config.go index d0d8e79cd45..af29a67cea8 100644 --- a/config/config.go +++ b/config/config.go @@ -10,7 +10,7 @@ import ( "regexp" "time" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/version" ) const ( @@ -698,7 +698,7 @@ func DefaultFuzzConnConfig() *FuzzConnConfig { // Note: Until v0.37 there was a `Version` field to select which implementation // of the mempool to use. Two versions used to exist: the current, default // implementation (previously called v0), and a prioritized mempool (v1), which -// was removed (see https://github.com/cometbft/cometbft/issues/260). +// was removed (see https://github.com/KYVENetwork/cometbft/v38/issues/260). type MempoolConfig struct { // The type of mempool for this node to use. // diff --git a/config/config_test.go b/config/config_test.go index 831d00a7593..cf1bbfa5d68 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" + "github.com/KYVENetwork/cometbft/v38/config" ) func TestDefaultConfig(t *testing.T) { diff --git a/config/db.go b/config/db.go index 2f0235fd827..849da36291c 100644 --- a/config/db.go +++ b/config/db.go @@ -5,8 +5,8 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) // ServiceProvider takes a config and a logger and returns a ready to go Node. diff --git a/config/toml.go b/config/toml.go index 76ef3d06c25..7fc0a57d996 100644 --- a/config/toml.go +++ b/config/toml.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - cmtos "github.com/cometbft/cometbft/libs/os" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" ) // DefaultDirPerm is the default permissions used when creating directories. diff --git a/config/toml_test.go b/config/toml_test.go index 58a103e9371..0bb547d46dc 100644 --- a/config/toml_test.go +++ b/config/toml_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/internal/test" ) func ensureFiles(t *testing.T, rootDir string, files ...string) { diff --git a/consensus/README.md b/consensus/README.md index e74c03ab088..6c30666813f 100644 --- a/consensus/README.md +++ b/consensus/README.md @@ -1,3 +1,3 @@ # Consensus -See the [consensus spec](https://github.com/cometbft/cometbft/tree/v0.38.x/spec/consensus) for more information. +See the [consensus spec](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/consensus) for more information. diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index bb72e7932a9..9169adc3ea0 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -14,21 +14,21 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcicli "github.com/cometbft/cometbft/abci/client" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" - - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/evidence" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/proxy" + + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" ) //---------------------------------------------- diff --git a/consensus/common_test.go b/consensus/common_test.go index 95effc131dd..492fe008cef 100644 --- a/consensus/common_test.go +++ b/consensus/common_test.go @@ -18,26 +18,26 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/internal/test" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cstypes "github.com/KYVENetwork/cometbft/v38/consensus/types" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) const ( diff --git a/consensus/invalid_test.go b/consensus/invalid_test.go index d6bcfdfda30..5f7944fda33 100644 --- a/consensus/invalid_test.go +++ b/consensus/invalid_test.go @@ -4,14 +4,14 @@ import ( "testing" "time" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) //---------------------------------------------- diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go index 405ba194b67..269470bb213 100644 --- a/consensus/mempool_test.go +++ b/consensus/mempool_test.go @@ -12,12 +12,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) // for testing diff --git a/consensus/metrics.go b/consensus/metrics.go index da29f871bc1..608e8fc23f2 100644 --- a/consensus/metrics.go +++ b/consensus/metrics.go @@ -6,8 +6,8 @@ import ( "github.com/go-kit/kit/metrics" - cstypes "github.com/cometbft/cometbft/consensus/types" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cstypes "github.com/KYVENetwork/cometbft/v38/consensus/types" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) const ( diff --git a/consensus/msgs.go b/consensus/msgs.go index e8c1e2cddeb..d200a5be919 100644 --- a/consensus/msgs.go +++ b/consensus/msgs.go @@ -6,13 +6,13 @@ import ( "github.com/cosmos/gogoproto/proto" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/libs/bits" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cstypes "github.com/KYVENetwork/cometbft/v38/consensus/types" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // MsgToProto takes a consensus message type and returns the proto defined consensus message. diff --git a/consensus/msgs_test.go b/consensus/msgs_test.go index b27650c6a58..b3a6d847725 100644 --- a/consensus/msgs_test.go +++ b/consensus/msgs_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/bits" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestMsgToProto(t *testing.T) { diff --git a/consensus/reactor.go b/consensus/reactor.go index ee87b7ba637..c3604c5dcee 100644 --- a/consensus/reactor.go +++ b/consensus/reactor.go @@ -7,18 +7,18 @@ import ( "sync" "time" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/libs/bits" - cmtevents "github.com/cometbft/cometbft/libs/events" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cstypes "github.com/KYVENetwork/cometbft/v38/consensus/types" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + cmtevents "github.com/KYVENetwork/cometbft/v38/libs/events" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtcons "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) const ( @@ -1507,15 +1507,15 @@ type Message interface { } func init() { - cmtjson.RegisterType(&NewRoundStepMessage{}, "tendermint/NewRoundStepMessage") - cmtjson.RegisterType(&NewValidBlockMessage{}, "tendermint/NewValidBlockMessage") - cmtjson.RegisterType(&ProposalMessage{}, "tendermint/Proposal") - cmtjson.RegisterType(&ProposalPOLMessage{}, "tendermint/ProposalPOL") - cmtjson.RegisterType(&BlockPartMessage{}, "tendermint/BlockPart") - cmtjson.RegisterType(&VoteMessage{}, "tendermint/Vote") - cmtjson.RegisterType(&HasVoteMessage{}, "tendermint/HasVote") - cmtjson.RegisterType(&VoteSetMaj23Message{}, "tendermint/VoteSetMaj23") - cmtjson.RegisterType(&VoteSetBitsMessage{}, "tendermint/VoteSetBits") + cmtjson.RegisterType(&NewRoundStepMessage{}, "cometbft/v38/NewRoundStepMessage") + cmtjson.RegisterType(&NewValidBlockMessage{}, "cometbft/v38/NewValidBlockMessage") + cmtjson.RegisterType(&ProposalMessage{}, "cometbft/v38/Proposal") + cmtjson.RegisterType(&ProposalPOLMessage{}, "cometbft/v38/ProposalPOL") + cmtjson.RegisterType(&BlockPartMessage{}, "cometbft/v38/BlockPart") + cmtjson.RegisterType(&VoteMessage{}, "cometbft/v38/Vote") + cmtjson.RegisterType(&HasVoteMessage{}, "cometbft/v38/HasVote") + cmtjson.RegisterType(&VoteSetMaj23Message{}, "cometbft/v38/VoteSetMaj23") + cmtjson.RegisterType(&VoteSetBitsMessage{}, "cometbft/v38/VoteSetBits") } //------------------------------------- diff --git a/consensus/reactor_test.go b/consensus/reactor_test.go index aed400188ac..2069180bb66 100644 --- a/consensus/reactor_test.go +++ b/consensus/reactor_test.go @@ -15,28 +15,28 @@ import ( dbm "github.com/cometbft/cometbft-db" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - cstypes "github.com/cometbft/cometbft/consensus/types" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bits" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - p2pmock "github.com/cometbft/cometbft/p2p/mock" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - statemocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cstypes "github.com/KYVENetwork/cometbft/v38/consensus/types" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/p2p" + p2pmock "github.com/KYVENetwork/cometbft/v38/p2p/mock" + cmtcons "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/consensus" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + statemocks "github.com/KYVENetwork/cometbft/v38/state/mocks" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" ) //---------------------------------------------- diff --git a/consensus/replay.go b/consensus/replay.go index b8e457fa518..1cecea5f42f 100644 --- a/consensus/replay.go +++ b/consensus/replay.go @@ -9,12 +9,12 @@ import ( "reflect" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) var crc32c = crc32.MakeTable(crc32.Castagnoli) diff --git a/consensus/replay_file.go b/consensus/replay_file.go index 269dcc0fd82..4f9576480ec 100644 --- a/consensus/replay_file.go +++ b/consensus/replay_file.go @@ -12,13 +12,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/consensus/replay_stubs.go b/consensus/replay_stubs.go index 0c55552f036..601374a3544 100644 --- a/consensus/replay_stubs.go +++ b/consensus/replay_stubs.go @@ -3,11 +3,11 @@ package consensus import ( "context" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/clist" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/clist" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/proxy" + "github.com/KYVENetwork/cometbft/v38/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/replay_test.go b/consensus/replay_test.go index bcf74387f36..cda4e8d4241 100644 --- a/consensus/replay_test.go +++ b/consensus/replay_test.go @@ -19,21 +19,21 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/abci/types/mocks" - cfg "github.com/cometbft/cometbft/config" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - smmocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/abci/types/mocks" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + smmocks "github.com/KYVENetwork/cometbft/v38/state/mocks" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestMain(m *testing.M) { diff --git a/consensus/state.go b/consensus/state.go index d2ae99aef89..d6068c7a129 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -13,22 +13,22 @@ import ( "github.com/cosmos/gogoproto/proto" - cfg "github.com/cometbft/cometbft/config" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/crypto" - cmtevents "github.com/cometbft/cometbft/libs/events" - "github.com/cometbft/cometbft/libs/fail" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cstypes "github.com/KYVENetwork/cometbft/v38/consensus/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtevents "github.com/KYVENetwork/cometbft/v38/libs/events" + "github.com/KYVENetwork/cometbft/v38/libs/fail" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) // Consensus sentinel errors @@ -1122,7 +1122,7 @@ func (cs *State) needProofBlock(height int64) bool { lastBlockMeta := cs.blockStore.LoadBlockMeta(height - 1) if lastBlockMeta == nil { - // See https://github.com/cometbft/cometbft/issues/370 + // See https://github.com/KYVENetwork/cometbft/v38/issues/370 cs.Logger.Info("short-circuited needProofBlock", "height", height, "InitialHeight", cs.state.InitialHeight) return true } @@ -2407,10 +2407,10 @@ func (cs *State) voteTime() time.Time { // Minimum time increment between blocks const timeIota = time.Millisecond // TODO: We should remove next line in case we don't vote for v in case cs.ProposalBlock == nil, - // even if cs.LockedBlock != nil. See https://github.com/cometbft/cometbft/tree/v0.38.x/spec/. + // even if cs.LockedBlock != nil. See https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/. if cs.LockedBlock != nil { // See the BFT time spec - // https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/bft-time.md + // https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/consensus/bft-time.md minVoteTime = cs.LockedBlock.Time.Add(timeIota) } else if cs.ProposalBlock != nil { minVoteTime = cs.ProposalBlock.Time.Add(timeIota) diff --git a/consensus/state_test.go b/consensus/state_test.go index 66169bb3b3d..3eb8f8d25c2 100644 --- a/consensus/state_test.go +++ b/consensus/state_test.go @@ -12,20 +12,20 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - abcimocks "github.com/cometbft/cometbft/abci/types/mocks" - cstypes "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/protoio" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtrand "github.com/cometbft/cometbft/libs/rand" - p2pmock "github.com/cometbft/cometbft/p2p/mock" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + abcimocks "github.com/KYVENetwork/cometbft/v38/abci/types/mocks" + cstypes "github.com/KYVENetwork/cometbft/v38/consensus/types" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + p2pmock "github.com/KYVENetwork/cometbft/v38/p2p/mock" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) /* diff --git a/consensus/ticker.go b/consensus/ticker.go index ae5fab794ab..6428e0a0aee 100644 --- a/consensus/ticker.go +++ b/consensus/ticker.go @@ -3,8 +3,8 @@ package consensus import ( "time" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) var ( diff --git a/consensus/types/height_vote_set.go b/consensus/types/height_vote_set.go index 2c45a29aa63..d37b752a3e7 100644 --- a/consensus/types/height_vote_set.go +++ b/consensus/types/height_vote_set.go @@ -6,11 +6,11 @@ import ( "strings" "sync" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) type RoundVoteSet struct { diff --git a/consensus/types/height_vote_set_test.go b/consensus/types/height_vote_set_test.go index 9827a6a48c1..44fc3c2160f 100644 --- a/consensus/types/height_vote_set_test.go +++ b/consensus/types/height_vote_set_test.go @@ -4,13 +4,13 @@ import ( "os" "testing" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" "github.com/stretchr/testify/require" ) diff --git a/consensus/types/peer_round_state.go b/consensus/types/peer_round_state.go index 4e8b440c015..0264aafeaf9 100644 --- a/consensus/types/peer_round_state.go +++ b/consensus/types/peer_round_state.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/bits" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + "github.com/KYVENetwork/cometbft/v38/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/types/round_state.go b/consensus/types/round_state.go index 6749d4265a0..064fb2967d6 100644 --- a/consensus/types/round_state.go +++ b/consensus/types/round_state.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/types" ) //----------------------------------------------------------------------------- diff --git a/consensus/wal.go b/consensus/wal.go index 2a17da1d441..64cfcb9b7b0 100644 --- a/consensus/wal.go +++ b/consensus/wal.go @@ -11,13 +11,13 @@ import ( "github.com/cosmos/gogoproto/proto" - auto "github.com/cometbft/cometbft/libs/autofile" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/service" - cmtcons "github.com/cometbft/cometbft/proto/tendermint/consensus" - cmttime "github.com/cometbft/cometbft/types/time" + auto "github.com/KYVENetwork/cometbft/v38/libs/autofile" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtcons "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/consensus" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) const ( @@ -46,9 +46,9 @@ type EndHeightMessage struct { type WALMessage interface{} func init() { - cmtjson.RegisterType(msgInfo{}, "tendermint/wal/MsgInfo") - cmtjson.RegisterType(timeoutInfo{}, "tendermint/wal/TimeoutInfo") - cmtjson.RegisterType(EndHeightMessage{}, "tendermint/wal/EndHeightMessage") + cmtjson.RegisterType(msgInfo{}, "cometbft/v38/wal/MsgInfo") + cmtjson.RegisterType(timeoutInfo{}, "cometbft/v38/wal/TimeoutInfo") + cmtjson.RegisterType(EndHeightMessage{}, "cometbft/v38/wal/EndHeightMessage") } //-------------------------------------------------------- diff --git a/consensus/wal_generator.go b/consensus/wal_generator.go index c44e9f68ad0..66d45a696ab 100644 --- a/consensus/wal_generator.go +++ b/consensus/wal_generator.go @@ -11,16 +11,16 @@ import ( db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" ) // WALGenerateNBlocks generates a consensus WAL. It does this by spinning up a diff --git a/consensus/wal_test.go b/consensus/wal_test.go index 32d8a7b8596..4be7682973d 100644 --- a/consensus/wal_test.go +++ b/consensus/wal_test.go @@ -13,12 +13,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/consensus/types" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/autofile" - "github.com/cometbft/cometbft/libs/log" - cmttypes "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/consensus/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/libs/autofile" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmttypes "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) const ( diff --git a/crypto/README.md b/crypto/README.md index d63513bbf46..922ba3b9684 100644 --- a/crypto/README.md +++ b/crypto/README.md @@ -5,26 +5,26 @@ crypto is the cryptographic package adapted for CometBFT's uses ## Importing it To get the interfaces, -`import "github.com/cometbft/cometbft/crypto"` +`import "github.com/KYVENetwork/cometbft/v38/crypto"` For any specific algorithm, use its specific module e.g. -`import "github.com/cometbft/cometbft/crypto/ed25519"` +`import "github.com/KYVENetwork/cometbft/v38/crypto/ed25519"` ## Binary encoding -For Binary encoding, please refer to the [CometBFT encoding specification](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/core/encoding.md). +For Binary encoding, please refer to the [CometBFT encoding specification](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/core/encoding.md). ## JSON Encoding -JSON encoding is done using CometBFT's internal json encoder. For more information on JSON encoding, please refer to [CometBFT JSON encoding](https://github.com/cometbft/cometbft/blob/v0.38.x/libs/json/doc.go) +JSON encoding is done using CometBFT's internal json encoder. For more information on JSON encoding, please refer to [CometBFT JSON encoding](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/libs/json/doc.go) ```go Example JSON encodings: -ed25519.PrivKey - {"type":"tendermint/PrivKeyEd25519","value":"EVkqJO/jIXp3rkASXfh9YnyToYXRXhBr6g9cQVxPFnQBP/5povV4HTjvsy530kybxKHwEi85iU8YL0qQhSYVoQ=="} -ed25519.PubKey - {"type":"tendermint/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="} -sr25519.PrivKeySr25519 - {"type":"tendermint/PrivKeySr25519","value":"xtYVH8UCIqfrY8FIFc0QEpAEBShSG4NT0zlEOVSZ2w4="} -sr25519.PubKeySr25519 - {"type":"tendermint/PubKeySr25519","value":"8sKBLKQ/OoXMcAJVxBqz1U7TyxRFQ5cmliuHy4MrF0s="} -crypto.PrivKeySecp256k1 - {"type":"tendermint/PrivKeySecp256k1","value":"zx4Pnh67N+g2V+5vZbQzEyRerX9c4ccNZOVzM9RvJ0Y="} -crypto.PubKeySecp256k1 - {"type":"tendermint/PubKeySecp256k1","value":"A8lPKJXcNl5VHt1FK8a244K9EJuS4WX1hFBnwisi0IJx"} +ed25519.PrivKey - {"type":"cometbft/v38/PrivKeyEd25519","value":"EVkqJO/jIXp3rkASXfh9YnyToYXRXhBr6g9cQVxPFnQBP/5povV4HTjvsy530kybxKHwEi85iU8YL0qQhSYVoQ=="} +ed25519.PubKey - {"type":"cometbft/v38/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="} +sr25519.PrivKeySr25519 - {"type":"cometbft/v38/PrivKeySr25519","value":"xtYVH8UCIqfrY8FIFc0QEpAEBShSG4NT0zlEOVSZ2w4="} +sr25519.PubKeySr25519 - {"type":"cometbft/v38/PubKeySr25519","value":"8sKBLKQ/OoXMcAJVxBqz1U7TyxRFQ5cmliuHy4MrF0s="} +crypto.PrivKeySecp256k1 - {"type":"cometbft/v38/PrivKeySecp256k1","value":"zx4Pnh67N+g2V+5vZbQzEyRerX9c4ccNZOVzM9RvJ0Y="} +crypto.PubKeySecp256k1 - {"type":"cometbft/v38/PubKeySecp256k1","value":"A8lPKJXcNl5VHt1FK8a244K9EJuS4WX1hFBnwisi0IJx"} ``` diff --git a/crypto/batch/batch.go b/crypto/batch/batch.go index 530caafdab7..3041c9f4b70 100644 --- a/crypto/batch/batch.go +++ b/crypto/batch/batch.go @@ -1,9 +1,9 @@ package batch import ( - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/sr25519" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/sr25519" ) // CreateBatchVerifier checks if a key type implements the batch verifier interface. diff --git a/crypto/crypto.go b/crypto/crypto.go index e4825b13259..fb6cd97c2bb 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -1,8 +1,8 @@ package crypto import ( - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" ) const ( @@ -42,7 +42,7 @@ type Symmetric interface { } // If a new key type implements batch verification, -// the key type must be registered in github.com/cometbft/cometbft/crypto/batch +// the key type must be registered in github.com/KYVENetwork/cometbft/v38/crypto/batch type BatchVerifier interface { // Add appends an entry into the BatchVerifier. Add(key PubKey, message, signature []byte) error diff --git a/crypto/ed25519/bench_test.go b/crypto/ed25519/bench_test.go index 114e872735b..d93e23cfb65 100644 --- a/crypto/ed25519/bench_test.go +++ b/crypto/ed25519/bench_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/internal/benchmarking" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/crypto/ed25519/ed25519.go b/crypto/ed25519/ed25519.go index 7d2eb4e6971..d66126109c7 100644 --- a/crypto/ed25519/ed25519.go +++ b/crypto/ed25519/ed25519.go @@ -10,9 +10,9 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/ed25519" "github.com/oasisprotocol/curve25519-voi/primitives/ed25519/extra/cache" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtjson "github.com/cometbft/cometbft/libs/json" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" ) //------------------------------------- @@ -32,8 +32,8 @@ var ( ) const ( - PrivKeyName = "tendermint/PrivKeyEd25519" - PubKeyName = "tendermint/PubKeyEd25519" + PrivKeyName = "cometbft/v38/PrivKeyEd25519" + PubKeyName = "cometbft/v38/PubKeyEd25519" // PubKeySize is is the size, in bytes, of public keys as used in this package. PubKeySize = 32 // PrivateKeySize is the size, in bytes, of private keys as used in this package. diff --git a/crypto/ed25519/ed25519_test.go b/crypto/ed25519/ed25519_test.go index 65696290929..68e1143e418 100644 --- a/crypto/ed25519/ed25519_test.go +++ b/crypto/ed25519/ed25519_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" ) func TestSignAndValidateEd25519(t *testing.T) { diff --git a/crypto/encoding/codec.go b/crypto/encoding/codec.go index 5980f88d4d5..3cf75f34555 100644 --- a/crypto/encoding/codec.go +++ b/crypto/encoding/codec.go @@ -3,11 +3,11 @@ package encoding import ( "fmt" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/secp256k1" - "github.com/cometbft/cometbft/libs/json" - pc "github.com/cometbft/cometbft/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/secp256k1" + "github.com/KYVENetwork/cometbft/v38/libs/json" + pc "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" ) func init() { diff --git a/crypto/example_test.go b/crypto/example_test.go index 6100727782d..4fdf2a9dbd4 100644 --- a/crypto/example_test.go +++ b/crypto/example_test.go @@ -3,7 +3,7 @@ package crypto_test import ( "fmt" - "github.com/cometbft/cometbft/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" ) func ExampleSha256() { diff --git a/crypto/internal/benchmarking/bench.go b/crypto/internal/benchmarking/bench.go index de1c97974bb..1e9c1ad5297 100644 --- a/crypto/internal/benchmarking/bench.go +++ b/crypto/internal/benchmarking/bench.go @@ -4,7 +4,7 @@ import ( "io" "testing" - "github.com/cometbft/cometbft/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" ) // The code in this file is adapted from agl/ed25519. diff --git a/crypto/merkle/hash.go b/crypto/merkle/hash.go index 9e149410390..86d6e36c58f 100644 --- a/crypto/merkle/hash.go +++ b/crypto/merkle/hash.go @@ -3,7 +3,7 @@ package merkle import ( "hash" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" ) // TODO: make these have a large predefined capacity diff --git a/crypto/merkle/proof.go b/crypto/merkle/proof.go index 2c53abf3d40..98f3f805f07 100644 --- a/crypto/merkle/proof.go +++ b/crypto/merkle/proof.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtcrypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" ) const ( diff --git a/crypto/merkle/proof_op.go b/crypto/merkle/proof_op.go index 62820303503..cdfeec4a7ac 100644 --- a/crypto/merkle/proof_op.go +++ b/crypto/merkle/proof_op.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + cmtcrypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" ) //---------------------------------------- diff --git a/crypto/merkle/proof_test.go b/crypto/merkle/proof_test.go index f307380aad6..b572fc3eab8 100644 --- a/crypto/merkle/proof_test.go +++ b/crypto/merkle/proof_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtcrypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" ) const ProofOpDomino = "test:domino" diff --git a/crypto/merkle/proof_value.go b/crypto/merkle/proof_value.go index 5cc188cbe90..56c1fbe47fa 100644 --- a/crypto/merkle/proof_value.go +++ b/crypto/merkle/proof_value.go @@ -4,8 +4,8 @@ import ( "bytes" "fmt" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtcrypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtcrypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" ) const ProofOpValue = "simple:v" diff --git a/crypto/merkle/rfc6962_test.go b/crypto/merkle/rfc6962_test.go index dd0c817cc9c..9678fbd0760 100644 --- a/crypto/merkle/rfc6962_test.go +++ b/crypto/merkle/rfc6962_test.go @@ -20,7 +20,7 @@ import ( "encoding/hex" "testing" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" ) func TestRFC6962Hasher(t *testing.T) { diff --git a/crypto/merkle/tree_test.go b/crypto/merkle/tree_test.go index df76360efc0..d946a309171 100644 --- a/crypto/merkle/tree_test.go +++ b/crypto/merkle/tree_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/test" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/test" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" ) type testItem []byte diff --git a/crypto/random_test.go b/crypto/random_test.go index 1c7bd1fb0a3..489705ff9ef 100644 --- a/crypto/random_test.go +++ b/crypto/random_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" ) // the purpose of this test is primarily to ensure that the randomness diff --git a/crypto/secp256k1/secp256k1.go b/crypto/secp256k1/secp256k1.go index c6e31f1e794..fe53a0d8750 100644 --- a/crypto/secp256k1/secp256k1.go +++ b/crypto/secp256k1/secp256k1.go @@ -12,14 +12,14 @@ import ( "github.com/btcsuite/btcd/btcec/v2/ecdsa" "golang.org/x/crypto/ripemd160" //nolint: staticcheck // necessary for Bitcoin address format - "github.com/cometbft/cometbft/crypto" - cmtjson "github.com/cometbft/cometbft/libs/json" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" ) // ------------------------------------- const ( - PrivKeyName = "tendermint/PrivKeySecp256k1" - PubKeyName = "tendermint/PubKeySecp256k1" + PrivKeyName = "cometbft/v38/PrivKeySecp256k1" + PubKeyName = "cometbft/v38/PubKeySecp256k1" KeyType = "secp256k1" PrivKeySize = 32 diff --git a/crypto/secp256k1/secp256k1_test.go b/crypto/secp256k1/secp256k1_test.go index 195d9dde709..5ec852e6711 100644 --- a/crypto/secp256k1/secp256k1_test.go +++ b/crypto/secp256k1/secp256k1_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/secp256k1" underlyingSecp256k1 "github.com/btcsuite/btcd/btcec/v2" ) diff --git a/crypto/sr25519/batch.go b/crypto/sr25519/batch.go index 6c07747d68d..22257c6441b 100644 --- a/crypto/sr25519/batch.go +++ b/crypto/sr25519/batch.go @@ -5,7 +5,7 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/sr25519" - "github.com/cometbft/cometbft/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" ) var _ crypto.BatchVerifier = &BatchVerifier{} diff --git a/crypto/sr25519/bench_test.go b/crypto/sr25519/bench_test.go index bee3f4f2470..40a4d756aed 100644 --- a/crypto/sr25519/bench_test.go +++ b/crypto/sr25519/bench_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/internal/benchmarking" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/internal/benchmarking" ) func BenchmarkKeyGeneration(b *testing.B) { diff --git a/crypto/sr25519/encoding.go b/crypto/sr25519/encoding.go index ab4ad54ffe6..6a31265b16e 100644 --- a/crypto/sr25519/encoding.go +++ b/crypto/sr25519/encoding.go @@ -1,10 +1,10 @@ package sr25519 -import cmtjson "github.com/cometbft/cometbft/libs/json" +import cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" const ( - PrivKeyName = "tendermint/PrivKeySr25519" - PubKeyName = "tendermint/PubKeySr25519" + PrivKeyName = "cometbft/v38/PrivKeySr25519" + PubKeyName = "cometbft/v38/PubKeySr25519" ) func init() { diff --git a/crypto/sr25519/privkey.go b/crypto/sr25519/privkey.go index 9bea7d3eeb3..77d80026eac 100644 --- a/crypto/sr25519/privkey.go +++ b/crypto/sr25519/privkey.go @@ -7,7 +7,7 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/sr25519" - "github.com/cometbft/cometbft/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" ) var ( diff --git a/crypto/sr25519/pubkey.go b/crypto/sr25519/pubkey.go index b25718f9a43..c1de296356c 100644 --- a/crypto/sr25519/pubkey.go +++ b/crypto/sr25519/pubkey.go @@ -6,8 +6,8 @@ import ( "github.com/oasisprotocol/curve25519-voi/primitives/sr25519" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" ) var _ crypto.PubKey = PubKey{} diff --git a/crypto/sr25519/sr25519_test.go b/crypto/sr25519/sr25519_test.go index b2437be797f..2d929d7c8f6 100644 --- a/crypto/sr25519/sr25519_test.go +++ b/crypto/sr25519/sr25519_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/sr25519" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/sr25519" ) func TestSignAndValidateSr25519(t *testing.T) { diff --git a/crypto/tmhash/hash_test.go b/crypto/tmhash/hash_test.go index 0849391e576..139f2d26b02 100644 --- a/crypto/tmhash/hash_test.go +++ b/crypto/tmhash/hash_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" ) func TestHash(t *testing.T) { diff --git a/crypto/xsalsa20symmetric/symmetric.go b/crypto/xsalsa20symmetric/symmetric.go index 20fb42ce295..6d0a03ab772 100644 --- a/crypto/xsalsa20symmetric/symmetric.go +++ b/crypto/xsalsa20symmetric/symmetric.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/nacl/secretbox" - "github.com/cometbft/cometbft/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" ) // TODO, make this into a struct that implements crypto.Symmetric. diff --git a/crypto/xsalsa20symmetric/symmetric_test.go b/crypto/xsalsa20symmetric/symmetric_test.go index 7f0da23b391..1a746aa2393 100644 --- a/crypto/xsalsa20symmetric/symmetric_test.go +++ b/crypto/xsalsa20symmetric/symmetric_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/crypto/bcrypt" - "github.com/cometbft/cometbft/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto" ) func TestSimple(t *testing.T) { diff --git a/docs/README.md b/docs/README.md index b0353b99b4f..1c36a2a6759 100644 --- a/docs/README.md +++ b/docs/README.md @@ -20,7 +20,7 @@ For more background, see [What is CometBFT?](./introduction/README.md#what-is-co To get started quickly with an example application, see the [quick start guide](guides/quick-start.md). -To learn about application development on CometBFT, see the [Application Blockchain Interface](https://github.com/cometbft/cometbft/tree/v0.38.x/spec/abci). +To learn about application development on CometBFT, see the [Application Blockchain Interface](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/abci). For more details on using CometBFT, see the respective documentation for [CometBFT internals](core/), [benchmarking and monitoring](tools/), and [network deployments](networks/). diff --git a/docs/app-dev/abci-cli.md b/docs/app-dev/abci-cli.md index 829a9a6cb52..debd005698d 100644 --- a/docs/app-dev/abci-cli.md +++ b/docs/app-dev/abci-cli.md @@ -65,7 +65,7 @@ purposes. We'll start a kvstore application, which was installed at the same time as `abci-cli` above. The kvstore just stores transactions in a Merkle tree. Its code can be found -[here](https://github.com/cometbft/cometbft/blob/v0.38.x/abci/example/kvstore/kvstore.go). +[here](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/abci/example/kvstore/kvstore.go). Start the application by running: @@ -105,7 +105,7 @@ response. The server may be generic for a particular language, and we provide a [reference implementation in -Golang](https://github.com/cometbft/cometbft/tree/v0.38.x/abci/server). See the +Golang](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/abci/server). See the [list of other ABCI implementations](https://github.com/tendermint/awesome#ecosystem) for servers in other languages. diff --git a/docs/architecture/adr-111-nop-mempool.md b/docs/architecture/adr-111-nop-mempool.md index 234cd5b9c1d..14e8d3273c1 100644 --- a/docs/architecture/adr-111-nop-mempool.md +++ b/docs/architecture/adr-111-nop-mempool.md @@ -12,7 +12,7 @@ Accepted -[Tracking issue](https://github.com/cometbft/cometbft/issues/1666) +[Tracking issue](https://github.com/KYVENetwork/cometbft/v38/issues/1666) ## Context @@ -109,8 +109,8 @@ those that have an ad-hoc mechanism for transaction dissemination that better me The ABCI application could reuse the P2P network once this is exposed via ABCI. But this will take some time as it needs to be implemented, and has a dependency on bi-directional ABCI, which is also quite substantial. See -[1](https://github.com/cometbft/cometbft/discussions/1112) and -[2](https://github.com/cometbft/cometbft/discussions/494) discussions. +[1](https://github.com/KYVENetwork/cometbft/v38/discussions/1112) and +[2](https://github.com/KYVENetwork/cometbft/v38/discussions/494) discussions. We propose to introduce a `nop` (short for no operation) mempool which will effectively act as a stubbed object internally: @@ -222,7 +222,7 @@ will simply be calling the new implementation. These considerations are exclusively the application's concern in this approach. * *Time to propose a block*. The consensus reactor will call `ReapMaxBytesMaxGas` which will return a `nil` slice. `RequestPrepareProposal` will thus contain no transactions. -* *Consensus waiting for transactions to become available*. `TxsAvailable()` returns `nil`. +* *Consensus waiting for transactions to become available*. `TxsAvailable()` returns `nil`. `cs.handleTxsAvailable()` won't ever be executed. At any rate, a configuration with the `nop` mempool and `create_empty_blocks` set to `false` will be rejected in the first place. @@ -317,8 +317,8 @@ In that sense, it is out of the scope of this ADR. The ABCI app could do it by submitting TX hashes (rather than TXs themselves) in `PrepareProposal`, and then having a mechanism for pulling TXs from the network upon `FinalizeBlock`. - + [sdk-app-mempool]: https://docs.cosmos.network/v0.47/build/building-apps/app-mempool -[adr-110]: https://github.com/cometbft/cometbft/pull/1565 +[adr-110]: https://github.com/KYVENetwork/cometbft/v38/pull/1565 [HT94]: https://dl.acm.org/doi/book/10.5555/866693 -[cat-mempool]: https://github.com/cometbft/cometbft/pull/1472 \ No newline at end of file +[cat-mempool]: https://github.com/KYVENetwork/cometbft/v38/pull/1472 diff --git a/docs/architecture/adr-template.md b/docs/architecture/adr-template.md index 07ee2941768..3a717f188c0 100644 --- a/docs/architecture/adr-template.md +++ b/docs/architecture/adr-template.md @@ -15,8 +15,8 @@ > > Accepted > -> [Tracking issue](https://github.com/cometbft/cometbft/issues/123) -> [Milestone](https://github.com/cometbft/cometbft/milestones/123) +> [Tracking issue](https://github.com/KYVENetwork/cometbft/v38/issues/123) +> [Milestone](https://github.com/KYVENetwork/cometbft/v38/milestones/123) > [Project board](https://github.com/orgs/cometbft/projects/123) > > Rejected ADRs are captured as a record of recommendations that we specifically diff --git a/docs/architecture/tendermint-core/adr-024-sign-bytes.md b/docs/architecture/tendermint-core/adr-024-sign-bytes.md index ae19922a683..d08142526d0 100644 --- a/docs/architecture/tendermint-core/adr-024-sign-bytes.md +++ b/docs/architecture/tendermint-core/adr-024-sign-bytes.md @@ -2,28 +2,28 @@ ## Context -Currently, the messages exchanged between tendermint and a (potentially remote) signer/validator, -namely votes, proposals, and heartbeats, are encoded as a JSON string -(e.g., via `Vote.SignBytes(...)`) and then -signed . JSON encoding is sub-optimal for both, hardware wallets -and for usage in ethereum smart contracts. Both is laid down in detail in [issue#1622]. +Currently, the messages exchanged between tendermint and a (potentially remote) signer/validator, +namely votes, proposals, and heartbeats, are encoded as a JSON string +(e.g., via `Vote.SignBytes(...)`) and then +signed . JSON encoding is sub-optimal for both, hardware wallets +and for usage in ethereum smart contracts. Both is laid down in detail in [issue#1622]. -Also, there are currently no differences between sign-request and -replies. Also, there is no possibility +Also, there are currently no differences between sign-request and -replies. Also, there is no possibility for a remote signer to include an error code or message in case something went wrong. -The messages exchanged between tendermint and a remote signer currently live in +The messages exchanged between tendermint and a remote signer currently live in [privval/socket.go] and encapsulate the corresponding types in [types]. [privval/socket.go]: https://github.com/tendermint/tendermint/blob/d419fffe18531317c28c29a292ad7d253f6cafdf/privval/socket.go#L496-L502 [issue#1622]: https://github.com/tendermint/tendermint/issues/1622 [types]: https://github.com/tendermint/tendermint/tree/main/types - + ## Decision -- restructure vote, proposal, and heartbeat such that their encoding is easily parseable by +- restructure vote, proposal, and heartbeat such that their encoding is easily parseable by hardware devices and smart contracts using a binary encoding format ([amino] in this case) -- split up the messages exchanged between tendermint and remote signers into requests and +- split up the messages exchanged between tendermint and remote signers into requests and responses (see details below) - include an error type in responses @@ -44,16 +44,16 @@ SignXRequest { SignedXReply { x: X sig: Signature // []byte - err: Error{ + err: Error{ code: int desc: string } } ``` -TODO: Alternatively, the type `X` might directly include the signature. A lot of places expect a vote with a +TODO: Alternatively, the type `X` might directly include the signature. A lot of places expect a vote with a signature and do not necessarily deal with "Replies". -Still exploring what would work best here. +Still exploring what would work best here. This would look like (exemplified using X = Vote): ``` Vote { @@ -75,42 +75,42 @@ SignedVoteReply { } ``` -**Note:** There was a related discussion around including a fingerprint of, or, the whole public-key -into each sign-request to tell the signer which corresponding private-key to +**Note:** There was a related discussion around including a fingerprint of, or, the whole public-key +into each sign-request to tell the signer which corresponding private-key to use to sign the message. This is particularly relevant in the context of the KMS -but is currently not considered in this ADR. +but is currently not considered in this ADR. [amino]: https://github.com/tendermint/go-amino/ ### Vote -As explained in [issue#1622] `Vote` will be changed to contain the following fields +As explained in [issue#1622] `Vote` will be changed to contain the following fields (notation in protobuf-like syntax for easy readability): ```proto // vanilla protobuf / amino encoded message Vote { - Version fixed32 - Height sfixed64 + Version fixed32 + Height sfixed64 Round sfixed32 VoteType fixed32 Timestamp Timestamp // << using protobuf definition - BlockID BlockID // << as already defined + BlockID BlockID // << as already defined ChainID string // at the end because length could vary a lot } -// this is an amino registered type; like currently privval.SignVoteMsg: -// registered with "tendermint/socketpv/SignVoteRequest" +// this is an amino registered type; like currently privval.SignVoteMsg: +// registered with "cometbft/v38/socketpv/SignVoteRequest" message SignVoteRequest { Vote vote } // amino registered type -// registered with "tendermint/socketpv/SignedVoteReply" -message SignedVoteReply { +// registered with "cometbft/v38/socketpv/SignedVoteReply" +message SignedVoteReply { Vote Vote - Signature Signature + Signature Signature Err Error } @@ -122,59 +122,59 @@ message Error { ``` -The `ChainID` gets moved into the vote message directly. Previously, it was injected -using the [Signable] interface method `SignBytes(chainID string) []byte`. Also, the +The `ChainID` gets moved into the vote message directly. Previously, it was injected +using the [Signable] interface method `SignBytes(chainID string) []byte`. Also, the signature won't be included directly, only in the corresponding `SignedVoteReply` message. [Signable]: https://github.com/tendermint/tendermint/blob/d419fffe18531317c28c29a292ad7d253f6cafdf/types/signable.go#L9-L11 - + ### Proposal ```proto // vanilla protobuf / amino encoded -message Proposal { - Height sfixed64 +message Proposal { + Height sfixed64 Round sfixed32 Timestamp Timestamp // << using protobuf definition BlockPartsHeader PartSetHeader // as already defined POLRound sfixed32 - POLBlockID BlockID // << as already defined + POLBlockID BlockID // << as already defined } - -// amino registered with "tendermint/socketpv/SignProposalRequest" + +// amino registered with "cometbft/v38/socketpv/SignProposalRequest" message SignProposalRequest { Proposal proposal } -// amino registered with "tendermint/socketpv/SignProposalReply" -message SignProposalReply { +// amino registered with "cometbft/v38/socketpv/SignProposalReply" +message SignProposalReply { Prop Proposal - Sig Signature + Sig Signature Err Error // as defined above } ``` ### Heartbeat -**TODO**: clarify if heartbeat also needs a fixed offset and update the fields accordingly: +**TODO**: clarify if heartbeat also needs a fixed offset and update the fields accordingly: ```proto message Heartbeat { - ValidatorAddress Address - ValidatorIndex int - Height int64 - Round int - Sequence int + ValidatorAddress Address + ValidatorIndex int + Height int64 + Round int + Sequence int } -// amino registered with "tendermint/socketpv/SignHeartbeatRequest" +// amino registered with "cometbft/v38/socketpv/SignHeartbeatRequest" message SignHeartbeatRequest { Hb Heartbeat } -// amino registered with "tendermint/socketpv/SignHeartbeatReply" -message SignHeartbeatReply { +// amino registered with "cometbft/v38/socketpv/SignHeartbeatReply" +message SignHeartbeatReply { Hb Heartbeat - Sig Signature + Sig Signature Err Error // as defined above } @@ -216,18 +216,18 @@ Partially Accepted ### Positive -The most relevant positive effect is that the signing bytes can easily be parsed by a +The most relevant positive effect is that the signing bytes can easily be parsed by a hardware module and a smart contract. Besides that: - + - clearer separation between requests and responses -- added error messages enable better error handling +- added error messages enable better error handling ### Negative - relatively huge change / refactoring touching quite some code -- lot's of places assume a `Vote` with a signature included -> they will need to -- need to modify some interfaces +- lot's of places assume a `Vote` with a signature included -> they will need to +- need to modify some interfaces ### Neutral diff --git a/docs/core/block-structure.md b/docs/core/block-structure.md index e1e9175cb67..9b57c016062 100644 --- a/docs/core/block-structure.md +++ b/docs/core/block-structure.md @@ -15,5 +15,5 @@ component - that's the best place to get started. To dig deeper, check out the [types package documentation][types]. -[data_structures]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/core/data_structures.md -[types]: https://pkg.go.dev/github.com/cometbft/cometbft/types +[data_structures]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/core/data_structures.md +[types]: https://pkg.go.dev/github.com/KYVENetwork/cometbft/v38/types diff --git a/docs/core/block-sync.md b/docs/core/block-sync.md index ad2797d447f..2ad12aecee1 100644 --- a/docs/core/block-sync.md +++ b/docs/core/block-sync.md @@ -25,7 +25,7 @@ process. Once caught up, the daemon will switch out of Block Sync and into the normal consensus mode. After running for some time, the node is considered `caught up` if it has at least one peer and its height is at least as high as the max reported peer height. See [the IsCaughtUp -method](https://github.com/cometbft/cometbft/blob/v0.38.x/blocksync/pool.go#L168). +method](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/blocksync/pool.go#L168). Note: While there have historically been multiple versions of blocksync, v0, v1, and v2, all versions other than v0 have been deprecated in favor of the simplest and most well understood algorithm. @@ -37,7 +37,7 @@ other than v0 have been deprecated in favor of the simplest and most well unders [blocksync] # Block Sync version to use: -# +# # In v0.37, v1 and v2 of the block sync protocols were deprecated. # Please use v0 instead. # diff --git a/docs/core/how-to-read-logs.md b/docs/core/how-to-read-logs.md index 2e54579ac36..7f4632b8b75 100644 --- a/docs/core/how-to-read-logs.md +++ b/docs/core/how-to-read-logs.md @@ -63,7 +63,7 @@ I[10-04|13:54:30.392] Started node module=main n Next follows a standard block creation cycle, where we enter a new round, propose a block, receive more than 2/3 of prevotes, then precommits and finally have a chance to commit a block. For details, -please refer to [Byzantine Consensus Algorithm](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/consensus.md). +please refer to [Byzantine Consensus Algorithm](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/consensus/consensus.md). ```sh I[10-04|13:54:30.393] enterNewRound(91/0). Current: 91/0/RoundStepNewHeight module=consensus @@ -114,7 +114,7 @@ little overview what they do. - `abci-client` As mentioned in [Application Development Guide](../app-dev/abci-cli.md), CometBFT acts as an ABCI client with respect to the application and maintains 3 connections: mempool, consensus and query. The code used by CometBFT can - be found [here](https://github.com/cometbft/cometbft/blob/v0.38.x/abci/client). + be found [here](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/abci/client). - `blockchain` Provides storage, pool (a group of peers), and reactor for both storing and exchanging blocks between peers. - `consensus` The heart of CometBFT, which is the @@ -124,17 +124,17 @@ little overview what they do. from a crash. - `events` Simple event notification system. The list of events can be found - [here](https://github.com/cometbft/cometbft/blob/v0.38.x/types/events.go). + [here](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/types/events.go). You can subscribe to them by calling `subscribe` RPC method. Refer to [RPC docs](./rpc.md) for additional information. - `mempool` Mempool module handles all incoming transactions, whenever they are coming from peers or the application. - `p2p` Provides an abstraction around peer-to-peer communication. For more details, please check out the - [README](https://github.com/cometbft/cometbft/blob/v0.38.x/p2p/README.md). + [README](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/p2p/README.md). - `rpc` [CometBFT's RPC](./rpc.md). - `rpc-server` RPC server. For implementation details, please read the - [doc.go](https://github.com/cometbft/cometbft/blob/v0.38.x/rpc/jsonrpc/doc.go). + [doc.go](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/rpc/jsonrpc/doc.go). - `state` Represents the latest state and execution submodule, which executes blocks against the application. - `types` A collection of the publicly exposed types and methods to diff --git a/docs/core/light-client.md b/docs/core/light-client.md index c64c9163473..3eb4589da2b 100644 --- a/docs/core/light-client.md +++ b/docs/core/light-client.md @@ -9,14 +9,14 @@ applications. CometBFT provides unique speed and security properties for light client applications. See our [light -package](https://pkg.go.dev/github.com/cometbft/cometbft/light?tab=doc). +package](https://pkg.go.dev/github.com/KYVENetwork/cometbft/v38/light?tab=doc). ## Overview The objective of the light client protocol is to get a commit for a recent block hash where the commit includes a majority of signatures from the last known validator set. From there, all the application state is verifiable with -[merkle proofs](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/core/encoding.md#iavl-tree). +[merkle proofs](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/core/encoding.md#iavl-tree). ## Properties @@ -32,7 +32,7 @@ known validator set. From there, all the application state is verifiable with ## Where to obtain trusted height & hash -[Trust Options](https://pkg.go.dev/github.com/cometbft/cometbft/light?tab=doc#TrustOptions) +[Trust Options](https://pkg.go.dev/github.com/KYVENetwork/cometbft/v38/light?tab=doc#TrustOptions) One way to obtain semi-trusted hash & height is to query multiple full nodes and compare their hashes: diff --git a/docs/core/running-in-production.md b/docs/core/running-in-production.md index 98406dadf13..fe8186f5392 100644 --- a/docs/core/running-in-production.md +++ b/docs/core/running-in-production.md @@ -159,7 +159,7 @@ command will scrap all the available info and kill the process. See You can inspect the resulting archive yourself or create an issue on [Github](https://github.com/cometbft/cometbft). Before opening an issue however, be sure to check if there's [no existing -issue](https://github.com/cometbft/cometbft/issues) already. +issue](https://github.com/KYVENetwork/cometbft/v38/issues) already. ## Monitoring CometBFT @@ -370,7 +370,7 @@ proposing the next block). By default, CometBFT checks whenever a peer's address is routable before saving it to the address book. The address is considered as routable if the IP -is [valid and within allowed ranges](https://github.com/cometbft/cometbft/blob/v0.38.x/p2p/netaddress.go#L258). +is [valid and within allowed ranges](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/p2p/netaddress.go#L258). This may not be the case for private or local networks, where your IP range is usually strictly limited and private. If that case, you need to set `addr_book_strict` diff --git a/docs/core/subscription.md b/docs/core/subscription.md index 7b7f1512e47..cca1dce9116 100644 --- a/docs/core/subscription.md +++ b/docs/core/subscription.md @@ -8,7 +8,7 @@ CometBFT emits different events, which you can subscribe to via [Websocket](https://en.wikipedia.org/wiki/WebSocket). This can be useful for third-party applications (for analysis) or for inspecting state. -[List of events](https://godoc.org/github.com/cometbft/cometbft/types#pkg-constants) +[List of events](https://godoc.org/github.com/KYVENetwork/cometbft/v38/types#pkg-constants) To connect to a node via websocket from the CLI, you can use a tool such as [wscat](https://github.com/websockets/wscat) and run: @@ -64,7 +64,7 @@ Prior to version `v0.38.x`, floats were not supported as query parameters. When validator set changes, ValidatorSetUpdates event is published. The event carries a list of pubkey/power pairs. The list is the same CometBFT receives from ABCI application (see [EndBlock -section](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/abci/abci++_methods.md#endblock) in +section](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/abci/abci++_methods.md#endblock) in the ABCI spec). Response: @@ -76,13 +76,13 @@ Response: "result": { "query": "tm.event='ValidatorSetUpdates'", "data": { - "type": "tendermint/event/ValidatorSetUpdates", + "type": "cometbft/v38/event/ValidatorSetUpdates", "value": { "validator_updates": [ { "address": "09EAD022FD25DE3A02E64B0FE9610B1417183EE4", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "ww0z4WaZ0Xg+YI10w43wTWbBmM3dpVza4mmSQYsd0ck=" }, "voting_power": "10", diff --git a/docs/core/using-cometbft.md b/docs/core/using-cometbft.md index cafa8d34319..ad951634da7 100644 --- a/docs/core/using-cometbft.md +++ b/docs/core/using-cometbft.md @@ -39,7 +39,7 @@ cometbft testnet --help The `genesis.json` file in `$CMTHOME/config/` defines the initial CometBFT state upon genesis of the blockchain ([see -definition](https://github.com/cometbft/cometbft/blob/v0.38.x/types/genesis.go)). +definition](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/types/genesis.go)). #### Fields @@ -49,7 +49,7 @@ definition](https://github.com/cometbft/cometbft/blob/v0.38.x/types/genesis.go)) chain IDs, you will have a bad time. The ChainID must be less than 50 symbols. - `initial_height`: Height at which CometBFT should begin at. If a blockchain is conducting a network upgrade, starting from the stopped height brings uniqueness to previous heights. -- `consensus_params` ([see spec](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/core/data_structures.md#consensusparams)) +- `consensus_params` ([see spec](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/core/data_structures.md#consensusparams)) - `block` - `max_bytes`: Max block size, in bytes. - `max_gas`: Max gas per block. @@ -71,7 +71,7 @@ definition](https://github.com/cometbft/cometbft/blob/v0.38.x/types/genesis.go)) application will initialize the validator set upon `InitChain`. - `pub_key`: The first element specifies the key type, using the declared `PubKeyName` for the adopted - [key type](https://github.com/cometbft/cometbft/blob/v0.38.x/crypto/ed25519/ed25519.go#L36). + [key type](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/crypto/ed25519/ed25519.go#L36). The second element are the pubkey bytes. - `power`: The validator's voting power. - `name`: Name of the validator (optional). @@ -110,7 +110,7 @@ definition](https://github.com/cometbft/cometbft/blob/v0.38.x/types/genesis.go)) { "address": "B547AB87E79F75A4A3198C57A8C2FDAF8628CB47", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "P/V6GHuZrb8rs/k1oBorxc6vyXMlnzhJmv7LmjELDys=" }, "power": "10", @@ -352,7 +352,7 @@ When `cometbft init` is run, both a `genesis.json` and { "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/v38/PubKeyEd25519" }, "power" : 10, "name" : "" @@ -373,12 +373,12 @@ And the `priv_validator_key.json`: "address" : "B788DEDE4F50AD8BC9462DE76741CCAFF87D51E2", "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/v38/PubKeyEd25519" }, "last_height" : "0", "priv_key" : { "value" : "JPivl82x+LfVkp8i3ztoTjY6c6GJ4pBxQexErOCyhwqHeGT5ATxzpAtPJKnxNx/NyUnD8Ebv3OIYH+kgD4N88Q==", - "type" : "tendermint/PrivKeyEd25519" + "type" : "cometbft/v38/PrivKeyEd25519" } } ``` @@ -498,11 +498,11 @@ Now we can update our genesis file. For instance, if the new "address" : "5AF49D2A2D4F5AD4C7C8C4CC2FB020131E9C4902", "pub_key" : { "value" : "l9X9+fjkeBzDfPGbUM7AMIRE6uJN78zN5+lk5OYotek=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/v38/PubKeyEd25519" }, "priv_key" : { "value" : "EDJY9W6zlAw+su6ITgTKg2nTZcHAH1NMTW5iwlgmNDuX1f35+OR4HMN88ZtQzsAwhETq4k3vzM3n6WTk5ii16Q==", - "type" : "tendermint/PrivKeyEd25519" + "type" : "cometbft/v38/PrivKeyEd25519" }, "last_step" : 0, "last_round" : "0", @@ -518,7 +518,7 @@ then the new `genesis.json` will be: { "pub_key" : { "value" : "h3hk+QE8c6QLTySp8TcfzclJw/BG79ziGB/pIA+DfPE=", - "type" : "tendermint/PubKeyEd25519" + "type" : "cometbft/v38/PubKeyEd25519" }, "power" : 10, "name" : "" @@ -565,7 +565,7 @@ library will deny making connections to peers with the same IP address. ### Upgrading See the -[UPGRADING.md](https://github.com/cometbft/cometbft/blob/v0.38.x/UPGRADING.md) +[UPGRADING.md](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/UPGRADING.md) guide. You may need to reset your chain between major breaking releases. Although, we expect CometBFT to have fewer breaking releases in the future (especially after 1.0 release). diff --git a/docs/guides/go-built-in.md b/docs/guides/go-built-in.md index 591665c6e25..54733649f1d 100644 --- a/docs/guides/go-built-in.md +++ b/docs/guides/go-built-in.md @@ -122,7 +122,7 @@ go build CometBFT communicates with the application through the Application BlockChain Interface (ABCI). The messages exchanged through the interface are defined in the ABCI [protobuf -file](https://github.com/cometbft/cometbft/blob/v0.38.x/proto/tendermint/abci/types.proto). +file](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/proto/tendermint/abci/types.proto). We begin by creating the basic scaffolding for an ABCI application by creating a new type, `KVStoreApplication`, which implements the @@ -134,7 +134,7 @@ Create a file called `app.go` with the following contents: package main import ( - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" "context" ) @@ -261,7 +261,7 @@ Next, update the `import` stanza at the top to include the Badger library: ```go import( "github.com/dgraph-io/badger/v3" - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" ) ``` @@ -325,7 +325,7 @@ import( "bytes" "github.com/dgraph-io/badger/v3" - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" ) ``` @@ -407,7 +407,7 @@ import ( "log" "github.com/dgraph-io/badger/v3" - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" ) ``` @@ -502,9 +502,9 @@ package main import ( "flag" "fmt" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/proxy" "log" "os" "os/signal" @@ -513,10 +513,10 @@ import ( "github.com/dgraph-io/badger/v3" "github.com/spf13/viper" - cfg "github.com/cometbft/cometbft/config" - cmtflags "github.com/cometbft/cometbft/libs/cli/flags" - cmtlog "github.com/cometbft/cometbft/libs/log" - nm "github.com/cometbft/cometbft/node" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cmtflags "github.com/KYVENetwork/cometbft/v38/libs/cli/flags" + cmtlog "github.com/KYVENetwork/cometbft/v38/libs/log" + nm "github.com/KYVENetwork/cometbft/v38/node" ) var homeDir string @@ -702,12 +702,12 @@ signal.Notify(c, os.Interrupt, syscall.SIGTERM) Our application is almost ready to run, but first we'll need to populate the CometBFT configuration files. The following command will create a `cometbft-home` directory in your project and add a basic set of configuration files in `cometbft-home/config/`. -For more information on what these files contain see [the configuration documentation](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/core/configuration.md). +For more information on what these files contain see [the configuration documentation](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/core/configuration.md). From the root of your project, run: ```bash -go run github.com/cometbft/cometbft/cmd/cometbft@v0.38.0 init --home /tmp/cometbft-home +go run github.com/KYVENetwork/cometbft/v38/cmd/cometbft@v0.38.0 init --home /tmp/cometbft-home ``` You should see an output similar to the following: @@ -795,4 +795,4 @@ echo "cm9ja3M=" | base64 -d ## Outro -Hope you could run everything smoothly. If you have any difficulties running through this tutorial, reach out to us via [discord](https://discord.com/invite/cosmosnetwork) or open a new [issue](https://github.com/cometbft/cometbft/issues/new/choose) on Github. +Hope you could run everything smoothly. If you have any difficulties running through this tutorial, reach out to us via [discord](https://discord.com/invite/cosmosnetwork) or open a new [issue](https://github.com/KYVENetwork/cometbft/v38/issues/new/choose) on Github. diff --git a/docs/guides/go.md b/docs/guides/go.md index 9ea354658b4..0da9b61cd6f 100644 --- a/docs/guides/go.md +++ b/docs/guides/go.md @@ -122,7 +122,7 @@ go build CometBFT communicates with the application through the Application BlockChain Interface (ABCI). The messages exchanged through the interface are defined in the ABCI [protobuf -file](https://github.com/cometbft/cometbft/blob/v0.38.x/proto/tendermint/abci/types.proto). +file](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/proto/tendermint/abci/types.proto). We begin by creating the basic scaffolding for an ABCI application by creating a new type, `KVStoreApplication`, which implements the @@ -134,7 +134,7 @@ Create a file called `app.go` with the following contents: package main import ( - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" "context" ) @@ -262,7 +262,7 @@ Next, update the `import` stanza at the top to include the Badger library: ```go import( "github.com/dgraph-io/badger/v3" - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" ) ``` @@ -325,7 +325,7 @@ import( "bytes" "github.com/dgraph-io/badger/v3" - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" ) ``` @@ -404,7 +404,7 @@ import ( "log" "github.com/dgraph-io/badger/v3" - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" ) ``` @@ -497,7 +497,7 @@ package main import ( "flag" "fmt" - abciserver "github.com/cometbft/cometbft/abci/server" + abciserver "github.com/KYVENetwork/cometbft/v38/abci/server" "log" "os" "os/signal" @@ -505,7 +505,7 @@ import ( "syscall" "github.com/dgraph-io/badger/v3" - cmtlog "github.com/cometbft/cometbft/libs/log" + cmtlog "github.com/KYVENetwork/cometbft/v38/libs/log" ) var homeDir string @@ -595,12 +595,12 @@ signal.Notify(c, os.Interrupt, syscall.SIGTERM) Our application is almost ready to run, but first we'll need to populate the CometBFT configuration files. The following command will create a `cometbft-home` directory in your project and add a basic set of configuration files in `cometbft-home/config/`. -For more information on what these files contain see [the configuration documentation](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/core/configuration.md). +For more information on what these files contain see [the configuration documentation](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/core/configuration.md). From the root of your project, run: ```bash -go run github.com/cometbft/cometbft/cmd/cometbft@v0.38.0 init --home /tmp/cometbft-home +go run github.com/KYVENetwork/cometbft/v38/cmd/cometbft@v0.38.0 init --home /tmp/cometbft-home ``` You should see an output similar to the following: @@ -638,7 +638,7 @@ Open a new terminal window and cd to the same folder where the app is running. Then execute the following command: ```bash -go run github.com/cometbft/cometbft/cmd/cometbft@v0.38.0 node --home /tmp/cometbft-home --proxy_app=unix://example.sock +go run github.com/KYVENetwork/cometbft/v38/cmd/cometbft@v0.38.0 node --home /tmp/cometbft-home --proxy_app=unix://example.sock ``` This should start the full node and connect to our ABCI application, which will be @@ -707,4 +707,4 @@ echo "cm9ja3M=" | base64 -d ## Outro -Hope you could run everything smoothly. If you have any difficulties running through this tutorial, reach out to us via [discord](https://discord.com/invite/cosmosnetwork) or open a new [issue](https://github.com/cometbft/cometbft/issues/new/choose) on Github. +Hope you could run everything smoothly. If you have any difficulties running through this tutorial, reach out to us via [discord](https://discord.com/invite/cosmosnetwork) or open a new [issue](https://github.com/KYVENetwork/cometbft/v38/issues/new/choose) on Github. diff --git a/docs/guides/install.md b/docs/guides/install.md index c7eaff20a50..72eee7cb44d 100644 --- a/docs/guides/install.md +++ b/docs/guides/install.md @@ -9,18 +9,18 @@ order: 3 Install the latest version of CometBFT's Go package: ```sh -go install github.com/cometbft/cometbft/cmd/cometbft@latest +go install github.com/KYVENetwork/cometbft/v38/cmd/cometbft@latest ``` Install a specific version of CometBFT's Go package: ```sh -go install github.com/cometbft/cometbft/cmd/cometbft@v0.38 +go install github.com/KYVENetwork/cometbft/v38/cmd/cometbft@v0.38 ``` ## From Binary -To download pre-built binaries, see the [releases page](https://github.com/cometbft/cometbft/releases). +To download pre-built binaries, see the [releases page](https://github.com/KYVENetwork/cometbft/v38/releases). ## From Source diff --git a/docs/introduction/README.md b/docs/introduction/README.md index 0eaf05f751e..e359222c8de 100644 --- a/docs/introduction/README.md +++ b/docs/introduction/README.md @@ -126,7 +126,7 @@ consensus engine, and provides a particular application state. ## ABCI Overview The [Application BlockChain Interface -(ABCI)](https://github.com/cometbft/cometbft/tree/v0.38.x/abci) +(ABCI)](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/abci) allows for Byzantine Fault Tolerant replication of applications written in any programming language. @@ -191,7 +191,7 @@ core to the application. The application replies with corresponding response messages. The messages are specified here: [ABCI Message -Types](https://github.com/cometbft/cometbft/blob/v0.38.x/proto/tendermint/abci/types.proto). +Types](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/proto/tendermint/abci/types.proto). The **FinalizeBlock** message is the work horse of the application. Each transaction in the blockchain is finalized within this message. The diff --git a/docs/networks/docker-compose.md b/docs/networks/docker-compose.md index 4ba36f8f41e..ac59b3a0013 100644 --- a/docs/networks/docker-compose.md +++ b/docs/networks/docker-compose.md @@ -96,7 +96,7 @@ rm -rf ./build/node* ## Configuring ABCI containers -To use your own ABCI applications with 4-node setup edit the [docker-compose.yaml](https://github.com/cometbft/cometbft/blob/v0.38.x/docker-compose.yml) file and add images to your ABCI application. +To use your own ABCI applications with 4-node setup edit the [docker-compose.yaml](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docker-compose.yml) file and add images to your ABCI application. ```yml abci0: @@ -145,7 +145,7 @@ To use your own ABCI applications with 4-node setup edit the [docker-compose.yam ``` -Override the [command](https://github.com/cometbft/cometbft/blob/v0.38.x/networks/local/localnode/Dockerfile#L11) in each node to connect to it's ABCI. +Override the [command](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/networks/local/localnode/Dockerfile#L11) in each node to connect to it's ABCI. ```yml node0: diff --git a/docs/qa/CometBFT-QA-37.md b/docs/qa/CometBFT-QA-37.md index 1181cf5d827..338cc4645da 100644 --- a/docs/qa/CometBFT-QA-37.md +++ b/docs/qa/CometBFT-QA-37.md @@ -10,7 +10,7 @@ parent: This iteration of the QA was run on CometBFT `v0.37.0-alpha3`, the first `v0.37.x` version from the CometBFT repository. -The changes with respect to the baseline, `TM v0.37.x` as of Oct 12, 2022 (Commit: 1cf9d8e276afe8595cba960b51cd056514965fd1), include the rebranding of our fork of Tendermint Core to CometBFT and several improvements, described in the CometBFT [CHANGELOG](https://github.com/cometbft/cometbft/blob/v0.37.0-alpha.3/CHANGELOG.md). +The changes with respect to the baseline, `TM v0.37.x` as of Oct 12, 2022 (Commit: 1cf9d8e276afe8595cba960b51cd056514965fd1), include the rebranding of our fork of Tendermint Core to CometBFT and several improvements, described in the CometBFT [CHANGELOG](https://github.com/KYVENetwork/cometbft/v38/blob/v0.37.0-alpha.3/CHANGELOG.md). ## Testbed diff --git a/docs/qa/CometBFT-QA-38.md b/docs/qa/CometBFT-QA-38.md index b44b386c9ae..cb19bc761eb 100644 --- a/docs/qa/CometBFT-QA-38.md +++ b/docs/qa/CometBFT-QA-38.md @@ -15,7 +15,7 @@ The changes with respect to the baseline, `v0.37.0-alpha.3` from Feb 21, 2023, include the introduction of the `FinalizeBlock` method to complete the full range of ABCI++ functionality (ABCI 2.0), and other several improvements described in the -[CHANGELOG](https://github.com/cometbft/cometbft/blob/v0.38.0-alpha.2/CHANGELOG.md). +[CHANGELOG](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.0-alpha.2/CHANGELOG.md). ## Issues discovered @@ -550,7 +550,7 @@ Observe that in all runs, the average number of transactions in the mempool quic [\#9539]: https://github.com/tendermint/tendermint/issues/9539 [\#9548]: https://github.com/tendermint/tendermint/issues/9548 -[\#539]: https://github.com/cometbft/cometbft/issues/539 -[\#546]: https://github.com/cometbft/cometbft/issues/546 -[\#562]: https://github.com/cometbft/cometbft/issues/562 -[end-to-end]: https://github.com/cometbft/cometbft/tree/main/test/e2e +[\#539]: https://github.com/KYVENetwork/cometbft/v38/issues/539 +[\#546]: https://github.com/KYVENetwork/cometbft/v38/issues/546 +[\#562]: https://github.com/KYVENetwork/cometbft/v38/issues/562 +[end-to-end]: https://github.com/KYVENetwork/cometbft/v38/tree/main/test/e2e diff --git a/docs/qa/method.md b/docs/qa/method.md index a1663f65a63..d639a0181a9 100644 --- a/docs/qa/method.md +++ b/docs/qa/method.md @@ -17,7 +17,7 @@ This baseline is then compared with results obtained in later versions. Out of the testnet-based test cases described in [the releases document][releases] we focused on two of them: _200 Node Test_, and _Rotating Nodes Test_. -[releases]: https://github.com/cometbft/cometbft/blob/v0.38.x/RELEASES.md#large-scale-testnets +[releases]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/RELEASES.md#large-scale-testnets ## Software Dependencies @@ -124,7 +124,7 @@ The CometBFT team should improve it at every iteration to increase the amount of * It is advisable to adjust the hash in the `go run` command to the latest possible. * ```bash mkdir results - go run github.com/cometbft/cometbft/test/loadtime/cmd/report@3003ef7 --database-type goleveldb --data-dir ./ > results/report.txt + go run github.com/KYVENetwork/cometbft/v38/test/loadtime/cmd/report@3003ef7 --database-type goleveldb --data-dir ./ > results/report.txt ``` 2. File `report.txt` contains an unordered list of experiments with varying concurrent connections and transaction rate. You will need to separate data per experiment. @@ -148,7 +148,7 @@ The CometBFT team should improve it at every iteration to increase the amount of 3. To generate a latency vs throughput plot, extract the data as a CSV * ```bash - go run github.com/cometbft/cometbft/test/loadtime/cmd/report@3003ef7 --database-type goleveldb --data-dir ./ --csv results/raw.csv + go run github.com/KYVENetwork/cometbft/v38/test/loadtime/cmd/report@3003ef7 --database-type goleveldb --data-dir ./ --csv results/raw.csv ``` * Follow the instructions for the [`latency_throughput.py`] script. This plot is useful to visualize the saturation point. @@ -156,8 +156,8 @@ The CometBFT team should improve it at every iteration to increase the amount of This script generates a series of plots per experiment and configuration that may help with visualizing Latency vs Throughput variation. -[`latency_throughput.py`]: https://github.com/cometbft/cometbft/tree/v0.38.x/scripts/qa/reporting#latency-vs-throughput-plotting -[`latency_plotter.py`]: https://github.com/cometbft/cometbft/tree/v0.38.x/scripts/qa/reporting#latency-vs-throughput-plotting-version-2 +[`latency_throughput.py`]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/scripts/qa/reporting#latency-vs-throughput-plotting +[`latency_plotter.py`]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/scripts/qa/reporting#latency-vs-throughput-plotting-version-2 #### Extracting Prometheus Metrics @@ -168,7 +168,7 @@ The CometBFT team should improve it at every iteration to increase the amount of 4. Identify the time window you want to plot in your graphs. 5. Execute the [`prometheus_plotter.py`] script for the time window. -[`prometheus_plotter.py`]: https://github.com/cometbft/cometbft/tree/v0.38.x/scripts/qa/reporting#prometheus-metrics +[`prometheus_plotter.py`]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/scripts/qa/reporting#prometheus-metrics ## Rotating Node Testnet diff --git a/docs/rfc/rfc-100-abci-vote-extension-propag.md b/docs/rfc/rfc-100-abci-vote-extension-propag.md index fce0fe9afc2..c1eef6487f4 100644 --- a/docs/rfc/rfc-100-abci-vote-extension-propag.md +++ b/docs/rfc/rfc-100-abci-vote-extension-propag.md @@ -594,14 +594,14 @@ Vote extensions pose an issue for CometBFT upgrades. Blockchains that perform a coordinated upgrade from ABCI 1.0 to ABCI 2.0 will attempt to produce the first height running ABCI 2.0 without vote extension data from the previous height. As explained in previous sections, blockchains running ABCI 2.0 *require* vote extension data in each -[PrepareProposal](https://github.com/cometbft/cometbft/blob/feature/abci++vef/proto/tendermint/abci/types.proto#L134) +[PrepareProposal](https://github.com/KYVENetwork/cometbft/v38/blob/feature/abci++vef/proto/tendermint/abci/types.proto#L134) call. #### New `ConsensusParam` To facilitate the upgrade and provide applications a mechanism to require vote extensions, we introduce a new -[`ConsensusParam`](https://github.com/cometbft/cometbft/blob/38a4cae/proto/tendermint/types/params.proto#L13) +[`ConsensusParam`](https://github.com/KYVENetwork/cometbft/v38/blob/38a4cae/proto/tendermint/types/params.proto#L13) to transition the chain from maintaining no history of vote extensions to requiring vote extensions. This parameter is an `int64` representing the first height where vote extensions will be required for votes to be considered valid. @@ -735,8 +735,8 @@ required to make progress will always be held somewhere in the network. - [Empty vote extensions issue](https://github.com/tendermint/tendermint/issues/8174) - [Toggle vote extensions issue][toggle-vote-extensions] -[abci-0-17-0]: https://github.com/cometbft/cometbft/blob/v0.34.x/spec/abci/README.md -[abci-1-0]: https://github.com/cometbft/cometbft/blob/v0.37.x/spec/abci/README.md -[abci-2-0]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/abci/README.md -[light-client-spec]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/README.md +[abci-0-17-0]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.34.x/spec/abci/README.md +[abci-1-0]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.37.x/spec/abci/README.md +[abci-2-0]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/abci/README.md +[light-client-spec]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/README.md [toggle-vote-extensions]: https://github.com/tendermint/tendermint/issues/8453 diff --git a/evidence/doc.go b/evidence/doc.go index 1e4909ff019..0140166aee6 100644 --- a/evidence/doc.go +++ b/evidence/doc.go @@ -1,7 +1,7 @@ /* Package evidence handles all evidence storage and gossiping from detection to block proposal. For the different types of evidence refer to the `evidence.go` file in the types package -or https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/light-client/accountability.md. +or https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/consensus/light-client/accountability.md. # Gossiping diff --git a/evidence/mocks/block_store.go b/evidence/mocks/block_store.go index 566fdcec8c4..7c6e9bae212 100644 --- a/evidence/mocks/block_store.go +++ b/evidence/mocks/block_store.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" mock "github.com/stretchr/testify/mock" ) diff --git a/evidence/pool.go b/evidence/pool.go index b502341a861..a70b17bc54e 100644 --- a/evidence/pool.go +++ b/evidence/pool.go @@ -13,11 +13,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - clist "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + clist "github.com/KYVENetwork/cometbft/v38/libs/clist" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/evidence/pool_test.go b/evidence/pool_test.go index 2b8a8e886ad..798e90a98f3 100644 --- a/evidence/pool_test.go +++ b/evidence/pool_test.go @@ -1,6 +1,7 @@ package evidence_test import ( + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "os" "testing" "time" @@ -11,16 +12,15 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/evidence/mocks" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - sm "github.com/cometbft/cometbft/state" - smmocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/evidence" + "github.com/KYVENetwork/cometbft/v38/evidence/mocks" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + sm "github.com/KYVENetwork/cometbft/v38/state" + smmocks "github.com/KYVENetwork/cometbft/v38/state/mocks" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) func TestMain(m *testing.M) { diff --git a/evidence/reactor.go b/evidence/reactor.go index 10d3e53111b..d1d165b93f2 100644 --- a/evidence/reactor.go +++ b/evidence/reactor.go @@ -6,11 +6,11 @@ import ( "github.com/cosmos/gogoproto/proto" - clist "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + clist "github.com/KYVENetwork/cometbft/v38/libs/clist" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/evidence/reactor_test.go b/evidence/reactor_test.go index 620c8fa7d5e..f5f27118a97 100644 --- a/evidence/reactor_test.go +++ b/evidence/reactor_test.go @@ -15,17 +15,17 @@ import ( dbm "github.com/cometbft/cometbft-db" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/evidence/mocks" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/evidence" + "github.com/KYVENetwork/cometbft/v38/evidence/mocks" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v38/p2p/mocks" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) var ( diff --git a/evidence/services.go b/evidence/services.go index 5ebbc5a5b71..b73e8fffcff 100644 --- a/evidence/services.go +++ b/evidence/services.go @@ -1,7 +1,7 @@ package evidence import ( - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) //go:generate ../scripts/mockery_generate.sh BlockStore diff --git a/evidence/verify.go b/evidence/verify.go index cd09285221a..fb5555303c4 100644 --- a/evidence/verify.go +++ b/evidence/verify.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/light" + "github.com/KYVENetwork/cometbft/v38/types" ) // verify verifies the evidence fully by checking: diff --git a/evidence/verify_test.go b/evidence/verify_test.go index 57c3c4f8b8c..f0bfe96011d 100644 --- a/evidence/verify_test.go +++ b/evidence/verify_test.go @@ -2,6 +2,7 @@ package evidence_test import ( "bytes" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "testing" "time" @@ -10,18 +11,17 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/evidence/mocks" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - sm "github.com/cometbft/cometbft/state" - smmocks "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/evidence" + "github.com/KYVENetwork/cometbft/v38/evidence/mocks" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + smmocks "github.com/KYVENetwork/cometbft/v38/state/mocks" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) const ( diff --git a/go.mod b/go.mod index 9ff429d6f09..fac4e953d49 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cometbft/cometbft +module github.com/KYVENetwork/cometbft/v38 go 1.21 @@ -294,12 +294,3 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect ) - -retract ( - // a regression was introduced - v0.38.4 - // a breaking change was introduced - v0.38.3 - // superseeded by v0.38.3 because of ASA-2024-001 - [v0.38.0, v0.38.2] -) diff --git a/inspect/inspect.go b/inspect/inspect.go index ad87551b900..c2cdef6e5ab 100644 --- a/inspect/inspect.go +++ b/inspect/inspect.go @@ -6,17 +6,17 @@ import ( "net" "os" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/inspect/rpc" - "github.com/cometbft/cometbft/libs/log" - cmtstrings "github.com/cometbft/cometbft/libs/strings" - rpccore "github.com/cometbft/cometbft/rpc/core" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/indexer/block" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/inspect/rpc" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtstrings "github.com/KYVENetwork/cometbft/v38/libs/strings" + rpccore "github.com/KYVENetwork/cometbft/v38/rpc/core" + "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/indexer/block" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" "golang.org/x/sync/errgroup" ) diff --git a/inspect/inspect_test.go b/inspect/inspect_test.go index 38245ac0c62..84fe73e3482 100644 --- a/inspect/inspect_test.go +++ b/inspect/inspect_test.go @@ -10,16 +10,16 @@ import ( "testing" "time" - abcitypes "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/inspect" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/pubsub/query" - httpclient "github.com/cometbft/cometbft/rpc/client/http" - indexermocks "github.com/cometbft/cometbft/state/indexer/mocks" - statemocks "github.com/cometbft/cometbft/state/mocks" - txindexmocks "github.com/cometbft/cometbft/state/txindex/mocks" - "github.com/cometbft/cometbft/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/inspect" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + httpclient "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + indexermocks "github.com/KYVENetwork/cometbft/v38/state/indexer/mocks" + statemocks "github.com/KYVENetwork/cometbft/v38/state/mocks" + txindexmocks "github.com/KYVENetwork/cometbft/v38/state/txindex/mocks" + "github.com/KYVENetwork/cometbft/v38/types" "github.com/fortytw2/leaktest" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -257,7 +257,7 @@ func TestBlockResults(t *testing.T) { testGasUsed := int64(100) stateStoreMock := &statemocks.Store{} stateStoreMock.On("Close").Return(nil) - // cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" + // cmtstate "github.com/KYVENetwork/cometbft/v38/proto/tendermint/state" stateStoreMock.On("LoadFinalizeBlockResponse", testHeight).Return(&abcitypes.ResponseFinalizeBlock{ TxResults: []*abcitypes.ExecTxResult{ { diff --git a/inspect/rpc/rpc.go b/inspect/rpc/rpc.go index 4367ade2d59..a71ec1a152c 100644 --- a/inspect/rpc/rpc.go +++ b/inspect/rpc/rpc.go @@ -7,13 +7,13 @@ import ( "github.com/rs/cors" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/rpc/core" - "github.com/cometbft/cometbft/rpc/jsonrpc/server" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/rpc/core" + "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" + "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/txindex" ) // Server defines parameters for running an Inspector rpc server. diff --git a/internal/indexer/indexer_utils.go b/internal/indexer/indexer_utils.go index c6caaee6f85..2f753ea42f4 100644 --- a/internal/indexer/indexer_utils.go +++ b/internal/indexer/indexer_utils.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/cometbft/cometbft/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/indexer" ) // If the actual event value is a float, we get the condition and parse it as a float diff --git a/internal/test/block.go b/internal/test/block.go index 5889ac3517d..41f3fb3ba81 100644 --- a/internal/test/block.go +++ b/internal/test/block.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) const ( diff --git a/internal/test/commit.go b/internal/test/commit.go index 599d56d3012..eca79cc3522 100644 --- a/internal/test/commit.go +++ b/internal/test/commit.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) func MakeCommitFromVoteSet(blockID types.BlockID, voteSet *types.VoteSet, validators []types.PrivValidator, now time.Time) (*types.Commit, error) { diff --git a/internal/test/config.go b/internal/test/config.go index 2685584e178..5a5d158244e 100644 --- a/internal/test/config.go +++ b/internal/test/config.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/cometbft/cometbft/config" - cmtos "github.com/cometbft/cometbft/libs/os" + "github.com/KYVENetwork/cometbft/v38/config" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" ) func ResetTestRoot(testName string) *config.Config { @@ -70,7 +70,7 @@ var testGenesisFmt = `{ "validators": [ { "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE=" }, "power": "10", @@ -83,11 +83,11 @@ var testGenesisFmt = `{ var testPrivValidatorKey = `{ "address": "A3258DCBF45DCA0DF052981870F2D1441A36D145", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE=" }, "priv_key": { - "type": "tendermint/PrivKeyEd25519", + "type": "cometbft/v38/PrivKeyEd25519", "value": "EVkqJO/jIXp3rkASXfh9YnyToYXRXhBr6g9cQVxPFnQBP/5povV4HTjvsy530kybxKHwEi85iU8YL0qQhSYVoQ==" } }` diff --git a/internal/test/factory_test.go b/internal/test/factory_test.go index 07bc2824d57..95fb30016dd 100644 --- a/internal/test/factory_test.go +++ b/internal/test/factory_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestMakeHeader(t *testing.T) { diff --git a/internal/test/genesis.go b/internal/test/genesis.go index 22b8028b8e1..65145223331 100644 --- a/internal/test/genesis.go +++ b/internal/test/genesis.go @@ -3,7 +3,7 @@ package test import ( "time" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) func GenesisDoc( diff --git a/internal/test/params.go b/internal/test/params.go index c4421d53cc4..07436102066 100644 --- a/internal/test/params.go +++ b/internal/test/params.go @@ -1,7 +1,7 @@ package test import ( - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // ConsensusParams returns a default set of ConsensusParams that are suitable diff --git a/internal/test/tx.go b/internal/test/tx.go index f5175a00cbd..f2db8b4f7a3 100644 --- a/internal/test/tx.go +++ b/internal/test/tx.go @@ -1,6 +1,6 @@ package test -import "github.com/cometbft/cometbft/types" +import "github.com/KYVENetwork/cometbft/v38/types" func MakeNTxs(height, n int64) types.Txs { txs := make([]types.Tx, n) diff --git a/internal/test/validator.go b/internal/test/validator.go index ddc471ee8e6..5c39ac921f4 100644 --- a/internal/test/validator.go +++ b/internal/test/validator.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) func Validator(_ context.Context, votingPower int64) (*types.Validator, types.PrivValidator, error) { diff --git a/libs/autofile/autofile.go b/libs/autofile/autofile.go index b67af20e150..d49106e4b39 100644 --- a/libs/autofile/autofile.go +++ b/libs/autofile/autofile.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) /* AutoFile usage diff --git a/libs/autofile/autofile_test.go b/libs/autofile/autofile_test.go index 2713e5482a0..e8ce684b777 100644 --- a/libs/autofile/autofile_test.go +++ b/libs/autofile/autofile_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtos "github.com/cometbft/cometbft/libs/os" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" ) func TestSIGHUP(t *testing.T) { diff --git a/libs/autofile/cmd/logjack.go b/libs/autofile/cmd/logjack.go index 92386e50023..91b54202eb2 100644 --- a/libs/autofile/cmd/logjack.go +++ b/libs/autofile/cmd/logjack.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - auto "github.com/cometbft/cometbft/libs/autofile" - cmtos "github.com/cometbft/cometbft/libs/os" + auto "github.com/KYVENetwork/cometbft/v38/libs/autofile" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" ) const ( diff --git a/libs/autofile/group.go b/libs/autofile/group.go index 057957915af..5d2e16ac753 100644 --- a/libs/autofile/group.go +++ b/libs/autofile/group.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) const ( diff --git a/libs/autofile/group_test.go b/libs/autofile/group_test.go index e2813b6c972..7deb8a62b6c 100644 --- a/libs/autofile/group_test.go +++ b/libs/autofile/group_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) func createTestGroupWithHeadSizeLimit(t *testing.T, headSizeLimit int64) *Group { diff --git a/libs/bits/bit_array.go b/libs/bits/bit_array.go index 92845e98fe9..9452bd57ffa 100644 --- a/libs/bits/bit_array.go +++ b/libs/bits/bit_array.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtprotobits "github.com/cometbft/cometbft/proto/tendermint/libs/bits" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtprotobits "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/libs/bits" ) // BitArray is a thread-safe implementation of a bit array. diff --git a/libs/bits/bit_array_test.go b/libs/bits/bit_array_test.go index 82326e55028..f81890cc42c 100644 --- a/libs/bits/bit_array_test.go +++ b/libs/bits/bit_array_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) func randBitArray(bits int) (*BitArray, []byte) { @@ -287,7 +287,7 @@ func TestBitArrayProtoBuf(t *testing.T) { } // Tests that UnmarshalJSON doesn't crash when no bits are passed into the JSON. -// See issue https://github.com/cometbft/cometbft/issues/2658 +// See issue https://github.com/KYVENetwork/cometbft/v38/issues/2658 func TestUnmarshalJSONDoesntCrashOnZeroBits(t *testing.T) { type indexCorpus struct { BitArray *BitArray `json:"ba"` diff --git a/libs/cli/flags/log_level.go b/libs/cli/flags/log_level.go index 13879e71a74..25792c139ce 100644 --- a/libs/cli/flags/log_level.go +++ b/libs/cli/flags/log_level.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) const ( diff --git a/libs/cli/flags/log_level_test.go b/libs/cli/flags/log_level_test.go index 17af292e7cd..f61f7d7d2da 100644 --- a/libs/cli/flags/log_level_test.go +++ b/libs/cli/flags/log_level_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - cmtflags "github.com/cometbft/cometbft/libs/cli/flags" - "github.com/cometbft/cometbft/libs/log" + cmtflags "github.com/KYVENetwork/cometbft/v38/libs/cli/flags" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) const ( diff --git a/libs/clist/clist.go b/libs/clist/clist.go index 5eb48f00a12..6395b2d99af 100644 --- a/libs/clist/clist.go +++ b/libs/clist/clist.go @@ -15,7 +15,7 @@ import ( "fmt" "sync" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // MaxLength is the max allowed number of elements a linked list is diff --git a/libs/clist/clist_test.go b/libs/clist/clist_test.go index 9cff7e34f2c..3b91454b3fa 100644 --- a/libs/clist/clist_test.go +++ b/libs/clist/clist_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) func TestPanicOnMaxLength(t *testing.T) { diff --git a/libs/cmap/cmap.go b/libs/cmap/cmap.go index 2169c02fe96..25dcbc35739 100644 --- a/libs/cmap/cmap.go +++ b/libs/cmap/cmap.go @@ -1,7 +1,7 @@ package cmap import ( - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // CMap is a goroutine-safe map diff --git a/libs/events/Makefile b/libs/events/Makefile index efc79277acb..0064ed9ec50 100644 --- a/libs/events/Makefile +++ b/libs/events/Makefile @@ -1,5 +1,5 @@ .PHONY: docs -REPO:=github.com/cometbft/cometbft/libs/events +REPO:=github.com/KYVENetwork/cometbft/v38/libs/events docs: @go get github.com/davecheney/godoc2md diff --git a/libs/events/README.md b/libs/events/README.md index f2e2a10f0a0..cfbf5047546 100644 --- a/libs/events/README.md +++ b/libs/events/README.md @@ -2,7 +2,7 @@ # events -`import "github.com/cometbft/cometbft/libs/events"` +`import "github.com/KYVENetwork/cometbft/v38/libs/events"` ## Overview diff --git a/libs/events/events.go b/libs/events/events.go index 293e6fb8da9..203daf4d010 100644 --- a/libs/events/events.go +++ b/libs/events/events.go @@ -4,8 +4,8 @@ package events import ( "fmt" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // ErrListenerWasRemoved is returned by AddEvent if the listener was removed. diff --git a/libs/events/events_test.go b/libs/events/events_test.go index d6bbcd08c35..134d573f3f8 100644 --- a/libs/events/events_test.go +++ b/libs/events/events_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/rand" ) // TestAddListenerForEventFireOnce sets up an EventSwitch, subscribes a single diff --git a/libs/flowrate/flowrate.go b/libs/flowrate/flowrate.go index 23252f4e333..41ad3c6212d 100644 --- a/libs/flowrate/flowrate.go +++ b/libs/flowrate/flowrate.go @@ -10,7 +10,7 @@ import ( "math" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // Monitor monitors and limits the transfer rate of a data stream. diff --git a/libs/json/decoder_test.go b/libs/json/decoder_test.go index 9a33bf0e2ad..ec463d7f1e7 100644 --- a/libs/json/decoder_test.go +++ b/libs/json/decoder_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/json" ) func TestUnmarshal(t *testing.T) { diff --git a/libs/json/encoder_test.go b/libs/json/encoder_test.go index e6eb18a1225..92903a42b92 100644 --- a/libs/json/encoder_test.go +++ b/libs/json/encoder_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/json" ) func TestMarshal(t *testing.T) { diff --git a/libs/json/helpers_test.go b/libs/json/helpers_test.go index 1776c9723cb..8e80f9e91ab 100644 --- a/libs/json/helpers_test.go +++ b/libs/json/helpers_test.go @@ -3,7 +3,7 @@ package json_test import ( "time" - "github.com/cometbft/cometbft/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/json" ) // Register Car, an instance of the Vehicle interface. diff --git a/libs/json/structs.go b/libs/json/structs.go index 8c717e3c83b..bf0a547fb2f 100644 --- a/libs/json/structs.go +++ b/libs/json/structs.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) var ( diff --git a/libs/json/types.go b/libs/json/types.go index 4d9a0e229c8..67c8cb89040 100644 --- a/libs/json/types.go +++ b/libs/json/types.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) var ( diff --git a/libs/log/filter_test.go b/libs/log/filter_test.go index f98fd6e71e2..b5286bda119 100644 --- a/libs/log/filter_test.go +++ b/libs/log/filter_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) func TestVariousLevels(t *testing.T) { diff --git a/libs/log/lazy.go b/libs/log/lazy.go index a8fb74f03aa..4d1a03ec488 100644 --- a/libs/log/lazy.go +++ b/libs/log/lazy.go @@ -3,7 +3,7 @@ package log import ( "fmt" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" ) type LazySprintf struct { diff --git a/libs/log/tm_logger_test.go b/libs/log/tm_logger_test.go index 95b4fd5379d..f3d9c43c95b 100644 --- a/libs/log/tm_logger_test.go +++ b/libs/log/tm_logger_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) func TestLoggerLogsItsErrors(t *testing.T) { diff --git a/libs/log/tmfmt_logger_test.go b/libs/log/tmfmt_logger_test.go index d4e8f8bfec2..677c0b1f715 100644 --- a/libs/log/tmfmt_logger_test.go +++ b/libs/log/tmfmt_logger_test.go @@ -11,7 +11,7 @@ import ( kitlog "github.com/go-kit/log" "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) func TestTMFmtLogger(t *testing.T) { diff --git a/libs/log/tracing_logger_test.go b/libs/log/tracing_logger_test.go index 9af2fd0ef4d..b4f28c647bc 100644 --- a/libs/log/tracing_logger_test.go +++ b/libs/log/tracing_logger_test.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) func TestTracingLogger(t *testing.T) { diff --git a/libs/os/os.go b/libs/os/os.go index 334eaf4c896..f4923f8a6ce 100644 --- a/libs/os/os.go +++ b/libs/os/os.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) type logger interface { diff --git a/libs/protoio/io_test.go b/libs/protoio/io_test.go index b95c187df0f..2a47a9e8748 100644 --- a/libs/protoio/io_test.go +++ b/libs/protoio/io_test.go @@ -41,7 +41,7 @@ import ( "github.com/cosmos/gogoproto/test" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/protoio" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" ) func iotest(writer protoio.WriteCloser, reader protoio.ReadCloser) error { diff --git a/libs/pubsub/example_test.go b/libs/pubsub/example_test.go index 33e9109861e..3d58362efea 100644 --- a/libs/pubsub/example_test.go +++ b/libs/pubsub/example_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" - "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" ) func TestExample(t *testing.T) { diff --git a/libs/pubsub/pubsub.go b/libs/pubsub/pubsub.go index c2a1ec060aa..ded848d8d74 100644 --- a/libs/pubsub/pubsub.go +++ b/libs/pubsub/pubsub.go @@ -38,8 +38,8 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) type operation int diff --git a/libs/pubsub/pubsub_test.go b/libs/pubsub/pubsub_test.go index f14e9eff4a6..f1ec245e19f 100644 --- a/libs/pubsub/pubsub_test.go +++ b/libs/pubsub/pubsub_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" - "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" ) const ( diff --git a/libs/pubsub/query/bench_test.go b/libs/pubsub/query/bench_test.go index fcae0e00bd8..77abe9ce459 100644 --- a/libs/pubsub/query/bench_test.go +++ b/libs/pubsub/query/bench_test.go @@ -3,7 +3,7 @@ package query_test import ( "testing" - "github.com/cometbft/cometbft/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" ) const testQuery = `tm.events.type='NewBlock' AND abci.account.name='Igor'` diff --git a/libs/pubsub/query/query.go b/libs/pubsub/query/query.go index b7cc180a72c..70951ca6170 100644 --- a/libs/pubsub/query/query.go +++ b/libs/pubsub/query/query.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" ) // All is a query that matches all events. diff --git a/libs/pubsub/query/query_test.go b/libs/pubsub/query/query_test.go index 2c8fcc557ed..f42a4893f53 100644 --- a/libs/pubsub/query/query_test.go +++ b/libs/pubsub/query/query_test.go @@ -10,17 +10,17 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" ) var _ pubsub.Query = (*query.Query)(nil) // Example events from the OpenAPI documentation: // -// https://github.com/cometbft/cometbft/blob/master/rpc/openapi/openapi.yaml +// https://github.com/KYVENetwork/cometbft/v38/blob/master/rpc/openapi/openapi.yaml // // Redactions: // diff --git a/libs/pubsub/query/syntax/syntax_test.go b/libs/pubsub/query/syntax/syntax_test.go index 29a85aa9ec6..27076c0592a 100644 --- a/libs/pubsub/query/syntax/syntax_test.go +++ b/libs/pubsub/query/syntax/syntax_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" ) func TestScanner(t *testing.T) { diff --git a/libs/pubsub/subscription.go b/libs/pubsub/subscription.go index 8de570fefdd..fc9f8532e25 100644 --- a/libs/pubsub/subscription.go +++ b/libs/pubsub/subscription.go @@ -3,7 +3,7 @@ package pubsub import ( "errors" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) var ( diff --git a/libs/rand/random.go b/libs/rand/random.go index 053e03e15e8..acf044fc0fd 100644 --- a/libs/rand/random.go +++ b/libs/rand/random.go @@ -5,7 +5,7 @@ import ( mrand "math/rand" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) const ( @@ -301,7 +301,7 @@ func (r *Rand) Perm(n int) []int { // NOTE: This relies on the os's random number generator. // For real security, we should salt that with some seed. -// See github.com/cometbft/cometbft/crypto for a more secure reader. +// See github.com/KYVENetwork/cometbft/v38/crypto for a more secure reader. func cRandBytes(numBytes int) []byte { b := make([]byte, numBytes) _, err := crand.Read(b) diff --git a/libs/service/service.go b/libs/service/service.go index 7a46e5e20b4..e75598f48ae 100644 --- a/libs/service/service.go +++ b/libs/service/service.go @@ -5,7 +5,7 @@ import ( "fmt" "sync/atomic" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) var ( diff --git a/libs/tempfile/tempfile.go b/libs/tempfile/tempfile.go index f79cd0e1632..d33915ab396 100644 --- a/libs/tempfile/tempfile.go +++ b/libs/tempfile/tempfile.go @@ -9,7 +9,7 @@ import ( "strings" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) const ( diff --git a/libs/tempfile/tempfile_test.go b/libs/tempfile/tempfile_test.go index 4ff18863f4a..19f5cb3472a 100644 --- a/libs/tempfile/tempfile_test.go +++ b/libs/tempfile/tempfile_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) func TestWriteFileAtomic(t *testing.T) { diff --git a/libs/test/mutate.go b/libs/test/mutate.go index 3a0d58301be..0d2594fdc45 100644 --- a/libs/test/mutate.go +++ b/libs/test/mutate.go @@ -1,7 +1,7 @@ package test import ( - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) // Contract: !bytes.Equal(input, output) && len(input) >= len(output) diff --git a/libs/timer/throttle_timer.go b/libs/timer/throttle_timer.go index d27269f4e53..1ca87bbcf62 100644 --- a/libs/timer/throttle_timer.go +++ b/libs/timer/throttle_timer.go @@ -3,7 +3,7 @@ package timer import ( "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) /* diff --git a/libs/timer/throttle_timer_test.go b/libs/timer/throttle_timer_test.go index 527c89ecea8..ecb985e7e6b 100644 --- a/libs/timer/throttle_timer_test.go +++ b/libs/timer/throttle_timer_test.go @@ -8,7 +8,7 @@ import ( asrt "github.com/stretchr/testify/assert" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) type thCounter struct { diff --git a/light/client.go b/light/client.go index 5860cb0e68d..29390895b42 100644 --- a/light/client.go +++ b/light/client.go @@ -9,12 +9,12 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/light/store" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/light/provider" + "github.com/KYVENetwork/cometbft/v38/light/store" + "github.com/KYVENetwork/cometbft/v38/types" ) type mode byte @@ -506,7 +506,7 @@ func (c *Client) VerifyLightBlockAtHeight(ctx context.Context, height int64, now // headers are not adjacent, verifySkipping is performed and necessary (not all) // intermediate headers will be requested. See the specification for details. // Intermediate headers are not saved to database. -// https://github.com/cometbft/cometbft/blob/v0.38.x/spec/consensus/light-client.md +// https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/consensus/light-client.md // // If the header, which is older than the currently trusted header, is // requested and the light client does not have it, VerifyHeader will perform: diff --git a/light/client_benchmark_test.go b/light/client_benchmark_test.go index e9d11c952f3..35c257077f0 100644 --- a/light/client_benchmark_test.go +++ b/light/client_benchmark_test.go @@ -7,11 +7,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - mockp "github.com/cometbft/cometbft/light/provider/mock" - dbs "github.com/cometbft/cometbft/light/store/db" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/light" + "github.com/KYVENetwork/cometbft/v38/light/provider" + mockp "github.com/KYVENetwork/cometbft/v38/light/provider/mock" + dbs "github.com/KYVENetwork/cometbft/v38/light/store/db" ) // NOTE: block is produced every minute. Make sure the verification time diff --git a/light/client_test.go b/light/client_test.go index 6e975212d62..76b2ba4483f 100644 --- a/light/client_test.go +++ b/light/client_test.go @@ -12,13 +12,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - mockp "github.com/cometbft/cometbft/light/provider/mock" - dbs "github.com/cometbft/cometbft/light/store/db" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/light" + "github.com/KYVENetwork/cometbft/v38/light/provider" + mockp "github.com/KYVENetwork/cometbft/v38/light/provider/mock" + dbs "github.com/KYVENetwork/cometbft/v38/light/store/db" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/light/detector.go b/light/detector.go index 228dec61a6c..6c4bd6f9b97 100644 --- a/light/detector.go +++ b/light/detector.go @@ -7,8 +7,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/light/provider" + "github.com/KYVENetwork/cometbft/v38/types" ) // The detector component of the light client detects and handles attacks on the light client. diff --git a/light/detector_test.go b/light/detector_test.go index d8afacefd89..9b5e2dbdc8e 100644 --- a/light/detector_test.go +++ b/light/detector_test.go @@ -9,12 +9,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - mockp "github.com/cometbft/cometbft/light/provider/mock" - dbs "github.com/cometbft/cometbft/light/store/db" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/light" + "github.com/KYVENetwork/cometbft/v38/light/provider" + mockp "github.com/KYVENetwork/cometbft/v38/light/provider/mock" + dbs "github.com/KYVENetwork/cometbft/v38/light/store/db" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestLightClientAttackEvidence_Lunatic(t *testing.T) { diff --git a/light/doc.go b/light/doc.go index 9b1ba62d165..6dc3414ef90 100644 --- a/light/doc.go +++ b/light/doc.go @@ -94,7 +94,7 @@ Check out other examples in example_test.go ## 2. Pure functions to verify a new header (see verifier.go) Verify function verifies a new header against some trusted header. See -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/README.md +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/README.md for details. There are two methods of verification: sequential and bisection @@ -121,7 +121,7 @@ See https://docs.cometbft.com/v0.38.x/core/light-client.html for usage example. Or see -https://github.com/cometbft/cometbft/tree/v0.38.x/spec/consensus/light-client +https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/consensus/light-client for the full spec */ package light diff --git a/light/errors.go b/light/errors.go index bc6357def66..4c7fcc2b57d 100644 --- a/light/errors.go +++ b/light/errors.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // ErrOldHeaderExpired means the old (trusted) header has expired according to diff --git a/light/example_test.go b/light/example_test.go index 45304de9a44..9afd72be526 100644 --- a/light/example_test.go +++ b/light/example_test.go @@ -10,13 +10,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/light/provider" - httpp "github.com/cometbft/cometbft/light/provider/http" - dbs "github.com/cometbft/cometbft/light/store/db" - rpctest "github.com/cometbft/cometbft/rpc/test" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/light" + "github.com/KYVENetwork/cometbft/v38/light/provider" + httpp "github.com/KYVENetwork/cometbft/v38/light/provider/http" + dbs "github.com/KYVENetwork/cometbft/v38/light/store/db" + rpctest "github.com/KYVENetwork/cometbft/v38/rpc/test" ) // Automatically getting new headers and verifying them. diff --git a/light/helpers_test.go b/light/helpers_test.go index e88335c4cf4..1e2e0cc3c5d 100644 --- a/light/helpers_test.go +++ b/light/helpers_test.go @@ -1,16 +1,16 @@ package light_test import ( + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" + "github.com/KYVENetwork/cometbft/v38/version" ) // privKeys is a helper type for testing. diff --git a/light/provider/http/http.go b/light/provider/http/http.go index b73f7bd4524..014c7f3e36b 100644 --- a/light/provider/http/http.go +++ b/light/provider/http/http.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/light/provider" - rpcclient "github.com/cometbft/cometbft/rpc/client" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/light/provider" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/client" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + "github.com/KYVENetwork/cometbft/v38/types" ) var ( @@ -180,7 +180,7 @@ func (p *http) signedHeader(ctx context.Context, height *int64) (*types.SignedHe commit, err := p.client.Commit(ctx, height) switch { case err == nil: - // See https://github.com/cometbft/cometbft/issues/575 + // See https://github.com/KYVENetwork/cometbft/v38/issues/575 // If the node is starting at a non-zero height, but does not yet // have any blocks, it can return an empty signed header without // returning an error. diff --git a/light/provider/http/http_test.go b/light/provider/http/http_test.go index 3ef7dbb1795..4ebc685bd88 100644 --- a/light/provider/http/http_test.go +++ b/light/provider/http/http_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/light/provider" - lighthttp "github.com/cometbft/cometbft/light/provider/http" - rpcclient "github.com/cometbft/cometbft/rpc/client" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpctest "github.com/cometbft/cometbft/rpc/test" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/light/provider" + lighthttp "github.com/KYVENetwork/cometbft/v38/light/provider/http" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/client" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + rpctest "github.com/KYVENetwork/cometbft/v38/rpc/test" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestNewProvider(t *testing.T) { diff --git a/light/provider/mock/deadmock.go b/light/provider/mock/deadmock.go index 789cc255fd9..5035f2a3543 100644 --- a/light/provider/mock/deadmock.go +++ b/light/provider/mock/deadmock.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/light/provider" + "github.com/KYVENetwork/cometbft/v38/types" ) type deadMock struct { diff --git a/light/provider/mock/mock.go b/light/provider/mock/mock.go index 57ecef09e51..cb9c4074c69 100644 --- a/light/provider/mock/mock.go +++ b/light/provider/mock/mock.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/light/provider" + "github.com/KYVENetwork/cometbft/v38/types" ) type Mock struct { diff --git a/light/provider/provider.go b/light/provider/provider.go index 333d8c1e891..3a5d0faa5a4 100644 --- a/light/provider/provider.go +++ b/light/provider/provider.go @@ -3,7 +3,7 @@ package provider import ( "context" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // Provider provides information for the light client to sync (verification diff --git a/light/proxy/proxy.go b/light/proxy/proxy.go index 450169a56b5..641a357bdf5 100644 --- a/light/proxy/proxy.go +++ b/light/proxy/proxy.go @@ -6,12 +6,12 @@ import ( "net" "net/http" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/light" - lrpc "github.com/cometbft/cometbft/light/rpc" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + "github.com/KYVENetwork/cometbft/v38/light" + lrpc "github.com/KYVENetwork/cometbft/v38/light/rpc" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + rpcserver "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" ) // A Proxy defines parameters for running an HTTP server proxy. diff --git a/light/proxy/routes.go b/light/proxy/routes.go index 62e20712706..3e35a943dad 100644 --- a/light/proxy/routes.go +++ b/light/proxy/routes.go @@ -1,13 +1,13 @@ package proxy import ( - "github.com/cometbft/cometbft/libs/bytes" - lrpc "github.com/cometbft/cometbft/light/rpc" - rpcclient "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + lrpc "github.com/KYVENetwork/cometbft/v38/light/rpc" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpcserver "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/types" ) func RPCRoutes(c *lrpc.Client) map[string]*rpcserver.RPCFunc { diff --git a/light/rpc/client.go b/light/rpc/client.go index b26c51a9d23..fb17efcca40 100644 --- a/light/rpc/client.go +++ b/light/rpc/client.go @@ -8,15 +8,15 @@ import ( "regexp" "time" - "github.com/cometbft/cometbft/crypto/merkle" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtmath "github.com/cometbft/cometbft/libs/math" - service "github.com/cometbft/cometbft/libs/service" - rpcclient "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + service "github.com/KYVENetwork/cometbft/v38/libs/service" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) var errNegOrZeroHeight = errors.New("negative or zero height") diff --git a/light/rpc/mocks/light_client.go b/light/rpc/mocks/light_client.go index 5699dfe4395..b37d5b11229 100644 --- a/light/rpc/mocks/light_client.go +++ b/light/rpc/mocks/light_client.go @@ -9,7 +9,7 @@ import ( time "time" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // LightClient is an autogenerated mock type for the LightClient type diff --git a/light/setup.go b/light/setup.go index 66ae15d6aa8..eb7c0e45442 100644 --- a/light/setup.go +++ b/light/setup.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/cometbft/cometbft/light/provider" - "github.com/cometbft/cometbft/light/provider/http" - "github.com/cometbft/cometbft/light/store" + "github.com/KYVENetwork/cometbft/v38/light/provider" + "github.com/KYVENetwork/cometbft/v38/light/provider/http" + "github.com/KYVENetwork/cometbft/v38/light/store" ) // NewHTTPClient initiates an instance of a light client using HTTP addresses diff --git a/light/store/db/db.go b/light/store/db/db.go index 83d1f1abdfd..f6082ab6a13 100644 --- a/light/store/db/db.go +++ b/light/store/db/db.go @@ -8,10 +8,10 @@ import ( dbm "github.com/cometbft/cometbft-db" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light/store" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/light/store" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) var sizeKey = []byte("size") diff --git a/light/store/db/db_test.go b/light/store/db/db_test.go index a2caffa81f4..b5564467426 100644 --- a/light/store/db/db_test.go +++ b/light/store/db/db_test.go @@ -1,6 +1,7 @@ package db import ( + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "sync" "testing" "time" @@ -10,12 +11,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) func TestLast_FirstLightBlockHeight(t *testing.T) { diff --git a/light/store/store.go b/light/store/store.go index 0377a5732ee..6d301c96af8 100644 --- a/light/store/store.go +++ b/light/store/store.go @@ -1,6 +1,6 @@ package store -import "github.com/cometbft/cometbft/types" +import "github.com/KYVENetwork/cometbft/v38/types" // Store is anything that can persistently store headers. type Store interface { diff --git a/light/trust_options.go b/light/trust_options.go index b2fd1d48dc2..6ae53cbe339 100644 --- a/light/trust_options.go +++ b/light/trust_options.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" ) // TrustOptions are the trust parameters needed when a new light client diff --git a/light/verifier.go b/light/verifier.go index 8905db56b05..4825621ebc3 100644 --- a/light/verifier.go +++ b/light/verifier.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/types" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + "github.com/KYVENetwork/cometbft/v38/types" ) var ( diff --git a/light/verifier_test.go b/light/verifier_test.go index 5758bc46d94..11ae4fc5556 100644 --- a/light/verifier_test.go +++ b/light/verifier_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/types" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + "github.com/KYVENetwork/cometbft/v38/light" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/mempool/bench_test.go b/mempool/bench_test.go index 1ddd59209e9..68cc4e7937a 100644 --- a/mempool/bench_test.go +++ b/mempool/bench_test.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "testing" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/proxy" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/proxy" ) func BenchmarkReap(b *testing.B) { diff --git a/mempool/cache.go b/mempool/cache.go index 37977e8fc5e..4c18fbe4048 100644 --- a/mempool/cache.go +++ b/mempool/cache.go @@ -3,8 +3,8 @@ package mempool import ( "container/list" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/types" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/types" ) // TxCache defines an interface for raw transaction caching in a mempool. diff --git a/mempool/cache_test.go b/mempool/cache_test.go index bb659f20924..12519520e8b 100644 --- a/mempool/cache_test.go +++ b/mempool/cache_test.go @@ -6,10 +6,10 @@ import ( "fmt" "testing" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + "github.com/KYVENetwork/cometbft/v38/types" "github.com/stretchr/testify/require" ) diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go index 266ca32028b..93589ceab7a 100644 --- a/mempool/clist_mempool.go +++ b/mempool/clist_mempool.go @@ -6,14 +6,14 @@ import ( "sync" "sync/atomic" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/clist" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/proxy" + "github.com/KYVENetwork/cometbft/v38/types" ) // CListMempool is an ordered in-memory pool for transactions before they are diff --git a/mempool/clist_mempool_test.go b/mempool/clist_mempool_test.go index 8582921d919..34988ce8ace 100644 --- a/mempool/clist_mempool_test.go +++ b/mempool/clist_mempool_test.go @@ -16,18 +16,18 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abciclient "github.com/cometbft/cometbft/abci/client" - abciclimocks "github.com/cometbft/cometbft/abci/client/mocks" - "github.com/cometbft/cometbft/abci/example/kvstore" - abciserver "github.com/cometbft/cometbft/abci/server" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abciclient "github.com/KYVENetwork/cometbft/v38/abci/client" + abciclimocks "github.com/KYVENetwork/cometbft/v38/abci/client/mocks" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abciserver "github.com/KYVENetwork/cometbft/v38/abci/server" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/proxy" + "github.com/KYVENetwork/cometbft/v38/types" ) // A cleanupFunc cleans up any config / test files created for a particular diff --git a/mempool/ids.go b/mempool/ids.go index aad98b7a7d1..fe3f82a9404 100644 --- a/mempool/ids.go +++ b/mempool/ids.go @@ -3,8 +3,8 @@ package mempool import ( "fmt" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" ) type mempoolIDs struct { diff --git a/mempool/ids_test.go b/mempool/ids_test.go index c822dd84191..7d473073eee 100644 --- a/mempool/ids_test.go +++ b/mempool/ids_test.go @@ -4,7 +4,7 @@ import ( "net" "testing" - "github.com/cometbft/cometbft/p2p/mock" + "github.com/KYVENetwork/cometbft/v38/p2p/mock" "github.com/stretchr/testify/assert" ) diff --git a/mempool/mempool.go b/mempool/mempool.go index 25f9253ba5f..aeb77f02ade 100644 --- a/mempool/mempool.go +++ b/mempool/mempool.go @@ -5,8 +5,8 @@ import ( "fmt" "math" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/mempool/mempoolTx.go b/mempool/mempoolTx.go index 5c160ce2f7f..52eef088d03 100644 --- a/mempool/mempoolTx.go +++ b/mempool/mempoolTx.go @@ -4,7 +4,7 @@ import ( "sync" "sync/atomic" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // mempoolTx is an entry in the mempool diff --git a/mempool/mocks/mempool.go b/mempool/mocks/mempool.go index 7573c58e978..4b1d0235625 100644 --- a/mempool/mocks/mempool.go +++ b/mempool/mocks/mempool.go @@ -3,12 +3,12 @@ package mocks import ( - abcitypes "github.com/cometbft/cometbft/abci/types" - mempool "github.com/cometbft/cometbft/mempool" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" + mempool "github.com/KYVENetwork/cometbft/v38/mempool" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // Mempool is an autogenerated mock type for the Mempool type diff --git a/mempool/nop_mempool.go b/mempool/nop_mempool.go index 6bfff3b04d4..2172aa6c9b0 100644 --- a/mempool/nop_mempool.go +++ b/mempool/nop_mempool.go @@ -3,10 +3,10 @@ package mempool import ( "errors" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/types" ) // NopMempool is a mempool that does nothing. diff --git a/mempool/nop_mempool_test.go b/mempool/nop_mempool_test.go index 01b169e0695..2df96c9b752 100644 --- a/mempool/nop_mempool_test.go +++ b/mempool/nop_mempool_test.go @@ -3,7 +3,7 @@ package mempool import ( "testing" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" "github.com/stretchr/testify/assert" ) diff --git a/mempool/reactor.go b/mempool/reactor.go index 6382b0a412b..b25903b3a35 100644 --- a/mempool/reactor.go +++ b/mempool/reactor.go @@ -6,12 +6,12 @@ import ( "fmt" "time" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/clist" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - protomem "github.com/cometbft/cometbft/proto/tendermint/mempool" - "github.com/cometbft/cometbft/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/clist" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + protomem "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/types" "golang.org/x/sync/semaphore" ) diff --git a/mempool/reactor_test.go b/mempool/reactor_test.go index 454012f8854..739ab7a5b0a 100644 --- a/mempool/reactor_test.go +++ b/mempool/reactor_test.go @@ -12,15 +12,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/mock" - memproto "github.com/cometbft/cometbft/proto/tendermint/mempool" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/mock" + memproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/proxy" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( @@ -63,7 +63,7 @@ func TestReactorBroadcastTxsMessage(t *testing.T) { waitForTxsOnReactors(t, txs, reactors) } -// regression test for https://github.com/cometbft/cometbft/issues/5408 +// regression test for https://github.com/KYVENetwork/cometbft/v38/issues/5408 func TestReactorConcurrency(t *testing.T) { config := cfg.TestConfig() const N = 2 @@ -233,7 +233,7 @@ func TestBroadcastTxForPeerStopsWhenReactorStops(t *testing.T) { // TODO: This test tests that we don't panic and are able to generate new // PeerIDs for each peer we add. It seems as though we should be able to test // this in a much more direct way. -// https://github.com/cometbft/cometbft/issues/9639 +// https://github.com/KYVENetwork/cometbft/v38/issues/9639 func TestDontExhaustMaxActiveIDs(t *testing.T) { config := cfg.TestConfig() const N = 1 diff --git a/mempool/tx.go b/mempool/tx.go index bbc5060c384..6908a570930 100644 --- a/mempool/tx.go +++ b/mempool/tx.go @@ -1,7 +1,7 @@ package mempool import ( - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) // TxInfo are parameters that get passed when attempting to add a tx to the diff --git a/node/node.go b/node/node.go index 4f865f1794e..3e00e281a39 100644 --- a/node/node.go +++ b/node/node.go @@ -13,31 +13,31 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/cors" - bc "github.com/cometbft/cometbft/blocksync" - cfg "github.com/cometbft/cometbft/config" - cs "github.com/cometbft/cometbft/consensus" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/light" - - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/service" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/pex" - "github.com/cometbft/cometbft/proxy" - rpccore "github.com/cometbft/cometbft/rpc/core" - grpccore "github.com/cometbft/cometbft/rpc/grpc" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/null" - "github.com/cometbft/cometbft/statesync" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + bc "github.com/KYVENetwork/cometbft/v38/blocksync" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cs "github.com/KYVENetwork/cometbft/v38/consensus" + "github.com/KYVENetwork/cometbft/v38/evidence" + "github.com/KYVENetwork/cometbft/v38/light" + + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + "github.com/KYVENetwork/cometbft/v38/libs/service" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/pex" + "github.com/KYVENetwork/cometbft/v38/proxy" + rpccore "github.com/KYVENetwork/cometbft/v38/rpc/core" + grpccore "github.com/KYVENetwork/cometbft/v38/rpc/grpc" + rpcserver "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/state/txindex/null" + "github.com/KYVENetwork/cometbft/v38/statesync" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" + "github.com/KYVENetwork/cometbft/v38/version" _ "net/http/pprof" //nolint: gosec ) diff --git a/node/node_test.go b/node/node_test.go index 01d5f0f8fcc..420aa6cf6c4 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -15,23 +15,23 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/abci/example/kvstore" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" - p2pmock "github.com/cometbft/cometbft/p2p/mock" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/evidence" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" + p2pmock "github.com/KYVENetwork/cometbft/v38/p2p/mock" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) func TestNodeStartStop(t *testing.T) { diff --git a/node/setup.go b/node/setup.go index 6d2e9c295b4..210193a9028 100644 --- a/node/setup.go +++ b/node/setup.go @@ -13,29 +13,29 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/blocksync" - cfg "github.com/cometbft/cometbft/config" - cs "github.com/cometbft/cometbft/consensus" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/evidence" - "github.com/cometbft/cometbft/statesync" - - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/light" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/pex" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/indexer/block" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/blocksync" + cfg "github.com/KYVENetwork/cometbft/v38/config" + cs "github.com/KYVENetwork/cometbft/v38/consensus" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/evidence" + "github.com/KYVENetwork/cometbft/v38/statesync" + + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/light" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/pex" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/indexer/block" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" _ "github.com/lib/pq" // provide the psql db driver ) diff --git a/p2p/base_reactor.go b/p2p/base_reactor.go index bfac2340847..dc535d5da42 100644 --- a/p2p/base_reactor.go +++ b/p2p/base_reactor.go @@ -1,8 +1,8 @@ package p2p import ( - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) // Reactor is responsible for handling incoming messages on one or more diff --git a/p2p/conn/conn_notgo110.go b/p2p/conn/conn_notgo110.go index 37de8afcc12..123bae41e90 100644 --- a/p2p/conn/conn_notgo110.go +++ b/p2p/conn/conn_notgo110.go @@ -15,7 +15,7 @@ import ( // https://github.com/tendermint/tendermint/issues/851 // so for go versions < Go1.10 use our custom net.Conn creator // that doesn't return an `Unimplemented error` for net.Conn. -// Before https://github.com/cometbft/cometbft/commit/49faa79bdce5663894b3febbf4955fb1d172df04 +// Before https://github.com/KYVENetwork/cometbft/v38/commit/49faa79bdce5663894b3febbf4955fb1d172df04 // we hadn't cared about errors from SetDeadline so swallow them up anyways. type pipe struct { net.Conn diff --git a/p2p/conn/connection.go b/p2p/conn/connection.go index 7bd8e34dc13..f1273a31da9 100644 --- a/p2p/conn/connection.go +++ b/p2p/conn/connection.go @@ -14,15 +14,15 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/config" - flow "github.com/cometbft/cometbft/libs/flowrate" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/libs/timer" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/config" + flow "github.com/KYVENetwork/cometbft/v38/libs/flowrate" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/libs/timer" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) const ( diff --git a/p2p/conn/connection_test.go b/p2p/conn/connection_test.go index 731fe5c5459..57ca3a33a16 100644 --- a/p2p/conn/connection_test.go +++ b/p2p/conn/connection_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/protoio" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" - "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) const maxPingPongPacketSize = 1024 // bytes diff --git a/p2p/conn/evil_secret_connection_test.go b/p2p/conn/evil_secret_connection_test.go index 6cb3a9b71db..38a22f27049 100644 --- a/p2p/conn/evil_secret_connection_test.go +++ b/p2p/conn/evil_secret_connection_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/crypto/chacha20poly1305" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/protoio" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) type buffer struct { diff --git a/p2p/conn/secret_connection.go b/p2p/conn/secret_connection.go index 65bcc543af4..6d1f5a18e39 100644 --- a/p2p/conn/secret_connection.go +++ b/p2p/conn/secret_connection.go @@ -21,13 +21,13 @@ import ( "golang.org/x/crypto/hkdf" "golang.org/x/crypto/nacl/box" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/async" - "github.com/cometbft/cometbft/libs/protoio" - cmtsync "github.com/cometbft/cometbft/libs/sync" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/libs/async" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) // 4 + 1024 == 1028 total frame size @@ -53,7 +53,7 @@ var ( // SecretConnection implements net.Conn. // It is an implementation of the STS protocol. -// See https://github.com/cometbft/cometbft/blob/0.1/docs/sts-final.pdf for +// See https://github.com/KYVENetwork/cometbft/v38/blob/0.1/docs/sts-final.pdf for // details on the protocol. // // Consumers of the SecretConnection are responsible for authenticating diff --git a/p2p/conn/secret_connection_test.go b/p2p/conn/secret_connection_test.go index 5b5655e3d5f..3fef99f5aa3 100644 --- a/p2p/conn/secret_connection_test.go +++ b/p2p/conn/secret_connection_test.go @@ -17,12 +17,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/sr25519" - "github.com/cometbft/cometbft/libs/async" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/sr25519" + "github.com/KYVENetwork/cometbft/v38/libs/async" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) // Run go test -update from within this module diff --git a/p2p/conn_set.go b/p2p/conn_set.go index 44eff4a0cf1..70343cd5a97 100644 --- a/p2p/conn_set.go +++ b/p2p/conn_set.go @@ -3,7 +3,7 @@ package p2p import ( "net" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // ConnSet is a lookup table for connections and all their ips. diff --git a/p2p/fuzz.go b/p2p/fuzz.go index 23ad8c5907f..2473f8f1afb 100644 --- a/p2p/fuzz.go +++ b/p2p/fuzz.go @@ -4,9 +4,9 @@ import ( "net" "time" - "github.com/cometbft/cometbft/config" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtsync "github.com/cometbft/cometbft/libs/sync" + "github.com/KYVENetwork/cometbft/v38/config" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // FuzzedConnection wraps any net.Conn and depending on the mode either delays diff --git a/p2p/key.go b/p2p/key.go index b30dca1dcde..e915b5ce7f2 100644 --- a/p2p/key.go +++ b/p2p/key.go @@ -6,10 +6,10 @@ import ( "fmt" "os" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" ) // ID is a hex-encoded crypto.Address diff --git a/p2p/key_test.go b/p2p/key_test.go index e87bfe88d63..6fbacb7778f 100644 --- a/p2p/key_test.go +++ b/p2p/key_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) func TestLoadOrGenNodeKey(t *testing.T) { diff --git a/p2p/mock/peer.go b/p2p/mock/peer.go index b4111004c81..6a2a875a244 100644 --- a/p2p/mock/peer.go +++ b/p2p/mock/peer.go @@ -3,10 +3,10 @@ package mock import ( "net" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) type Peer struct { diff --git a/p2p/mock/reactor.go b/p2p/mock/reactor.go index 64d93a97358..076563393f5 100644 --- a/p2p/mock/reactor.go +++ b/p2p/mock/reactor.go @@ -1,9 +1,9 @@ package mock import ( - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) type Reactor struct { diff --git a/p2p/mocks/peer.go b/p2p/mocks/peer.go index 235b0e976fb..7f020453b6a 100644 --- a/p2p/mocks/peer.go +++ b/p2p/mocks/peer.go @@ -3,14 +3,14 @@ package mocks import ( - log "github.com/cometbft/cometbft/libs/log" - conn "github.com/cometbft/cometbft/p2p/conn" + log "github.com/KYVENetwork/cometbft/v38/libs/log" + conn "github.com/KYVENetwork/cometbft/v38/p2p/conn" mock "github.com/stretchr/testify/mock" net "net" - p2p "github.com/cometbft/cometbft/p2p" + p2p "github.com/KYVENetwork/cometbft/v38/p2p" ) // Peer is an autogenerated mock type for the Peer type diff --git a/p2p/netaddress.go b/p2p/netaddress.go index 252178be3a3..4834779a419 100644 --- a/p2p/netaddress.go +++ b/p2p/netaddress.go @@ -14,7 +14,7 @@ import ( "strings" "time" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) // EmptyNetAddress defines the string representation of an empty NetAddress diff --git a/p2p/node_info.go b/p2p/node_info.go index 59cf885cb1f..8c4dedb2a81 100644 --- a/p2p/node_info.go +++ b/p2p/node_info.go @@ -6,10 +6,10 @@ import ( "fmt" "reflect" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtstrings "github.com/cometbft/cometbft/libs/strings" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" - "github.com/cometbft/cometbft/version" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtstrings "github.com/KYVENetwork/cometbft/v38/libs/strings" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/version" ) const ( diff --git a/p2p/node_info_test.go b/p2p/node_info_test.go index f1c43e35217..5b4582f7ae1 100644 --- a/p2p/node_info_test.go +++ b/p2p/node_info_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" ) func TestNodeInfoValidate(t *testing.T) { diff --git a/p2p/peer.go b/p2p/peer.go index dc88152df6d..e2fac2d0070 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -8,11 +8,11 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/libs/cmap" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/libs/cmap" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" - cmtconn "github.com/cometbft/cometbft/p2p/conn" + cmtconn "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) //go:generate ../scripts/mockery_generate.sh Peer diff --git a/p2p/peer_set.go b/p2p/peer_set.go index 0a7727e6f1d..9f4ce8e3c80 100644 --- a/p2p/peer_set.go +++ b/p2p/peer_set.go @@ -3,7 +3,7 @@ package p2p import ( "net" - cmtsync "github.com/cometbft/cometbft/libs/sync" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" ) // IPeerSet has a (immutable) subset of the methods of PeerSet. diff --git a/p2p/peer_set_test.go b/p2p/peer_set_test.go index 64911ecebff..2dd49eb8c73 100644 --- a/p2p/peer_set_test.go +++ b/p2p/peer_set_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) // mockPeer for testing the PeerSet diff --git a/p2p/peer_test.go b/p2p/peer_test.go index ce45b7fe3da..da95b98a931 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/proto/tendermint/p2p" - - "github.com/cometbft/cometbft/config" - cmtconn "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" + + "github.com/KYVENetwork/cometbft/v38/config" + cmtconn "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) func TestPeerBasic(t *testing.T) { diff --git a/p2p/pex/addrbook.go b/p2p/pex/addrbook.go index 2dc3fd8a834..f432c1056e9 100644 --- a/p2p/pex/addrbook.go +++ b/p2p/pex/addrbook.go @@ -16,13 +16,13 @@ import ( "github.com/minio/highwayhash" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" ) const ( diff --git a/p2p/pex/addrbook_test.go b/p2p/pex/addrbook_test.go index c34ee412dbc..fa0561bfa7c 100644 --- a/p2p/pex/addrbook_test.go +++ b/p2p/pex/addrbook_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/p2p" ) // FIXME These tests should not rely on .(*addrBook) assertions diff --git a/p2p/pex/bench_test.go b/p2p/pex/bench_test.go index 00d2724bfa1..3840b91a1a8 100644 --- a/p2p/pex/bench_test.go +++ b/p2p/pex/bench_test.go @@ -3,7 +3,7 @@ package pex import ( "testing" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) func BenchmarkAddrBook_hash(b *testing.B) { diff --git a/p2p/pex/errors.go b/p2p/pex/errors.go index f4551292b80..14151003e22 100644 --- a/p2p/pex/errors.go +++ b/p2p/pex/errors.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) type ErrAddrBookNonRoutable struct { diff --git a/p2p/pex/file.go b/p2p/pex/file.go index 38eec9636b9..30a57ab2850 100644 --- a/p2p/pex/file.go +++ b/p2p/pex/file.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/cometbft/cometbft/libs/tempfile" + "github.com/KYVENetwork/cometbft/v38/libs/tempfile" ) /* Loading & Saving */ diff --git a/p2p/pex/known_address.go b/p2p/pex/known_address.go index a46e682d88b..315e35717b7 100644 --- a/p2p/pex/known_address.go +++ b/p2p/pex/known_address.go @@ -3,7 +3,7 @@ package pex import ( "time" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) // knownAddress tracks information about a known network address diff --git a/p2p/pex/pex_reactor.go b/p2p/pex/pex_reactor.go index 0457df2c626..8ccc3c2c97e 100644 --- a/p2p/pex/pex_reactor.go +++ b/p2p/pex/pex_reactor.go @@ -6,13 +6,13 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/cmap" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/libs/cmap" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) type Peer = p2p.Peer diff --git a/p2p/pex/pex_reactor_test.go b/p2p/pex/pex_reactor_test.go index 03134995954..3ffc17cef48 100644 --- a/p2p/pex/pex_reactor_test.go +++ b/p2p/pex/pex_reactor_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/p2p/mock" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/mock" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) var cfg *config.P2PConfig diff --git a/p2p/switch.go b/p2p/switch.go index 68ad5669b3e..a1f701fc2c4 100644 --- a/p2p/switch.go +++ b/p2p/switch.go @@ -8,11 +8,11 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/cmap" - "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/cmap" + "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) const ( diff --git a/p2p/switch_test.go b/p2p/switch_test.go index ad4040760fa..97b8d8a9044 100644 --- a/p2p/switch_test.go +++ b/p2p/switch_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p/conn" - p2pproto "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" + p2pproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) var cfg *config.P2PConfig diff --git a/p2p/test_util.go b/p2p/test_util.go index 3fbb68bb655..04160032176 100644 --- a/p2p/test_util.go +++ b/p2p/test_util.go @@ -5,14 +5,14 @@ import ( "net" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - cmtrand "github.com/cometbft/cometbft/libs/rand" - - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) const testCh = 0x01 diff --git a/p2p/transport.go b/p2p/transport.go index d6043da3beb..0c5ee318f59 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -10,10 +10,10 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) const ( diff --git a/p2p/transport_test.go b/p2p/transport_test.go index 3c404f6a8dd..6b52d625dba 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) var defaultNodeName = "host_peer" diff --git a/p2p/types.go b/p2p/types.go index 48a6746ceba..3d303d9a9ef 100644 --- a/p2p/types.go +++ b/p2p/types.go @@ -3,8 +3,8 @@ package p2p import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p/conn" - tmp2p "github.com/cometbft/cometbft/proto/tendermint/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p/conn" + tmp2p "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/p2p" ) type ChannelDescriptor = conn.ChannelDescriptor diff --git a/privval/file.go b/privval/file.go index a092e38b087..d8b032723d3 100644 --- a/privval/file.go +++ b/privval/file.go @@ -9,16 +9,16 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/libs/tempfile" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + "github.com/KYVENetwork/cometbft/v38/libs/tempfile" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) // TODO: type ? diff --git a/privval/file_test.go b/privval/file_test.go index 6d8df0270fd..048400589fb 100644 --- a/privval/file_test.go +++ b/privval/file_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) func TestGenLoadValidator(t *testing.T) { @@ -119,11 +119,11 @@ func TestUnmarshalValidatorKey(t *testing.T) { serialized := fmt.Sprintf(`{ "address": "%s", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "%s" }, "priv_key": { - "type": "tendermint/PrivKeyEd25519", + "type": "cometbft/v38/PrivKeyEd25519", "value": "%s" } }`, addr, pubB64, privB64) diff --git a/privval/msgs.go b/privval/msgs.go index 4b440e612df..feafc882103 100644 --- a/privval/msgs.go +++ b/privval/msgs.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" + privvalproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" ) // TODO: Add ChainIDRequest diff --git a/privval/msgs_test.go b/privval/msgs_test.go index b305e208050..7e3c357cbf6 100644 --- a/privval/msgs_test.go +++ b/privval/msgs_test.go @@ -8,14 +8,14 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - privproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cryptoproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + privproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) var stamp = time.Date(2019, 10, 13, 16, 14, 44, 0, time.UTC) diff --git a/privval/retry_signer_client.go b/privval/retry_signer_client.go index 271e146474c..920001a66c1 100644 --- a/privval/retry_signer_client.go +++ b/privval/retry_signer_client.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // RetrySignerClient wraps SignerClient adding retry for each operation (except diff --git a/privval/signer_client.go b/privval/signer_client.go index 8ebb99fc408..154c20797b1 100644 --- a/privval/signer_client.go +++ b/privval/signer_client.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + privvalproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // SignerClient implements PrivValidator. diff --git a/privval/signer_client_test.go b/privval/signer_client_test.go index 81e69a5002f..3d6426e8255 100644 --- a/privval/signer_client_test.go +++ b/privval/signer_client_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cryptoproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + privvalproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) type signerTestCase struct { diff --git a/privval/signer_dialer_endpoint.go b/privval/signer_dialer_endpoint.go index 9afb3aaa3ff..60f361b4e99 100644 --- a/privval/signer_dialer_endpoint.go +++ b/privval/signer_dialer_endpoint.go @@ -3,8 +3,8 @@ package privval import ( "time" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) const ( diff --git a/privval/signer_endpoint.go b/privval/signer_endpoint.go index 2b4abe2dd96..2191a8534ea 100644 --- a/privval/signer_endpoint.go +++ b/privval/signer_endpoint.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/cometbft/cometbft/libs/protoio" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + privvalproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" ) const ( diff --git a/privval/signer_listener_endpoint.go b/privval/signer_listener_endpoint.go index ac0700a2bb2..067214a8f1f 100644 --- a/privval/signer_listener_endpoint.go +++ b/privval/signer_listener_endpoint.go @@ -5,10 +5,10 @@ import ( "net" "time" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + privvalproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" ) // SignerListenerEndpointOption sets an optional parameter on the SignerListenerEndpoint. diff --git a/privval/signer_listener_endpoint_test.go b/privval/signer_listener_endpoint_test.go index 108c842cf4b..effe210bc54 100644 --- a/privval/signer_listener_endpoint_test.go +++ b/privval/signer_listener_endpoint_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/types" ) var ( diff --git a/privval/signer_requestHandler.go b/privval/signer_requestHandler.go index b0cbe127c90..7e600504da4 100644 --- a/privval/signer_requestHandler.go +++ b/privval/signer_requestHandler.go @@ -3,12 +3,12 @@ package privval import ( "fmt" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + cryptoproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + privvalproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) func DefaultValidationRequestHandler( diff --git a/privval/signer_server.go b/privval/signer_server.go index 8c9abe717d4..b55983ac198 100644 --- a/privval/signer_server.go +++ b/privval/signer_server.go @@ -3,10 +3,10 @@ package privval import ( "io" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - privvalproto "github.com/cometbft/cometbft/proto/tendermint/privval" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + privvalproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/types" ) // ValidationRequestHandlerFunc handles different remoteSigner requests diff --git a/privval/socket_dialers.go b/privval/socket_dialers.go index d49231c72c0..62d9c5839dc 100644 --- a/privval/socket_dialers.go +++ b/privval/socket_dialers.go @@ -5,9 +5,9 @@ import ( "net" "time" - "github.com/cometbft/cometbft/crypto" - cmtnet "github.com/cometbft/cometbft/libs/net" - p2pconn "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + p2pconn "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) // Socket errors. diff --git a/privval/socket_dialers_test.go b/privval/socket_dialers_test.go index f167a1daed3..5286b825254 100644 --- a/privval/socket_dialers_test.go +++ b/privval/socket_dialers_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" ) func getDialerTestCases(t *testing.T) []dialerTestCase { diff --git a/privval/socket_listeners.go b/privval/socket_listeners.go index 6d406bd6925..4bb44d51a14 100644 --- a/privval/socket_listeners.go +++ b/privval/socket_listeners.go @@ -4,8 +4,8 @@ import ( "net" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - p2pconn "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + p2pconn "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) const ( diff --git a/privval/socket_listeners_test.go b/privval/socket_listeners_test.go index 27a6e65f97e..b490c9e259b 100644 --- a/privval/socket_listeners_test.go +++ b/privval/socket_listeners_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" ) //------------------------------------------- diff --git a/privval/utils.go b/privval/utils.go index b7d84a9e928..12903d53eb4 100644 --- a/privval/utils.go +++ b/privval/utils.go @@ -5,9 +5,9 @@ import ( "fmt" "net" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" ) // IsConnTimeout returns a boolean indicating whether the error is known to diff --git a/proto/README.md b/proto/README.md index f5fa29e8ad4..49a3d7dfe20 100644 --- a/proto/README.md +++ b/proto/README.md @@ -44,13 +44,13 @@ branch in the `tendermint/tendermint` Buf repository. [protobuf]: https://protobuf.dev/ [CometBFT]: https://github.com/cometbft/cometbft -[abci]: https://github.com/cometbft/cometbft/tree/main/spec/abci +[abci]: https://github.com/KYVENetwork/cometbft/v38/tree/main/spec/abci [buf]: https://buf.build/tendermint/tendermint [tmcore]: https://github.com/tendermint/tendermint -[\#1330]: https://github.com/cometbft/cometbft/issues/1330 -[v034-protos]: https://github.com/cometbft/cometbft/tree/v0.34.x/proto +[\#1330]: https://github.com/KYVENetwork/cometbft/v38/issues/1330 +[v034-protos]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.34.x/proto [v034-buf]: https://buf.build/tendermint/tendermint/docs/v0.34.x -[v037-protos]: https://github.com/cometbft/cometbft/tree/v0.37.x/proto +[v037-protos]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.37.x/proto [v037-buf]: https://buf.build/tendermint/tendermint/docs/v0.37.x -[v038-protos]: https://github.com/cometbft/cometbft/tree/v0.38.x/proto +[v038-protos]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/proto [v038-buf]: https://buf.build/tendermint/tendermint/docs/v0.38.x diff --git a/proto/tendermint/abci/types.proto b/proto/cometbft/v38/abci/types.proto similarity index 96% rename from proto/tendermint/abci/types.proto rename to proto/cometbft/v38/abci/types.proto index 89bafb6cd54..8d21eca8934 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/cometbft/v38/abci/types.proto @@ -1,14 +1,14 @@ syntax = "proto3"; -package tendermint.abci; +package cometbft.v38.abci; -option go_package = "github.com/cometbft/cometbft/abci/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/abci/types"; // For more information on gogo.proto, see: // https://github.com/cosmos/gogoproto/blob/master/extensions.md -import "tendermint/crypto/proof.proto"; -import "tendermint/crypto/keys.proto"; -import "tendermint/types/params.proto"; -import "tendermint/types/validator.proto"; +import "cometbft/v38/crypto/proof.proto"; +import "cometbft/v38/crypto/keys.proto"; +import "cometbft/v38/types/params.proto"; +import "cometbft/v38/types/validator.proto"; import "google/protobuf/timestamp.proto"; import "gogoproto/gogo.proto"; @@ -78,7 +78,7 @@ message RequestInitChain { google.protobuf.Timestamp time = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; string chain_id = 2; - tendermint.types.ConsensusParams consensus_params = 3; + cometbft.v38.types.ConsensusParams consensus_params = 3; repeated ValidatorUpdate validators = 4 [(gogoproto.nullable) = false]; bytes app_state_bytes = 5; int64 initial_height = 6; @@ -241,7 +241,7 @@ message ResponseInfo { } message ResponseInitChain { - tendermint.types.ConsensusParams consensus_params = 1; + cometbft.v38.types.ConsensusParams consensus_params = 1; repeated ValidatorUpdate validators = 2 [(gogoproto.nullable) = false]; bytes app_hash = 3; } @@ -254,7 +254,7 @@ message ResponseQuery { int64 index = 5; bytes key = 6; bytes value = 7; - tendermint.crypto.ProofOps proof_ops = 8; + cometbft.v38.crypto.ProofOps proof_ops = 8; int64 height = 9; string codespace = 10; } @@ -360,7 +360,7 @@ message ResponseFinalizeBlock { // a list of updates to the validator set. These will reflect the validator set at current height + 2. repeated ValidatorUpdate validator_updates = 3 [(gogoproto.nullable) = false]; // updates to the consensus params, if any. - tendermint.types.ConsensusParams consensus_param_updates = 4; + cometbft.v38.types.ConsensusParams consensus_param_updates = 4; // app_hash is the hash of the applications' state which is used to confirm that execution of the transactions was deterministic. It is up to the application to decide which algorithm to use. bytes app_hash = 5; } @@ -437,13 +437,13 @@ message Validator { } message ValidatorUpdate { - tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; + cometbft.v38.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; int64 power = 2; } message VoteInfo { Validator validator = 1 [(gogoproto.nullable) = false]; - tendermint.types.BlockIDFlag block_id_flag = 3; + cometbft.v38.types.BlockIDFlag block_id_flag = 3; reserved 2; // signed_last_block } @@ -456,7 +456,7 @@ message ExtendedVoteInfo { // Vote extension signature created by CometBFT bytes extension_signature = 4; // block_id_flag indicates whether the validator voted for a block, nil, or did not vote at all - tendermint.types.BlockIDFlag block_id_flag = 5; + cometbft.v38.types.BlockIDFlag block_id_flag = 5; reserved 2; // signed_last_block } diff --git a/proto/tendermint/blocksync/message.go b/proto/cometbft/v38/blocksync/message.go similarity index 97% rename from proto/tendermint/blocksync/message.go rename to proto/cometbft/v38/blocksync/message.go index bce83de14ce..29b885291d1 100644 --- a/proto/tendermint/blocksync/message.go +++ b/proto/cometbft/v38/blocksync/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) var _ p2p.Wrapper = &StatusRequest{} diff --git a/proto/tendermint/blocksync/types.pb.go b/proto/cometbft/v38/blocksync/types.pb.go similarity index 90% rename from proto/tendermint/blocksync/types.pb.go rename to proto/cometbft/v38/blocksync/types.pb.go index a9791970993..fe1ae8d6339 100644 --- a/proto/tendermint/blocksync/types.pb.go +++ b/proto/cometbft/v38/blocksync/types.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/blocksync/types.proto +// source: cometbft/v38/blocksync/types.proto package blocksync import ( fmt "fmt" - types "github.com/cometbft/cometbft/proto/tendermint/types" - proto "github.com/cosmos/gogoproto/proto" + types "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -32,7 +32,7 @@ func (m *BlockRequest) Reset() { *m = BlockRequest{} } func (m *BlockRequest) String() string { return proto.CompactTextString(m) } func (*BlockRequest) ProtoMessage() {} func (*BlockRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_19b397c236e0fa07, []int{0} + return fileDescriptor_8c30316224b76ab6, []int{0} } func (m *BlockRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ func (m *NoBlockResponse) Reset() { *m = NoBlockResponse{} } func (m *NoBlockResponse) String() string { return proto.CompactTextString(m) } func (*NoBlockResponse) ProtoMessage() {} func (*NoBlockResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_19b397c236e0fa07, []int{1} + return fileDescriptor_8c30316224b76ab6, []int{1} } func (m *NoBlockResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -123,7 +123,7 @@ func (m *BlockResponse) Reset() { *m = BlockResponse{} } func (m *BlockResponse) String() string { return proto.CompactTextString(m) } func (*BlockResponse) ProtoMessage() {} func (*BlockResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_19b397c236e0fa07, []int{2} + return fileDescriptor_8c30316224b76ab6, []int{2} } func (m *BlockResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -174,7 +174,7 @@ func (m *StatusRequest) Reset() { *m = StatusRequest{} } func (m *StatusRequest) String() string { return proto.CompactTextString(m) } func (*StatusRequest) ProtoMessage() {} func (*StatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_19b397c236e0fa07, []int{3} + return fileDescriptor_8c30316224b76ab6, []int{3} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -213,7 +213,7 @@ func (m *StatusResponse) Reset() { *m = StatusResponse{} } func (m *StatusResponse) String() string { return proto.CompactTextString(m) } func (*StatusResponse) ProtoMessage() {} func (*StatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_19b397c236e0fa07, []int{4} + return fileDescriptor_8c30316224b76ab6, []int{4} } func (m *StatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -270,7 +270,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_19b397c236e0fa07, []int{5} + return fileDescriptor_8c30316224b76ab6, []int{5} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -381,44 +381,47 @@ func (*Message) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*BlockRequest)(nil), "tendermint.blocksync.BlockRequest") - proto.RegisterType((*NoBlockResponse)(nil), "tendermint.blocksync.NoBlockResponse") - proto.RegisterType((*BlockResponse)(nil), "tendermint.blocksync.BlockResponse") - proto.RegisterType((*StatusRequest)(nil), "tendermint.blocksync.StatusRequest") - proto.RegisterType((*StatusResponse)(nil), "tendermint.blocksync.StatusResponse") - proto.RegisterType((*Message)(nil), "tendermint.blocksync.Message") -} - -func init() { proto.RegisterFile("tendermint/blocksync/types.proto", fileDescriptor_19b397c236e0fa07) } - -var fileDescriptor_19b397c236e0fa07 = []byte{ - // 405 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xcd, 0x4a, 0xc3, 0x40, - 0x14, 0x85, 0x13, 0xd3, 0x56, 0xbc, 0x36, 0x0d, 0x06, 0xd1, 0x22, 0x12, 0x4a, 0xfc, 0x41, 0x17, - 0x26, 0xa0, 0x0b, 0x37, 0x82, 0x50, 0x11, 0x2a, 0xf8, 0x83, 0xe9, 0xce, 0x4d, 0xe9, 0xa4, 0x63, - 0x1b, 0x34, 0x99, 0xda, 0x99, 0x40, 0xbb, 0xf2, 0x15, 0x7c, 0x01, 0xdf, 0xc7, 0x65, 0x97, 0x2e, - 0xa5, 0x7d, 0x11, 0xe9, 0x4c, 0x9a, 0xa6, 0x31, 0x66, 0x37, 0xb9, 0x73, 0xee, 0x97, 0x73, 0xee, - 0x65, 0xa0, 0xc6, 0x70, 0xd0, 0xc1, 0x03, 0xdf, 0x0b, 0x98, 0x8d, 0x5e, 0x89, 0xfb, 0x42, 0x47, - 0x81, 0x6b, 0xb3, 0x51, 0x1f, 0x53, 0xab, 0x3f, 0x20, 0x8c, 0xe8, 0x9b, 0x0b, 0x85, 0x15, 0x2b, - 0x76, 0x76, 0x13, 0x7d, 0x5c, 0x2d, 0xba, 0x45, 0x4f, 0xc6, 0x6d, 0x82, 0x68, 0x1e, 0x42, 0xb9, - 0x3e, 0x13, 0x3b, 0xf8, 0x2d, 0xc4, 0x94, 0xe9, 0x5b, 0x50, 0xea, 0x61, 0xaf, 0xdb, 0x63, 0x55, - 0xb9, 0x26, 0x1f, 0x29, 0x4e, 0xf4, 0x65, 0x1e, 0x83, 0x76, 0x4f, 0x22, 0x25, 0xed, 0x93, 0x80, - 0xe2, 0x7f, 0xa5, 0xef, 0xa0, 0x2e, 0x0b, 0x4f, 0xa0, 0xc8, 0x0d, 0x71, 0xdd, 0xfa, 0xe9, 0xb6, - 0x95, 0x48, 0x21, 0xbc, 0x08, 0xbd, 0x50, 0xe9, 0x97, 0x00, 0x78, 0xc8, 0x5a, 0x2e, 0xf1, 0x7d, - 0x8f, 0x55, 0x57, 0x78, 0x4f, 0xed, 0x6f, 0xcf, 0xf5, 0x90, 0x97, 0x3a, 0x57, 0x5c, 0xe7, 0xac, - 0xe1, 0x21, 0x13, 0x47, 0x53, 0x03, 0xb5, 0xc9, 0xda, 0x2c, 0xa4, 0x51, 0x28, 0xf3, 0x02, 0x2a, - 0xf3, 0x42, 0xbe, 0x77, 0x5d, 0x87, 0x02, 0x6a, 0x53, 0xcc, 0xff, 0xaa, 0x38, 0xfc, 0x6c, 0x7e, - 0x2a, 0xb0, 0x7a, 0x87, 0x29, 0x6d, 0x77, 0xb1, 0x7e, 0x03, 0x2a, 0x37, 0xd9, 0x1a, 0x08, 0x74, - 0x14, 0xc9, 0xb4, 0xb2, 0x16, 0x63, 0x25, 0x27, 0xdb, 0x90, 0x9c, 0x32, 0x4a, 0x4e, 0xba, 0x09, - 0x1b, 0x01, 0x69, 0xcd, 0x69, 0xc2, 0x57, 0x94, 0xf6, 0x20, 0x1b, 0x97, 0x5a, 0x40, 0x43, 0x72, - 0xb4, 0x20, 0xb5, 0x93, 0x5b, 0xa8, 0xa4, 0x88, 0x0a, 0x27, 0xee, 0xe5, 0x1a, 0x8c, 0x79, 0x2a, - 0x4a, 0xd3, 0x28, 0x9f, 0x5b, 0x1c, 0xb7, 0x90, 0x47, 0x5b, 0x1a, 0xfa, 0x8c, 0x46, 0x93, 0x05, - 0xfd, 0x01, 0xb4, 0x98, 0x16, 0x99, 0x2b, 0x72, 0xdc, 0x7e, 0x3e, 0x2e, 0x76, 0x57, 0xa1, 0x4b, - 0x95, 0x7a, 0x11, 0x14, 0x1a, 0xfa, 0xf5, 0xc7, 0xaf, 0x89, 0x21, 0x8f, 0x27, 0x86, 0xfc, 0x33, - 0x31, 0xe4, 0x8f, 0xa9, 0x21, 0x8d, 0xa7, 0x86, 0xf4, 0x3d, 0x35, 0xa4, 0xa7, 0xf3, 0xae, 0xc7, - 0x7a, 0x21, 0xb2, 0x5c, 0xe2, 0xdb, 0x2e, 0xf1, 0x31, 0x43, 0xcf, 0x6c, 0x71, 0xe0, 0x0f, 0xc0, - 0xce, 0x7a, 0x73, 0xa8, 0xc4, 0xef, 0xce, 0x7e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x56, 0x8a, 0x71, - 0xcf, 0x92, 0x03, 0x00, 0x00, + proto.RegisterType((*BlockRequest)(nil), "cometbft.v38.blocksync.BlockRequest") + proto.RegisterType((*NoBlockResponse)(nil), "cometbft.v38.blocksync.NoBlockResponse") + proto.RegisterType((*BlockResponse)(nil), "cometbft.v38.blocksync.BlockResponse") + proto.RegisterType((*StatusRequest)(nil), "cometbft.v38.blocksync.StatusRequest") + proto.RegisterType((*StatusResponse)(nil), "cometbft.v38.blocksync.StatusResponse") + proto.RegisterType((*Message)(nil), "cometbft.v38.blocksync.Message") +} + +func init() { + proto.RegisterFile("cometbft/v38/blocksync/types.proto", fileDescriptor_8c30316224b76ab6) +} + +var fileDescriptor_8c30316224b76ab6 = []byte{ + // 430 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x4f, 0x4f, 0xe2, 0x40, + 0x18, 0xc6, 0xdb, 0x2d, 0xb0, 0xd9, 0x77, 0x29, 0xcd, 0xf6, 0x40, 0xd8, 0x3d, 0x34, 0x9b, 0x66, + 0x97, 0x5d, 0x2f, 0x6d, 0x22, 0x17, 0x0e, 0xc6, 0x44, 0x0c, 0x09, 0x09, 0x91, 0xc4, 0x1a, 0x8d, + 0x7a, 0x21, 0xb4, 0x8c, 0xd0, 0x60, 0x3b, 0xd8, 0x99, 0x22, 0x9c, 0xfd, 0x02, 0x7e, 0x0b, 0xbf, + 0x8a, 0x47, 0x8e, 0x1e, 0x0d, 0x7c, 0x11, 0xc3, 0x4c, 0xa9, 0x6d, 0xc3, 0x9f, 0xdb, 0x74, 0xe6, + 0x79, 0x7f, 0xf3, 0x3c, 0xef, 0xf4, 0x05, 0xdd, 0xc1, 0x1e, 0xa2, 0xf6, 0x1d, 0x35, 0x27, 0xb5, + 0xba, 0x69, 0xdf, 0x63, 0x67, 0x44, 0x66, 0xbe, 0x63, 0xd2, 0xd9, 0x18, 0x11, 0x63, 0x1c, 0x60, + 0x8a, 0xd5, 0xf2, 0x5a, 0x63, 0x4c, 0x6a, 0x75, 0x23, 0xd6, 0xfc, 0xd2, 0x52, 0xb5, 0xac, 0x82, + 0x13, 0x78, 0xdd, 0xc6, 0xf3, 0x04, 0x57, 0xaf, 0x42, 0xb1, 0xb1, 0x92, 0x5b, 0xe8, 0x21, 0x44, + 0x84, 0xaa, 0x65, 0x28, 0x0c, 0x91, 0x3b, 0x18, 0xd2, 0x8a, 0xf8, 0x5b, 0xfc, 0x2f, 0x59, 0xd1, + 0x97, 0x7e, 0x00, 0x4a, 0x07, 0x47, 0x4a, 0x32, 0xc6, 0x3e, 0x41, 0x5b, 0xa5, 0x4f, 0x22, 0xc8, + 0x69, 0xa5, 0x09, 0x79, 0xe6, 0x89, 0x09, 0xbf, 0x1f, 0xfe, 0x34, 0x52, 0x61, 0xb8, 0x1d, 0x5e, + 0xc1, 0x75, 0xea, 0x09, 0x00, 0x9a, 0xd2, 0xae, 0x83, 0x3d, 0xcf, 0xa5, 0x95, 0x2f, 0xac, 0x4a, + 0xdf, 0x54, 0xd5, 0x9c, 0x52, 0xe4, 0xf7, 0x51, 0xff, 0x94, 0x29, 0xad, 0x6f, 0x68, 0x4a, 0xf9, + 0x52, 0x57, 0x40, 0xbe, 0xa0, 0x3d, 0x1a, 0x92, 0x28, 0x99, 0x7e, 0x04, 0xa5, 0xf5, 0xc6, 0xee, + 0x00, 0xaa, 0x0a, 0x39, 0xbb, 0x47, 0x10, 0xbb, 0x57, 0xb2, 0xd8, 0x5a, 0x7f, 0x91, 0xe0, 0xeb, + 0x19, 0x22, 0xa4, 0x37, 0x40, 0x6a, 0x1b, 0x64, 0x66, 0xb3, 0x1b, 0x70, 0x74, 0x14, 0xeb, 0x8f, + 0xb1, 0xf9, 0x8d, 0x8c, 0x64, 0x83, 0x5b, 0x82, 0x55, 0xb4, 0x93, 0x0d, 0xbf, 0x84, 0x1f, 0x3e, + 0xee, 0xae, 0x79, 0xdc, 0x59, 0x94, 0xf8, 0xdf, 0x36, 0x60, 0xe6, 0x25, 0x5a, 0x82, 0xa5, 0xf8, + 0x99, 0xc7, 0xe9, 0x40, 0x29, 0xc3, 0x94, 0x18, 0xf3, 0xef, 0x1e, 0x93, 0x31, 0x51, 0xb6, 0xb3, + 0x3c, 0xc2, 0xba, 0x17, 0x87, 0xce, 0xed, 0xe6, 0xa5, 0x9a, 0xbf, 0xe2, 0x91, 0xe4, 0x86, 0x7a, + 0x0e, 0x4a, 0xcc, 0x8b, 0x0c, 0xe6, 0x19, 0xb0, 0xba, 0x0f, 0x18, 0x3b, 0x2c, 0x91, 0xd4, 0x4e, + 0x23, 0x0f, 0x12, 0x09, 0xbd, 0xc6, 0xf5, 0xeb, 0x42, 0x13, 0xe7, 0x0b, 0x4d, 0x7c, 0x5f, 0x68, + 0xe2, 0xf3, 0x52, 0x13, 0xe6, 0x4b, 0x4d, 0x78, 0x5b, 0x6a, 0xc2, 0xed, 0xf1, 0xc0, 0xa5, 0xc3, + 0xd0, 0x5e, 0x5d, 0x60, 0xb6, 0x6f, 0xae, 0x9a, 0x1d, 0x44, 0x1f, 0x71, 0x30, 0x32, 0x53, 0x23, + 0xc2, 0xc6, 0xc2, 0x64, 0x7f, 0x55, 0xe0, 0xb9, 0x3e, 0xfd, 0x9c, 0x47, 0xbb, 0xc0, 0xce, 0x6a, + 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x55, 0x4d, 0xaf, 0xbf, 0xb0, 0x03, 0x00, 0x00, } func (m *BlockRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/blocksync/types.proto b/proto/cometbft/v38/blocksync/types.proto similarity index 72% rename from proto/tendermint/blocksync/types.proto rename to proto/cometbft/v38/blocksync/types.proto index 11c39a713bb..87354f20230 100644 --- a/proto/tendermint/blocksync/types.proto +++ b/proto/cometbft/v38/blocksync/types.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.blocksync; +package cometbft.v38.blocksync; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/blocksync"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/blocksync"; -import "tendermint/types/block.proto"; -import "tendermint/types/types.proto"; +import "cometbft/v38/types/block.proto"; +import "cometbft/v38/types/types.proto"; // BlockRequest requests a block for a specific height message BlockRequest { @@ -18,8 +18,8 @@ message NoBlockResponse { // BlockResponse returns block to the requested message BlockResponse { - tendermint.types.Block block = 1; - tendermint.types.ExtendedCommit ext_commit = 2; + cometbft.v38.types.Block block = 1; + cometbft.v38.types.ExtendedCommit ext_commit = 2; } // StatusRequest requests the status of a peer. diff --git a/proto/tendermint/consensus/message.go b/proto/cometbft/v38/consensus/message.go similarity index 98% rename from proto/tendermint/consensus/message.go rename to proto/cometbft/v38/consensus/message.go index 782d30beeea..7f149386c5c 100644 --- a/proto/tendermint/consensus/message.go +++ b/proto/cometbft/v38/consensus/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) var _ p2p.Wrapper = &VoteSetBits{} diff --git a/proto/tendermint/consensus/types.pb.go b/proto/cometbft/v38/consensus/types.pb.go similarity index 91% rename from proto/tendermint/consensus/types.pb.go rename to proto/cometbft/v38/consensus/types.pb.go index e23f0abddee..709026fc58d 100644 --- a/proto/tendermint/consensus/types.pb.go +++ b/proto/cometbft/v38/consensus/types.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/consensus/types.proto +// source: cometbft/v38/consensus/types.proto package consensus import ( fmt "fmt" - bits "github.com/cometbft/cometbft/proto/tendermint/libs/bits" - types "github.com/cometbft/cometbft/proto/tendermint/types" + bits "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/libs/bits" + types "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ func (m *NewRoundStep) Reset() { *m = NewRoundStep{} } func (m *NewRoundStep) String() string { return proto.CompactTextString(m) } func (*NewRoundStep) ProtoMessage() {} func (*NewRoundStep) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{0} + return fileDescriptor_10108d27daf966e7, []int{0} } func (m *NewRoundStep) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,7 +118,7 @@ func (m *NewValidBlock) Reset() { *m = NewValidBlock{} } func (m *NewValidBlock) String() string { return proto.CompactTextString(m) } func (*NewValidBlock) ProtoMessage() {} func (*NewValidBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{1} + return fileDescriptor_10108d27daf966e7, []int{1} } func (m *NewValidBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -191,7 +191,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{2} + return fileDescriptor_10108d27daf966e7, []int{2} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -238,7 +238,7 @@ func (m *ProposalPOL) Reset() { *m = ProposalPOL{} } func (m *ProposalPOL) String() string { return proto.CompactTextString(m) } func (*ProposalPOL) ProtoMessage() {} func (*ProposalPOL) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{3} + return fileDescriptor_10108d27daf966e7, []int{3} } func (m *ProposalPOL) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -299,7 +299,7 @@ func (m *BlockPart) Reset() { *m = BlockPart{} } func (m *BlockPart) String() string { return proto.CompactTextString(m) } func (*BlockPart) ProtoMessage() {} func (*BlockPart) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{4} + return fileDescriptor_10108d27daf966e7, []int{4} } func (m *BlockPart) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -358,7 +358,7 @@ func (m *Vote) Reset() { *m = Vote{} } func (m *Vote) String() string { return proto.CompactTextString(m) } func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{5} + return fileDescriptor_10108d27daf966e7, []int{5} } func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -398,7 +398,7 @@ func (m *Vote) GetVote() *types.Vote { type HasVote struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` - Type types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Type types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=cometbft.v38.types.SignedMsgType" json:"type,omitempty"` Index int32 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"` } @@ -406,7 +406,7 @@ func (m *HasVote) Reset() { *m = HasVote{} } func (m *HasVote) String() string { return proto.CompactTextString(m) } func (*HasVote) ProtoMessage() {} func (*HasVote) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{6} + return fileDescriptor_10108d27daf966e7, []int{6} } func (m *HasVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -467,7 +467,7 @@ func (m *HasVote) GetIndex() int32 { type VoteSetMaj23 struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` - Type types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Type types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=cometbft.v38.types.SignedMsgType" json:"type,omitempty"` BlockID types.BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"` } @@ -475,7 +475,7 @@ func (m *VoteSetMaj23) Reset() { *m = VoteSetMaj23{} } func (m *VoteSetMaj23) String() string { return proto.CompactTextString(m) } func (*VoteSetMaj23) ProtoMessage() {} func (*VoteSetMaj23) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{7} + return fileDescriptor_10108d27daf966e7, []int{7} } func (m *VoteSetMaj23) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -536,7 +536,7 @@ func (m *VoteSetMaj23) GetBlockID() types.BlockID { type VoteSetBits struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Round int32 `protobuf:"varint,2,opt,name=round,proto3" json:"round,omitempty"` - Type types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Type types.SignedMsgType `protobuf:"varint,3,opt,name=type,proto3,enum=cometbft.v38.types.SignedMsgType" json:"type,omitempty"` BlockID types.BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"` Votes bits.BitArray `protobuf:"bytes,5,opt,name=votes,proto3" json:"votes"` } @@ -545,7 +545,7 @@ func (m *VoteSetBits) Reset() { *m = VoteSetBits{} } func (m *VoteSetBits) String() string { return proto.CompactTextString(m) } func (*VoteSetBits) ProtoMessage() {} func (*VoteSetBits) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{8} + return fileDescriptor_10108d27daf966e7, []int{8} } func (m *VoteSetBits) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -627,7 +627,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_81a22d2efc008981, []int{9} + return fileDescriptor_10108d27daf966e7, []int{9} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -786,76 +786,79 @@ func (*Message) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*NewRoundStep)(nil), "tendermint.consensus.NewRoundStep") - proto.RegisterType((*NewValidBlock)(nil), "tendermint.consensus.NewValidBlock") - proto.RegisterType((*Proposal)(nil), "tendermint.consensus.Proposal") - proto.RegisterType((*ProposalPOL)(nil), "tendermint.consensus.ProposalPOL") - proto.RegisterType((*BlockPart)(nil), "tendermint.consensus.BlockPart") - proto.RegisterType((*Vote)(nil), "tendermint.consensus.Vote") - proto.RegisterType((*HasVote)(nil), "tendermint.consensus.HasVote") - proto.RegisterType((*VoteSetMaj23)(nil), "tendermint.consensus.VoteSetMaj23") - proto.RegisterType((*VoteSetBits)(nil), "tendermint.consensus.VoteSetBits") - proto.RegisterType((*Message)(nil), "tendermint.consensus.Message") -} - -func init() { proto.RegisterFile("tendermint/consensus/types.proto", fileDescriptor_81a22d2efc008981) } - -var fileDescriptor_81a22d2efc008981 = []byte{ - // 856 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcd, 0x8e, 0xe3, 0x44, - 0x10, 0xb6, 0x19, 0x67, 0x92, 0x94, 0x93, 0x19, 0x68, 0xcd, 0xae, 0x42, 0x80, 0x24, 0x98, 0xcb, - 0x08, 0x21, 0x07, 0x65, 0x0e, 0x2b, 0xad, 0x90, 0x00, 0xf3, 0xb3, 0xde, 0xd5, 0x66, 0x37, 0x38, - 0xab, 0x15, 0xe2, 0x62, 0x39, 0x71, 0x93, 0x34, 0x1b, 0xbb, 0x2d, 0x77, 0x27, 0xc3, 0x5c, 0x79, - 0x02, 0x1e, 0x80, 0xd7, 0x40, 0xe2, 0x11, 0xe6, 0x38, 0x47, 0x4e, 0x23, 0x94, 0x79, 0x04, 0x04, - 0x67, 0xd4, 0xed, 0x4e, 0xec, 0x30, 0x9e, 0x81, 0xb9, 0x20, 0x71, 0xeb, 0x4e, 0x55, 0x7d, 0x5d, - 0xf5, 0x55, 0xd5, 0x17, 0x43, 0x8f, 0xe3, 0x38, 0xc4, 0x69, 0x44, 0x62, 0xde, 0x9f, 0xd2, 0x98, - 0xe1, 0x98, 0x2d, 0x59, 0x9f, 0x9f, 0x25, 0x98, 0xd9, 0x49, 0x4a, 0x39, 0x45, 0x47, 0xb9, 0x87, - 0xbd, 0xf5, 0x68, 0x1f, 0xcd, 0xe8, 0x8c, 0x4a, 0x87, 0xbe, 0x38, 0x65, 0xbe, 0xed, 0xb7, 0x0b, - 0x68, 0x12, 0xa3, 0x88, 0xd4, 0x2e, 0xbe, 0xb5, 0x20, 0x13, 0xd6, 0x9f, 0x10, 0xbe, 0xe3, 0x61, - 0xfd, 0xac, 0x43, 0xe3, 0x19, 0x3e, 0xf5, 0xe8, 0x32, 0x0e, 0xc7, 0x1c, 0x27, 0xe8, 0x3e, 0xec, - 0xcf, 0x31, 0x99, 0xcd, 0x79, 0x4b, 0xef, 0xe9, 0xc7, 0x7b, 0x9e, 0xba, 0xa1, 0x23, 0xa8, 0xa4, - 0xc2, 0xa9, 0xf5, 0x5a, 0x4f, 0x3f, 0xae, 0x78, 0xd9, 0x05, 0x21, 0x30, 0x18, 0xc7, 0x49, 0x6b, - 0xaf, 0xa7, 0x1f, 0x37, 0x3d, 0x79, 0x46, 0x0f, 0xa0, 0xc5, 0xf0, 0x94, 0xc6, 0x21, 0xf3, 0x19, - 0x89, 0xa7, 0xd8, 0x67, 0x3c, 0x48, 0xb9, 0xcf, 0x49, 0x84, 0x5b, 0x86, 0xc4, 0xbc, 0xa7, 0xec, - 0x63, 0x61, 0x1e, 0x0b, 0xeb, 0x0b, 0x12, 0x61, 0xf4, 0x3e, 0xbc, 0xb1, 0x08, 0x18, 0xf7, 0xa7, - 0x34, 0x8a, 0x08, 0xf7, 0xb3, 0xe7, 0x2a, 0xf2, 0xb9, 0x43, 0x61, 0xf8, 0x4c, 0xfe, 0x2e, 0x53, - 0xb5, 0xfe, 0xd0, 0xa1, 0xf9, 0x0c, 0x9f, 0xbe, 0x0c, 0x16, 0x24, 0x74, 0x16, 0x74, 0xfa, 0xea, - 0x8e, 0x89, 0x7f, 0x0d, 0xf7, 0x26, 0x22, 0xcc, 0x4f, 0x44, 0x6e, 0x0c, 0x73, 0x7f, 0x8e, 0x83, - 0x10, 0xa7, 0xb2, 0x12, 0x73, 0xd0, 0xb5, 0x0b, 0x3d, 0xc8, 0xf8, 0x1a, 0x05, 0x29, 0x1f, 0x63, - 0xee, 0x4a, 0x37, 0xc7, 0x38, 0xbf, 0xec, 0x6a, 0x1e, 0x92, 0x18, 0x3b, 0x16, 0xf4, 0x31, 0x98, - 0x39, 0x32, 0x93, 0x15, 0x9b, 0x83, 0x4e, 0x11, 0x4f, 0x74, 0xc2, 0x16, 0x9d, 0xb0, 0x1d, 0xc2, - 0x3f, 0x4d, 0xd3, 0xe0, 0xcc, 0x83, 0x2d, 0x10, 0x43, 0x6f, 0x41, 0x9d, 0x30, 0x45, 0x82, 0x2c, - 0xbf, 0xe6, 0xd5, 0x08, 0xcb, 0x8a, 0xb7, 0x5c, 0xa8, 0x8d, 0x52, 0x9a, 0x50, 0x16, 0x2c, 0xd0, - 0x47, 0x50, 0x4b, 0xd4, 0x59, 0xd6, 0x6c, 0x0e, 0xda, 0x25, 0x69, 0x2b, 0x0f, 0x95, 0xf1, 0x36, - 0xc2, 0xfa, 0x49, 0x07, 0x73, 0x63, 0x1c, 0x3d, 0x7f, 0x7a, 0x23, 0x7f, 0x1f, 0x00, 0xda, 0xc4, - 0xf8, 0x09, 0x5d, 0xf8, 0x45, 0x32, 0x5f, 0xdf, 0x58, 0x46, 0x74, 0x21, 0xfb, 0x82, 0x1e, 0x41, - 0xa3, 0xe8, 0xad, 0xe8, 0xfc, 0x87, 0xf2, 0x55, 0x6e, 0x66, 0x01, 0xcd, 0x7a, 0x05, 0x75, 0x67, - 0xc3, 0xc9, 0x1d, 0x7b, 0xfb, 0x21, 0x18, 0x82, 0x7b, 0xf5, 0xf6, 0xfd, 0xf2, 0x56, 0xaa, 0x37, - 0xa5, 0xa7, 0x35, 0x00, 0xe3, 0x25, 0xe5, 0x62, 0x02, 0x8d, 0x15, 0xe5, 0x58, 0xb1, 0x59, 0x12, - 0x29, 0xbc, 0x3c, 0xe9, 0x63, 0xfd, 0xa0, 0x43, 0xd5, 0x0d, 0x98, 0x8c, 0xbb, 0x5b, 0x7e, 0x27, - 0x60, 0x08, 0x34, 0x99, 0xdf, 0x41, 0xd9, 0xa8, 0x8d, 0xc9, 0x2c, 0xc6, 0xe1, 0x90, 0xcd, 0x5e, - 0x9c, 0x25, 0xd8, 0x93, 0xce, 0x02, 0x8a, 0xc4, 0x21, 0xfe, 0x5e, 0x0e, 0x54, 0xc5, 0xcb, 0x2e, - 0xd6, 0x2f, 0x3a, 0x34, 0x44, 0x06, 0x63, 0xcc, 0x87, 0xc1, 0x77, 0x83, 0x93, 0xff, 0x22, 0x93, - 0x2f, 0xa0, 0x96, 0x0d, 0x38, 0x09, 0xd5, 0x74, 0xbf, 0x79, 0x3d, 0x50, 0xf6, 0xee, 0xf1, 0xe7, - 0xce, 0xa1, 0x60, 0x79, 0x7d, 0xd9, 0xad, 0xaa, 0x1f, 0xbc, 0xaa, 0x8c, 0x7d, 0x1c, 0x5a, 0xbf, - 0xeb, 0x60, 0xaa, 0xd4, 0x1d, 0xc2, 0xd9, 0xff, 0x27, 0x73, 0xf4, 0x10, 0x2a, 0x62, 0x02, 0x98, - 0x5c, 0xce, 0x7f, 0x3b, 0xdc, 0x59, 0x88, 0xf5, 0xa7, 0x01, 0xd5, 0x21, 0x66, 0x2c, 0x98, 0x61, - 0xf4, 0x04, 0x0e, 0x62, 0x7c, 0x9a, 0x2d, 0x94, 0x2f, 0x65, 0x34, 0x9b, 0x3b, 0xcb, 0x2e, 0xfb, - 0x03, 0xb0, 0x8b, 0x32, 0xed, 0x6a, 0x5e, 0x23, 0x2e, 0xca, 0xf6, 0x10, 0x0e, 0x05, 0xd6, 0x4a, - 0xe8, 0xa1, 0x2f, 0x13, 0x95, 0x7c, 0x99, 0x83, 0xf7, 0x6e, 0x04, 0xcb, 0xb5, 0xd3, 0xd5, 0xbc, - 0x66, 0xbc, 0x23, 0xa6, 0x45, 0x69, 0x29, 0x59, 0xe1, 0x1c, 0x67, 0xa3, 0x20, 0x6e, 0x41, 0x5a, - 0xd0, 0x97, 0x7f, 0x13, 0x81, 0x8c, 0xeb, 0x77, 0x6f, 0x47, 0x18, 0x3d, 0x7f, 0xea, 0xee, 0x6a, - 0x00, 0xfa, 0x04, 0x20, 0x97, 0x52, 0xc5, 0x76, 0xb7, 0x1c, 0x65, 0xab, 0x15, 0xae, 0xe6, 0xd5, - 0xb7, 0x62, 0x2a, 0xa4, 0x40, 0x2e, 0xf4, 0xfe, 0x75, 0x79, 0xcc, 0x63, 0xc5, 0x14, 0xba, 0x5a, - 0xb6, 0xd6, 0xe8, 0x21, 0xd4, 0xe6, 0x01, 0xf3, 0x65, 0x54, 0x55, 0x46, 0xbd, 0x53, 0x1e, 0xa5, - 0x76, 0xdf, 0xd5, 0xbc, 0xea, 0x5c, 0xc9, 0xc0, 0x13, 0x38, 0x10, 0x71, 0xf2, 0xef, 0x24, 0x12, - 0xeb, 0xd8, 0xaa, 0xdd, 0xd6, 0xd0, 0xe2, 0xe2, 0x8a, 0x86, 0xae, 0x8a, 0x8b, 0xfc, 0x08, 0x9a, - 0x5b, 0x2c, 0x31, 0x4f, 0xad, 0xfa, 0x6d, 0x24, 0x16, 0x16, 0x49, 0x90, 0xb8, 0xca, 0xaf, 0x4e, - 0x05, 0xf6, 0xd8, 0x32, 0x72, 0xbe, 0x3a, 0x5f, 0x77, 0xf4, 0x8b, 0x75, 0x47, 0xff, 0x6d, 0xdd, - 0xd1, 0x7f, 0xbc, 0xea, 0x68, 0x17, 0x57, 0x1d, 0xed, 0xd7, 0xab, 0x8e, 0xf6, 0xcd, 0x83, 0x19, - 0xe1, 0xf3, 0xe5, 0xc4, 0x9e, 0xd2, 0xa8, 0x3f, 0xa5, 0x11, 0xe6, 0x93, 0x6f, 0x79, 0x7e, 0xc8, - 0xbe, 0x38, 0xca, 0xbe, 0x59, 0x26, 0xfb, 0xd2, 0x76, 0xf2, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xfe, 0x06, 0x66, 0x65, 0xd2, 0x08, 0x00, 0x00, + proto.RegisterType((*NewRoundStep)(nil), "cometbft.v38.consensus.NewRoundStep") + proto.RegisterType((*NewValidBlock)(nil), "cometbft.v38.consensus.NewValidBlock") + proto.RegisterType((*Proposal)(nil), "cometbft.v38.consensus.Proposal") + proto.RegisterType((*ProposalPOL)(nil), "cometbft.v38.consensus.ProposalPOL") + proto.RegisterType((*BlockPart)(nil), "cometbft.v38.consensus.BlockPart") + proto.RegisterType((*Vote)(nil), "cometbft.v38.consensus.Vote") + proto.RegisterType((*HasVote)(nil), "cometbft.v38.consensus.HasVote") + proto.RegisterType((*VoteSetMaj23)(nil), "cometbft.v38.consensus.VoteSetMaj23") + proto.RegisterType((*VoteSetBits)(nil), "cometbft.v38.consensus.VoteSetBits") + proto.RegisterType((*Message)(nil), "cometbft.v38.consensus.Message") +} + +func init() { + proto.RegisterFile("cometbft/v38/consensus/types.proto", fileDescriptor_10108d27daf966e7) +} + +var fileDescriptor_10108d27daf966e7 = []byte{ + // 873 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xe3, 0x44, + 0x14, 0xb7, 0x69, 0xd2, 0xa4, 0xcf, 0xfd, 0x03, 0xa3, 0xdd, 0x95, 0xd5, 0x45, 0x69, 0xd7, 0x80, + 0x54, 0xa1, 0x95, 0x23, 0xa5, 0x20, 0xf6, 0xb0, 0x5a, 0x69, 0x0d, 0x08, 0x17, 0xfa, 0x27, 0x72, + 0x56, 0x15, 0xec, 0xc5, 0x72, 0xe2, 0x21, 0x19, 0x36, 0xf6, 0x58, 0x9e, 0x69, 0x4a, 0xef, 0x1c, + 0x38, 0xf2, 0x09, 0xf8, 0x16, 0xdc, 0xf8, 0x00, 0x7b, 0xdc, 0x23, 0xa7, 0x15, 0x4a, 0x3f, 0x05, + 0x37, 0x34, 0xcf, 0x93, 0xc4, 0x46, 0x49, 0x4b, 0x2f, 0x48, 0xdc, 0x3c, 0x79, 0xef, 0xfd, 0xe6, + 0xe7, 0xdf, 0x7b, 0xef, 0x17, 0x83, 0x33, 0xe0, 0x09, 0x95, 0xfd, 0xef, 0x65, 0x7b, 0x72, 0xf8, + 0xa4, 0x3d, 0xe0, 0xa9, 0xa0, 0xa9, 0xb8, 0x10, 0x6d, 0x79, 0x95, 0x51, 0xe1, 0x66, 0x39, 0x97, + 0x9c, 0x3c, 0x98, 0xe5, 0xb8, 0x93, 0xc3, 0x27, 0xee, 0x3c, 0x67, 0xf7, 0xde, 0x90, 0x0f, 0x39, + 0xa6, 0xb4, 0xd5, 0x53, 0x91, 0xbd, 0xdb, 0xaa, 0x20, 0x22, 0x4e, 0x19, 0x6d, 0xb7, 0x7a, 0xe3, + 0x98, 0xf5, 0x45, 0xbb, 0xcf, 0x64, 0x25, 0xc7, 0xf9, 0xcd, 0x84, 0xcd, 0x53, 0x7a, 0x19, 0xf0, + 0x8b, 0x34, 0xee, 0x49, 0x9a, 0x91, 0x07, 0xb0, 0x3e, 0xa2, 0x6c, 0x38, 0x92, 0xb6, 0xb9, 0x6f, + 0x1e, 0xac, 0x05, 0xfa, 0x44, 0xee, 0x41, 0x3d, 0x57, 0x49, 0xf6, 0x3b, 0xfb, 0xe6, 0x41, 0x3d, + 0x28, 0x0e, 0x84, 0x40, 0x4d, 0x48, 0x9a, 0xd9, 0x6b, 0xfb, 0xe6, 0xc1, 0x56, 0x80, 0xcf, 0xe4, + 0x33, 0xb0, 0x05, 0x1d, 0xf0, 0x34, 0x16, 0xa1, 0x60, 0xe9, 0x80, 0x86, 0x42, 0x46, 0xb9, 0x0c, + 0x25, 0x4b, 0xa8, 0x5d, 0x43, 0xcc, 0xfb, 0x3a, 0xde, 0x53, 0xe1, 0x9e, 0x8a, 0xbe, 0x60, 0x09, + 0x25, 0x1f, 0xc3, 0x7b, 0xe3, 0x48, 0xc8, 0x70, 0xc0, 0x93, 0x84, 0xc9, 0xb0, 0xb8, 0xae, 0x8e, + 0xd7, 0xed, 0xa8, 0xc0, 0xe7, 0xf8, 0x3b, 0x52, 0x75, 0xfe, 0x32, 0x61, 0xeb, 0x94, 0x5e, 0x9e, + 0x47, 0x63, 0x16, 0x7b, 0x63, 0x3e, 0x78, 0x75, 0x47, 0xe2, 0x2f, 0xe1, 0x7e, 0x5f, 0x95, 0x85, + 0x99, 0xe2, 0x26, 0xa8, 0x0c, 0x47, 0x34, 0x8a, 0x69, 0x8e, 0x6f, 0x62, 0x75, 0x1e, 0xb9, 0x95, + 0x4e, 0x14, 0x8a, 0x75, 0xa3, 0x5c, 0xf6, 0xa8, 0xf4, 0x31, 0xd1, 0xab, 0xbd, 0x7e, 0xbb, 0x67, + 0x04, 0x04, 0x51, 0x2a, 0x11, 0xf2, 0x1c, 0xac, 0x05, 0xb6, 0xc0, 0x77, 0xb6, 0x3a, 0xfb, 0x55, + 0x44, 0xd5, 0x0d, 0x57, 0x75, 0xc3, 0xf5, 0x98, 0x7c, 0x9e, 0xe7, 0xd1, 0x55, 0x00, 0x73, 0x28, + 0x41, 0x1e, 0xc2, 0x06, 0x13, 0x5a, 0x08, 0x94, 0xa0, 0x19, 0x34, 0x99, 0x28, 0x04, 0x70, 0xbe, + 0x86, 0x66, 0x37, 0xe7, 0x19, 0x17, 0xd1, 0x98, 0x3c, 0x83, 0x66, 0xa6, 0x9f, 0xf1, 0xbd, 0xad, + 0xce, 0xfb, 0x4b, 0xa9, 0xeb, 0x1c, 0xcd, 0x7a, 0x5e, 0xe3, 0xfc, 0x6a, 0x82, 0x35, 0x0b, 0x76, + 0xcf, 0x8e, 0x57, 0xaa, 0xf8, 0x18, 0xc8, 0xac, 0x26, 0xcc, 0xf8, 0x38, 0x2c, 0x4b, 0xfa, 0xee, + 0x2c, 0xd2, 0xe5, 0x63, 0xec, 0x0e, 0x39, 0x82, 0xcd, 0x72, 0xb6, 0x16, 0xf5, 0x56, 0x09, 0x34, + 0x3b, 0xab, 0x84, 0xe7, 0x24, 0xb0, 0xe1, 0xcd, 0x74, 0xb9, 0x63, 0x8f, 0x3b, 0x50, 0x53, 0x1d, + 0xd0, 0xb7, 0xdb, 0xab, 0x5a, 0xaa, 0x6f, 0xc5, 0x5c, 0xe7, 0x13, 0xa8, 0x9d, 0x73, 0x49, 0xc9, + 0x63, 0xa8, 0x4d, 0xb8, 0xa4, 0x5a, 0xd3, 0xa5, 0xb5, 0x2a, 0x2f, 0xc0, 0x2c, 0xe7, 0x27, 0x13, + 0x1a, 0x7e, 0x24, 0xb0, 0xf2, 0x6e, 0x1c, 0x3f, 0x85, 0x9a, 0x42, 0x43, 0x8e, 0xdb, 0xcb, 0xc7, + 0xae, 0xc7, 0x86, 0x29, 0x8d, 0x4f, 0xc4, 0xf0, 0xc5, 0x55, 0x46, 0x03, 0x4c, 0x57, 0x60, 0x2c, + 0x8d, 0xe9, 0x8f, 0x38, 0x5c, 0xf5, 0xa0, 0x38, 0x38, 0xbf, 0x9b, 0xb0, 0xa9, 0x38, 0xf4, 0xa8, + 0x3c, 0x89, 0x7e, 0xe8, 0x1c, 0xfe, 0x37, 0x5c, 0xbe, 0x82, 0x66, 0x31, 0xee, 0x2c, 0xd6, 0xb3, + 0xfe, 0x70, 0x59, 0x29, 0x76, 0xf1, 0xe8, 0x0b, 0x6f, 0x47, 0xa9, 0x3d, 0x7d, 0xbb, 0xd7, 0xd0, + 0x3f, 0x04, 0x0d, 0xac, 0x3e, 0xc2, 0x9d, 0xb6, 0x34, 0x7d, 0x8f, 0x49, 0xf1, 0xff, 0x62, 0x4f, + 0x9e, 0x42, 0x5d, 0xcd, 0x82, 0xc0, 0x75, 0xfd, 0xf7, 0xc3, 0x5e, 0x14, 0x39, 0x3f, 0xd7, 0xa1, + 0x71, 0x42, 0x85, 0x88, 0x86, 0x94, 0x1c, 0xc3, 0x76, 0x4a, 0x2f, 0x8b, 0x15, 0x0b, 0xd1, 0x5e, + 0x8b, 0x29, 0xfc, 0xd0, 0x5d, 0xfe, 0xf7, 0xe0, 0x96, 0x0d, 0xdc, 0x37, 0x82, 0xcd, 0xb4, 0x6c, + 0xe8, 0x67, 0xb0, 0xa3, 0xd0, 0x26, 0xca, 0x29, 0x43, 0x24, 0x8b, 0xba, 0x59, 0x9d, 0x8f, 0x6e, + 0x80, 0x5b, 0xf8, 0xaa, 0x6f, 0x04, 0x5b, 0x69, 0xc5, 0x68, 0xcb, 0x96, 0xb3, 0x74, 0xb1, 0x17, + 0x48, 0x33, 0x67, 0xf1, 0x4b, 0x96, 0x43, 0xfc, 0x7f, 0x98, 0x43, 0xa1, 0xfa, 0x07, 0xb7, 0x61, + 0x74, 0xcf, 0x8e, 0xfd, 0xaa, 0x37, 0x10, 0x0f, 0x60, 0x61, 0xb4, 0x5a, 0xf7, 0x47, 0xab, 0x70, + 0xe6, 0x2e, 0xe2, 0x1b, 0xc1, 0xc6, 0xdc, 0x6a, 0x95, 0x49, 0xe0, 0xa2, 0xaf, 0x2f, 0x33, 0xcf, + 0x45, 0xb5, 0x9a, 0x4b, 0xdf, 0x28, 0xd6, 0x9d, 0x3c, 0x85, 0xe6, 0x28, 0x12, 0x21, 0xd6, 0x35, + 0xb0, 0x6e, 0x6f, 0x55, 0x9d, 0x76, 0x05, 0xdf, 0x08, 0x1a, 0x23, 0x6d, 0x10, 0xc7, 0xb0, 0xad, + 0x2a, 0xf1, 0x4f, 0x27, 0x51, 0x6b, 0x6a, 0x37, 0x6f, 0x6e, 0x6f, 0x79, 0xa5, 0x55, 0x7b, 0x27, + 0xe5, 0x15, 0x3f, 0x82, 0xad, 0x39, 0x9a, 0x9a, 0x2f, 0x7b, 0xe3, 0x66, 0x39, 0x4b, 0x0b, 0xa6, + 0xe4, 0x9c, 0x2c, 0x8e, 0x5e, 0x1d, 0xd6, 0xc4, 0x45, 0xe2, 0x7d, 0xfb, 0x7a, 0xda, 0x32, 0xdf, + 0x4c, 0x5b, 0xe6, 0x9f, 0xd3, 0x96, 0xf9, 0xcb, 0x75, 0xcb, 0x78, 0x73, 0xdd, 0x32, 0xfe, 0xb8, + 0x6e, 0x19, 0x2f, 0x9f, 0x0d, 0x99, 0x1c, 0x5d, 0xf4, 0x15, 0x74, 0xfb, 0x9b, 0xef, 0xce, 0xbf, + 0x3c, 0xa5, 0xf2, 0x92, 0xe7, 0xaf, 0xda, 0x95, 0xef, 0x8c, 0xe2, 0x33, 0x45, 0xd2, 0x34, 0xa6, + 0x79, 0xc2, 0x52, 0xb9, 0xf8, 0xd4, 0xe9, 0xaf, 0x63, 0xec, 0xf0, 0xef, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x72, 0xf9, 0x1b, 0x95, 0x0b, 0x09, 0x00, 0x00, } func (m *NewRoundStep) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/consensus/types.proto b/proto/cometbft/v38/consensus/types.proto similarity index 68% rename from proto/tendermint/consensus/types.proto rename to proto/cometbft/v38/consensus/types.proto index 542bdc19173..3768443a5a2 100644 --- a/proto/tendermint/consensus/types.proto +++ b/proto/cometbft/v38/consensus/types.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package tendermint.consensus; +package cometbft.v38.consensus; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/consensus"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/consensus"; import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; -import "tendermint/libs/bits/types.proto"; +import "cometbft/v38/types/types.proto"; +import "cometbft/v38/libs/bits/types.proto"; // NewRoundStep is sent for every step taken in the ConsensusState. // For every height/round/step transition @@ -23,40 +23,40 @@ message NewRoundStep { message NewValidBlock { int64 height = 1; int32 round = 2; - tendermint.types.PartSetHeader block_part_set_header = 3 [(gogoproto.nullable) = false]; - tendermint.libs.bits.BitArray block_parts = 4; + cometbft.v38.types.PartSetHeader block_part_set_header = 3 [(gogoproto.nullable) = false]; + cometbft.v38.libs.bits.BitArray block_parts = 4; bool is_commit = 5; } // Proposal is sent when a new block is proposed. message Proposal { - tendermint.types.Proposal proposal = 1 [(gogoproto.nullable) = false]; + cometbft.v38.types.Proposal proposal = 1 [(gogoproto.nullable) = false]; } // ProposalPOL is sent when a previous proposal is re-proposed. message ProposalPOL { int64 height = 1; int32 proposal_pol_round = 2; - tendermint.libs.bits.BitArray proposal_pol = 3 [(gogoproto.nullable) = false]; + cometbft.v38.libs.bits.BitArray proposal_pol = 3 [(gogoproto.nullable) = false]; } // BlockPart is sent when gossipping a piece of the proposed block. message BlockPart { int64 height = 1; int32 round = 2; - tendermint.types.Part part = 3 [(gogoproto.nullable) = false]; + cometbft.v38.types.Part part = 3 [(gogoproto.nullable) = false]; } // Vote is sent when voting for a proposal (or lack thereof). message Vote { - tendermint.types.Vote vote = 1; + cometbft.v38.types.Vote vote = 1; } // HasVote is sent to indicate that a particular vote has been received. message HasVote { int64 height = 1; int32 round = 2; - tendermint.types.SignedMsgType type = 3; + cometbft.v38.types.SignedMsgType type = 3; int32 index = 4; } @@ -64,17 +64,17 @@ message HasVote { message VoteSetMaj23 { int64 height = 1; int32 round = 2; - tendermint.types.SignedMsgType type = 3; - tendermint.types.BlockID block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false]; + cometbft.v38.types.SignedMsgType type = 3; + cometbft.v38.types.BlockID block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false]; } // VoteSetBits is sent to communicate the bit-array of votes seen for the BlockID. message VoteSetBits { int64 height = 1; int32 round = 2; - tendermint.types.SignedMsgType type = 3; - tendermint.types.BlockID block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false]; - tendermint.libs.bits.BitArray votes = 5 [(gogoproto.nullable) = false]; + cometbft.v38.types.SignedMsgType type = 3; + cometbft.v38.types.BlockID block_id = 4 [(gogoproto.customname) = "BlockID", (gogoproto.nullable) = false]; + cometbft.v38.libs.bits.BitArray votes = 5 [(gogoproto.nullable) = false]; } message Message { diff --git a/proto/tendermint/consensus/wal.pb.go b/proto/cometbft/v38/consensus/wal.pb.go similarity index 86% rename from proto/tendermint/consensus/wal.pb.go rename to proto/cometbft/v38/consensus/wal.pb.go index f870835ef8b..8de04ad9450 100644 --- a/proto/tendermint/consensus/wal.pb.go +++ b/proto/cometbft/v38/consensus/wal.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/consensus/wal.proto +// source: cometbft/v38/consensus/wal.proto package consensus import ( fmt "fmt" - types "github.com/cometbft/cometbft/proto/tendermint/types" + types "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" io "io" math "math" @@ -39,7 +39,7 @@ func (m *MsgInfo) Reset() { *m = MsgInfo{} } func (m *MsgInfo) String() string { return proto.CompactTextString(m) } func (*MsgInfo) ProtoMessage() {} func (*MsgInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ed0b60c2d348ab09, []int{0} + return fileDescriptor_39a65f00df2a82d5, []int{0} } func (m *MsgInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -94,7 +94,7 @@ func (m *TimeoutInfo) Reset() { *m = TimeoutInfo{} } func (m *TimeoutInfo) String() string { return proto.CompactTextString(m) } func (*TimeoutInfo) ProtoMessage() {} func (*TimeoutInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ed0b60c2d348ab09, []int{1} + return fileDescriptor_39a65f00df2a82d5, []int{1} } func (m *TimeoutInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -161,7 +161,7 @@ func (m *EndHeight) Reset() { *m = EndHeight{} } func (m *EndHeight) String() string { return proto.CompactTextString(m) } func (*EndHeight) ProtoMessage() {} func (*EndHeight) Descriptor() ([]byte, []int) { - return fileDescriptor_ed0b60c2d348ab09, []int{2} + return fileDescriptor_39a65f00df2a82d5, []int{2} } func (m *EndHeight) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -210,7 +210,7 @@ func (m *WALMessage) Reset() { *m = WALMessage{} } func (m *WALMessage) String() string { return proto.CompactTextString(m) } func (*WALMessage) ProtoMessage() {} func (*WALMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_ed0b60c2d348ab09, []int{3} + return fileDescriptor_39a65f00df2a82d5, []int{3} } func (m *WALMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -318,7 +318,7 @@ func (m *TimedWALMessage) Reset() { *m = TimedWALMessage{} } func (m *TimedWALMessage) String() string { return proto.CompactTextString(m) } func (*TimedWALMessage) ProtoMessage() {} func (*TimedWALMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_ed0b60c2d348ab09, []int{4} + return fileDescriptor_39a65f00df2a82d5, []int{4} } func (m *TimedWALMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -362,51 +362,52 @@ func (m *TimedWALMessage) GetMsg() *WALMessage { } func init() { - proto.RegisterType((*MsgInfo)(nil), "tendermint.consensus.MsgInfo") - proto.RegisterType((*TimeoutInfo)(nil), "tendermint.consensus.TimeoutInfo") - proto.RegisterType((*EndHeight)(nil), "tendermint.consensus.EndHeight") - proto.RegisterType((*WALMessage)(nil), "tendermint.consensus.WALMessage") - proto.RegisterType((*TimedWALMessage)(nil), "tendermint.consensus.TimedWALMessage") -} - -func init() { proto.RegisterFile("tendermint/consensus/wal.proto", fileDescriptor_ed0b60c2d348ab09) } - -var fileDescriptor_ed0b60c2d348ab09 = []byte{ - // 543 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xdf, 0x8a, 0xd3, 0x4e, - 0x14, 0xce, 0x6c, 0xff, 0x9f, 0xfe, 0x7e, 0x08, 0xb1, 0x2c, 0xb5, 0xb0, 0x69, 0xec, 0x22, 0xf4, - 0x2a, 0x81, 0x15, 0x51, 0xbc, 0x51, 0x4b, 0x57, 0x5a, 0x70, 0x41, 0xc7, 0x05, 0x41, 0x84, 0x90, - 0x36, 0xa7, 0x69, 0x60, 0x33, 0x53, 0x32, 0x13, 0xc5, 0x2b, 0x5f, 0xa1, 0x97, 0xbe, 0x89, 0xaf, - 0xb0, 0x97, 0x7b, 0xe9, 0xd5, 0x2a, 0xed, 0x8b, 0x48, 0x66, 0xd2, 0x36, 0xb8, 0xf1, 0x6e, 0xce, - 0x9c, 0xef, 0x9c, 0xef, 0x9c, 0xef, 0x9b, 0x01, 0x4b, 0x22, 0x0b, 0x30, 0x89, 0x23, 0x26, 0xdd, - 0x39, 0x67, 0x02, 0x99, 0x48, 0x85, 0xfb, 0xc5, 0xbf, 0x72, 0x56, 0x09, 0x97, 0xdc, 0xec, 0x1c, - 0xf2, 0xce, 0x3e, 0xdf, 0xeb, 0x84, 0x3c, 0xe4, 0x0a, 0xe0, 0x66, 0x27, 0x8d, 0xed, 0xd9, 0xa5, - 0xbd, 0xe4, 0xd7, 0x15, 0x8a, 0x1c, 0x71, 0x52, 0x40, 0xa8, 0x7b, 0x17, 0x3f, 0x23, 0x93, 0xbb, - 0xb4, 0x15, 0x72, 0x1e, 0x5e, 0xa1, 0xab, 0xa2, 0x59, 0xba, 0x70, 0x83, 0x34, 0xf1, 0x65, 0xc4, - 0x59, 0x9e, 0xef, 0xff, 0x9d, 0x97, 0x51, 0x8c, 0x42, 0xfa, 0xf1, 0x4a, 0x03, 0x06, 0x08, 0x8d, - 0x0b, 0x11, 0x4e, 0xd9, 0x82, 0x9b, 0x4f, 0xa0, 0x12, 0x8b, 0xb0, 0x4b, 0x6c, 0x32, 0x6c, 0x9f, - 0x9d, 0x38, 0x65, 0x6b, 0x38, 0x17, 0x28, 0x84, 0x1f, 0xe2, 0xa8, 0x7a, 0x7d, 0xdb, 0x37, 0x68, - 0x86, 0x37, 0x4f, 0xa1, 0xb1, 0x42, 0x4c, 0xbc, 0x28, 0xe8, 0x1e, 0xd9, 0x64, 0xd8, 0x1a, 0xc1, - 0xe6, 0xb6, 0x5f, 0x7f, 0x8b, 0x98, 0x4c, 0xc7, 0xb4, 0x9e, 0xa5, 0xa6, 0xc1, 0x60, 0x4d, 0xa0, - 0x7d, 0x19, 0xc5, 0xc8, 0x53, 0xa9, 0xb8, 0x5e, 0x40, 0x73, 0x37, 0x69, 0x4e, 0xf8, 0xc0, 0xd1, - 0xa3, 0x3a, 0xbb, 0x51, 0x9d, 0x71, 0x0e, 0x18, 0x35, 0x33, 0xb2, 0xef, 0xbf, 0xfa, 0x84, 0xee, - 0x8b, 0xcc, 0x63, 0xa8, 0x2f, 0x31, 0x0a, 0x97, 0x52, 0x91, 0x56, 0x68, 0x1e, 0x99, 0x1d, 0xa8, - 0x25, 0x3c, 0x65, 0x41, 0xb7, 0x62, 0x93, 0x61, 0x8d, 0xea, 0xc0, 0x34, 0xa1, 0x2a, 0x24, 0xae, - 0xba, 0x55, 0x9b, 0x0c, 0xff, 0xa7, 0xea, 0x3c, 0x38, 0x85, 0xd6, 0x39, 0x0b, 0x26, 0xba, 0xec, - 0xd0, 0x8e, 0x14, 0xdb, 0x0d, 0x7e, 0x1c, 0x01, 0x7c, 0x78, 0xf5, 0x26, 0x5f, 0xdb, 0xfc, 0x04, - 0xc7, 0x4a, 0x7e, 0x2f, 0xf0, 0xa5, 0xef, 0xa9, 0xde, 0x9e, 0x90, 0xbe, 0xc4, 0x7c, 0x89, 0x47, - 0x45, 0xd5, 0xb4, 0x8d, 0xe7, 0x19, 0x7e, 0xec, 0x4b, 0x9f, 0x66, 0xe8, 0xf7, 0x19, 0x78, 0x62, - 0xd0, 0xfb, 0x78, 0xf7, 0xda, 0x7c, 0x0e, 0xcd, 0x58, 0x84, 0x5e, 0xc4, 0x16, 0x5c, 0x6d, 0xf5, - 0x6f, 0x17, 0xb4, 0x63, 0x13, 0x83, 0x36, 0xe2, 0xdc, 0xbc, 0xd7, 0xf0, 0x9f, 0xd4, 0xfa, 0xea, - 0xfa, 0x8a, 0xaa, 0x7f, 0x58, 0x5e, 0x5f, 0x70, 0x62, 0x62, 0xd0, 0xb6, 0x2c, 0x18, 0xf3, 0x12, - 0x00, 0x59, 0xe0, 0xe5, 0x62, 0x54, 0x55, 0x97, 0x7e, 0x79, 0x97, 0xbd, 0x7a, 0x13, 0x83, 0xb6, - 0x70, 0x17, 0x8c, 0x6a, 0x50, 0x11, 0x69, 0x3c, 0xf8, 0x06, 0xf7, 0x32, 0x9a, 0xa0, 0xa0, 0xde, - 0x33, 0xa8, 0x66, 0x54, 0xb9, 0x56, 0xbd, 0x3b, 0x86, 0x5f, 0xee, 0xde, 0xa6, 0x76, 0x7c, 0x9d, - 0x39, 0xae, 0x2a, 0xcc, 0x33, 0xfd, 0x34, 0xb5, 0x28, 0x76, 0xf9, 0x38, 0x07, 0x22, 0xf5, 0x2e, - 0x47, 0xef, 0xae, 0x37, 0x16, 0xb9, 0xd9, 0x58, 0xe4, 0xf7, 0xc6, 0x22, 0xeb, 0xad, 0x65, 0xdc, - 0x6c, 0x2d, 0xe3, 0xe7, 0xd6, 0x32, 0x3e, 0x3e, 0x0d, 0x23, 0xb9, 0x4c, 0x67, 0xce, 0x9c, 0xc7, - 0xee, 0x9c, 0xc7, 0x28, 0x67, 0x0b, 0x79, 0x38, 0xe8, 0x4f, 0x5a, 0xf6, 0x31, 0x67, 0x75, 0x95, - 0x7b, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x81, 0x69, 0x90, 0x03, 0x04, 0x00, 0x00, + proto.RegisterType((*MsgInfo)(nil), "cometbft.v38.consensus.MsgInfo") + proto.RegisterType((*TimeoutInfo)(nil), "cometbft.v38.consensus.TimeoutInfo") + proto.RegisterType((*EndHeight)(nil), "cometbft.v38.consensus.EndHeight") + proto.RegisterType((*WALMessage)(nil), "cometbft.v38.consensus.WALMessage") + proto.RegisterType((*TimedWALMessage)(nil), "cometbft.v38.consensus.TimedWALMessage") +} + +func init() { proto.RegisterFile("cometbft/v38/consensus/wal.proto", fileDescriptor_39a65f00df2a82d5) } + +var fileDescriptor_39a65f00df2a82d5 = []byte{ + // 560 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xbb, 0x8e, 0xd3, 0x40, + 0x14, 0xf5, 0x6c, 0xde, 0x13, 0x10, 0x92, 0x59, 0x45, 0x21, 0x85, 0x13, 0x9c, 0x82, 0x54, 0xb6, + 0x44, 0x90, 0x48, 0x81, 0x40, 0x58, 0x89, 0xe4, 0x08, 0x16, 0x21, 0xb3, 0xe2, 0x55, 0x60, 0x39, + 0xeb, 0x1b, 0xc7, 0x62, 0xed, 0x89, 0x3c, 0xe3, 0xac, 0x28, 0xf9, 0x83, 0x94, 0xfc, 0x0d, 0xed, + 0x96, 0x5b, 0x52, 0x2d, 0x28, 0xf9, 0x11, 0x34, 0x33, 0x76, 0x1e, 0x2c, 0xd9, 0xce, 0xe3, 0x7b, + 0xee, 0x39, 0xf7, 0x9e, 0x33, 0x83, 0x3b, 0x67, 0x24, 0x02, 0x36, 0x99, 0x32, 0x73, 0xd1, 0x1f, + 0x98, 0x67, 0x24, 0xa6, 0x10, 0xd3, 0x94, 0x9a, 0x17, 0xde, 0xb9, 0x31, 0x4f, 0x08, 0x23, 0x6a, + 0x23, 0x47, 0x18, 0x8b, 0xfe, 0xc0, 0xd8, 0x20, 0x5a, 0xc7, 0x01, 0x09, 0x88, 0x80, 0x98, 0xfc, + 0x4b, 0xa2, 0x5b, 0xfa, 0x01, 0x3e, 0xf6, 0x6d, 0x0e, 0x34, 0xc3, 0xb4, 0xf7, 0x30, 0xa2, 0x62, + 0xc2, 0x02, 0x62, 0x96, 0x03, 0xb4, 0x80, 0x90, 0xe0, 0x1c, 0x4c, 0x71, 0x9a, 0xa4, 0x53, 0xd3, + 0x4f, 0x13, 0x8f, 0x85, 0x24, 0xce, 0x09, 0xfe, 0xad, 0xb3, 0x30, 0x02, 0xca, 0xbc, 0x68, 0x2e, + 0x01, 0x7a, 0x80, 0x2b, 0x27, 0x34, 0x18, 0xc7, 0x53, 0xa2, 0x3e, 0xc5, 0x85, 0x88, 0x06, 0x4d, + 0xd4, 0x41, 0xbd, 0xfa, 0xe3, 0xb6, 0xf1, 0xff, 0x65, 0x8c, 0x13, 0xa0, 0xd4, 0x0b, 0xc0, 0x2a, + 0x5e, 0x5e, 0xb7, 0x15, 0x87, 0x77, 0xa8, 0x5d, 0x5c, 0x99, 0x03, 0x24, 0x6e, 0xe8, 0x37, 0x8f, + 0x3a, 0xa8, 0x57, 0xb3, 0xf0, 0xea, 0xba, 0x5d, 0x7e, 0x0b, 0x90, 0x8c, 0x87, 0x4e, 0x99, 0x97, + 0xc6, 0xbe, 0xbe, 0x44, 0xb8, 0x7e, 0x1a, 0x46, 0x40, 0x52, 0x26, 0xd4, 0x5e, 0xe0, 0x6a, 0x3e, + 0x6b, 0x26, 0xf9, 0xc0, 0x90, 0xc3, 0x1a, 0xf9, 0xb0, 0xc6, 0x30, 0x03, 0x58, 0x55, 0x2e, 0xf6, + 0xe3, 0x77, 0x1b, 0x39, 0x9b, 0x26, 0xb5, 0x81, 0xcb, 0x33, 0x08, 0x83, 0x19, 0x13, 0xa2, 0x05, + 0x27, 0x3b, 0xa9, 0xc7, 0xb8, 0x94, 0x90, 0x34, 0xf6, 0x9b, 0x85, 0x0e, 0xea, 0x95, 0x1c, 0x79, + 0x50, 0x55, 0x5c, 0xa4, 0x0c, 0xe6, 0xcd, 0x62, 0x07, 0xf5, 0xee, 0x3a, 0xe2, 0x5b, 0xef, 0xe2, + 0xda, 0x28, 0xf6, 0x6d, 0xd9, 0xb6, 0xa5, 0x43, 0xbb, 0x74, 0xfa, 0xcf, 0x23, 0x8c, 0x3f, 0xbc, + 0x7c, 0x9d, 0xad, 0xad, 0x7e, 0xc1, 0x0d, 0x11, 0x80, 0xeb, 0x7b, 0xcc, 0x73, 0x05, 0xb7, 0x4b, + 0x99, 0xc7, 0x20, 0x5b, 0xe2, 0xd1, 0xbe, 0x6f, 0x32, 0xcc, 0x11, 0xef, 0x18, 0x7a, 0xcc, 0x73, + 0x38, 0xfe, 0x1d, 0x87, 0xdb, 0x8a, 0x73, 0x1f, 0x6e, 0xfe, 0x56, 0x9f, 0xe1, 0x6a, 0x44, 0x03, + 0x37, 0x8c, 0xa7, 0x44, 0xec, 0x75, 0x5b, 0x12, 0x32, 0x37, 0x5b, 0x71, 0x2a, 0x51, 0x16, 0xa1, + 0x8d, 0xef, 0x30, 0xe9, 0xb1, 0x64, 0x28, 0x08, 0x86, 0xee, 0x21, 0x86, 0x9d, 0x3c, 0x6c, 0xc5, + 0xa9, 0xb3, 0x9d, 0x78, 0x2c, 0x8c, 0x21, 0xf6, 0xdd, 0xcc, 0x92, 0xa2, 0xe0, 0x79, 0x78, 0x88, + 0x67, 0xe3, 0xa2, 0xad, 0x38, 0x35, 0xc8, 0x0f, 0x56, 0x09, 0x17, 0x68, 0x1a, 0xe9, 0xdf, 0x11, + 0xbe, 0xc7, 0x95, 0xfc, 0x1d, 0x1b, 0x07, 0xb8, 0xc8, 0xd5, 0x32, 0xd3, 0x5a, 0x37, 0x92, 0x3f, + 0xcd, 0xaf, 0xa9, 0x8c, 0x7e, 0xc9, 0xa3, 0x17, 0x1d, 0xea, 0x13, 0x79, 0x4b, 0xa5, 0x37, 0xfa, + 0xa1, 0x89, 0xb6, 0x52, 0xe2, 0x8a, 0x5a, 0x1f, 0x2f, 0x57, 0x1a, 0xba, 0x5a, 0x69, 0xe8, 0xcf, + 0x4a, 0x43, 0xcb, 0xb5, 0xa6, 0x5c, 0xad, 0x35, 0xe5, 0xd7, 0x5a, 0x53, 0x3e, 0x3f, 0x0f, 0x42, + 0x36, 0x4b, 0x27, 0x9c, 0xc8, 0x7c, 0xf5, 0xe9, 0xfd, 0xe8, 0x0d, 0xb0, 0x0b, 0x92, 0x7c, 0x35, + 0xf7, 0x5e, 0x9e, 0x7c, 0xbc, 0x0c, 0x62, 0x1f, 0x92, 0x28, 0x8c, 0xd9, 0xf6, 0xb9, 0x4e, 0xca, + 0xa2, 0xd6, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x50, 0xfb, 0x40, 0x1f, 0x04, 0x00, 0x00, } func (m *MsgInfo) Marshal() (dAtA []byte, err error) { @@ -484,7 +485,7 @@ func (m *TimeoutInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x10 } - n2, err2 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration):]) + n2, err2 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration):]) if err2 != nil { return 0, err2 } @@ -671,7 +672,7 @@ func (m *TimedWALMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - n8, err8 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n8, err8 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err8 != nil { return 0, err8 } @@ -714,7 +715,7 @@ func (m *TimeoutInfo) Size() (n int) { } var l int _ = l - l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.Duration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration) n += 1 + l + sovWal(uint64(l)) if m.Height != 0 { n += 1 + sovWal(uint64(m.Height)) @@ -806,7 +807,7 @@ func (m *TimedWALMessage) Size() (n int) { } var l int _ = l - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovWal(uint64(l)) if m.Msg != nil { l = m.Msg.Size() @@ -994,7 +995,7 @@ func (m *TimeoutInfo) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.Duration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.Duration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1393,7 +1394,7 @@ func (m *TimedWALMessage) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/consensus/wal.proto b/proto/cometbft/v38/consensus/wal.proto similarity index 81% rename from proto/tendermint/consensus/wal.proto rename to proto/cometbft/v38/consensus/wal.proto index fafcf11fa92..0341677789c 100644 --- a/proto/tendermint/consensus/wal.proto +++ b/proto/cometbft/v38/consensus/wal.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package tendermint.consensus; +package cometbft.v38.consensus; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/consensus"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/consensus"; import "gogoproto/gogo.proto"; -import "tendermint/consensus/types.proto"; -import "tendermint/types/events.proto"; +import "cometbft/v38/consensus/types.proto"; +import "cometbft/v38/types/events.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; @@ -32,7 +32,7 @@ message EndHeight { message WALMessage { oneof sum { - tendermint.types.EventDataRoundState event_data_round_state = 1; + cometbft.v38.types.EventDataRoundState event_data_round_state = 1; MsgInfo msg_info = 2; TimeoutInfo timeout_info = 3; EndHeight end_height = 4; diff --git a/proto/tendermint/crypto/keys.pb.go b/proto/cometbft/v38/crypto/keys.pb.go similarity index 88% rename from proto/tendermint/crypto/keys.pb.go rename to proto/cometbft/v38/crypto/keys.pb.go index 0edb2269f53..2d833933538 100644 --- a/proto/tendermint/crypto/keys.pb.go +++ b/proto/cometbft/v38/crypto/keys.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/crypto/keys.proto +// source: cometbft/v38/crypto/keys.proto package crypto @@ -7,7 +7,7 @@ import ( bytes "bytes" fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -37,7 +37,7 @@ func (m *PublicKey) Reset() { *m = PublicKey{} } func (m *PublicKey) String() string { return proto.CompactTextString(m) } func (*PublicKey) ProtoMessage() {} func (*PublicKey) Descriptor() ([]byte, []int) { - return fileDescriptor_cb048658b234868c, []int{0} + return fileDescriptor_28f7589817517c9c, []int{0} } func (m *PublicKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,26 +114,28 @@ func (*PublicKey) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*PublicKey)(nil), "tendermint.crypto.PublicKey") -} - -func init() { proto.RegisterFile("tendermint/crypto/keys.proto", fileDescriptor_cb048658b234868c) } - -var fileDescriptor_cb048658b234868c = []byte{ - // 204 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x4e, - 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x44, 0xc8, 0xea, 0x41, 0x64, 0xa5, - 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xb2, 0xfa, 0x20, 0x16, 0x44, 0xa1, 0x52, 0x04, 0x17, 0x67, - 0x40, 0x69, 0x52, 0x4e, 0x66, 0xb2, 0x77, 0x6a, 0xa5, 0x90, 0x14, 0x17, 0x7b, 0x6a, 0x8a, 0x91, - 0xa9, 0xa9, 0xa1, 0xa5, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x8f, 0x07, 0x43, 0x10, 0x4c, 0x40, 0x48, - 0x8e, 0x8b, 0xb3, 0x38, 0x35, 0xb9, 0xc0, 0xc8, 0xd4, 0x2c, 0xdb, 0x50, 0x82, 0x09, 0x2a, 0x8b, - 0x10, 0xb2, 0xe2, 0x78, 0xb1, 0x40, 0x9e, 0xf1, 0xc5, 0x42, 0x79, 0x46, 0x27, 0x56, 0x2e, 0xe6, - 0xe2, 0xd2, 0x5c, 0x27, 0xbf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, - 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, - 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0xcf, 0x4d, 0x2d, - 0x49, 0x4a, 0x2b, 0x41, 0x30, 0x20, 0x4e, 0xc4, 0xf0, 0x5d, 0x12, 0x1b, 0x58, 0xc2, 0x18, 0x10, - 0x00, 0x00, 0xff, 0xff, 0xa3, 0xfb, 0xf7, 0x98, 0xf9, 0x00, 0x00, 0x00, + proto.RegisterType((*PublicKey)(nil), "cometbft.v38.crypto.PublicKey") +} + +func init() { proto.RegisterFile("cometbft/v38/crypto/keys.proto", fileDescriptor_28f7589817517c9c) } + +var fileDescriptor_28f7589817517c9c = []byte{ + // 225 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, + 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, 0xc9, 0xeb, 0x95, + 0x19, 0x5b, 0xe8, 0x41, 0xe4, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xf2, 0xfa, 0x20, 0x16, + 0x44, 0xa9, 0x52, 0x04, 0x17, 0x67, 0x40, 0x69, 0x52, 0x4e, 0x66, 0xb2, 0x77, 0x6a, 0xa5, 0x90, + 0x14, 0x17, 0x7b, 0x6a, 0x8a, 0x91, 0xa9, 0xa9, 0xa1, 0xa5, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x8f, + 0x07, 0x43, 0x10, 0x4c, 0x40, 0x48, 0x8e, 0x8b, 0xb3, 0x38, 0x35, 0xb9, 0xc0, 0xc8, 0xd4, 0x2c, + 0xdb, 0x50, 0x82, 0x09, 0x2a, 0x8b, 0x10, 0xb2, 0xe2, 0x78, 0xb1, 0x40, 0x9e, 0xf1, 0xc5, 0x42, + 0x79, 0x46, 0x27, 0x56, 0x2e, 0xe6, 0xe2, 0xd2, 0x5c, 0xa7, 0xd0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, + 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, + 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, + 0xd5, 0xf7, 0x8e, 0x0c, 0x73, 0xf5, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x47, 0xf1, 0x15, + 0xc4, 0xa5, 0x25, 0xa9, 0x79, 0x29, 0xa9, 0x45, 0xb9, 0x99, 0x79, 0x25, 0x50, 0x6f, 0x26, 0xb1, + 0x81, 0x25, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x69, 0x5b, 0x1c, 0x84, 0x04, 0x01, 0x00, + 0x00, } func (this *PublicKey) Compare(that interface{}) int { diff --git a/proto/tendermint/crypto/keys.proto b/proto/cometbft/v38/crypto/keys.proto similarity index 71% rename from proto/tendermint/crypto/keys.proto rename to proto/cometbft/v38/crypto/keys.proto index 8fa192fa4bc..6851100ca9f 100644 --- a/proto/tendermint/crypto/keys.proto +++ b/proto/cometbft/v38/crypto/keys.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.crypto; +package cometbft.v38.crypto; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/crypto"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/crypto"; import "gogoproto/gogo.proto"; diff --git a/proto/tendermint/crypto/proof.pb.go b/proto/cometbft/v38/crypto/proof.pb.go similarity index 90% rename from proto/tendermint/crypto/proof.pb.go rename to proto/cometbft/v38/crypto/proof.pb.go index 1c2273a7491..c8296d78f97 100644 --- a/proto/tendermint/crypto/proof.pb.go +++ b/proto/cometbft/v38/crypto/proof.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/crypto/proof.proto +// source: cometbft/v38/crypto/proof.proto package crypto import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -34,7 +34,7 @@ func (m *Proof) Reset() { *m = Proof{} } func (m *Proof) String() string { return proto.CompactTextString(m) } func (*Proof) ProtoMessage() {} func (*Proof) Descriptor() ([]byte, []int) { - return fileDescriptor_6b60b6ba2ab5b856, []int{0} + return fileDescriptor_66457a7ee0644e4e, []int{0} } func (m *Proof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -102,7 +102,7 @@ func (m *ValueOp) Reset() { *m = ValueOp{} } func (m *ValueOp) String() string { return proto.CompactTextString(m) } func (*ValueOp) ProtoMessage() {} func (*ValueOp) Descriptor() ([]byte, []int) { - return fileDescriptor_6b60b6ba2ab5b856, []int{1} + return fileDescriptor_66457a7ee0644e4e, []int{1} } func (m *ValueOp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -155,7 +155,7 @@ func (m *DominoOp) Reset() { *m = DominoOp{} } func (m *DominoOp) String() string { return proto.CompactTextString(m) } func (*DominoOp) ProtoMessage() {} func (*DominoOp) Descriptor() ([]byte, []int) { - return fileDescriptor_6b60b6ba2ab5b856, []int{2} + return fileDescriptor_66457a7ee0644e4e, []int{2} } func (m *DominoOp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -218,7 +218,7 @@ func (m *ProofOp) Reset() { *m = ProofOp{} } func (m *ProofOp) String() string { return proto.CompactTextString(m) } func (*ProofOp) ProtoMessage() {} func (*ProofOp) Descriptor() ([]byte, []int) { - return fileDescriptor_6b60b6ba2ab5b856, []int{3} + return fileDescriptor_66457a7ee0644e4e, []int{3} } func (m *ProofOp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -277,7 +277,7 @@ func (m *ProofOps) Reset() { *m = ProofOps{} } func (m *ProofOps) String() string { return proto.CompactTextString(m) } func (*ProofOps) ProtoMessage() {} func (*ProofOps) Descriptor() ([]byte, []int) { - return fileDescriptor_6b60b6ba2ab5b856, []int{4} + return fileDescriptor_66457a7ee0644e4e, []int{4} } func (m *ProofOps) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -314,40 +314,41 @@ func (m *ProofOps) GetOps() []ProofOp { } func init() { - proto.RegisterType((*Proof)(nil), "tendermint.crypto.Proof") - proto.RegisterType((*ValueOp)(nil), "tendermint.crypto.ValueOp") - proto.RegisterType((*DominoOp)(nil), "tendermint.crypto.DominoOp") - proto.RegisterType((*ProofOp)(nil), "tendermint.crypto.ProofOp") - proto.RegisterType((*ProofOps)(nil), "tendermint.crypto.ProofOps") + proto.RegisterType((*Proof)(nil), "cometbft.v38.crypto.Proof") + proto.RegisterType((*ValueOp)(nil), "cometbft.v38.crypto.ValueOp") + proto.RegisterType((*DominoOp)(nil), "cometbft.v38.crypto.DominoOp") + proto.RegisterType((*ProofOp)(nil), "cometbft.v38.crypto.ProofOp") + proto.RegisterType((*ProofOps)(nil), "cometbft.v38.crypto.ProofOps") } -func init() { proto.RegisterFile("tendermint/crypto/proof.proto", fileDescriptor_6b60b6ba2ab5b856) } +func init() { proto.RegisterFile("cometbft/v38/crypto/proof.proto", fileDescriptor_66457a7ee0644e4e) } -var fileDescriptor_6b60b6ba2ab5b856 = []byte{ - // 357 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0xbd, 0x6a, 0xe3, 0x40, - 0x10, 0x96, 0x2c, 0xf9, 0x6f, 0xed, 0xe2, 0x6e, 0x31, 0x87, 0xf0, 0x71, 0x3a, 0xa1, 0x4a, 0x95, - 0x04, 0x4e, 0xea, 0x14, 0x4e, 0x8a, 0x90, 0x40, 0x1c, 0x54, 0xa4, 0x48, 0x13, 0xd6, 0xf6, 0xca, - 0x12, 0xb1, 0x34, 0x8b, 0x34, 0x82, 0xf8, 0x2d, 0xf2, 0x58, 0x2e, 0x5d, 0xa6, 0x0a, 0xc1, 0x7e, - 0x91, 0xb0, 0xbb, 0x0a, 0x26, 0x98, 0x74, 0xdf, 0xcf, 0xec, 0x37, 0xdf, 0x20, 0x91, 0x7f, 0xc8, - 0x8b, 0x25, 0x2f, 0xf3, 0xac, 0xc0, 0x68, 0x51, 0x6e, 0x04, 0x42, 0x24, 0x4a, 0x80, 0x24, 0x14, - 0x25, 0x20, 0xd0, 0xdf, 0x47, 0x3b, 0xd4, 0xf6, 0x78, 0xb4, 0x82, 0x15, 0x28, 0x37, 0x92, 0x48, - 0x0f, 0xfa, 0x09, 0x69, 0xdf, 0xcb, 0x77, 0x74, 0x44, 0xda, 0x08, 0xc8, 0xd6, 0x8e, 0xe9, 0x99, - 0x81, 0x15, 0x6b, 0x22, 0xd5, 0xac, 0x58, 0xf2, 0x17, 0xa7, 0xa5, 0x55, 0x45, 0xe8, 0x5f, 0xd2, - 0x5f, 0x73, 0x96, 0x3c, 0xa5, 0xac, 0x4a, 0x1d, 0xcb, 0x33, 0x83, 0x61, 0xdc, 0x93, 0xc2, 0x35, - 0xab, 0x52, 0xf9, 0x84, 0xd5, 0x05, 0x56, 0x8e, 0xed, 0x59, 0xc1, 0x30, 0xd6, 0xc4, 0xbf, 0x25, - 0xdd, 0x07, 0xb6, 0xae, 0xf9, 0x4c, 0xd0, 0x5f, 0xc4, 0x7a, 0xe6, 0x1b, 0xb5, 0x67, 0x18, 0x4b, - 0x48, 0x43, 0xd2, 0x56, 0xe5, 0xd5, 0x96, 0xc1, 0xc4, 0x09, 0x4f, 0xda, 0x87, 0xaa, 0x64, 0xac, - 0xc7, 0xfc, 0x1b, 0xd2, 0xbb, 0x82, 0x3c, 0x2b, 0xe0, 0x7b, 0x5a, 0x5f, 0xa7, 0xa9, 0xce, 0xa2, - 0x46, 0x95, 0xd6, 0x8f, 0x35, 0xa1, 0x7f, 0x48, 0x07, 0x6a, 0x94, 0xb2, 0xa5, 0xe4, 0x86, 0xf9, - 0x97, 0xa4, 0xab, 0xb2, 0x67, 0x82, 0x52, 0x62, 0xe3, 0x46, 0xf0, 0x26, 0x4b, 0xe1, 0xaf, 0xf8, - 0xd6, 0xb1, 0x2c, 0x25, 0xf6, 0x92, 0x21, 0x6b, 0xee, 0x56, 0xd8, 0xbf, 0x20, 0xbd, 0x26, 0xa4, - 0xa2, 0x13, 0x62, 0x81, 0xa8, 0x1c, 0xd3, 0xb3, 0x82, 0xc1, 0x64, 0xfc, 0xd3, 0x29, 0x33, 0x31, - 0xb5, 0xb7, 0xef, 0xff, 0x8d, 0x58, 0x0e, 0x4f, 0xef, 0xb6, 0x7b, 0xd7, 0xdc, 0xed, 0x5d, 0xf3, - 0x63, 0xef, 0x9a, 0xaf, 0x07, 0xd7, 0xd8, 0x1d, 0x5c, 0xe3, 0xed, 0xe0, 0x1a, 0x8f, 0xe7, 0xab, - 0x0c, 0xd3, 0x7a, 0x1e, 0x2e, 0x20, 0x8f, 0x16, 0x90, 0x73, 0x9c, 0x27, 0x78, 0x04, 0xfa, 0x73, - 0x9e, 0xfc, 0x0a, 0xf3, 0x8e, 0x32, 0xce, 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x5a, 0xb3, - 0xb6, 0x26, 0x02, 0x00, 0x00, +var fileDescriptor_66457a7ee0644e4e = []byte{ + // 376 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x4b, 0xc3, 0x30, + 0x1c, 0xc5, 0xdb, 0xb5, 0xfb, 0x95, 0xed, 0x20, 0x71, 0x48, 0x99, 0xd2, 0x95, 0x9e, 0x7a, 0x6a, + 0x65, 0xf3, 0x30, 0xf0, 0x22, 0x53, 0x41, 0x14, 0x9d, 0x14, 0x1c, 0xe8, 0x45, 0xb2, 0x2d, 0x5d, + 0xcb, 0xb6, 0x26, 0xb4, 0xe9, 0x74, 0xff, 0x85, 0x7f, 0xd6, 0x8e, 0x3b, 0x7a, 0x12, 0xd9, 0xfe, + 0x11, 0x49, 0xd2, 0x21, 0x03, 0xbd, 0x7d, 0xdf, 0xcb, 0xcb, 0x27, 0x2f, 0x24, 0xa0, 0x35, 0x22, + 0x73, 0xcc, 0x86, 0x01, 0xf3, 0x16, 0x9d, 0xae, 0x37, 0x4a, 0x96, 0x94, 0x11, 0x8f, 0x26, 0x84, + 0x04, 0x2e, 0x4d, 0x08, 0x23, 0xf0, 0x70, 0x17, 0x70, 0x17, 0x9d, 0xae, 0x2b, 0x03, 0xcd, 0xc6, + 0x84, 0x4c, 0x88, 0x58, 0xf7, 0xf8, 0x24, 0xa3, 0x76, 0x00, 0x8a, 0x8f, 0x7c, 0x27, 0x6c, 0x80, + 0x22, 0x23, 0x0c, 0xcd, 0x0c, 0xd5, 0x52, 0x1d, 0xcd, 0x97, 0x82, 0xbb, 0x51, 0x3c, 0xc6, 0xef, + 0x46, 0x41, 0xba, 0x42, 0xc0, 0x63, 0x50, 0x9d, 0x61, 0x14, 0xbc, 0x86, 0x28, 0x0d, 0x0d, 0xcd, + 0x52, 0x9d, 0xba, 0x5f, 0xe1, 0xc6, 0x0d, 0x4a, 0x43, 0xbe, 0x05, 0x65, 0x31, 0x4b, 0x0d, 0xdd, + 0xd2, 0x9c, 0xba, 0x2f, 0x85, 0x7d, 0x0f, 0xca, 0x03, 0x34, 0xcb, 0x70, 0x9f, 0xc2, 0x03, 0xa0, + 0x4d, 0xf1, 0x52, 0x9c, 0x53, 0xf7, 0xf9, 0x08, 0x4f, 0x41, 0x51, 0xd4, 0x17, 0xa7, 0xd4, 0xda, + 0x4d, 0xf7, 0x8f, 0xfe, 0xae, 0xa8, 0xe9, 0xcb, 0xa0, 0x7d, 0x0b, 0x2a, 0x57, 0x64, 0x1e, 0xc5, + 0x64, 0x9f, 0x57, 0x95, 0x3c, 0xd1, 0x9a, 0x66, 0x4c, 0xf0, 0xaa, 0xbe, 0x14, 0xf0, 0x08, 0x94, + 0x48, 0xc6, 0xb8, 0xad, 0x09, 0x3b, 0x57, 0xf6, 0x25, 0x28, 0x0b, 0x76, 0x9f, 0x42, 0x08, 0x74, + 0xb6, 0xa4, 0x38, 0x67, 0x89, 0x79, 0x87, 0x2f, 0xfc, 0xd6, 0x85, 0x40, 0x1f, 0x23, 0x86, 0xf2, + 0x9b, 0x8b, 0xd9, 0xbe, 0x00, 0x95, 0x1c, 0x92, 0xc2, 0x33, 0xa0, 0x11, 0x9a, 0x1a, 0xaa, 0xa5, + 0x39, 0xb5, 0xf6, 0xc9, 0xff, 0x97, 0xe9, 0xd3, 0x9e, 0xbe, 0xfa, 0x6a, 0x29, 0x3e, 0x8f, 0xf7, + 0x9e, 0x56, 0x1b, 0x53, 0x5d, 0x6f, 0x4c, 0xf5, 0x7b, 0x63, 0xaa, 0x1f, 0x5b, 0x53, 0x59, 0x6f, + 0x4d, 0xe5, 0x73, 0x6b, 0x2a, 0x2f, 0xe7, 0x93, 0x88, 0x85, 0xd9, 0x90, 0x83, 0xbc, 0xbb, 0xe7, + 0xc1, 0xf5, 0x03, 0x66, 0x6f, 0x24, 0x99, 0x7a, 0x7b, 0xdf, 0x40, 0xbe, 0x2c, 0xc3, 0xf1, 0x18, + 0x27, 0xf3, 0x28, 0x66, 0xf9, 0xbf, 0x18, 0x96, 0xc4, 0x42, 0xe7, 0x27, 0x00, 0x00, 0xff, 0xff, + 0x5d, 0x5d, 0xc8, 0xb8, 0x35, 0x02, 0x00, 0x00, } func (m *Proof) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/crypto/proof.proto b/proto/cometbft/v38/crypto/proof.proto similarity index 87% rename from proto/tendermint/crypto/proof.proto rename to proto/cometbft/v38/crypto/proof.proto index ae72195e868..25c16a9eb29 100644 --- a/proto/tendermint/crypto/proof.proto +++ b/proto/cometbft/v38/crypto/proof.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.crypto; +package cometbft.v38.crypto; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/crypto"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/crypto"; import "gogoproto/gogo.proto"; diff --git a/proto/tendermint/libs/bits/types.pb.go b/proto/cometbft/v38/libs/bits/types.pb.go similarity index 84% rename from proto/tendermint/libs/bits/types.pb.go rename to proto/cometbft/v38/libs/bits/types.pb.go index 9dc37733632..a9f25c908cc 100644 --- a/proto/tendermint/libs/bits/types.pb.go +++ b/proto/cometbft/v38/libs/bits/types.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/libs/bits/types.proto +// source: cometbft/v38/libs/bits/types.proto package bits import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -31,7 +31,7 @@ func (m *BitArray) Reset() { *m = BitArray{} } func (m *BitArray) String() string { return proto.CompactTextString(m) } func (*BitArray) ProtoMessage() {} func (*BitArray) Descriptor() ([]byte, []int) { - return fileDescriptor_e91ab2672920d7d4, []int{0} + return fileDescriptor_a9c9849f13c27ada, []int{0} } func (m *BitArray) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -75,24 +75,28 @@ func (m *BitArray) GetElems() []uint64 { } func init() { - proto.RegisterType((*BitArray)(nil), "tendermint.libs.bits.BitArray") + proto.RegisterType((*BitArray)(nil), "cometbft.v38.libs.bits.BitArray") } -func init() { proto.RegisterFile("tendermint/libs/bits/types.proto", fileDescriptor_e91ab2672920d7d4) } +func init() { + proto.RegisterFile("cometbft/v38/libs/bits/types.proto", fileDescriptor_a9c9849f13c27ada) +} -var fileDescriptor_e91ab2672920d7d4 = []byte{ - // 173 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, 0x4f, 0xca, 0x2c, 0x29, - 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, 0xa8, - 0xd0, 0x03, 0xa9, 0xd0, 0x03, 0xa9, 0x50, 0x32, 0xe1, 0xe2, 0x70, 0xca, 0x2c, 0x71, 0x2c, 0x2a, - 0x4a, 0xac, 0x14, 0x12, 0xe2, 0x62, 0x01, 0x89, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0x81, - 0xd9, 0x42, 0x22, 0x5c, 0xac, 0xa9, 0x39, 0xa9, 0xb9, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0x2c, - 0x41, 0x10, 0x8e, 0x53, 0xe0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, - 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x99, - 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x27, 0xe7, 0xe7, 0xa6, 0x96, - 0x24, 0xa5, 0x95, 0x20, 0x18, 0x60, 0x97, 0xe8, 0x63, 0x73, 0x6a, 0x12, 0x1b, 0x58, 0xce, 0x18, - 0x10, 0x00, 0x00, 0xff, 0xff, 0x09, 0xfd, 0x78, 0xed, 0xc9, 0x00, 0x00, 0x00, +var fileDescriptor_a9c9849f13c27ada = []byte{ + // 194 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4a, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0xcf, 0xc9, 0x4c, 0x2a, 0xd6, 0x4f, 0xca, + 0x2c, 0x29, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, + 0x83, 0xa9, 0xd1, 0x2b, 0x33, 0xb6, 0xd0, 0x03, 0xa9, 0xd1, 0x03, 0xa9, 0x51, 0x32, 0xe1, 0xe2, + 0x70, 0xca, 0x2c, 0x71, 0x2c, 0x2a, 0x4a, 0xac, 0x14, 0x12, 0xe2, 0x62, 0x01, 0x89, 0x49, 0x30, + 0x2a, 0x30, 0x6a, 0x30, 0x07, 0x81, 0xd9, 0x42, 0x22, 0x5c, 0xac, 0xa9, 0x39, 0xa9, 0xb9, 0xc5, + 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0x2c, 0x41, 0x10, 0x8e, 0x53, 0xc4, 0x89, 0x47, 0x72, 0x8c, 0x17, + 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, + 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xd9, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, + 0xea, 0x7b, 0x47, 0x86, 0xb9, 0xfa, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0xeb, 0xa3, 0x38, 0x11, + 0xec, 0x24, 0xfd, 0x92, 0xd4, 0xbc, 0x94, 0xd4, 0xa2, 0xdc, 0xcc, 0xbc, 0x12, 0x84, 0x9b, 0x93, + 0xd8, 0xc0, 0x72, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0xa6, 0x62, 0xe4, 0xd4, 0x00, + 0x00, 0x00, } func (m *BitArray) Marshal() (dAtA []byte, err error) { diff --git a/proto/cometbft/v38/libs/bits/types.proto b/proto/cometbft/v38/libs/bits/types.proto new file mode 100644 index 00000000000..e5626d049be --- /dev/null +++ b/proto/cometbft/v38/libs/bits/types.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +package cometbft.v38.libs.bits; + +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/libs/bits"; + +message BitArray { + int64 bits = 1; + repeated uint64 elems = 2; +} diff --git a/proto/tendermint/mempool/message.go b/proto/cometbft/v38/mempool/message.go similarity index 93% rename from proto/tendermint/mempool/message.go rename to proto/cometbft/v38/mempool/message.go index 270a744faec..267f1cfbee1 100644 --- a/proto/tendermint/mempool/message.go +++ b/proto/cometbft/v38/mempool/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) var _ p2p.Wrapper = &Txs{} diff --git a/proto/tendermint/mempool/types.pb.go b/proto/cometbft/v38/mempool/types.pb.go similarity index 86% rename from proto/tendermint/mempool/types.pb.go rename to proto/cometbft/v38/mempool/types.pb.go index 4a6a40ef341..dc17f76c1fa 100644 --- a/proto/tendermint/mempool/types.pb.go +++ b/proto/cometbft/v38/mempool/types.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/mempool/types.proto +// source: cometbft/v38/mempool/types.proto package mempool import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -30,7 +30,7 @@ func (m *Txs) Reset() { *m = Txs{} } func (m *Txs) String() string { return proto.CompactTextString(m) } func (*Txs) ProtoMessage() {} func (*Txs) Descriptor() ([]byte, []int) { - return fileDescriptor_2af51926fdbcbc05, []int{0} + return fileDescriptor_6571fb1af0a5ab7e, []int{0} } func (m *Txs) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -77,7 +77,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_2af51926fdbcbc05, []int{1} + return fileDescriptor_6571fb1af0a5ab7e, []int{1} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -140,26 +140,27 @@ func (*Message) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*Txs)(nil), "tendermint.mempool.Txs") - proto.RegisterType((*Message)(nil), "tendermint.mempool.Message") -} - -func init() { proto.RegisterFile("tendermint/mempool/types.proto", fileDescriptor_2af51926fdbcbc05) } - -var fileDescriptor_2af51926fdbcbc05 = []byte{ - // 184 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0xcf, 0x4d, 0xcd, 0x2d, 0xc8, 0xcf, 0xcf, 0xd1, 0x2f, - 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41, - 0xe5, 0x95, 0xc4, 0xb9, 0x98, 0x43, 0x2a, 0x8a, 0x85, 0x04, 0xb8, 0x98, 0x4b, 0x2a, 0x8a, 0x25, - 0x18, 0x15, 0x98, 0x35, 0x78, 0x82, 0x40, 0x4c, 0x25, 0x5b, 0x2e, 0x76, 0xdf, 0xd4, 0xe2, 0xe2, - 0xc4, 0xf4, 0x54, 0x21, 0x6d, 0x98, 0x24, 0xa3, 0x06, 0xb7, 0x91, 0xb8, 0x1e, 0xa6, 0x29, 0x7a, - 0x21, 0x15, 0xc5, 0x1e, 0x0c, 0x60, 0x7d, 0x4e, 0xac, 0x5c, 0xcc, 0xc5, 0xa5, 0xb9, 0x4e, 0xfe, - 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, - 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x9a, 0x9e, 0x59, 0x92, 0x51, - 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x9c, 0x9f, 0x9b, 0x5a, 0x92, 0x94, 0x56, 0x82, 0x60, - 0x80, 0x5d, 0xaa, 0x8f, 0xe9, 0x91, 0x24, 0x36, 0xb0, 0x8c, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, - 0x53, 0xc3, 0xc4, 0x0a, 0xe5, 0x00, 0x00, 0x00, + proto.RegisterType((*Txs)(nil), "cometbft.v38.mempool.Txs") + proto.RegisterType((*Message)(nil), "cometbft.v38.mempool.Message") +} + +func init() { proto.RegisterFile("cometbft/v38/mempool/types.proto", fileDescriptor_6571fb1af0a5ab7e) } + +var fileDescriptor_6571fb1af0a5ab7e = []byte{ + // 203 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0xcf, 0x4d, 0xcd, 0x2d, 0xc8, 0xcf, 0xcf, + 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0xa9, + 0xd0, 0x2b, 0x33, 0xb6, 0xd0, 0x83, 0xaa, 0x50, 0x12, 0xe7, 0x62, 0x0e, 0xa9, 0x28, 0x16, 0x12, + 0xe0, 0x62, 0x2e, 0xa9, 0x28, 0x96, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x09, 0x02, 0x31, 0x95, 0xec, + 0xb9, 0xd8, 0x7d, 0x53, 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0x85, 0x74, 0x61, 0x92, 0x8c, 0x1a, 0xdc, + 0x46, 0x92, 0x7a, 0xd8, 0xcc, 0xd1, 0x0b, 0xa9, 0x28, 0xf6, 0x60, 0x00, 0xeb, 0x74, 0x62, 0xe5, + 0x62, 0x2e, 0x2e, 0xcd, 0x75, 0x0a, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, + 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, + 0x28, 0x9b, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0x90, 0x41, 0xfa, 0xde, 0x91, 0x61, 0xae, 0x7e, + 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0xfa, 0x28, 0x5e, 0x00, 0x3b, 0x5a, 0xbf, 0x24, 0x35, 0x2f, + 0x25, 0xb5, 0x28, 0x37, 0x33, 0xaf, 0x04, 0xe6, 0xa7, 0x24, 0x36, 0xb0, 0x8c, 0x31, 0x20, 0x00, + 0x00, 0xff, 0xff, 0x90, 0x29, 0x95, 0x13, 0xf2, 0x00, 0x00, 0x00, } func (m *Txs) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/mempool/types.proto b/proto/cometbft/v38/mempool/types.proto similarity index 51% rename from proto/tendermint/mempool/types.proto rename to proto/cometbft/v38/mempool/types.proto index 60bafff03d1..5dea54e0d8f 100644 --- a/proto/tendermint/mempool/types.proto +++ b/proto/cometbft/v38/mempool/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.mempool; +package cometbft.v38.mempool; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/mempool"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/mempool"; message Txs { repeated bytes txs = 1; diff --git a/proto/tendermint/p2p/conn.pb.go b/proto/cometbft/v38/p2p/conn.pb.go similarity index 88% rename from proto/tendermint/p2p/conn.pb.go rename to proto/cometbft/v38/p2p/conn.pb.go index 4a0f8256428..292e25a18b0 100644 --- a/proto/tendermint/p2p/conn.pb.go +++ b/proto/cometbft/v38/p2p/conn.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/p2p/conn.proto +// source: cometbft/v38/p2p/conn.proto package p2p import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + crypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -31,7 +31,7 @@ func (m *PacketPing) Reset() { *m = PacketPing{} } func (m *PacketPing) String() string { return proto.CompactTextString(m) } func (*PacketPing) ProtoMessage() {} func (*PacketPing) Descriptor() ([]byte, []int) { - return fileDescriptor_22474b5527c8fa9f, []int{0} + return fileDescriptor_ea39451c47900c6b, []int{0} } func (m *PacketPing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -67,7 +67,7 @@ func (m *PacketPong) Reset() { *m = PacketPong{} } func (m *PacketPong) String() string { return proto.CompactTextString(m) } func (*PacketPong) ProtoMessage() {} func (*PacketPong) Descriptor() ([]byte, []int) { - return fileDescriptor_22474b5527c8fa9f, []int{1} + return fileDescriptor_ea39451c47900c6b, []int{1} } func (m *PacketPong) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -106,7 +106,7 @@ func (m *PacketMsg) Reset() { *m = PacketMsg{} } func (m *PacketMsg) String() string { return proto.CompactTextString(m) } func (*PacketMsg) ProtoMessage() {} func (*PacketMsg) Descriptor() ([]byte, []int) { - return fileDescriptor_22474b5527c8fa9f, []int{2} + return fileDescriptor_ea39451c47900c6b, []int{2} } func (m *PacketMsg) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -169,7 +169,7 @@ func (m *Packet) Reset() { *m = Packet{} } func (m *Packet) String() string { return proto.CompactTextString(m) } func (*Packet) ProtoMessage() {} func (*Packet) Descriptor() ([]byte, []int) { - return fileDescriptor_22474b5527c8fa9f, []int{3} + return fileDescriptor_ea39451c47900c6b, []int{3} } func (m *Packet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -264,7 +264,7 @@ func (m *AuthSigMessage) Reset() { *m = AuthSigMessage{} } func (m *AuthSigMessage) String() string { return proto.CompactTextString(m) } func (*AuthSigMessage) ProtoMessage() {} func (*AuthSigMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_22474b5527c8fa9f, []int{4} + return fileDescriptor_ea39451c47900c6b, []int{4} } func (m *AuthSigMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -308,42 +308,44 @@ func (m *AuthSigMessage) GetSig() []byte { } func init() { - proto.RegisterType((*PacketPing)(nil), "tendermint.p2p.PacketPing") - proto.RegisterType((*PacketPong)(nil), "tendermint.p2p.PacketPong") - proto.RegisterType((*PacketMsg)(nil), "tendermint.p2p.PacketMsg") - proto.RegisterType((*Packet)(nil), "tendermint.p2p.Packet") - proto.RegisterType((*AuthSigMessage)(nil), "tendermint.p2p.AuthSigMessage") -} - -func init() { proto.RegisterFile("tendermint/p2p/conn.proto", fileDescriptor_22474b5527c8fa9f) } - -var fileDescriptor_22474b5527c8fa9f = []byte{ - // 397 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x52, 0x4d, 0x8f, 0xd3, 0x30, - 0x10, 0x8d, 0xc9, 0x6e, 0x97, 0x4e, 0xcb, 0x0a, 0x59, 0x1c, 0xda, 0x6a, 0x95, 0x56, 0x3d, 0xf5, - 0x80, 0x12, 0x11, 0x6e, 0x20, 0x0e, 0x84, 0x0f, 0xb1, 0xaa, 0x2a, 0xaa, 0x70, 0xe3, 0x12, 0xe5, - 0xc3, 0xeb, 0x58, 0xdd, 0xd8, 0x56, 0xed, 0x1c, 0xf2, 0x2f, 0xf8, 0x59, 0xcb, 0xad, 0x47, 0x4e, - 0x15, 0x4a, 0xff, 0x08, 0x4a, 0x5c, 0x68, 0x2a, 0xb1, 0xb7, 0xf7, 0x66, 0xfc, 0x66, 0xde, 0x93, - 0x07, 0xc6, 0x9a, 0xf0, 0x8c, 0x6c, 0x0b, 0xc6, 0xb5, 0x27, 0x7d, 0xe9, 0xa5, 0x82, 0x73, 0x57, - 0x6e, 0x85, 0x16, 0xf8, 0xfa, 0xd4, 0x72, 0xa5, 0x2f, 0x27, 0x2f, 0xa8, 0xa0, 0xa2, 0x6d, 0x79, - 0x0d, 0x32, 0xaf, 0x26, 0x37, 0x9d, 0x01, 0xe9, 0xb6, 0x92, 0x5a, 0x78, 0x1b, 0x52, 0x29, 0xd3, - 0x9d, 0x0f, 0x01, 0xd6, 0x71, 0xba, 0x21, 0x7a, 0xcd, 0x38, 0xed, 0x30, 0xc1, 0xe9, 0x3c, 0x87, - 0xbe, 0x61, 0x2b, 0x45, 0xf1, 0x4b, 0x80, 0x34, 0x8f, 0x39, 0x27, 0xf7, 0x11, 0xcb, 0x46, 0x68, - 0x86, 0x16, 0x97, 0xc1, 0xb3, 0x7a, 0x3f, 0xed, 0x7f, 0x30, 0xd5, 0xdb, 0x8f, 0x61, 0xff, 0xf8, - 0xe0, 0x36, 0xc3, 0x63, 0xb0, 0x89, 0xb8, 0x1b, 0x3d, 0x99, 0xa1, 0xc5, 0xd3, 0xe0, 0xaa, 0xde, - 0x4f, 0xed, 0x4f, 0x5f, 0x3f, 0x87, 0x4d, 0x0d, 0x63, 0xb8, 0xc8, 0x62, 0x1d, 0x8f, 0xec, 0x19, - 0x5a, 0x0c, 0xc3, 0x16, 0xcf, 0x7f, 0x22, 0xe8, 0x99, 0x55, 0xf8, 0x1d, 0x0c, 0x64, 0x8b, 0x22, - 0xc9, 0x38, 0x6d, 0x17, 0x0d, 0xfc, 0x89, 0x7b, 0x1e, 0xd5, 0x3d, 0x79, 0xfe, 0x62, 0x85, 0x20, - 0xff, 0xb1, 0xae, 0x5c, 0x70, 0xda, 0x1a, 0x78, 0x5c, 0x2e, 0xce, 0xe4, 0x82, 0x53, 0xfc, 0x06, - 0x8e, 0x2c, 0x2a, 0x14, 0x6d, 0x2d, 0x0e, 0xfc, 0xf1, 0xff, 0xd5, 0x2b, 0xd5, 0x88, 0xfb, 0xf2, - 0x2f, 0x09, 0x2e, 0xc1, 0x56, 0x65, 0x31, 0x8f, 0xe0, 0xfa, 0x7d, 0xa9, 0xf3, 0x6f, 0x8c, 0xae, - 0x88, 0x52, 0x31, 0x25, 0xf8, 0x2d, 0x5c, 0xc9, 0x32, 0x89, 0x36, 0xa4, 0x3a, 0xc6, 0xb9, 0xe9, - 0x4e, 0x34, 0x7f, 0xe2, 0xae, 0xcb, 0xe4, 0x9e, 0xa5, 0x4b, 0x52, 0x05, 0x17, 0x0f, 0xfb, 0xa9, - 0x15, 0xf6, 0x64, 0x99, 0x2c, 0x49, 0x85, 0x9f, 0x83, 0xad, 0x98, 0x09, 0x32, 0x0c, 0x1b, 0x18, - 0x2c, 0x1f, 0x6a, 0x07, 0xed, 0x6a, 0x07, 0xfd, 0xae, 0x1d, 0xf4, 0xe3, 0xe0, 0x58, 0xbb, 0x83, - 0x63, 0xfd, 0x3a, 0x38, 0xd6, 0xf7, 0x57, 0x94, 0xe9, 0xbc, 0x4c, 0xdc, 0x54, 0x14, 0x5e, 0x2a, - 0x0a, 0xa2, 0x93, 0x3b, 0x7d, 0x02, 0xe6, 0x32, 0xce, 0xcf, 0x29, 0xe9, 0xb5, 0xd5, 0xd7, 0x7f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xf9, 0x75, 0xae, 0x67, 0x02, 0x00, 0x00, + proto.RegisterType((*PacketPing)(nil), "cometbft.v38.p2p.PacketPing") + proto.RegisterType((*PacketPong)(nil), "cometbft.v38.p2p.PacketPong") + proto.RegisterType((*PacketMsg)(nil), "cometbft.v38.p2p.PacketMsg") + proto.RegisterType((*Packet)(nil), "cometbft.v38.p2p.Packet") + proto.RegisterType((*AuthSigMessage)(nil), "cometbft.v38.p2p.AuthSigMessage") +} + +func init() { proto.RegisterFile("cometbft/v38/p2p/conn.proto", fileDescriptor_ea39451c47900c6b) } + +var fileDescriptor_ea39451c47900c6b = []byte{ + // 419 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x6f, 0xd3, 0x30, + 0x14, 0xc7, 0x63, 0xb2, 0x75, 0xf4, 0xb5, 0xa0, 0xc9, 0xe2, 0x50, 0x36, 0xe4, 0x56, 0x3d, 0xf5, + 0x80, 0x12, 0xa9, 0xbd, 0xf4, 0x00, 0x42, 0x04, 0x86, 0x98, 0xaa, 0x42, 0x15, 0x24, 0x24, 0xb8, + 0x54, 0x49, 0xea, 0xb9, 0x56, 0x17, 0xdb, 0x8a, 0x9d, 0xa1, 0x7c, 0x0b, 0x3e, 0xd6, 0x6e, 0xec, + 0xc8, 0xa9, 0x42, 0xe9, 0x17, 0x41, 0x71, 0x3a, 0x58, 0x90, 0xd8, 0xed, 0xff, 0x7f, 0xcf, 0xef, + 0xf7, 0xde, 0x93, 0x1f, 0x9c, 0x26, 0x32, 0xa5, 0x26, 0xbe, 0x30, 0xfe, 0xd5, 0x64, 0xea, 0xab, + 0xb1, 0xf2, 0x13, 0x29, 0x84, 0xa7, 0x32, 0x69, 0x24, 0x3e, 0xbe, 0x4d, 0x7a, 0x57, 0x93, 0xa9, + 0xa7, 0xc6, 0xea, 0xe4, 0x09, 0x93, 0x4c, 0xda, 0xa4, 0x5f, 0xa9, 0xfa, 0xdd, 0x09, 0x69, 0x40, + 0x92, 0xac, 0x50, 0x46, 0xfa, 0x1b, 0x5a, 0xe8, 0x3a, 0x3f, 0xec, 0x02, 0x2c, 0xa2, 0x64, 0x43, + 0xcd, 0x82, 0x0b, 0x76, 0xc7, 0x49, 0xc1, 0x86, 0x6b, 0x68, 0xd7, 0x6e, 0xae, 0x19, 0x7e, 0x0e, + 0x90, 0xac, 0x23, 0x21, 0xe8, 0xe5, 0x92, 0xaf, 0x7a, 0x68, 0x80, 0x46, 0x87, 0xc1, 0xa3, 0x72, + 0xdb, 0x6f, 0xbf, 0xa9, 0xa3, 0xe7, 0x6f, 0xc3, 0xf6, 0xfe, 0xc1, 0xf9, 0x0a, 0x3f, 0x05, 0x97, + 0xca, 0x8b, 0xde, 0x83, 0x01, 0x1a, 0x3d, 0x0c, 0x8e, 0xca, 0x6d, 0xdf, 0x3d, 0xfb, 0xf8, 0x2e, + 0xac, 0x62, 0x18, 0xc3, 0xc1, 0x2a, 0x32, 0x51, 0xcf, 0x1d, 0xa0, 0x51, 0x37, 0xb4, 0x7a, 0xf8, + 0x03, 0x41, 0xab, 0x6e, 0x85, 0x5f, 0x41, 0x47, 0x59, 0xb5, 0x54, 0x5c, 0x30, 0xdb, 0xa8, 0x33, + 0x7e, 0xe6, 0xfd, 0xbb, 0xae, 0xf7, 0x77, 0xea, 0xf7, 0x4e, 0x08, 0xea, 0x8f, 0xbb, 0x0b, 0x90, + 0x82, 0xd9, 0x11, 0xee, 0x03, 0xc8, 0x06, 0x40, 0x0a, 0x86, 0x5f, 0xc0, 0xde, 0x2d, 0x53, 0xcd, + 0xec, 0x98, 0x9d, 0xf1, 0xe9, 0xff, 0xea, 0xe7, 0xba, 0x2a, 0x6f, 0xab, 0x5b, 0x13, 0x1c, 0x82, + 0xab, 0xf3, 0x74, 0x18, 0xc1, 0xe3, 0xd7, 0xb9, 0x59, 0x7f, 0xe2, 0x6c, 0x4e, 0xb5, 0x8e, 0x18, + 0xc5, 0x2f, 0xe1, 0x48, 0xe5, 0xf1, 0x72, 0x43, 0x8b, 0xfd, 0x52, 0xa4, 0xc9, 0xac, 0xff, 0xc6, + 0x5b, 0xe4, 0xf1, 0x25, 0x4f, 0x66, 0xb4, 0x08, 0x0e, 0xae, 0xb7, 0x7d, 0x27, 0x6c, 0xa9, 0x3c, + 0x9e, 0xd1, 0x02, 0x1f, 0x83, 0xab, 0x79, 0xbd, 0x4e, 0x37, 0xac, 0x64, 0x10, 0x5e, 0x97, 0x04, + 0xdd, 0x94, 0x04, 0xfd, 0x2a, 0x09, 0xfa, 0xbe, 0x23, 0xce, 0xcd, 0x8e, 0x38, 0x3f, 0x77, 0xc4, + 0xf9, 0x3a, 0x65, 0xdc, 0xac, 0xf3, 0xb8, 0xe2, 0xfb, 0xb3, 0x2f, 0x9f, 0xcf, 0x3e, 0x50, 0xf3, + 0x4d, 0x66, 0x1b, 0xbf, 0x79, 0x50, 0xf6, 0x54, 0x0c, 0x15, 0x2b, 0x9a, 0xa5, 0x5c, 0x98, 0xea, + 0xc2, 0xe2, 0x96, 0x8d, 0x4e, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x52, 0xe5, 0x73, 0x55, 0x7c, + 0x02, 0x00, 0x00, } func (m *PacketPing) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/conn.proto b/proto/cometbft/v38/p2p/conn.proto similarity index 67% rename from proto/tendermint/p2p/conn.proto rename to proto/cometbft/v38/p2p/conn.proto index a7de695ac8d..8a0fdf3546c 100644 --- a/proto/tendermint/p2p/conn.proto +++ b/proto/cometbft/v38/p2p/conn.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.p2p; +package cometbft.v38.p2p; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/p2p"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/p2p"; import "gogoproto/gogo.proto"; -import "tendermint/crypto/keys.proto"; +import "cometbft/v38/crypto/keys.proto"; message PacketPing {} @@ -25,6 +25,6 @@ message Packet { } message AuthSigMessage { - tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; + cometbft.v38.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; bytes sig = 2; } diff --git a/proto/tendermint/p2p/pex.go b/proto/cometbft/v38/p2p/pex.go similarity index 100% rename from proto/tendermint/p2p/pex.go rename to proto/cometbft/v38/p2p/pex.go diff --git a/proto/tendermint/p2p/pex.pb.go b/proto/cometbft/v38/p2p/pex.pb.go similarity index 87% rename from proto/tendermint/p2p/pex.pb.go rename to proto/cometbft/v38/p2p/pex.pb.go index d8dcb94add8..7cb5d3fd5ea 100644 --- a/proto/tendermint/p2p/pex.pb.go +++ b/proto/cometbft/v38/p2p/pex.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/p2p/pex.proto +// source: cometbft/v38/p2p/pex.proto package p2p import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -30,7 +30,7 @@ func (m *PexRequest) Reset() { *m = PexRequest{} } func (m *PexRequest) String() string { return proto.CompactTextString(m) } func (*PexRequest) ProtoMessage() {} func (*PexRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_81c2f011fd13be57, []int{0} + return fileDescriptor_7b6099d804ad5caf, []int{0} } func (m *PexRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -67,7 +67,7 @@ func (m *PexAddrs) Reset() { *m = PexAddrs{} } func (m *PexAddrs) String() string { return proto.CompactTextString(m) } func (*PexAddrs) ProtoMessage() {} func (*PexAddrs) Descriptor() ([]byte, []int) { - return fileDescriptor_81c2f011fd13be57, []int{1} + return fileDescriptor_7b6099d804ad5caf, []int{1} } func (m *PexAddrs) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,7 +114,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_81c2f011fd13be57, []int{2} + return fileDescriptor_7b6099d804ad5caf, []int{2} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -189,33 +189,34 @@ func (*Message) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*PexRequest)(nil), "tendermint.p2p.PexRequest") - proto.RegisterType((*PexAddrs)(nil), "tendermint.p2p.PexAddrs") - proto.RegisterType((*Message)(nil), "tendermint.p2p.Message") -} - -func init() { proto.RegisterFile("tendermint/p2p/pex.proto", fileDescriptor_81c2f011fd13be57) } - -var fileDescriptor_81c2f011fd13be57 = []byte{ - // 273 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, 0xd0, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x43, 0xc8, 0xe8, 0x15, 0x18, 0x15, 0x48, 0x49, 0xa1, 0xa9, - 0x2c, 0xa9, 0x2c, 0x48, 0x2d, 0x86, 0xa8, 0x95, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x33, 0xf5, - 0x41, 0x2c, 0x88, 0xa8, 0x12, 0x0f, 0x17, 0x57, 0x40, 0x6a, 0x45, 0x50, 0x6a, 0x61, 0x69, 0x6a, - 0x71, 0x89, 0x92, 0x13, 0x17, 0x47, 0x40, 0x6a, 0x85, 0x63, 0x4a, 0x4a, 0x51, 0xb1, 0x90, 0x19, - 0x17, 0x6b, 0x22, 0x88, 0x21, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, 0x6d, 0x24, 0xa5, 0x87, 0x6a, 0x97, - 0x9e, 0x5f, 0x6a, 0x09, 0x48, 0x61, 0x6a, 0x71, 0xb1, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, - 0x10, 0xe5, 0x4a, 0x1d, 0x8c, 0x5c, 0xec, 0xbe, 0xa9, 0xc5, 0xc5, 0x89, 0xe9, 0xa9, 0x42, 0xb6, - 0x5c, 0xdc, 0x05, 0xa9, 0x15, 0xf1, 0x45, 0x10, 0xe3, 0x25, 0x18, 0x15, 0x18, 0xb1, 0x99, 0x84, - 0x70, 0x80, 0x07, 0x43, 0x10, 0x57, 0x01, 0x9c, 0x27, 0x64, 0xce, 0xc5, 0x09, 0xd2, 0x0e, 0x71, - 0x06, 0x13, 0x58, 0xb3, 0x04, 0x16, 0xcd, 0x60, 0xf7, 0x7a, 0x30, 0x04, 0x71, 0x14, 0x40, 0xd9, - 0x4e, 0xac, 0x5c, 0xcc, 0xc5, 0xa5, 0xb9, 0x4e, 0xde, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, - 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, - 0x2c, 0xc7, 0x10, 0x65, 0x98, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, - 0x9c, 0x9f, 0x9b, 0x5a, 0x92, 0x94, 0x56, 0x82, 0x60, 0x40, 0x42, 0x09, 0x35, 0x2c, 0x93, 0xd8, - 0xc0, 0xa2, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0xad, 0x52, 0xe1, 0x8e, 0x01, 0x00, - 0x00, + proto.RegisterType((*PexRequest)(nil), "cometbft.v38.p2p.PexRequest") + proto.RegisterType((*PexAddrs)(nil), "cometbft.v38.p2p.PexAddrs") + proto.RegisterType((*Message)(nil), "cometbft.v38.p2p.Message") +} + +func init() { proto.RegisterFile("cometbft/v38/p2p/pex.proto", fileDescriptor_7b6099d804ad5caf) } + +var fileDescriptor_7b6099d804ad5caf = []byte{ + // 292 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x48, 0xad, + 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x80, 0xc9, 0xe9, 0x95, 0x19, 0x5b, 0xe8, 0x15, + 0x18, 0x15, 0x48, 0xc9, 0x60, 0xa8, 0x2e, 0xa9, 0x2c, 0x48, 0x2d, 0x86, 0xa8, 0x97, 0x12, 0x49, + 0xcf, 0x4f, 0xcf, 0x07, 0x33, 0xf5, 0x41, 0x2c, 0x88, 0xa8, 0x12, 0x0f, 0x17, 0x57, 0x40, 0x6a, + 0x45, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x92, 0x0b, 0x17, 0x47, 0x40, 0x6a, 0x85, 0x63, + 0x4a, 0x4a, 0x51, 0xb1, 0x90, 0x05, 0x17, 0x6b, 0x22, 0x88, 0x21, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, + 0x6d, 0x24, 0xa3, 0x87, 0x6e, 0x9f, 0x9e, 0x5f, 0x6a, 0x09, 0x48, 0x69, 0x6a, 0x71, 0xb1, 0x13, + 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x10, 0x0d, 0x4a, 0x3d, 0x8c, 0x5c, 0xec, 0xbe, 0xa9, 0xc5, + 0xc5, 0x89, 0xe9, 0xa9, 0x42, 0xf6, 0x5c, 0xdc, 0x05, 0xa9, 0x15, 0xf1, 0x45, 0x10, 0x0b, 0x24, + 0x18, 0x15, 0x18, 0xb1, 0x9b, 0x85, 0x70, 0x84, 0x07, 0x43, 0x10, 0x57, 0x01, 0x9c, 0x27, 0x64, + 0xc9, 0xc5, 0x09, 0x32, 0x00, 0xe2, 0x14, 0x26, 0xb0, 0x76, 0x29, 0xac, 0xda, 0xc1, 0xae, 0xf6, + 0x60, 0x08, 0xe2, 0x28, 0x80, 0xb2, 0x9d, 0x58, 0xb9, 0x98, 0x8b, 0x4b, 0x73, 0x9d, 0x82, 0x4e, + 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, + 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x22, 0x3d, 0xb3, 0x24, 0xa3, 0x34, + 0x09, 0x64, 0x9c, 0xbe, 0x77, 0x64, 0x98, 0xab, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0xb6, 0x3e, + 0x6a, 0x38, 0x82, 0x83, 0xac, 0x24, 0x35, 0x2f, 0x25, 0xb5, 0x28, 0x37, 0x33, 0xaf, 0x04, 0x14, + 0xb0, 0x49, 0x6c, 0x60, 0x51, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x16, 0xc0, 0x7a, + 0xa1, 0x01, 0x00, 0x00, } func (m *PexRequest) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/pex.proto b/proto/cometbft/v38/p2p/pex.proto similarity index 64% rename from proto/tendermint/p2p/pex.proto rename to proto/cometbft/v38/p2p/pex.proto index 2191866609b..0876dfe962a 100644 --- a/proto/tendermint/p2p/pex.proto +++ b/proto/cometbft/v38/p2p/pex.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package tendermint.p2p; +package cometbft.v38.p2p; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/p2p"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/p2p"; -import "tendermint/p2p/types.proto"; +import "cometbft/v38/p2p/types.proto"; import "gogoproto/gogo.proto"; message PexRequest {} diff --git a/proto/tendermint/p2p/types.pb.go b/proto/cometbft/v38/p2p/types.pb.go similarity index 88% rename from proto/tendermint/p2p/types.pb.go rename to proto/cometbft/v38/p2p/types.pb.go index 9de144b3490..31f96b01143 100644 --- a/proto/tendermint/p2p/types.pb.go +++ b/proto/cometbft/v38/p2p/types.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/p2p/types.proto +// source: cometbft/v38/p2p/types.proto package p2p import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -33,7 +33,7 @@ func (m *NetAddress) Reset() { *m = NetAddress{} } func (m *NetAddress) String() string { return proto.CompactTextString(m) } func (*NetAddress) ProtoMessage() {} func (*NetAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_c8a29e659aeca578, []int{0} + return fileDescriptor_7a6a548589dc3c58, []int{0} } func (m *NetAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -93,7 +93,7 @@ func (m *ProtocolVersion) Reset() { *m = ProtocolVersion{} } func (m *ProtocolVersion) String() string { return proto.CompactTextString(m) } func (*ProtocolVersion) ProtoMessage() {} func (*ProtocolVersion) Descriptor() ([]byte, []int) { - return fileDescriptor_c8a29e659aeca578, []int{1} + return fileDescriptor_7a6a548589dc3c58, []int{1} } func (m *ProtocolVersion) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -158,7 +158,7 @@ func (m *DefaultNodeInfo) Reset() { *m = DefaultNodeInfo{} } func (m *DefaultNodeInfo) String() string { return proto.CompactTextString(m) } func (*DefaultNodeInfo) ProtoMessage() {} func (*DefaultNodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_c8a29e659aeca578, []int{2} + return fileDescriptor_7a6a548589dc3c58, []int{2} } func (m *DefaultNodeInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -252,7 +252,7 @@ func (m *DefaultNodeInfoOther) Reset() { *m = DefaultNodeInfoOther{} } func (m *DefaultNodeInfoOther) String() string { return proto.CompactTextString(m) } func (*DefaultNodeInfoOther) ProtoMessage() {} func (*DefaultNodeInfoOther) Descriptor() ([]byte, []int) { - return fileDescriptor_c8a29e659aeca578, []int{3} + return fileDescriptor_7a6a548589dc3c58, []int{3} } func (m *DefaultNodeInfoOther) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -296,47 +296,48 @@ func (m *DefaultNodeInfoOther) GetRPCAddress() string { } func init() { - proto.RegisterType((*NetAddress)(nil), "tendermint.p2p.NetAddress") - proto.RegisterType((*ProtocolVersion)(nil), "tendermint.p2p.ProtocolVersion") - proto.RegisterType((*DefaultNodeInfo)(nil), "tendermint.p2p.DefaultNodeInfo") - proto.RegisterType((*DefaultNodeInfoOther)(nil), "tendermint.p2p.DefaultNodeInfoOther") + proto.RegisterType((*NetAddress)(nil), "cometbft.v38.p2p.NetAddress") + proto.RegisterType((*ProtocolVersion)(nil), "cometbft.v38.p2p.ProtocolVersion") + proto.RegisterType((*DefaultNodeInfo)(nil), "cometbft.v38.p2p.DefaultNodeInfo") + proto.RegisterType((*DefaultNodeInfoOther)(nil), "cometbft.v38.p2p.DefaultNodeInfoOther") } -func init() { proto.RegisterFile("tendermint/p2p/types.proto", fileDescriptor_c8a29e659aeca578) } +func init() { proto.RegisterFile("cometbft/v38/p2p/types.proto", fileDescriptor_7a6a548589dc3c58) } -var fileDescriptor_c8a29e659aeca578 = []byte{ - // 483 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x3d, 0x8f, 0xda, 0x40, - 0x10, 0xc5, 0xc6, 0x7c, 0xdc, 0x10, 0x8e, 0xcb, 0x0a, 0x45, 0x3e, 0x0a, 0x1b, 0xa1, 0x14, 0x54, - 0xa0, 0x90, 0x2a, 0x5d, 0x42, 0x68, 0x50, 0xa4, 0x8b, 0xb5, 0x8a, 0x52, 0xa4, 0x41, 0xe0, 0x5d, - 0x60, 0x85, 0xd9, 0x5d, 0xad, 0xf7, 0x12, 0xf2, 0x2f, 0xf2, 0xb3, 0xae, 0xbc, 0x32, 0x95, 0x15, - 0x99, 0x32, 0x7f, 0x22, 0xf2, 0xae, 0x2f, 0xc7, 0xa1, 0xeb, 0xe6, 0xcd, 0x9b, 0x99, 0x37, 0xf3, - 0x34, 0xd0, 0xd3, 0x94, 0x13, 0xaa, 0xf6, 0x8c, 0xeb, 0xb1, 0x9c, 0xc8, 0xb1, 0xfe, 0x29, 0x69, - 0x3a, 0x92, 0x4a, 0x68, 0x81, 0x2e, 0x1f, 0xb9, 0x91, 0x9c, 0xc8, 0x5e, 0x77, 0x23, 0x36, 0xc2, - 0x50, 0xe3, 0x22, 0xb2, 0x55, 0x83, 0x08, 0xe0, 0x86, 0xea, 0x0f, 0x84, 0x28, 0x9a, 0xa6, 0xe8, - 0x15, 0xb8, 0x8c, 0xf8, 0x4e, 0xdf, 0x19, 0x5e, 0x4c, 0xeb, 0x79, 0x16, 0xba, 0xf3, 0x19, 0x76, - 0x19, 0x31, 0x79, 0xe9, 0xbb, 0x27, 0xf9, 0x08, 0xbb, 0x4c, 0x22, 0x04, 0x9e, 0x14, 0x4a, 0xfb, - 0xd5, 0xbe, 0x33, 0x6c, 0x63, 0x13, 0x0f, 0xbe, 0x40, 0x27, 0x2a, 0x46, 0xc7, 0x22, 0xf9, 0x4a, - 0x55, 0xca, 0x04, 0x47, 0xd7, 0x50, 0x95, 0x13, 0x69, 0xe6, 0x7a, 0xd3, 0x46, 0x9e, 0x85, 0xd5, - 0x68, 0x12, 0xe1, 0x22, 0x87, 0xba, 0x50, 0x5b, 0x25, 0x22, 0xde, 0x99, 0xe1, 0x1e, 0xb6, 0x00, - 0x5d, 0x41, 0x75, 0x29, 0xa5, 0x19, 0xeb, 0xe1, 0x22, 0x1c, 0xfc, 0x75, 0xa1, 0x33, 0xa3, 0xeb, - 0xe5, 0x6d, 0xa2, 0x6f, 0x04, 0xa1, 0x73, 0xbe, 0x16, 0x28, 0x82, 0x2b, 0x59, 0x2a, 0x2d, 0xbe, - 0x5b, 0x29, 0xa3, 0xd1, 0x9a, 0x84, 0xa3, 0xa7, 0xc7, 0x8f, 0xce, 0x36, 0x9a, 0x7a, 0x77, 0x59, - 0x58, 0xc1, 0x1d, 0x79, 0xb6, 0xe8, 0x3b, 0xe8, 0x10, 0x2b, 0xb2, 0xe0, 0x82, 0xd0, 0x05, 0x23, - 0xe5, 0xd1, 0x2f, 0xf3, 0x2c, 0x6c, 0x9f, 0xea, 0xcf, 0x70, 0x9b, 0x9c, 0x40, 0x82, 0x42, 0x68, - 0x25, 0x2c, 0xd5, 0x94, 0x2f, 0x96, 0x84, 0x28, 0xb3, 0xfa, 0x05, 0x06, 0x9b, 0x2a, 0xec, 0x45, - 0x3e, 0x34, 0x38, 0xd5, 0x3f, 0x84, 0xda, 0xf9, 0x9e, 0x21, 0x1f, 0x60, 0xc1, 0x3c, 0xac, 0x5f, - 0xb3, 0x4c, 0x09, 0x51, 0x0f, 0x9a, 0xf1, 0x76, 0xc9, 0x39, 0x4d, 0x52, 0xbf, 0xde, 0x77, 0x86, - 0x2f, 0xf0, 0x7f, 0x5c, 0x74, 0xed, 0x05, 0x67, 0x3b, 0xaa, 0xfc, 0x86, 0xed, 0x2a, 0x21, 0x7a, - 0x0f, 0x35, 0xa1, 0xb7, 0x54, 0xf9, 0x4d, 0x63, 0xc6, 0xeb, 0x73, 0x33, 0xce, 0x7c, 0xfc, 0x5c, - 0xd4, 0x96, 0x8e, 0xd8, 0xc6, 0xc1, 0x0a, 0xba, 0xcf, 0x15, 0xa1, 0x6b, 0x68, 0xea, 0xc3, 0x82, - 0x71, 0x42, 0x0f, 0xf6, 0x4b, 0x70, 0x43, 0x1f, 0xe6, 0x05, 0x44, 0x63, 0x68, 0x29, 0x19, 0x9b, - 0xe3, 0x69, 0x9a, 0x96, 0xb6, 0x5d, 0xe6, 0x59, 0x08, 0x38, 0xfa, 0x58, 0xfe, 0x17, 0x06, 0x25, - 0xe3, 0x32, 0x9e, 0x7e, 0xba, 0xcb, 0x03, 0xe7, 0x3e, 0x0f, 0x9c, 0x3f, 0x79, 0xe0, 0xfc, 0x3a, - 0x06, 0x95, 0xfb, 0x63, 0x50, 0xf9, 0x7d, 0x0c, 0x2a, 0xdf, 0xde, 0x6c, 0x98, 0xde, 0xde, 0xae, - 0x46, 0xb1, 0xd8, 0x8f, 0x63, 0xb1, 0xa7, 0x7a, 0xb5, 0xd6, 0x8f, 0x81, 0x7d, 0xe1, 0xa7, 0x8f, - 0xbf, 0xaa, 0x9b, 0xec, 0xdb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xae, 0xdb, 0x56, 0x6d, 0x11, - 0x03, 0x00, 0x00, +var fileDescriptor_7a6a548589dc3c58 = []byte{ + // 500 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcf, 0x8e, 0xda, 0x3e, + 0x10, 0x26, 0x21, 0xfc, 0xd9, 0xe1, 0xc7, 0x0f, 0x6a, 0xa1, 0x2a, 0xbb, 0xaa, 0x12, 0xca, 0xa1, + 0xe2, 0x44, 0x24, 0xb8, 0xd0, 0x63, 0x29, 0x3d, 0xa0, 0x4a, 0x34, 0xb2, 0xaa, 0x95, 0xda, 0x0b, + 0x82, 0xd8, 0x40, 0x04, 0xd8, 0x96, 0xe3, 0xa5, 0xf4, 0x2d, 0xfa, 0x58, 0x7b, 0xdc, 0x63, 0x4f, + 0xa8, 0x0a, 0x0f, 0xd0, 0x57, 0xa8, 0xec, 0x84, 0x8a, 0xd2, 0xde, 0xe6, 0x9b, 0xcf, 0x33, 0xf3, + 0xcd, 0xa7, 0x31, 0xbc, 0x88, 0xf8, 0x8e, 0xaa, 0xc5, 0x52, 0x05, 0xfb, 0xc1, 0x30, 0x10, 0x7d, + 0x11, 0xa8, 0xaf, 0x82, 0x26, 0x3d, 0x21, 0xb9, 0xe2, 0xa8, 0x79, 0x66, 0x7b, 0xfb, 0xc1, 0xb0, + 0x27, 0xfa, 0xe2, 0xae, 0xb5, 0xe2, 0x2b, 0x6e, 0xc8, 0x40, 0x47, 0xd9, 0xbb, 0x4e, 0x08, 0x30, + 0xa5, 0xea, 0x0d, 0x21, 0x92, 0x26, 0x09, 0x7a, 0x0e, 0x76, 0x4c, 0x5c, 0xab, 0x6d, 0x75, 0x6f, + 0x46, 0xe5, 0xf4, 0xe8, 0xdb, 0x93, 0x31, 0xb6, 0x63, 0x62, 0xf2, 0xc2, 0xb5, 0x2f, 0xf2, 0x21, + 0xb6, 0x63, 0x81, 0x10, 0x38, 0x82, 0x4b, 0xe5, 0x16, 0xdb, 0x56, 0xb7, 0x8e, 0x4d, 0xdc, 0xf9, + 0x08, 0x8d, 0x50, 0xb7, 0x8e, 0xf8, 0xf6, 0x9e, 0xca, 0x24, 0xe6, 0x0c, 0xdd, 0x42, 0x51, 0xf4, + 0x85, 0xe9, 0xeb, 0x8c, 0x2a, 0xe9, 0xd1, 0x2f, 0x86, 0xfd, 0x10, 0xeb, 0x1c, 0x6a, 0x41, 0x69, + 0xb1, 0xe5, 0xd1, 0xc6, 0x34, 0x77, 0x70, 0x06, 0x50, 0x13, 0x8a, 0x73, 0x21, 0x4c, 0x5b, 0x07, + 0xeb, 0xb0, 0xf3, 0xd3, 0x86, 0xc6, 0x98, 0x2e, 0xe7, 0x0f, 0x5b, 0x35, 0xe5, 0x84, 0x4e, 0xd8, + 0x92, 0x23, 0x0c, 0x4d, 0x91, 0x4f, 0x9a, 0xed, 0xb3, 0x51, 0x66, 0x46, 0xad, 0xff, 0xb2, 0x77, + 0xbd, 0x7e, 0xef, 0x4a, 0xd3, 0xc8, 0x79, 0x3c, 0xfa, 0x05, 0xdc, 0x10, 0x57, 0x52, 0x5f, 0x43, + 0x83, 0x64, 0x63, 0x66, 0x8c, 0x13, 0x3a, 0x8b, 0x49, 0xbe, 0xf6, 0xb3, 0xf4, 0xe8, 0xd7, 0x2f, + 0x15, 0x8c, 0x71, 0x9d, 0x5c, 0x40, 0x82, 0x7c, 0xa8, 0x6d, 0xe3, 0x44, 0x51, 0x36, 0x9b, 0x13, + 0x22, 0x8d, 0xf8, 0x1b, 0x0c, 0x59, 0x4a, 0x1b, 0x8c, 0x5c, 0xa8, 0x30, 0xaa, 0xbe, 0x70, 0xb9, + 0x71, 0x1d, 0x43, 0x9e, 0xa1, 0x66, 0xce, 0x0b, 0x94, 0x32, 0x26, 0x87, 0xe8, 0x0e, 0xaa, 0xd1, + 0x7a, 0xce, 0x18, 0xdd, 0x26, 0x6e, 0xb9, 0x6d, 0x75, 0xff, 0xc3, 0xbf, 0xb1, 0xae, 0xda, 0x71, + 0x16, 0x6f, 0xa8, 0x74, 0x2b, 0x59, 0x55, 0x0e, 0xd1, 0x08, 0x4a, 0x5c, 0xad, 0xa9, 0x74, 0xab, + 0xc6, 0x8e, 0x57, 0x7f, 0xdb, 0x71, 0xe5, 0xe5, 0x07, 0xfd, 0x3a, 0xf7, 0x24, 0x2b, 0xed, 0x2c, + 0xa0, 0xf5, 0xaf, 0x47, 0xe8, 0x16, 0xaa, 0xea, 0x30, 0x8b, 0x19, 0xa1, 0x87, 0xec, 0x52, 0x70, + 0x45, 0x1d, 0x26, 0x1a, 0xa2, 0x00, 0x6a, 0x52, 0x44, 0x66, 0x7d, 0x9a, 0x24, 0xb9, 0x71, 0xff, + 0xa7, 0x47, 0x1f, 0x70, 0xf8, 0x36, 0xbf, 0x31, 0x0c, 0x52, 0x44, 0x79, 0x3c, 0xc2, 0x8f, 0xa9, + 0x67, 0x3d, 0xa5, 0x9e, 0xf5, 0x23, 0xf5, 0xac, 0x6f, 0x27, 0xaf, 0xf0, 0x74, 0xf2, 0x0a, 0xdf, + 0x4f, 0x5e, 0xe1, 0xf3, 0x70, 0x15, 0xab, 0xf5, 0xc3, 0x42, 0x0b, 0x0f, 0xde, 0x7f, 0xba, 0x7f, + 0x37, 0xcd, 0x9c, 0x0a, 0xfe, 0x3c, 0x7a, 0x73, 0xcd, 0x8a, 0x32, 0x42, 0xe5, 0x2e, 0x66, 0x4a, + 0xff, 0x82, 0x45, 0xd9, 0x64, 0x07, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x44, 0xb2, 0x69, 0xb1, + 0x20, 0x03, 0x00, 0x00, } func (m *NetAddress) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/p2p/types.proto b/proto/cometbft/v38/p2p/types.proto similarity index 89% rename from proto/tendermint/p2p/types.proto rename to proto/cometbft/v38/p2p/types.proto index 157d8ba1ca1..c4807ffe21d 100644 --- a/proto/tendermint/p2p/types.proto +++ b/proto/cometbft/v38/p2p/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.p2p; +package cometbft.v38.p2p; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/p2p"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/p2p"; import "gogoproto/gogo.proto"; diff --git a/proto/tendermint/privval/types.pb.go b/proto/cometbft/v38/privval/types.pb.go similarity index 90% rename from proto/tendermint/privval/types.pb.go rename to proto/cometbft/v38/privval/types.pb.go index cafa0e9278c..82e32069b18 100644 --- a/proto/tendermint/privval/types.pb.go +++ b/proto/cometbft/v38/privval/types.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/privval/types.proto +// source: cometbft/v38/privval/types.proto package privval import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - types "github.com/cometbft/cometbft/proto/tendermint/types" + crypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + types "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -59,7 +59,7 @@ func (x Errors) String() string { } func (Errors) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{0} + return fileDescriptor_b17b99deae09a772, []int{0} } type RemoteSignerError struct { @@ -71,7 +71,7 @@ func (m *RemoteSignerError) Reset() { *m = RemoteSignerError{} } func (m *RemoteSignerError) String() string { return proto.CompactTextString(m) } func (*RemoteSignerError) ProtoMessage() {} func (*RemoteSignerError) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{0} + return fileDescriptor_b17b99deae09a772, []int{0} } func (m *RemoteSignerError) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -123,7 +123,7 @@ func (m *PubKeyRequest) Reset() { *m = PubKeyRequest{} } func (m *PubKeyRequest) String() string { return proto.CompactTextString(m) } func (*PubKeyRequest) ProtoMessage() {} func (*PubKeyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{1} + return fileDescriptor_b17b99deae09a772, []int{1} } func (m *PubKeyRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -169,7 +169,7 @@ func (m *PubKeyResponse) Reset() { *m = PubKeyResponse{} } func (m *PubKeyResponse) String() string { return proto.CompactTextString(m) } func (*PubKeyResponse) ProtoMessage() {} func (*PubKeyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{2} + return fileDescriptor_b17b99deae09a772, []int{2} } func (m *PubKeyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -222,7 +222,7 @@ func (m *SignVoteRequest) Reset() { *m = SignVoteRequest{} } func (m *SignVoteRequest) String() string { return proto.CompactTextString(m) } func (*SignVoteRequest) ProtoMessage() {} func (*SignVoteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{3} + return fileDescriptor_b17b99deae09a772, []int{3} } func (m *SignVoteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -275,7 +275,7 @@ func (m *SignedVoteResponse) Reset() { *m = SignedVoteResponse{} } func (m *SignedVoteResponse) String() string { return proto.CompactTextString(m) } func (*SignedVoteResponse) ProtoMessage() {} func (*SignedVoteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{4} + return fileDescriptor_b17b99deae09a772, []int{4} } func (m *SignedVoteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -328,7 +328,7 @@ func (m *SignProposalRequest) Reset() { *m = SignProposalRequest{} } func (m *SignProposalRequest) String() string { return proto.CompactTextString(m) } func (*SignProposalRequest) ProtoMessage() {} func (*SignProposalRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{5} + return fileDescriptor_b17b99deae09a772, []int{5} } func (m *SignProposalRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -381,7 +381,7 @@ func (m *SignedProposalResponse) Reset() { *m = SignedProposalResponse{} func (m *SignedProposalResponse) String() string { return proto.CompactTextString(m) } func (*SignedProposalResponse) ProtoMessage() {} func (*SignedProposalResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{6} + return fileDescriptor_b17b99deae09a772, []int{6} } func (m *SignedProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -432,7 +432,7 @@ func (m *PingRequest) Reset() { *m = PingRequest{} } func (m *PingRequest) String() string { return proto.CompactTextString(m) } func (*PingRequest) ProtoMessage() {} func (*PingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{7} + return fileDescriptor_b17b99deae09a772, []int{7} } func (m *PingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -469,7 +469,7 @@ func (m *PingResponse) Reset() { *m = PingResponse{} } func (m *PingResponse) String() string { return proto.CompactTextString(m) } func (*PingResponse) ProtoMessage() {} func (*PingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{8} + return fileDescriptor_b17b99deae09a772, []int{8} } func (m *PingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -515,7 +515,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_cb4e437a5328cf9c, []int{9} + return fileDescriptor_b17b99deae09a772, []int{9} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -662,71 +662,72 @@ func (*Message) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterEnum("tendermint.privval.Errors", Errors_name, Errors_value) - proto.RegisterType((*RemoteSignerError)(nil), "tendermint.privval.RemoteSignerError") - proto.RegisterType((*PubKeyRequest)(nil), "tendermint.privval.PubKeyRequest") - proto.RegisterType((*PubKeyResponse)(nil), "tendermint.privval.PubKeyResponse") - proto.RegisterType((*SignVoteRequest)(nil), "tendermint.privval.SignVoteRequest") - proto.RegisterType((*SignedVoteResponse)(nil), "tendermint.privval.SignedVoteResponse") - proto.RegisterType((*SignProposalRequest)(nil), "tendermint.privval.SignProposalRequest") - proto.RegisterType((*SignedProposalResponse)(nil), "tendermint.privval.SignedProposalResponse") - proto.RegisterType((*PingRequest)(nil), "tendermint.privval.PingRequest") - proto.RegisterType((*PingResponse)(nil), "tendermint.privval.PingResponse") - proto.RegisterType((*Message)(nil), "tendermint.privval.Message") -} - -func init() { proto.RegisterFile("tendermint/privval/types.proto", fileDescriptor_cb4e437a5328cf9c) } - -var fileDescriptor_cb4e437a5328cf9c = []byte{ - // 756 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x4f, 0xe3, 0x46, - 0x18, 0xb6, 0x21, 0x1f, 0xf0, 0x86, 0x84, 0x30, 0x50, 0x1a, 0x22, 0x6a, 0xd2, 0x54, 0x6d, 0x51, - 0x0e, 0x49, 0x45, 0xd5, 0x5e, 0xe8, 0xa5, 0x80, 0xd5, 0x44, 0x11, 0x76, 0x3a, 0x09, 0x05, 0x21, - 0x55, 0x56, 0x3e, 0x06, 0x63, 0x41, 0x3c, 0x5e, 0x8f, 0x83, 0x94, 0xf3, 0xde, 0xf6, 0xb4, 0xd2, - 0xfe, 0x89, 0x3d, 0xef, 0xaf, 0xe0, 0xc8, 0x71, 0x4f, 0xab, 0x15, 0xfc, 0x91, 0x55, 0xc6, 0x13, - 0xdb, 0xf9, 0x42, 0xbb, 0xe2, 0x36, 0xf3, 0xbe, 0xef, 0x3c, 0x1f, 0x33, 0x8f, 0x65, 0x50, 0x3c, - 0x62, 0xf7, 0x88, 0xdb, 0xb7, 0x6c, 0xaf, 0xe2, 0xb8, 0xd6, 0xdd, 0x5d, 0xfb, 0xb6, 0xe2, 0x0d, - 0x1d, 0xc2, 0xca, 0x8e, 0x4b, 0x3d, 0x8a, 0x50, 0xd8, 0x2f, 0x8b, 0x7e, 0x7e, 0x37, 0x72, 0xa6, - 0xeb, 0x0e, 0x1d, 0x8f, 0x56, 0x6e, 0xc8, 0x50, 0x9c, 0x98, 0xe8, 0x72, 0xa4, 0x28, 0x5e, 0x7e, - 0xcb, 0xa4, 0x26, 0xe5, 0xcb, 0xca, 0x68, 0xe5, 0x57, 0x8b, 0x35, 0xd8, 0xc0, 0xa4, 0x4f, 0x3d, - 0xd2, 0xb4, 0x4c, 0x9b, 0xb8, 0xaa, 0xeb, 0x52, 0x17, 0x21, 0x88, 0x75, 0x69, 0x8f, 0xe4, 0xe4, - 0x82, 0xbc, 0x1f, 0xc7, 0x7c, 0x8d, 0x0a, 0x90, 0xea, 0x11, 0xd6, 0x75, 0x2d, 0xc7, 0xb3, 0xa8, - 0x9d, 0x5b, 0x2a, 0xc8, 0xfb, 0xab, 0x38, 0x5a, 0x2a, 0x96, 0x20, 0xdd, 0x18, 0x74, 0xea, 0x64, - 0x88, 0xc9, 0xab, 0x01, 0x61, 0x1e, 0xda, 0x81, 0x95, 0xee, 0x75, 0xdb, 0xb2, 0x0d, 0xab, 0xc7, - 0xa1, 0x56, 0x71, 0x92, 0xef, 0x6b, 0xbd, 0xe2, 0x1b, 0x19, 0x32, 0xe3, 0x61, 0xe6, 0x50, 0x9b, - 0x11, 0x74, 0x08, 0x49, 0x67, 0xd0, 0x31, 0x6e, 0xc8, 0x90, 0x0f, 0xa7, 0x0e, 0x76, 0xcb, 0x91, - 0x1b, 0xf0, 0xdd, 0x96, 0x1b, 0x83, 0xce, 0xad, 0xd5, 0xad, 0x93, 0xe1, 0x51, 0xec, 0xfe, 0xd3, - 0x9e, 0x84, 0x13, 0x0e, 0x07, 0x41, 0x87, 0x10, 0x27, 0x23, 0xe9, 0x5c, 0x57, 0xea, 0xe0, 0xe7, - 0xf2, 0xec, 0xe5, 0x95, 0x67, 0x7c, 0x62, 0xff, 0x4c, 0xf1, 0x02, 0xd6, 0x47, 0xd5, 0xff, 0xa8, - 0x47, 0xc6, 0xd2, 0x4b, 0x10, 0xbb, 0xa3, 0x1e, 0x11, 0x4a, 0xb6, 0xa3, 0x70, 0xfe, 0x9d, 0xf2, - 0x61, 0x3e, 0x33, 0x61, 0x73, 0x69, 0xd2, 0xe6, 0x6b, 0x19, 0x10, 0x27, 0xec, 0xf9, 0xe0, 0xc2, - 0xea, 0x6f, 0x5f, 0x83, 0x2e, 0x1c, 0xfa, 0x1c, 0x2f, 0xf2, 0x77, 0x0d, 0x9b, 0xa3, 0x6a, 0xc3, - 0xa5, 0x0e, 0x65, 0xed, 0xdb, 0xb1, 0xc7, 0x3f, 0x61, 0xc5, 0x11, 0x25, 0xa1, 0x24, 0x3f, 0xab, - 0x24, 0x38, 0x14, 0xcc, 0x3e, 0xe7, 0xf7, 0x9d, 0x0c, 0xdb, 0xbe, 0xdf, 0x90, 0x4c, 0x78, 0xfe, - 0xeb, 0x5b, 0xd8, 0x84, 0xf7, 0x90, 0xf3, 0x45, 0xfe, 0xd3, 0x90, 0x6a, 0x58, 0xb6, 0x29, 0x7c, - 0x17, 0x33, 0xb0, 0xe6, 0x6f, 0x7d, 0x65, 0xc5, 0x0f, 0x71, 0x48, 0x9e, 0x12, 0xc6, 0xda, 0x26, - 0x41, 0x75, 0x58, 0x17, 0x21, 0x34, 0x5c, 0x7f, 0x5c, 0x88, 0xfd, 0x71, 0x1e, 0xe3, 0x44, 0xdc, - 0xab, 0x12, 0x4e, 0x3b, 0x13, 0xf9, 0xd7, 0x20, 0x1b, 0x82, 0xf9, 0x64, 0x42, 0x7f, 0xf1, 0x39, - 0x34, 0x7f, 0xb2, 0x2a, 0xe1, 0x8c, 0x33, 0xf9, 0x85, 0xfc, 0x0b, 0x1b, 0xcc, 0x32, 0x6d, 0x63, - 0x94, 0x88, 0x40, 0xde, 0x32, 0x07, 0xfc, 0x69, 0x1e, 0xe0, 0x54, 0xa8, 0xab, 0x12, 0x5e, 0x67, - 0x53, 0x39, 0xbf, 0x84, 0x2d, 0xc6, 0xdf, 0x6b, 0x0c, 0x2a, 0x64, 0xc6, 0x38, 0xea, 0x2f, 0x8b, - 0x50, 0x27, 0xf3, 0x5c, 0x95, 0x30, 0x62, 0xb3, 0x29, 0xff, 0x1f, 0xbe, 0xe3, 0x72, 0xc7, 0x8f, - 0x18, 0x48, 0x8e, 0x73, 0xf0, 0x5f, 0x17, 0x81, 0x4f, 0xe5, 0xb4, 0x2a, 0xe1, 0x4d, 0x36, 0x27, - 0xbe, 0x57, 0x90, 0x13, 0xd2, 0x23, 0x04, 0x42, 0x7e, 0x82, 0x33, 0x94, 0x16, 0xcb, 0x9f, 0x8e, - 0x67, 0x55, 0xc2, 0xdb, 0x6c, 0x7e, 0x70, 0x4f, 0x60, 0xcd, 0xb1, 0x6c, 0x33, 0x50, 0x9f, 0xe4, - 0xd8, 0x7b, 0x73, 0x5f, 0x30, 0x4c, 0x59, 0x55, 0xc2, 0x29, 0x27, 0xdc, 0xa2, 0x7f, 0x20, 0x2d, - 0x50, 0x84, 0xc4, 0x15, 0x0e, 0x53, 0x58, 0x0c, 0x13, 0x08, 0x5b, 0x73, 0x22, 0xfb, 0xa3, 0x38, - 0x2c, 0xb3, 0x41, 0xbf, 0xf4, 0x5e, 0x86, 0x04, 0x0f, 0x39, 0x43, 0x08, 0x32, 0x2a, 0xc6, 0x3a, - 0x6e, 0x1a, 0x67, 0x5a, 0x5d, 0xd3, 0xcf, 0xb5, 0xac, 0x84, 0x14, 0xc8, 0x07, 0x35, 0xf5, 0xa2, - 0xa1, 0x1e, 0xb7, 0xd4, 0x13, 0x03, 0xab, 0xcd, 0x86, 0xae, 0x35, 0xd5, 0xac, 0x8c, 0x72, 0xb0, - 0x25, 0xfa, 0x9a, 0x6e, 0x1c, 0xeb, 0x9a, 0xa6, 0x1e, 0xb7, 0x6a, 0xba, 0x96, 0x5d, 0x42, 0x3f, - 0xc0, 0x8e, 0xe8, 0x84, 0x65, 0xa3, 0x55, 0x3b, 0x55, 0xf5, 0xb3, 0x56, 0x76, 0x19, 0x7d, 0x0f, - 0x9b, 0xa2, 0x8d, 0xd5, 0xbf, 0x4f, 0x82, 0x46, 0x2c, 0x82, 0x78, 0x8e, 0x6b, 0x2d, 0x35, 0xe8, - 0xc4, 0x8f, 0xf4, 0xfb, 0x47, 0x45, 0x7e, 0x78, 0x54, 0xe4, 0xcf, 0x8f, 0x8a, 0xfc, 0xf6, 0x49, - 0x91, 0x1e, 0x9e, 0x14, 0xe9, 0xe3, 0x93, 0x22, 0x5d, 0xfe, 0x61, 0x5a, 0xde, 0xf5, 0xa0, 0x53, - 0xee, 0xd2, 0x7e, 0xa5, 0x4b, 0xfb, 0xc4, 0xeb, 0x5c, 0x79, 0xe1, 0xc2, 0xff, 0x57, 0xcd, 0xfe, - 0x25, 0x3b, 0x09, 0xde, 0xf9, 0xfd, 0x4b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0x9f, 0x99, 0x3e, - 0x42, 0x07, 0x00, 0x00, + proto.RegisterEnum("cometbft.v38.privval.Errors", Errors_name, Errors_value) + proto.RegisterType((*RemoteSignerError)(nil), "cometbft.v38.privval.RemoteSignerError") + proto.RegisterType((*PubKeyRequest)(nil), "cometbft.v38.privval.PubKeyRequest") + proto.RegisterType((*PubKeyResponse)(nil), "cometbft.v38.privval.PubKeyResponse") + proto.RegisterType((*SignVoteRequest)(nil), "cometbft.v38.privval.SignVoteRequest") + proto.RegisterType((*SignedVoteResponse)(nil), "cometbft.v38.privval.SignedVoteResponse") + proto.RegisterType((*SignProposalRequest)(nil), "cometbft.v38.privval.SignProposalRequest") + proto.RegisterType((*SignedProposalResponse)(nil), "cometbft.v38.privval.SignedProposalResponse") + proto.RegisterType((*PingRequest)(nil), "cometbft.v38.privval.PingRequest") + proto.RegisterType((*PingResponse)(nil), "cometbft.v38.privval.PingResponse") + proto.RegisterType((*Message)(nil), "cometbft.v38.privval.Message") +} + +func init() { proto.RegisterFile("cometbft/v38/privval/types.proto", fileDescriptor_b17b99deae09a772) } + +var fileDescriptor_b17b99deae09a772 = []byte{ + // 777 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x4e, 0xdb, 0x4a, + 0x14, 0xb6, 0x21, 0x3f, 0x70, 0x42, 0x42, 0x18, 0x72, 0xb9, 0x01, 0xdd, 0xeb, 0xa6, 0x69, 0xab, + 0x52, 0x84, 0x12, 0x09, 0x36, 0x2c, 0x4a, 0xa5, 0x02, 0xae, 0x12, 0x45, 0x38, 0xd1, 0x24, 0x40, + 0x8b, 0x2a, 0x59, 0xf9, 0x99, 0x1a, 0x17, 0xe2, 0x71, 0x3d, 0x4e, 0xaa, 0x3c, 0x41, 0x77, 0x55, + 0x77, 0x7d, 0x85, 0x3e, 0x47, 0x57, 0x2c, 0x59, 0x76, 0x55, 0x55, 0xf0, 0x22, 0x55, 0xc6, 0x13, + 0x27, 0x0e, 0x21, 0x6a, 0xc5, 0x6e, 0xe6, 0x9c, 0x33, 0xdf, 0xf9, 0xbe, 0x33, 0xdf, 0x68, 0x20, + 0xd3, 0xa4, 0x6d, 0xe2, 0x36, 0xde, 0xb9, 0xf9, 0xee, 0xf6, 0x4e, 0xde, 0x76, 0xcc, 0x6e, 0xb7, + 0x7e, 0x91, 0x77, 0x7b, 0x36, 0x61, 0x39, 0xdb, 0xa1, 0x2e, 0x45, 0xa9, 0x41, 0x45, 0xae, 0xbb, + 0xbd, 0x93, 0x13, 0x15, 0x6b, 0x4a, 0xe0, 0x5c, 0xd3, 0xe9, 0xd9, 0x2e, 0xcd, 0x9f, 0x93, 0x9e, + 0x38, 0x35, 0x96, 0xe7, 0x78, 0xa3, 0xa8, 0x6b, 0x29, 0x83, 0x1a, 0x94, 0x2f, 0xf3, 0xfd, 0x95, + 0x17, 0xcd, 0x16, 0x61, 0x09, 0x93, 0x36, 0x75, 0x49, 0xd5, 0x34, 0x2c, 0xe2, 0xa8, 0x8e, 0x43, + 0x1d, 0x84, 0x20, 0xd4, 0xa4, 0x2d, 0x92, 0x96, 0x33, 0xf2, 0x7a, 0x18, 0xf3, 0x35, 0xca, 0x40, + 0xac, 0x45, 0x58, 0xd3, 0x31, 0x6d, 0xd7, 0xa4, 0x56, 0x7a, 0x26, 0x23, 0xaf, 0xcf, 0xe3, 0xd1, + 0x50, 0x76, 0x03, 0xe2, 0x95, 0x4e, 0xa3, 0x44, 0x7a, 0x98, 0x7c, 0xe8, 0x10, 0xe6, 0xa2, 0x55, + 0x98, 0x6b, 0x9e, 0xd5, 0x4d, 0x4b, 0x37, 0x5b, 0x1c, 0x6a, 0x1e, 0x47, 0xf9, 0xbe, 0xd8, 0xca, + 0x7e, 0x96, 0x21, 0x31, 0x28, 0x66, 0x36, 0xb5, 0x18, 0x41, 0xbb, 0x10, 0xb5, 0x3b, 0x0d, 0xfd, + 0x9c, 0xf4, 0x78, 0x71, 0x6c, 0x4b, 0xc9, 0x05, 0xe6, 0xe0, 0x29, 0xce, 0x55, 0x3a, 0x8d, 0x0b, + 0xb3, 0x59, 0x22, 0xbd, 0xbd, 0xd0, 0xe5, 0xcf, 0x07, 0x12, 0x8e, 0xd8, 0x1c, 0x06, 0xed, 0x42, + 0x98, 0xf4, 0xc9, 0x73, 0x66, 0xb1, 0xad, 0xa7, 0xb9, 0x49, 0x43, 0xcc, 0xdd, 0xd2, 0x8a, 0xbd, + 0x53, 0xd9, 0x53, 0x58, 0xec, 0x47, 0x8f, 0xa9, 0x4b, 0x06, 0xf4, 0x37, 0x21, 0xd4, 0xa5, 0x2e, + 0x11, 0x6c, 0xd2, 0x41, 0x40, 0x6f, 0xb2, 0xbc, 0x9c, 0x57, 0x05, 0xc4, 0xce, 0x04, 0xc5, 0x7e, + 0x92, 0x01, 0xf1, 0x96, 0x2d, 0x0f, 0x5e, 0x08, 0xde, 0xfa, 0x33, 0x7c, 0xa1, 0xd3, 0xeb, 0x72, + 0x4f, 0x95, 0xef, 0x61, 0xb9, 0x1f, 0xad, 0x38, 0xd4, 0xa6, 0xac, 0x7e, 0x31, 0x50, 0xba, 0x03, + 0x73, 0xb6, 0x08, 0x09, 0x36, 0xff, 0x4d, 0x62, 0xe3, 0x1f, 0xf3, 0xab, 0xa7, 0xa9, 0xfe, 0x2a, + 0xc3, 0x8a, 0xa7, 0x7a, 0xd8, 0x4e, 0x28, 0x7f, 0xf1, 0x77, 0xfd, 0xc4, 0x04, 0x86, 0x5d, 0xef, + 0x39, 0x85, 0x38, 0xc4, 0x2a, 0xa6, 0x65, 0x08, 0xf5, 0xd9, 0x04, 0x2c, 0x78, 0x5b, 0x8f, 0x5d, + 0xf6, 0x7b, 0x18, 0xa2, 0x87, 0x84, 0xb1, 0xba, 0x41, 0xd0, 0x21, 0x2c, 0x0a, 0x53, 0xea, 0x8e, + 0x57, 0x2e, 0x08, 0x3f, 0x9a, 0xdc, 0x33, 0xf0, 0x00, 0x0a, 0x12, 0x8e, 0xdb, 0x81, 0x17, 0x51, + 0x81, 0xe4, 0x10, 0xce, 0x6b, 0x27, 0x34, 0x3c, 0x9e, 0x8e, 0xe7, 0xd5, 0x16, 0x24, 0x9c, 0xb0, + 0x83, 0xaf, 0xa6, 0x0a, 0x4b, 0xcc, 0x34, 0x2c, 0xbd, 0xef, 0x0e, 0x9f, 0xe2, 0x2c, 0x87, 0x7c, + 0x32, 0x19, 0x72, 0xcc, 0xe6, 0x05, 0x09, 0x2f, 0xb2, 0x31, 0xe7, 0xbf, 0x85, 0x14, 0xe3, 0x37, + 0x37, 0x80, 0x15, 0x54, 0x43, 0x1c, 0x77, 0xfd, 0x6e, 0xdc, 0xa0, 0xc3, 0x0b, 0x12, 0x46, 0xec, + 0xb6, 0xef, 0x75, 0xf8, 0x87, 0x53, 0x1e, 0x5c, 0xa7, 0x4f, 0x3b, 0xcc, 0xe1, 0x9f, 0xdd, 0x0d, + 0x3f, 0xe6, 0xdb, 0x82, 0x84, 0x97, 0xd9, 0x04, 0x3b, 0x9f, 0x41, 0x5a, 0xd0, 0x1f, 0x69, 0x21, + 0x24, 0x44, 0x78, 0x8f, 0xcd, 0x69, 0x12, 0xc6, 0xed, 0x5a, 0x90, 0xf0, 0x0a, 0x9b, 0x6c, 0xe4, + 0x57, 0xb0, 0x60, 0x9b, 0x96, 0xe1, 0x2b, 0x88, 0x72, 0xf4, 0x87, 0x77, 0xdc, 0xe5, 0xd0, 0x73, + 0x05, 0x09, 0xc7, 0xec, 0xe1, 0x16, 0x15, 0x21, 0x2e, 0x70, 0x04, 0xcd, 0x39, 0x0e, 0x94, 0x9d, + 0x06, 0xe4, 0x93, 0x5b, 0xb0, 0x47, 0xf6, 0x7b, 0x61, 0x98, 0x65, 0x9d, 0xf6, 0xc6, 0x37, 0x19, + 0x22, 0xdc, 0xf4, 0x0c, 0x21, 0x48, 0xa8, 0x18, 0x97, 0x71, 0x55, 0x3f, 0xd2, 0x4a, 0x5a, 0xf9, + 0x44, 0x4b, 0x4a, 0x48, 0x81, 0x35, 0x3f, 0xa6, 0xbe, 0xae, 0xa8, 0xfb, 0x35, 0xf5, 0x40, 0xc7, + 0x6a, 0xb5, 0x52, 0xd6, 0xaa, 0x6a, 0x52, 0x46, 0x69, 0x48, 0x89, 0xbc, 0x56, 0xd6, 0xf7, 0xcb, + 0x9a, 0xa6, 0xee, 0xd7, 0x8a, 0x65, 0x2d, 0x39, 0x83, 0xfe, 0x87, 0x55, 0x91, 0x19, 0x86, 0xf5, + 0x5a, 0xf1, 0x50, 0x2d, 0x1f, 0xd5, 0x92, 0xb3, 0xe8, 0x5f, 0x58, 0x16, 0x69, 0xac, 0xbe, 0x3c, + 0xf0, 0x13, 0xa1, 0x11, 0xc4, 0x13, 0x5c, 0xac, 0xa9, 0x7e, 0x26, 0xbc, 0x77, 0x7c, 0x79, 0xad, + 0xc8, 0x57, 0xd7, 0x8a, 0xfc, 0xeb, 0x5a, 0x91, 0xbf, 0xdc, 0x28, 0xd2, 0xd5, 0x8d, 0x22, 0xfd, + 0xb8, 0x51, 0xa4, 0xd3, 0xe7, 0x86, 0xe9, 0x9e, 0x75, 0x1a, 0xfd, 0x29, 0xe4, 0x4b, 0x6f, 0x8e, + 0x55, 0x8d, 0xb8, 0x1f, 0xa9, 0x73, 0x9e, 0x1f, 0xfb, 0x41, 0xfb, 0x5f, 0x9a, 0x4b, 0xac, 0x16, + 0x71, 0xda, 0xa6, 0xe5, 0x0e, 0xbe, 0xd4, 0x46, 0x84, 0x67, 0xb6, 0x7f, 0x07, 0x00, 0x00, 0xff, + 0xff, 0x3d, 0xed, 0x1c, 0x81, 0x71, 0x07, 0x00, 0x00, } func (m *RemoteSignerError) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/privval/types.proto b/proto/cometbft/v38/privval/types.proto similarity index 78% rename from proto/tendermint/privval/types.proto rename to proto/cometbft/v38/privval/types.proto index 13190ca42fa..015a5592699 100644 --- a/proto/tendermint/privval/types.proto +++ b/proto/cometbft/v38/privval/types.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package tendermint.privval; +package cometbft.v38.privval; -import "tendermint/crypto/keys.proto"; -import "tendermint/types/types.proto"; +import "cometbft/v38/crypto/keys.proto"; +import "cometbft/v38/types/types.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/privval"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/privval"; enum Errors { ERRORS_UNKNOWN = 0; @@ -28,31 +28,31 @@ message PubKeyRequest { // PubKeyResponse is a response message containing the public key. message PubKeyResponse { - tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; + cometbft.v38.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; RemoteSignerError error = 2; } // SignVoteRequest is a request to sign a vote message SignVoteRequest { - tendermint.types.Vote vote = 1; + cometbft.v38.types.Vote vote = 1; string chain_id = 2; } // SignedVoteResponse is a response containing a signed vote or an error message SignedVoteResponse { - tendermint.types.Vote vote = 1 [(gogoproto.nullable) = false]; + cometbft.v38.types.Vote vote = 1 [(gogoproto.nullable) = false]; RemoteSignerError error = 2; } // SignProposalRequest is a request to sign a proposal message SignProposalRequest { - tendermint.types.Proposal proposal = 1; + cometbft.v38.types.Proposal proposal = 1; string chain_id = 2; } // SignedProposalResponse is response containing a signed proposal or an error message SignedProposalResponse { - tendermint.types.Proposal proposal = 1 [(gogoproto.nullable) = false]; + cometbft.v38.types.Proposal proposal = 1 [(gogoproto.nullable) = false]; RemoteSignerError error = 2; } diff --git a/proto/tendermint/rpc/grpc/types.pb.go b/proto/cometbft/v38/rpc/grpc/types.pb.go similarity index 85% rename from proto/tendermint/rpc/grpc/types.pb.go rename to proto/cometbft/v38/rpc/grpc/types.pb.go index 393c7394764..b4dbdd3fac8 100644 --- a/proto/tendermint/rpc/grpc/types.pb.go +++ b/proto/cometbft/v38/rpc/grpc/types.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/rpc/grpc/types.proto +// source: cometbft/v38/rpc/grpc/types.proto package coregrpc import ( context "context" fmt "fmt" - types "github.com/cometbft/cometbft/abci/types" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + types "github.com/KYVENetwork/cometbft/v38/abci/types" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -35,7 +34,7 @@ func (m *RequestPing) Reset() { *m = RequestPing{} } func (m *RequestPing) String() string { return proto.CompactTextString(m) } func (*RequestPing) ProtoMessage() {} func (*RequestPing) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{0} + return fileDescriptor_96a066730637149c, []int{0} } func (m *RequestPing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -72,7 +71,7 @@ func (m *RequestBroadcastTx) Reset() { *m = RequestBroadcastTx{} } func (m *RequestBroadcastTx) String() string { return proto.CompactTextString(m) } func (*RequestBroadcastTx) ProtoMessage() {} func (*RequestBroadcastTx) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{1} + return fileDescriptor_96a066730637149c, []int{1} } func (m *RequestBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -115,7 +114,7 @@ func (m *ResponsePing) Reset() { *m = ResponsePing{} } func (m *ResponsePing) String() string { return proto.CompactTextString(m) } func (*ResponsePing) ProtoMessage() {} func (*ResponsePing) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{2} + return fileDescriptor_96a066730637149c, []int{2} } func (m *ResponsePing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -153,7 +152,7 @@ func (m *ResponseBroadcastTx) Reset() { *m = ResponseBroadcastTx{} } func (m *ResponseBroadcastTx) String() string { return proto.CompactTextString(m) } func (*ResponseBroadcastTx) ProtoMessage() {} func (*ResponseBroadcastTx) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{3} + return fileDescriptor_96a066730637149c, []int{3} } func (m *ResponseBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -197,37 +196,37 @@ func (m *ResponseBroadcastTx) GetTxResult() *types.ExecTxResult { } func init() { - proto.RegisterType((*RequestPing)(nil), "tendermint.rpc.grpc.RequestPing") - proto.RegisterType((*RequestBroadcastTx)(nil), "tendermint.rpc.grpc.RequestBroadcastTx") - proto.RegisterType((*ResponsePing)(nil), "tendermint.rpc.grpc.ResponsePing") - proto.RegisterType((*ResponseBroadcastTx)(nil), "tendermint.rpc.grpc.ResponseBroadcastTx") -} - -func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) } - -var fileDescriptor_0ffff5682c662b95 = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x31, 0x4f, 0x02, 0x31, - 0x14, 0xc7, 0x29, 0x31, 0x8a, 0x05, 0x19, 0xca, 0x42, 0x30, 0x9e, 0x48, 0x4c, 0x64, 0x2a, 0x09, - 0x6e, 0x32, 0x89, 0x31, 0xd1, 0xb8, 0x90, 0x86, 0xc9, 0x05, 0xb9, 0xf2, 0x84, 0x8b, 0x72, 0x3d, - 0xdb, 0x47, 0x52, 0xbf, 0x84, 0xf1, 0x0b, 0xb9, 0x3b, 0x32, 0x3a, 0x1a, 0xf8, 0x22, 0xa6, 0x27, - 0x27, 0x35, 0x46, 0x96, 0xe6, 0xdf, 0xe6, 0xff, 0x7b, 0xfd, 0xbf, 0xd7, 0xd2, 0x43, 0x84, 0x78, - 0x04, 0x7a, 0x1a, 0xc5, 0xd8, 0xd2, 0x89, 0x6c, 0x8d, 0xdd, 0x82, 0xcf, 0x09, 0x18, 0x9e, 0x68, - 0x85, 0x8a, 0x55, 0xd6, 0x06, 0xae, 0x13, 0xc9, 0x9d, 0xa1, 0xb6, 0xef, 0x51, 0xc3, 0x50, 0x46, - 0x3e, 0xd1, 0xd8, 0xa3, 0x45, 0x01, 0x4f, 0x33, 0x30, 0xd8, 0x8b, 0xe2, 0x71, 0xe3, 0x98, 0xb2, - 0xd5, 0xb6, 0xab, 0xd5, 0x70, 0x24, 0x87, 0x06, 0xfb, 0x96, 0x95, 0x69, 0x1e, 0x6d, 0x95, 0xd4, - 0x49, 0xb3, 0x24, 0xf2, 0x68, 0x1b, 0x65, 0x5a, 0x12, 0x60, 0x12, 0x15, 0x1b, 0x48, 0xa9, 0x17, - 0x42, 0x2b, 0xd9, 0x81, 0xcf, 0x75, 0x68, 0x41, 0x4e, 0x40, 0x3e, 0x0c, 0x56, 0x74, 0xb1, 0x5d, - 0xe7, 0x5e, 0x42, 0x17, 0x86, 0x67, 0xdc, 0x85, 0x33, 0xf6, 0xad, 0xd8, 0x91, 0xdf, 0x82, 0x9d, - 0xd1, 0x5d, 0xb4, 0x03, 0x0d, 0x66, 0xf6, 0x88, 0xd5, 0x7c, 0x4a, 0x1f, 0xfc, 0xa1, 0x2f, 0x2d, - 0xc8, 0xbe, 0x15, 0xa9, 0x49, 0x14, 0x70, 0xa5, 0xda, 0x6f, 0x84, 0x96, 0x7e, 0x82, 0x9c, 0xf7, - 0xae, 0xd9, 0x0d, 0xdd, 0x72, 0x49, 0xd9, 0xaf, 0xfb, 0xb3, 0x09, 0x71, 0x6f, 0x02, 0xb5, 0xa3, - 0x7f, 0x1c, 0xeb, 0x76, 0xd9, 0x1d, 0x2d, 0xfa, 0x5d, 0x9e, 0x6c, 0xaa, 0xe9, 0x19, 0x6b, 0xcd, - 0x8d, 0xa5, 0x3d, 0x67, 0xf7, 0xea, 0x7d, 0x11, 0x90, 0xf9, 0x22, 0x20, 0x9f, 0x8b, 0x80, 0xbc, - 0x2e, 0x83, 0xdc, 0x7c, 0x19, 0xe4, 0x3e, 0x96, 0x41, 0xee, 0x96, 0x8f, 0x23, 0x9c, 0xcc, 0x42, - 0x2e, 0xd5, 0xb4, 0x25, 0xd5, 0x14, 0x30, 0xbc, 0xc7, 0xb5, 0xc8, 0x3e, 0x45, 0x47, 0x2a, 0x0d, - 0x4e, 0x84, 0xdb, 0xe9, 0x33, 0x9f, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xca, 0xdb, 0xe7, - 0x3b, 0x02, 0x00, 0x00, + proto.RegisterType((*RequestPing)(nil), "cometbft.v38.rpc.grpc.RequestPing") + proto.RegisterType((*RequestBroadcastTx)(nil), "cometbft.v38.rpc.grpc.RequestBroadcastTx") + proto.RegisterType((*ResponsePing)(nil), "cometbft.v38.rpc.grpc.ResponsePing") + proto.RegisterType((*ResponseBroadcastTx)(nil), "cometbft.v38.rpc.grpc.ResponseBroadcastTx") +} + +func init() { proto.RegisterFile("cometbft/v38/rpc/grpc/types.proto", fileDescriptor_96a066730637149c) } + +var fileDescriptor_96a066730637149c = []byte{ + // 334 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, 0x07, 0x11, + 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xa2, 0x30, 0x25, 0x7a, + 0x65, 0xc6, 0x16, 0x7a, 0x45, 0x05, 0xc9, 0x7a, 0x20, 0x25, 0x52, 0xb2, 0x28, 0x3a, 0x13, 0x93, + 0x92, 0x33, 0x91, 0x75, 0x29, 0xf1, 0x72, 0x71, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x04, + 0x64, 0xe6, 0xa5, 0x2b, 0xa9, 0x70, 0x09, 0x41, 0xb9, 0x4e, 0x45, 0xf9, 0x89, 0x29, 0xc9, 0x89, + 0xc5, 0x25, 0x21, 0x15, 0x42, 0x7c, 0x5c, 0x4c, 0x25, 0x15, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c, + 0x41, 0x4c, 0x25, 0x15, 0x4a, 0x7c, 0x5c, 0x3c, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, + 0x60, 0x5d, 0x93, 0x18, 0xb9, 0x84, 0x61, 0x02, 0xc8, 0xfa, 0x6c, 0xb9, 0x38, 0x92, 0x33, 0x52, + 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9, 0x8d, 0x94, 0xf4, 0x50, 0x5c, 0x09, 0x72, 0x8e, 0x1e, 0x4c, + 0xa7, 0x33, 0x48, 0x69, 0x48, 0x45, 0x10, 0x7b, 0x32, 0x84, 0x21, 0x64, 0xc3, 0xc5, 0x59, 0x52, + 0x11, 0x5f, 0x94, 0x5a, 0x5c, 0x9a, 0x53, 0x22, 0xc1, 0x04, 0xd6, 0x2f, 0x8f, 0x45, 0xbf, 0x6b, + 0x45, 0x6a, 0x72, 0x48, 0x45, 0x10, 0x58, 0x59, 0x10, 0x47, 0x09, 0x94, 0x65, 0x74, 0x94, 0x91, + 0x8b, 0x07, 0xee, 0x18, 0xc7, 0x00, 0x4f, 0x21, 0x7f, 0x2e, 0x16, 0x90, 0x6b, 0x85, 0xd0, 0xdc, + 0x00, 0x0b, 0x29, 0x3d, 0xa4, 0x70, 0x90, 0x52, 0xc6, 0xa9, 0x06, 0xe1, 0x6d, 0xa1, 0x14, 0x2e, + 0x6e, 0x64, 0xdf, 0x6a, 0xe2, 0x37, 0x17, 0x49, 0xa9, 0x94, 0x16, 0x01, 0xe3, 0x91, 0xd4, 0x3a, + 0xf9, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, + 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x69, 0x7a, 0x66, 0x49, + 0x46, 0x69, 0x12, 0xc8, 0x2c, 0x7d, 0xef, 0xc8, 0x30, 0x57, 0xbf, 0xd4, 0x92, 0xf2, 0xfc, 0xa2, + 0x6c, 0x7d, 0xac, 0x69, 0xc5, 0x3a, 0x39, 0xbf, 0x28, 0x15, 0xc4, 0x48, 0x62, 0x03, 0xc7, 0xbc, + 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xad, 0x54, 0x8a, 0x58, 0x54, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -247,16 +246,16 @@ type BroadcastAPIClient interface { } type broadcastAPIClient struct { - cc grpc1.ClientConn + cc *grpc.ClientConn } -func NewBroadcastAPIClient(cc grpc1.ClientConn) BroadcastAPIClient { +func NewBroadcastAPIClient(cc *grpc.ClientConn) BroadcastAPIClient { return &broadcastAPIClient{cc} } func (c *broadcastAPIClient) Ping(ctx context.Context, in *RequestPing, opts ...grpc.CallOption) (*ResponsePing, error) { out := new(ResponsePing) - err := c.cc.Invoke(ctx, "/tendermint.rpc.grpc.BroadcastAPI/Ping", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.rpc.grpc.BroadcastAPI/Ping", in, out, opts...) if err != nil { return nil, err } @@ -265,7 +264,7 @@ func (c *broadcastAPIClient) Ping(ctx context.Context, in *RequestPing, opts ... func (c *broadcastAPIClient) BroadcastTx(ctx context.Context, in *RequestBroadcastTx, opts ...grpc.CallOption) (*ResponseBroadcastTx, error) { out := new(ResponseBroadcastTx) - err := c.cc.Invoke(ctx, "/tendermint.rpc.grpc.BroadcastAPI/BroadcastTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.rpc.grpc.BroadcastAPI/BroadcastTx", in, out, opts...) if err != nil { return nil, err } @@ -289,7 +288,7 @@ func (*UnimplementedBroadcastAPIServer) BroadcastTx(ctx context.Context, req *Re return nil, status.Errorf(codes.Unimplemented, "method BroadcastTx not implemented") } -func RegisterBroadcastAPIServer(s grpc1.Server, srv BroadcastAPIServer) { +func RegisterBroadcastAPIServer(s *grpc.Server, srv BroadcastAPIServer) { s.RegisterService(&_BroadcastAPI_serviceDesc, srv) } @@ -303,7 +302,7 @@ func _BroadcastAPI_Ping_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.rpc.grpc.BroadcastAPI/Ping", + FullMethod: "/cometbft.v38.rpc.grpc.BroadcastAPI/Ping", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).Ping(ctx, req.(*RequestPing)) @@ -321,7 +320,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.rpc.grpc.BroadcastAPI/BroadcastTx", + FullMethod: "/cometbft.v38.rpc.grpc.BroadcastAPI/BroadcastTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).BroadcastTx(ctx, req.(*RequestBroadcastTx)) @@ -330,7 +329,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ - ServiceName: "tendermint.rpc.grpc.BroadcastAPI", + ServiceName: "cometbft.v38.rpc.grpc.BroadcastAPI", HandlerType: (*BroadcastAPIServer)(nil), Methods: []grpc.MethodDesc{ { @@ -343,7 +342,7 @@ var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tendermint/rpc/grpc/types.proto", + Metadata: "cometbft/v38/rpc/grpc/types.proto", } func (m *RequestPing) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/rpc/grpc/types.proto b/proto/cometbft/v38/rpc/grpc/types.proto similarity index 71% rename from proto/tendermint/rpc/grpc/types.proto rename to proto/cometbft/v38/rpc/grpc/types.proto index 68ff0cad71b..1622d699349 100644 --- a/proto/tendermint/rpc/grpc/types.proto +++ b/proto/cometbft/v38/rpc/grpc/types.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package tendermint.rpc.grpc; -option go_package = "github.com/cometbft/cometbft/rpc/grpc;coregrpc"; +package cometbft.v38.rpc.grpc; +option go_package = "github.com/KYVENetwork/cometbft/v38/rpc/grpc;coregrpc"; -import "tendermint/abci/types.proto"; +import "cometbft/v38/abci/types.proto"; //---------------------------------------- // Request types @@ -19,8 +19,8 @@ message RequestBroadcastTx { message ResponsePing {} message ResponseBroadcastTx { - tendermint.abci.ResponseCheckTx check_tx = 1; - tendermint.abci.ExecTxResult tx_result = 2; + cometbft.v38.abci.ResponseCheckTx check_tx = 1; + cometbft.v38.abci.ExecTxResult tx_result = 2; } //---------------------------------------- diff --git a/proto/tendermint/state/types.pb.go b/proto/cometbft/v38/state/types.pb.go similarity index 88% rename from proto/tendermint/state/types.pb.go rename to proto/cometbft/v38/state/types.pb.go index 4426543ed9b..5b9d36f5da1 100644 --- a/proto/tendermint/state/types.pb.go +++ b/proto/cometbft/v38/state/types.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/state/types.proto +// source: cometbft/v38/state/types.proto package state import ( fmt "fmt" - types "github.com/cometbft/cometbft/abci/types" - types1 "github.com/cometbft/cometbft/proto/tendermint/types" - version "github.com/cometbft/cometbft/proto/tendermint/version" + types "github.com/KYVENetwork/cometbft/v38/abci/types" + types1 "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + version "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/version" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -44,7 +44,7 @@ func (m *LegacyABCIResponses) Reset() { *m = LegacyABCIResponses{} } func (m *LegacyABCIResponses) String() string { return proto.CompactTextString(m) } func (*LegacyABCIResponses) ProtoMessage() {} func (*LegacyABCIResponses) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{0} + return fileDescriptor_44b0c97de039673c, []int{0} } func (m *LegacyABCIResponses) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -103,7 +103,7 @@ func (m *ResponseBeginBlock) Reset() { *m = ResponseBeginBlock{} } func (m *ResponseBeginBlock) String() string { return proto.CompactTextString(m) } func (*ResponseBeginBlock) ProtoMessage() {} func (*ResponseBeginBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{1} + return fileDescriptor_44b0c97de039673c, []int{1} } func (m *ResponseBeginBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -150,7 +150,7 @@ func (m *ResponseEndBlock) Reset() { *m = ResponseEndBlock{} } func (m *ResponseEndBlock) String() string { return proto.CompactTextString(m) } func (*ResponseEndBlock) ProtoMessage() {} func (*ResponseEndBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{2} + return fileDescriptor_44b0c97de039673c, []int{2} } func (m *ResponseEndBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -210,7 +210,7 @@ func (m *ValidatorsInfo) Reset() { *m = ValidatorsInfo{} } func (m *ValidatorsInfo) String() string { return proto.CompactTextString(m) } func (*ValidatorsInfo) ProtoMessage() {} func (*ValidatorsInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{3} + return fileDescriptor_44b0c97de039673c, []int{3} } func (m *ValidatorsInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -263,7 +263,7 @@ func (m *ConsensusParamsInfo) Reset() { *m = ConsensusParamsInfo{} } func (m *ConsensusParamsInfo) String() string { return proto.CompactTextString(m) } func (*ConsensusParamsInfo) ProtoMessage() {} func (*ConsensusParamsInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{4} + return fileDescriptor_44b0c97de039673c, []int{4} } func (m *ConsensusParamsInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -316,7 +316,7 @@ func (m *ABCIResponsesInfo) Reset() { *m = ABCIResponsesInfo{} } func (m *ABCIResponsesInfo) String() string { return proto.CompactTextString(m) } func (*ABCIResponsesInfo) ProtoMessage() {} func (*ABCIResponsesInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{5} + return fileDescriptor_44b0c97de039673c, []int{5} } func (m *ABCIResponsesInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -375,7 +375,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{6} + return fileDescriptor_44b0c97de039673c, []int{6} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -451,7 +451,7 @@ func (m *State) Reset() { *m = State{} } func (m *State) String() string { return proto.CompactTextString(m) } func (*State) ProtoMessage() {} func (*State) Descriptor() ([]byte, []int) { - return fileDescriptor_ccfacf933f22bf93, []int{7} + return fileDescriptor_44b0c97de039673c, []int{7} } func (m *State) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -579,81 +579,82 @@ func (m *State) GetAppHash() []byte { } func init() { - proto.RegisterType((*LegacyABCIResponses)(nil), "tendermint.state.LegacyABCIResponses") - proto.RegisterType((*ResponseBeginBlock)(nil), "tendermint.state.ResponseBeginBlock") - proto.RegisterType((*ResponseEndBlock)(nil), "tendermint.state.ResponseEndBlock") - proto.RegisterType((*ValidatorsInfo)(nil), "tendermint.state.ValidatorsInfo") - proto.RegisterType((*ConsensusParamsInfo)(nil), "tendermint.state.ConsensusParamsInfo") - proto.RegisterType((*ABCIResponsesInfo)(nil), "tendermint.state.ABCIResponsesInfo") - proto.RegisterType((*Version)(nil), "tendermint.state.Version") - proto.RegisterType((*State)(nil), "tendermint.state.State") -} - -func init() { proto.RegisterFile("tendermint/state/types.proto", fileDescriptor_ccfacf933f22bf93) } - -var fileDescriptor_ccfacf933f22bf93 = []byte{ - // 963 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4b, 0x6f, 0xdb, 0x46, - 0x17, 0x35, 0xe3, 0x44, 0x8f, 0x2b, 0xcb, 0x96, 0x47, 0x9f, 0x13, 0x45, 0xf9, 0x22, 0xa9, 0x42, - 0x12, 0x18, 0x45, 0x41, 0x01, 0xc9, 0xaa, 0x9b, 0x14, 0x96, 0xec, 0xd6, 0x02, 0xdc, 0xa2, 0xa0, - 0xdd, 0x00, 0xe9, 0x22, 0xc4, 0x88, 0x1c, 0x49, 0x83, 0x4a, 0x24, 0xc1, 0x19, 0xa9, 0x72, 0xf7, - 0xdd, 0x75, 0x91, 0x6d, 0xff, 0x51, 0x96, 0x59, 0x76, 0x53, 0xb7, 0x95, 0x81, 0x2e, 0xfa, 0x2b, - 0x8a, 0x79, 0xf0, 0x25, 0xba, 0xa8, 0x8b, 0xec, 0xc8, 0xb9, 0xe7, 0x9e, 0x7b, 0xee, 0x99, 0xb9, - 0x43, 0xc2, 0xff, 0x39, 0xf1, 0x5c, 0x12, 0xce, 0xa9, 0xc7, 0x7b, 0x8c, 0x63, 0x4e, 0x7a, 0xfc, - 0x32, 0x20, 0xcc, 0x0c, 0x42, 0x9f, 0xfb, 0xa8, 0x96, 0x44, 0x4d, 0x19, 0x6d, 0xfe, 0x6f, 0xe2, - 0x4f, 0x7c, 0x19, 0xec, 0x89, 0x27, 0x85, 0x6b, 0x3e, 0x4a, 0xb1, 0xe0, 0x91, 0x43, 0xd3, 0x24, - 0xcd, 0x74, 0x09, 0xb9, 0x9e, 0x89, 0x76, 0x72, 0xd1, 0x25, 0x9e, 0x51, 0x17, 0x73, 0x3f, 0xd4, - 0x88, 0xc7, 0x39, 0x44, 0x80, 0x43, 0x3c, 0x8f, 0x08, 0x5a, 0xa9, 0xf0, 0x92, 0x84, 0x8c, 0xfa, - 0x5e, 0xa6, 0x40, 0x7b, 0xe2, 0xfb, 0x93, 0x19, 0xe9, 0xc9, 0xb7, 0xd1, 0x62, 0xdc, 0xe3, 0x74, - 0x4e, 0x18, 0xc7, 0xf3, 0x40, 0x01, 0xba, 0xbf, 0x1a, 0x50, 0x3f, 0x23, 0x13, 0xec, 0x5c, 0x1e, - 0xf5, 0x07, 0x43, 0x8b, 0xb0, 0xc0, 0xf7, 0x18, 0x61, 0xe8, 0x25, 0x54, 0x5c, 0x32, 0xa3, 0x4b, - 0x12, 0xda, 0x7c, 0xc5, 0x1a, 0x46, 0x67, 0xfb, 0xb0, 0xf2, 0xfc, 0xb1, 0x99, 0xb2, 0x44, 0xb4, - 0x6a, 0x9e, 0xac, 0x88, 0x73, 0xb1, 0xb2, 0x08, 0x5b, 0xcc, 0xb8, 0x05, 0x3a, 0xe3, 0x62, 0xc5, - 0xd0, 0x67, 0x50, 0x26, 0x9e, 0x6b, 0x8f, 0x66, 0xbe, 0xf3, 0x5d, 0xe3, 0x4e, 0xc7, 0x38, 0xac, - 0x3c, 0xef, 0x9a, 0x9b, 0x86, 0x9a, 0x51, 0xbd, 0x13, 0xcf, 0xed, 0x0b, 0xa4, 0x55, 0x22, 0xfa, - 0x09, 0x9d, 0x40, 0x65, 0x44, 0x26, 0xd4, 0xd3, 0x14, 0xdb, 0x92, 0xe2, 0xc9, 0x3f, 0x53, 0xf4, - 0x05, 0x58, 0x91, 0xc0, 0x28, 0x7e, 0xee, 0xbe, 0x01, 0x94, 0x47, 0xa0, 0x53, 0x28, 0x90, 0x25, - 0xf1, 0x78, 0xd4, 0xd8, 0xfd, 0x7c, 0x63, 0x22, 0xdc, 0x6f, 0xbc, 0xbb, 0x6a, 0x6f, 0xfd, 0x75, - 0xd5, 0xae, 0x29, 0xf4, 0x27, 0xfe, 0x9c, 0x72, 0x32, 0x0f, 0xf8, 0xa5, 0xa5, 0xf3, 0xbb, 0x3f, - 0xdd, 0x81, 0xda, 0x66, 0x17, 0xe8, 0x1c, 0xf6, 0xe3, 0x7d, 0xb4, 0x17, 0x81, 0x8b, 0x39, 0x89, - 0x2a, 0x75, 0x72, 0x95, 0x5e, 0x45, 0xc8, 0x6f, 0x24, 0xb0, 0x7f, 0x57, 0xd4, 0xb4, 0x6a, 0xcb, - 0xec, 0x32, 0x43, 0xaf, 0xe1, 0x81, 0x23, 0xaa, 0x78, 0x6c, 0xc1, 0x6c, 0x79, 0x08, 0x62, 0x6a, - 0xe5, 0xef, 0x47, 0x69, 0x6a, 0x75, 0x08, 0x06, 0x51, 0xc2, 0xd7, 0xf2, 0xd0, 0x58, 0x07, 0x4e, - 0x66, 0x21, 0xa2, 0x4e, 0xec, 0xd8, 0xfe, 0x40, 0x3b, 0x7e, 0x34, 0x60, 0x37, 0x6e, 0x88, 0x0d, - 0xbd, 0xb1, 0x8f, 0x06, 0x50, 0x4d, 0xcc, 0x60, 0x84, 0x37, 0x0c, 0xa9, 0xb6, 0x95, 0x57, 0x1b, - 0x27, 0x9e, 0x13, 0x6e, 0xed, 0x2c, 0x53, 0x6f, 0xc8, 0x84, 0xfa, 0x0c, 0x33, 0x6e, 0x4f, 0x09, - 0x9d, 0x4c, 0xb9, 0xed, 0x4c, 0xb1, 0x37, 0x21, 0xae, 0x6c, 0x7c, 0xdb, 0xda, 0x17, 0xa1, 0x53, - 0x19, 0x19, 0xa8, 0x40, 0xf7, 0x67, 0x03, 0xea, 0x1b, 0xcd, 0x4b, 0x31, 0x16, 0xd4, 0x36, 0x4c, - 0x64, 0x5a, 0xcf, 0xbf, 0xbb, 0xa7, 0x77, 0x66, 0x2f, 0xeb, 0x21, 0xfb, 0xcf, 0xda, 0xfe, 0x34, - 0x60, 0x3f, 0x33, 0x6c, 0x52, 0xd9, 0x6b, 0x38, 0x98, 0xc9, 0x39, 0xb4, 0x85, 0xe1, 0x76, 0x18, - 0x05, 0xb5, 0xbc, 0xa7, 0xf9, 0x93, 0x7f, 0xc3, 0xd8, 0x5a, 0x75, 0xc5, 0x71, 0x34, 0x72, 0x68, - 0x32, 0xcb, 0xf7, 0xa1, 0xa0, 0xb4, 0x69, 0x4d, 0xfa, 0x0d, 0xbd, 0x81, 0x07, 0x51, 0x19, 0x7b, - 0x4c, 0x3d, 0x3c, 0xa3, 0x3f, 0x90, 0xcc, 0xb8, 0x3d, 0xcb, 0x9d, 0x83, 0x88, 0xf4, 0x73, 0x0d, - 0x57, 0x03, 0x77, 0x10, 0xde, 0xb4, 0xdc, 0x9d, 0x42, 0xf1, 0x95, 0xba, 0x93, 0xd0, 0x11, 0x94, - 0x63, 0xdb, 0x74, 0x47, 0x99, 0xcb, 0x44, 0xdf, 0x5d, 0x89, 0xe5, 0xda, 0xec, 0x24, 0x0b, 0x35, - 0xa1, 0xc4, 0xfc, 0x31, 0xff, 0x1e, 0x87, 0x44, 0xf6, 0x51, 0xb6, 0xe2, 0xf7, 0xee, 0x1f, 0x05, - 0xb8, 0x77, 0x2e, 0x4c, 0x41, 0x9f, 0x42, 0x51, 0x73, 0xe9, 0x32, 0x0f, 0xf3, 0xc6, 0x69, 0x51, - 0xba, 0x44, 0x84, 0x47, 0xcf, 0xa0, 0xe4, 0x4c, 0x31, 0xf5, 0x6c, 0xaa, 0x36, 0xaf, 0xdc, 0xaf, - 0xac, 0xaf, 0xda, 0xc5, 0x81, 0x58, 0x1b, 0x1e, 0x5b, 0x45, 0x19, 0x1c, 0xba, 0xe8, 0x29, 0xec, - 0x52, 0x8f, 0x72, 0x8a, 0x67, 0x7a, 0xcb, 0x1b, 0xbb, 0xd2, 0xd6, 0xaa, 0x5e, 0x55, 0xbb, 0x8d, - 0x3e, 0x06, 0xb9, 0xf7, 0xca, 0xd0, 0x08, 0xb9, 0x2d, 0x91, 0x7b, 0x22, 0x20, 0x3d, 0xd2, 0x58, - 0x0b, 0xaa, 0x29, 0x2c, 0x75, 0x1b, 0x77, 0xf3, 0xda, 0xd5, 0x99, 0x94, 0x59, 0xc3, 0xe3, 0x7e, - 0x5d, 0x68, 0x5f, 0x5f, 0xb5, 0x2b, 0x67, 0x11, 0xd5, 0xf0, 0xd8, 0xaa, 0xc4, 0xbc, 0x43, 0x17, - 0x9d, 0xc1, 0x5e, 0x8a, 0x53, 0xdc, 0xfb, 0x8d, 0x7b, 0x92, 0xb5, 0x69, 0xaa, 0x8f, 0x82, 0x19, - 0x7d, 0x14, 0xcc, 0x8b, 0xe8, 0xa3, 0xd0, 0x2f, 0x09, 0xda, 0xb7, 0xbf, 0xb5, 0x0d, 0xab, 0x1a, - 0x73, 0x89, 0x28, 0xfa, 0x02, 0xf6, 0x3c, 0xb2, 0xe2, 0x76, 0x3c, 0x95, 0xac, 0x51, 0xb8, 0xd5, - 0x1c, 0xef, 0x8a, 0xb4, 0xe4, 0x4a, 0x40, 0x2f, 0x01, 0x52, 0x1c, 0xc5, 0x5b, 0x71, 0xa4, 0x32, - 0x84, 0x10, 0xd9, 0x56, 0x8a, 0xa4, 0x74, 0x3b, 0x21, 0x22, 0x2d, 0x25, 0x64, 0x00, 0xad, 0xf4, - 0xd8, 0x26, 0x7c, 0xf1, 0x04, 0x97, 0xe5, 0x66, 0x3d, 0x4a, 0x26, 0x38, 0xc9, 0xd6, 0xb3, 0x7c, - 0xe3, 0x7d, 0x02, 0x1f, 0x78, 0x9f, 0x7c, 0x05, 0x4f, 0x32, 0xf7, 0xc9, 0x06, 0x7f, 0x2c, 0xaf, - 0x22, 0xe5, 0x75, 0x52, 0x17, 0x4c, 0x96, 0x28, 0xd2, 0x18, 0x1d, 0xc4, 0x50, 0x7e, 0xa5, 0x99, - 0x3d, 0xc5, 0x6c, 0xda, 0xd8, 0xe9, 0x18, 0x87, 0x3b, 0xea, 0x20, 0xaa, 0xaf, 0x37, 0x3b, 0xc5, - 0x6c, 0x8a, 0x1e, 0x42, 0x09, 0x07, 0x81, 0x82, 0x54, 0x25, 0xa4, 0x88, 0x83, 0x40, 0x84, 0xfa, - 0x5f, 0xbe, 0x5b, 0xb7, 0x8c, 0xf7, 0xeb, 0x96, 0xf1, 0xfb, 0xba, 0x65, 0xbc, 0xbd, 0x6e, 0x6d, - 0xbd, 0xbf, 0x6e, 0x6d, 0xfd, 0x72, 0xdd, 0xda, 0xfa, 0xf6, 0xc5, 0x84, 0xf2, 0xe9, 0x62, 0x64, - 0x3a, 0xfe, 0xbc, 0xe7, 0xf8, 0x73, 0xc2, 0x47, 0x63, 0x9e, 0x3c, 0xa8, 0xff, 0xa5, 0xcd, 0x3f, - 0xad, 0x51, 0x41, 0xae, 0xbf, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xec, 0x26, 0xcf, 0x93, 0x84, - 0x09, 0x00, 0x00, + proto.RegisterType((*LegacyABCIResponses)(nil), "cometbft.v38.state.LegacyABCIResponses") + proto.RegisterType((*ResponseBeginBlock)(nil), "cometbft.v38.state.ResponseBeginBlock") + proto.RegisterType((*ResponseEndBlock)(nil), "cometbft.v38.state.ResponseEndBlock") + proto.RegisterType((*ValidatorsInfo)(nil), "cometbft.v38.state.ValidatorsInfo") + proto.RegisterType((*ConsensusParamsInfo)(nil), "cometbft.v38.state.ConsensusParamsInfo") + proto.RegisterType((*ABCIResponsesInfo)(nil), "cometbft.v38.state.ABCIResponsesInfo") + proto.RegisterType((*Version)(nil), "cometbft.v38.state.Version") + proto.RegisterType((*State)(nil), "cometbft.v38.state.State") +} + +func init() { proto.RegisterFile("cometbft/v38/state/types.proto", fileDescriptor_44b0c97de039673c) } + +var fileDescriptor_44b0c97de039673c = []byte{ + // 982 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0xdb, 0x46, + 0x10, 0x35, 0xe3, 0x44, 0x1f, 0xa3, 0xc8, 0x1f, 0xab, 0xba, 0x61, 0x15, 0x54, 0x12, 0xd4, 0x34, + 0x35, 0x8a, 0x82, 0x02, 0xe2, 0x4b, 0xd0, 0x5e, 0x62, 0xc9, 0x6e, 0xa3, 0xd6, 0x08, 0x0a, 0x46, + 0x31, 0xd0, 0xe6, 0xc0, 0xac, 0xc8, 0x95, 0xb4, 0x8d, 0x44, 0x12, 0xdc, 0x95, 0x22, 0xf7, 0x0f, + 0xf4, 0x1a, 0xf4, 0xda, 0x3f, 0x94, 0x63, 0x8e, 0x3d, 0xb9, 0x85, 0x7c, 0x0b, 0xd0, 0xff, 0x50, + 0xec, 0x07, 0x29, 0x52, 0x21, 0x0a, 0x17, 0xb9, 0x89, 0x3b, 0x6f, 0xde, 0xbc, 0x79, 0xbb, 0xb3, + 0x2b, 0x68, 0xb8, 0xc1, 0x8c, 0xf0, 0xe1, 0x88, 0x77, 0x16, 0x47, 0x0f, 0x3b, 0x8c, 0x63, 0x4e, + 0x3a, 0xfc, 0x22, 0x24, 0xcc, 0x0a, 0xa3, 0x80, 0x07, 0x08, 0xc5, 0x71, 0x6b, 0x71, 0xf4, 0xd0, + 0x92, 0xf1, 0xfa, 0x47, 0xe3, 0x60, 0x1c, 0xc8, 0x70, 0x47, 0xfc, 0x52, 0xc8, 0xfa, 0xa7, 0x19, + 0x26, 0x3c, 0x74, 0x69, 0x9a, 0xa8, 0x9e, 0x2d, 0x24, 0x23, 0x99, 0x78, 0x3b, 0x27, 0xbe, 0xc0, + 0x53, 0xea, 0x61, 0x1e, 0x44, 0x1a, 0xd3, 0xcc, 0xc1, 0x84, 0x38, 0xc2, 0xb3, 0x98, 0xa4, 0x95, + 0x01, 0x2c, 0x48, 0xc4, 0x68, 0xe0, 0x67, 0xca, 0x34, 0xc7, 0x41, 0x30, 0x9e, 0x92, 0x8e, 0xfc, + 0x1a, 0xce, 0x47, 0x1d, 0x4e, 0x67, 0x84, 0x71, 0x3c, 0x0b, 0x15, 0xa0, 0x7d, 0x65, 0x40, 0xed, + 0x8c, 0x8c, 0xb1, 0x7b, 0x71, 0xdc, 0xed, 0xf5, 0x6d, 0xc2, 0xc2, 0xc0, 0x67, 0x84, 0xa1, 0x47, + 0x50, 0xf1, 0xc8, 0x94, 0x2e, 0x48, 0xe4, 0xf0, 0x25, 0x33, 0x8d, 0xd6, 0xf6, 0x61, 0xe5, 0x41, + 0xd3, 0xca, 0xd8, 0x23, 0x9a, 0xb6, 0x4e, 0x97, 0xc4, 0x1d, 0x2c, 0x6d, 0xc2, 0xe6, 0x53, 0x6e, + 0x83, 0xce, 0x19, 0x2c, 0x19, 0x3a, 0x86, 0x32, 0xf1, 0x3d, 0x67, 0x38, 0x0d, 0xdc, 0x97, 0xe6, + 0x8d, 0x96, 0x71, 0x58, 0x79, 0x70, 0xcf, 0x7a, 0xdf, 0x5e, 0x2b, 0xae, 0x79, 0xea, 0x7b, 0x5d, + 0x81, 0xb5, 0x4b, 0x44, 0xff, 0x42, 0xdf, 0x41, 0x65, 0x48, 0xc6, 0xd4, 0xd7, 0x24, 0xdb, 0x92, + 0xe4, 0xfe, 0x7f, 0x91, 0x74, 0x05, 0x5c, 0xd1, 0xc0, 0x30, 0xf9, 0xdd, 0x7e, 0x01, 0xe8, 0x7d, + 0x04, 0xfa, 0x1e, 0x0a, 0x64, 0x41, 0x7c, 0x1e, 0xb7, 0x67, 0xe6, 0xb5, 0x27, 0x00, 0x5d, 0xf3, + 0xcd, 0x65, 0x73, 0xeb, 0xdd, 0x65, 0x73, 0x4f, 0xe1, 0xbf, 0x0a, 0x66, 0x94, 0x93, 0x59, 0xc8, + 0x2f, 0x6c, 0xcd, 0xd0, 0xfe, 0xfd, 0x06, 0xec, 0x6d, 0x76, 0x82, 0x9e, 0xc1, 0x7e, 0xb2, 0xa7, + 0xce, 0x3c, 0xf4, 0x30, 0x27, 0x71, 0xad, 0x76, 0x4e, 0xad, 0xf3, 0x18, 0xfb, 0x4c, 0x42, 0xbb, + 0x37, 0x45, 0x55, 0x7b, 0x6f, 0x91, 0x5d, 0x66, 0xe8, 0x39, 0xdc, 0x71, 0x45, 0x1d, 0x9f, 0xcd, + 0x99, 0x23, 0x0f, 0x44, 0x42, 0xae, 0x7c, 0xfe, 0x2c, 0x4b, 0xae, 0x0e, 0x44, 0x2f, 0x4e, 0xf9, + 0x51, 0x1e, 0x21, 0xfb, 0xc0, 0xcd, 0x2c, 0xc4, 0xe4, 0x6b, 0x53, 0xb6, 0x3f, 0xd8, 0x94, 0xdf, + 0x0c, 0xd8, 0x49, 0x9a, 0x62, 0x7d, 0x7f, 0x14, 0xa0, 0x53, 0xa8, 0xae, 0x2d, 0x61, 0x84, 0x9b, + 0x86, 0x54, 0xdc, 0xca, 0x53, 0x9c, 0xa4, 0x3e, 0x25, 0xdc, 0xbe, 0xbd, 0x48, 0x7d, 0x21, 0x0b, + 0x6a, 0x53, 0xcc, 0xb8, 0x33, 0x21, 0x74, 0x3c, 0xe1, 0x8e, 0x3b, 0xc1, 0xfe, 0x98, 0x78, 0xb2, + 0xfd, 0x6d, 0x7b, 0x5f, 0x84, 0x1e, 0xcb, 0x48, 0x4f, 0x05, 0xda, 0x7f, 0x18, 0x50, 0xdb, 0x30, + 0x40, 0xca, 0x19, 0xc0, 0xde, 0x86, 0x95, 0x4c, 0x2b, 0xba, 0x8e, 0x87, 0x7a, 0x87, 0x76, 0xb3, + 0x4e, 0xb2, 0xff, 0xad, 0xee, 0x9d, 0x01, 0xfb, 0x99, 0xf1, 0x93, 0xda, 0x9e, 0xc3, 0xc1, 0x54, + 0x4e, 0xa6, 0x23, 0x4c, 0x77, 0xa2, 0x38, 0xa8, 0x05, 0x7e, 0x91, 0x37, 0x07, 0x39, 0xa3, 0x6c, + 0xd7, 0x14, 0xcb, 0xf1, 0xd0, 0xa5, 0xeb, 0xf9, 0xfe, 0x18, 0x0a, 0x4a, 0x9d, 0x56, 0xa5, 0xbf, + 0xd0, 0x0b, 0xb8, 0x13, 0x17, 0x72, 0x46, 0xd4, 0xc7, 0x53, 0xfa, 0x2b, 0xc9, 0x8c, 0xdf, 0x61, + 0xce, 0x79, 0x88, 0x69, 0xbf, 0xd5, 0x09, 0x6a, 0x00, 0x0f, 0xa2, 0xbc, 0xe5, 0xf6, 0x2f, 0x50, + 0x3c, 0x57, 0x37, 0x15, 0xea, 0x41, 0x39, 0xb1, 0x4e, 0x77, 0xb5, 0x71, 0xc5, 0xe8, 0x3b, 0x6d, + 0x6d, 0xbc, 0xb6, 0x7c, 0x9d, 0x87, 0xea, 0x50, 0x62, 0xc1, 0x88, 0xbf, 0xc2, 0x11, 0x91, 0xbd, + 0x94, 0xed, 0xe4, 0xbb, 0xfd, 0x4f, 0x01, 0x6e, 0x3d, 0x15, 0xc6, 0xa0, 0x6f, 0xa0, 0xa8, 0xb9, + 0x74, 0xa1, 0xbb, 0x79, 0xf6, 0x69, 0x61, 0xba, 0x48, 0x9c, 0x81, 0xee, 0x43, 0xc9, 0x9d, 0x60, + 0xea, 0x3b, 0x54, 0x6d, 0x62, 0xb9, 0x5b, 0x59, 0x5d, 0x36, 0x8b, 0x3d, 0xb1, 0xd6, 0x3f, 0xb1, + 0x8b, 0x32, 0xd8, 0xf7, 0xd0, 0xe7, 0xb0, 0x43, 0x7d, 0xca, 0x29, 0x9e, 0xea, 0xad, 0x37, 0x77, + 0xa4, 0xb9, 0x55, 0xbd, 0xaa, 0x76, 0x1d, 0x7d, 0x09, 0xf2, 0x0c, 0x28, 0x5b, 0x63, 0xe4, 0xb6, + 0x44, 0xee, 0x8a, 0x80, 0xf4, 0x49, 0x63, 0x07, 0x50, 0x4d, 0x61, 0xa9, 0x67, 0xde, 0xcc, 0x53, + 0xaf, 0x4e, 0xa7, 0xcc, 0xeb, 0x9f, 0x74, 0x6b, 0x42, 0xfd, 0xea, 0xb2, 0x59, 0x39, 0x8b, 0xc9, + 0xfa, 0x27, 0x76, 0x25, 0x61, 0xee, 0x7b, 0xe8, 0x0c, 0x76, 0x53, 0xac, 0xe2, 0x4d, 0x30, 0x6f, + 0x49, 0xde, 0xba, 0xa5, 0x1e, 0x0c, 0x2b, 0x7e, 0x30, 0xac, 0x41, 0xfc, 0x60, 0x74, 0x4b, 0x82, + 0xf6, 0xf5, 0x5f, 0x4d, 0xc3, 0xae, 0x26, 0x5c, 0x22, 0x8a, 0xfa, 0xb0, 0xeb, 0x93, 0x25, 0x77, + 0x92, 0x09, 0x65, 0x66, 0xe1, 0x9a, 0x53, 0xbd, 0x23, 0x12, 0xd7, 0x57, 0x04, 0x7a, 0x04, 0x90, + 0x62, 0x29, 0x5e, 0x93, 0x25, 0x95, 0x23, 0xc4, 0xc8, 0xd6, 0x52, 0x34, 0xa5, 0xeb, 0x8a, 0x11, + 0x89, 0x29, 0x31, 0x3d, 0x68, 0xa4, 0xc7, 0x78, 0xcd, 0x98, 0x4c, 0x74, 0x59, 0x6e, 0xda, 0xdd, + 0xf5, 0x44, 0xaf, 0xb3, 0xf5, 0x6c, 0xe7, 0xde, 0x30, 0xf0, 0xc1, 0x37, 0xcc, 0x13, 0xb8, 0x97, + 0xb9, 0x61, 0x36, 0x2a, 0x24, 0x02, 0x2b, 0x52, 0x60, 0x2b, 0x75, 0xe5, 0x64, 0x89, 0x62, 0x95, + 0xf1, 0x91, 0x8c, 0xe4, 0x3b, 0xce, 0x9c, 0x09, 0x66, 0x13, 0xf3, 0x76, 0xcb, 0x38, 0xbc, 0xad, + 0x8e, 0xa4, 0x7a, 0xdf, 0xd9, 0x63, 0xcc, 0x26, 0xe8, 0x13, 0x28, 0xe1, 0x30, 0x54, 0x90, 0xaa, + 0x84, 0x14, 0x71, 0x18, 0x8a, 0x50, 0x77, 0xf0, 0x66, 0xd5, 0x30, 0xde, 0xae, 0x1a, 0xc6, 0xdf, + 0xab, 0x86, 0xf1, 0xfa, 0xaa, 0xb1, 0xf5, 0xf6, 0xaa, 0xb1, 0xf5, 0xe7, 0x55, 0x63, 0xeb, 0xe7, + 0xaf, 0xc7, 0x94, 0x4f, 0xe6, 0x43, 0xd1, 0x72, 0xe7, 0x87, 0x9f, 0xce, 0x4f, 0x9f, 0x10, 0xfe, + 0x2a, 0x88, 0x5e, 0x76, 0x32, 0xff, 0x60, 0xd4, 0x9f, 0x2c, 0x4e, 0x7c, 0x8f, 0x44, 0x33, 0xea, + 0x73, 0xf5, 0x07, 0x6d, 0x58, 0x90, 0xeb, 0x47, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x81, 0xd7, + 0x25, 0x30, 0xbd, 0x09, 0x00, 0x00, } func (m *LegacyABCIResponses) Marshal() (dAtA []byte, err error) { @@ -1082,7 +1083,7 @@ func (m *State) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.LastBlockTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.LastBlockTime):]) + n13, err13 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.LastBlockTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.LastBlockTime):]) if err13 != nil { return 0, err13 } @@ -1281,7 +1282,7 @@ func (m *State) Size() (n int) { } l = m.LastBlockID.Size() n += 1 + l + sovTypes(uint64(l)) - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.LastBlockTime) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.LastBlockTime) n += 1 + l + sovTypes(uint64(l)) if m.NextValidators != nil { l = m.NextValidators.Size() @@ -2355,7 +2356,7 @@ func (m *State) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.LastBlockTime, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.LastBlockTime, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/state/types.proto b/proto/cometbft/v38/state/types.proto similarity index 68% rename from proto/tendermint/state/types.proto rename to proto/cometbft/v38/state/types.proto index c76c25fa852..e6b83d540e9 100644 --- a/proto/tendermint/state/types.proto +++ b/proto/cometbft/v38/state/types.proto @@ -1,14 +1,14 @@ syntax = "proto3"; -package tendermint.state; +package cometbft.v38.state; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/state"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/state"; import "gogoproto/gogo.proto"; -import "tendermint/abci/types.proto"; -import "tendermint/types/types.proto"; -import "tendermint/types/validator.proto"; -import "tendermint/types/params.proto"; -import "tendermint/version/types.proto"; +import "cometbft/v38/abci/types.proto"; +import "cometbft/v38/types/types.proto"; +import "cometbft/v38/types/validator.proto"; +import "cometbft/v38/types/params.proto"; +import "cometbft/v38/version/types.proto"; import "google/protobuf/timestamp.proto"; // LegacyABCIResponses retains the responses @@ -16,34 +16,34 @@ import "google/protobuf/timestamp.proto"; // Note ReponseDeliverTx is renamed to ExecTxResult but they are semantically the same // Kept for backwards compatibility for versions prior to v0.38 message LegacyABCIResponses { - repeated tendermint.abci.ExecTxResult deliver_txs = 1; + repeated cometbft.v38.abci.ExecTxResult deliver_txs = 1; ResponseEndBlock end_block = 2; ResponseBeginBlock begin_block = 3; } // ResponseBeginBlock is kept for backwards compatibility for versions prior to v0.38 message ResponseBeginBlock { - repeated tendermint.abci.Event events = 1 + repeated cometbft.v38.abci.Event events = 1 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; } // ResponseEndBlock is kept for backwards compatibility for versions prior to v0.38 message ResponseEndBlock { - repeated tendermint.abci.ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; - tendermint.types.ConsensusParams consensus_param_updates = 2; - repeated tendermint.abci.Event events = 3 + repeated cometbft.v38.abci.ValidatorUpdate validator_updates = 1 [(gogoproto.nullable) = false]; + cometbft.v38.types.ConsensusParams consensus_param_updates = 2; + repeated cometbft.v38.abci.Event events = 3 [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; } // ValidatorsInfo represents the latest validator set, or the last height it changed message ValidatorsInfo { - tendermint.types.ValidatorSet validator_set = 1; + cometbft.v38.types.ValidatorSet validator_set = 1; int64 last_height_changed = 2; } // ConsensusParamsInfo represents the latest consensus params, or the last height it changed message ConsensusParamsInfo { - tendermint.types.ConsensusParams consensus_params = 1 [(gogoproto.nullable) = false]; + cometbft.v38.types.ConsensusParams consensus_params = 1 [(gogoproto.nullable) = false]; int64 last_height_changed = 2; } @@ -54,7 +54,7 @@ message ABCIResponsesInfo { } message Version { - tendermint.version.Consensus consensus = 1 [(gogoproto.nullable) = false]; + cometbft.v38.version.Consensus consensus = 1 [(gogoproto.nullable) = false]; string software = 2; } @@ -67,7 +67,7 @@ message State { // LastBlockHeight=0 at genesis (ie. block(H=0) does not exist) int64 last_block_height = 3; - tendermint.types.BlockID last_block_id = 4 + cometbft.v38.types.BlockID last_block_id = 4 [(gogoproto.nullable) = false, (gogoproto.customname) = "LastBlockID"]; google.protobuf.Timestamp last_block_time = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -78,14 +78,14 @@ message State { // Note that if s.LastBlockHeight causes a valset change, // we set s.LastHeightValidatorsChanged = s.LastBlockHeight + 1 + 1 // Extra +1 due to nextValSet delay. - tendermint.types.ValidatorSet next_validators = 6; - tendermint.types.ValidatorSet validators = 7; - tendermint.types.ValidatorSet last_validators = 8; + cometbft.v38.types.ValidatorSet next_validators = 6; + cometbft.v38.types.ValidatorSet validators = 7; + cometbft.v38.types.ValidatorSet last_validators = 8; int64 last_height_validators_changed = 9; // Consensus parameters used for validating blocks. // Changes returned by EndBlock and updated after Commit. - tendermint.types.ConsensusParams consensus_params = 10 [(gogoproto.nullable) = false]; + cometbft.v38.types.ConsensusParams consensus_params = 10 [(gogoproto.nullable) = false]; int64 last_height_consensus_params_changed = 11; // Merkle root of the results from executing prev block diff --git a/proto/tendermint/statesync/message.go b/proto/cometbft/v38/statesync/message.go similarity index 96% rename from proto/tendermint/statesync/message.go rename to proto/cometbft/v38/statesync/message.go index 357e8eac5c5..a252b771b3e 100644 --- a/proto/tendermint/statesync/message.go +++ b/proto/cometbft/v38/statesync/message.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/gogoproto/proto" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) var _ p2p.Wrapper = &ChunkRequest{} diff --git a/proto/tendermint/statesync/types.pb.go b/proto/cometbft/v38/statesync/types.pb.go similarity index 91% rename from proto/tendermint/statesync/types.pb.go rename to proto/cometbft/v38/statesync/types.pb.go index 84a637f5e21..51d46af610e 100644 --- a/proto/tendermint/statesync/types.pb.go +++ b/proto/cometbft/v38/statesync/types.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/statesync/types.proto +// source: cometbft/v38/statesync/types.proto package statesync import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -36,7 +36,7 @@ func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} func (*Message) Descriptor() ([]byte, []int) { - return fileDescriptor_a1c2869546ca7914, []int{0} + return fileDescriptor_874cf53c58c1a307, []int{0} } func (m *Message) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -141,7 +141,7 @@ func (m *SnapshotsRequest) Reset() { *m = SnapshotsRequest{} } func (m *SnapshotsRequest) String() string { return proto.CompactTextString(m) } func (*SnapshotsRequest) ProtoMessage() {} func (*SnapshotsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a1c2869546ca7914, []int{1} + return fileDescriptor_874cf53c58c1a307, []int{1} } func (m *SnapshotsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -182,7 +182,7 @@ func (m *SnapshotsResponse) Reset() { *m = SnapshotsResponse{} } func (m *SnapshotsResponse) String() string { return proto.CompactTextString(m) } func (*SnapshotsResponse) ProtoMessage() {} func (*SnapshotsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a1c2869546ca7914, []int{2} + return fileDescriptor_874cf53c58c1a307, []int{2} } func (m *SnapshotsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -256,7 +256,7 @@ func (m *ChunkRequest) Reset() { *m = ChunkRequest{} } func (m *ChunkRequest) String() string { return proto.CompactTextString(m) } func (*ChunkRequest) ProtoMessage() {} func (*ChunkRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a1c2869546ca7914, []int{3} + return fileDescriptor_874cf53c58c1a307, []int{3} } func (m *ChunkRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -318,7 +318,7 @@ func (m *ChunkResponse) Reset() { *m = ChunkResponse{} } func (m *ChunkResponse) String() string { return proto.CompactTextString(m) } func (*ChunkResponse) ProtoMessage() {} func (*ChunkResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a1c2869546ca7914, []int{4} + return fileDescriptor_874cf53c58c1a307, []int{4} } func (m *ChunkResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -383,42 +383,46 @@ func (m *ChunkResponse) GetMissing() bool { } func init() { - proto.RegisterType((*Message)(nil), "tendermint.statesync.Message") - proto.RegisterType((*SnapshotsRequest)(nil), "tendermint.statesync.SnapshotsRequest") - proto.RegisterType((*SnapshotsResponse)(nil), "tendermint.statesync.SnapshotsResponse") - proto.RegisterType((*ChunkRequest)(nil), "tendermint.statesync.ChunkRequest") - proto.RegisterType((*ChunkResponse)(nil), "tendermint.statesync.ChunkResponse") -} - -func init() { proto.RegisterFile("tendermint/statesync/types.proto", fileDescriptor_a1c2869546ca7914) } - -var fileDescriptor_a1c2869546ca7914 = []byte{ - // 397 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x3f, 0x6b, 0xdb, 0x40, - 0x1c, 0x95, 0xfc, 0x9f, 0x5f, 0xad, 0x62, 0x1f, 0xa6, 0x88, 0x0e, 0xc2, 0xa8, 0xd0, 0x76, 0x92, - 0xa0, 0x1d, 0xba, 0xbb, 0x8b, 0x0b, 0xed, 0xd0, 0x6b, 0x03, 0x21, 0x4b, 0x38, 0xcb, 0x67, 0x49, - 0x04, 0x9d, 0x14, 0xfd, 0x4e, 0x10, 0x7f, 0x80, 0x4c, 0x59, 0xf2, 0xb1, 0x32, 0x7a, 0x0c, 0x99, - 0x82, 0xfd, 0x45, 0x82, 0x4e, 0xb2, 0xac, 0x38, 0x26, 0x21, 0x90, 0xed, 0xde, 0xd3, 0xd3, 0xbb, - 0xf7, 0x1e, 0x1c, 0x8c, 0x25, 0x17, 0x73, 0x9e, 0x46, 0xa1, 0x90, 0x2e, 0x4a, 0x26, 0x39, 0x2e, - 0x85, 0xe7, 0xca, 0x65, 0xc2, 0xd1, 0x49, 0xd2, 0x58, 0xc6, 0x64, 0xb4, 0x53, 0x38, 0x95, 0xc2, - 0xbe, 0x6b, 0x40, 0xf7, 0x0f, 0x47, 0x64, 0x3e, 0x27, 0x47, 0x30, 0x44, 0xc1, 0x12, 0x0c, 0x62, - 0x89, 0xa7, 0x29, 0x3f, 0xcf, 0x38, 0x4a, 0x53, 0x1f, 0xeb, 0x5f, 0xdf, 0x7d, 0xfb, 0xec, 0x1c, - 0xfa, 0xdb, 0xf9, 0xb7, 0x95, 0xd3, 0x42, 0x3d, 0xd5, 0xe8, 0x00, 0xf7, 0x38, 0x72, 0x0c, 0xa4, - 0x6e, 0x8b, 0x49, 0x2c, 0x90, 0x9b, 0x0d, 0xe5, 0xfb, 0xe5, 0x45, 0xdf, 0x42, 0x3e, 0xd5, 0xe8, - 0x10, 0xf7, 0x49, 0xf2, 0x0b, 0x0c, 0x2f, 0xc8, 0xc4, 0x59, 0x15, 0xb6, 0xa9, 0x4c, 0xed, 0xc3, - 0xa6, 0x3f, 0x73, 0xe9, 0x2e, 0x68, 0xdf, 0xab, 0x61, 0xf2, 0x1b, 0xde, 0x6f, 0xad, 0xca, 0x80, - 0x2d, 0xe5, 0xf5, 0xe9, 0x59, 0xaf, 0x2a, 0x9c, 0xe1, 0xd5, 0x89, 0x49, 0x1b, 0x9a, 0x98, 0x45, - 0x36, 0x81, 0xc1, 0xfe, 0x42, 0xf6, 0x95, 0x0e, 0xc3, 0x27, 0xf5, 0xc8, 0x07, 0xe8, 0x04, 0x3c, - 0xf4, 0x83, 0x62, 0xef, 0x16, 0x2d, 0x51, 0xce, 0x2f, 0xe2, 0x34, 0x62, 0x52, 0xed, 0x65, 0xd0, - 0x12, 0xe5, 0xbc, 0xba, 0x11, 0x55, 0x65, 0x83, 0x96, 0x88, 0x10, 0x68, 0x05, 0x0c, 0x03, 0x15, - 0xbe, 0x4f, 0xd5, 0x99, 0x7c, 0x84, 0x5e, 0xc4, 0x25, 0x9b, 0x33, 0xc9, 0xcc, 0xb6, 0xe2, 0x2b, - 0x6c, 0xff, 0x87, 0x7e, 0x7d, 0x96, 0x57, 0xe7, 0x18, 0x41, 0x3b, 0x14, 0x73, 0x7e, 0x51, 0xc6, - 0x28, 0x80, 0x7d, 0xa9, 0x83, 0xf1, 0x68, 0xa1, 0xb7, 0xf1, 0xcd, 0x59, 0xd5, 0xb3, 0xac, 0x57, - 0x00, 0x62, 0x42, 0x37, 0x0a, 0x11, 0x43, 0xe1, 0xab, 0x7a, 0x3d, 0xba, 0x85, 0x93, 0xbf, 0x37, - 0x6b, 0x4b, 0x5f, 0xad, 0x2d, 0xfd, 0x7e, 0x6d, 0xe9, 0xd7, 0x1b, 0x4b, 0x5b, 0x6d, 0x2c, 0xed, - 0x76, 0x63, 0x69, 0x27, 0x3f, 0xfc, 0x50, 0x06, 0xd9, 0xcc, 0xf1, 0xe2, 0xc8, 0xf5, 0xe2, 0x88, - 0xcb, 0xd9, 0x42, 0xee, 0x0e, 0xea, 0xc1, 0xb8, 0x87, 0x5e, 0xd4, 0xac, 0xa3, 0xbe, 0x7d, 0x7f, - 0x08, 0x00, 0x00, 0xff, 0xff, 0x04, 0xbe, 0xb0, 0x90, 0x70, 0x03, 0x00, 0x00, + proto.RegisterType((*Message)(nil), "cometbft.v38.statesync.Message") + proto.RegisterType((*SnapshotsRequest)(nil), "cometbft.v38.statesync.SnapshotsRequest") + proto.RegisterType((*SnapshotsResponse)(nil), "cometbft.v38.statesync.SnapshotsResponse") + proto.RegisterType((*ChunkRequest)(nil), "cometbft.v38.statesync.ChunkRequest") + proto.RegisterType((*ChunkResponse)(nil), "cometbft.v38.statesync.ChunkResponse") +} + +func init() { + proto.RegisterFile("cometbft/v38/statesync/types.proto", fileDescriptor_874cf53c58c1a307) +} + +var fileDescriptor_874cf53c58c1a307 = []byte{ + // 418 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x4d, 0x8b, 0xd3, 0x50, + 0x14, 0x4d, 0x66, 0xda, 0x99, 0xe1, 0xda, 0xc8, 0xf4, 0x21, 0x43, 0x70, 0x11, 0x24, 0x28, 0xd4, + 0x4d, 0x02, 0x76, 0xd3, 0x95, 0x8b, 0x8a, 0x50, 0x28, 0x76, 0xf1, 0x14, 0x3f, 0xba, 0x91, 0xd7, + 0xf4, 0x35, 0x09, 0x25, 0x2f, 0x31, 0xf7, 0xa5, 0xda, 0x1f, 0xe0, 0xca, 0x8d, 0x3f, 0xcb, 0x65, + 0x97, 0x2e, 0x25, 0xfd, 0x23, 0x92, 0x97, 0x8f, 0xa6, 0x55, 0x51, 0x61, 0x76, 0x39, 0x27, 0xf7, + 0x9e, 0x9c, 0x73, 0xc2, 0x05, 0xdb, 0x8b, 0x23, 0x2e, 0x17, 0x2b, 0xe9, 0x6e, 0x86, 0x23, 0x17, + 0x25, 0x93, 0x1c, 0xb7, 0xc2, 0x73, 0xe5, 0x36, 0xe1, 0xe8, 0x24, 0x69, 0x2c, 0x63, 0x72, 0x53, + 0xcf, 0x38, 0x9b, 0xe1, 0xc8, 0x69, 0x66, 0xec, 0xfc, 0x0c, 0x2e, 0x5f, 0x70, 0x44, 0xe6, 0x73, + 0xf2, 0x06, 0xfa, 0x28, 0x58, 0x82, 0x41, 0x2c, 0xf1, 0x7d, 0xca, 0x3f, 0x64, 0x1c, 0xa5, 0xa9, + 0x3f, 0xd0, 0x07, 0x77, 0x9e, 0x0c, 0x9c, 0xdf, 0xef, 0x3b, 0x2f, 0xeb, 0x05, 0x5a, 0xce, 0x4f, + 0x34, 0x7a, 0x8d, 0x27, 0x1c, 0x99, 0x03, 0x69, 0x0b, 0x63, 0x12, 0x0b, 0xe4, 0xe6, 0x99, 0x52, + 0x7e, 0xfc, 0x0f, 0xca, 0xe5, 0xc2, 0x44, 0xa3, 0x7d, 0x3c, 0x25, 0xc9, 0x14, 0x0c, 0x2f, 0xc8, + 0xc4, 0xba, 0x31, 0x7c, 0xae, 0x64, 0x1f, 0xfe, 0x49, 0xf6, 0x59, 0x31, 0x7c, 0x30, 0xdb, 0xf3, + 0x5a, 0x98, 0xcc, 0xe0, 0x6e, 0x2d, 0x56, 0x99, 0xec, 0x28, 0xb5, 0x47, 0x7f, 0x51, 0x6b, 0x0c, + 0x1a, 0x5e, 0x9b, 0x18, 0x77, 0xe1, 0x1c, 0xb3, 0xc8, 0x26, 0x70, 0x7d, 0xda, 0x93, 0xfd, 0x45, + 0x87, 0xfe, 0x2f, 0x11, 0xc9, 0x0d, 0x5c, 0x04, 0x3c, 0xf4, 0x83, 0xb2, 0xf7, 0x0e, 0xad, 0x50, + 0xc1, 0xaf, 0xe2, 0x34, 0x62, 0x52, 0xb5, 0x66, 0xd0, 0x0a, 0x15, 0xbc, 0xfa, 0x22, 0xaa, 0xd8, + 0x06, 0xad, 0x10, 0x21, 0xd0, 0x09, 0x18, 0x06, 0xca, 0x7e, 0x8f, 0xaa, 0x67, 0x72, 0x1f, 0xae, + 0x22, 0x2e, 0xd9, 0x92, 0x49, 0x66, 0x76, 0x15, 0xdf, 0x60, 0xfb, 0x15, 0xf4, 0xda, 0xc5, 0xfc, + 0xb7, 0x8f, 0x7b, 0xd0, 0x0d, 0xc5, 0x92, 0x7f, 0xaa, 0x6c, 0x94, 0xc0, 0xfe, 0xac, 0x83, 0x71, + 0xd4, 0xd0, 0xed, 0xe8, 0x16, 0xac, 0xca, 0x59, 0xc5, 0x2b, 0x01, 0x31, 0xe1, 0x32, 0x0a, 0x11, + 0x43, 0xe1, 0xab, 0x78, 0x57, 0xb4, 0x86, 0xe3, 0xb7, 0xdf, 0x72, 0x4b, 0xdf, 0xe5, 0x96, 0xfe, + 0x23, 0xb7, 0xf4, 0xaf, 0x7b, 0x4b, 0xdb, 0xed, 0x2d, 0xed, 0xfb, 0xde, 0xd2, 0xe6, 0x4f, 0xfd, + 0x50, 0x06, 0xd9, 0xa2, 0xf8, 0xbd, 0xee, 0xf4, 0xdd, 0xeb, 0xe7, 0x33, 0x2e, 0x3f, 0xc6, 0xe9, + 0xda, 0x3d, 0xba, 0x28, 0x75, 0x41, 0xae, 0xe4, 0x62, 0xc9, 0xd3, 0x28, 0x14, 0xf2, 0x70, 0x62, + 0x8b, 0x0b, 0xf5, 0x6e, 0xf8, 0x33, 0x00, 0x00, 0xff, 0xff, 0x11, 0x3d, 0x26, 0xed, 0x83, 0x03, + 0x00, 0x00, } func (m *Message) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/statesync/types.proto b/proto/cometbft/v38/statesync/types.proto similarity index 84% rename from proto/tendermint/statesync/types.proto rename to proto/cometbft/v38/statesync/types.proto index eac36b3dec3..b94d390ddbe 100644 --- a/proto/tendermint/statesync/types.proto +++ b/proto/cometbft/v38/statesync/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.statesync; +package cometbft.v38.statesync; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/statesync"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/statesync"; message Message { oneof sum { diff --git a/proto/tendermint/store/types.pb.go b/proto/cometbft/v38/store/types.pb.go similarity index 81% rename from proto/tendermint/store/types.pb.go rename to proto/cometbft/v38/store/types.pb.go index e7e553e0e2c..a178d40c87f 100644 --- a/proto/tendermint/store/types.pb.go +++ b/proto/cometbft/v38/store/types.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/store/types.proto +// source: cometbft/v38/store/types.proto package store import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -31,7 +31,7 @@ func (m *BlockStoreState) Reset() { *m = BlockStoreState{} } func (m *BlockStoreState) String() string { return proto.CompactTextString(m) } func (*BlockStoreState) ProtoMessage() {} func (*BlockStoreState) Descriptor() ([]byte, []int) { - return fileDescriptor_ff9e53a0a74267f7, []int{0} + return fileDescriptor_755135d936eb2f0b, []int{0} } func (m *BlockStoreState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -75,24 +75,25 @@ func (m *BlockStoreState) GetHeight() int64 { } func init() { - proto.RegisterType((*BlockStoreState)(nil), "tendermint.store.BlockStoreState") + proto.RegisterType((*BlockStoreState)(nil), "cometbft.v38.store.BlockStoreState") } -func init() { proto.RegisterFile("tendermint/store/types.proto", fileDescriptor_ff9e53a0a74267f7) } +func init() { proto.RegisterFile("cometbft/v38/store/types.proto", fileDescriptor_755135d936eb2f0b) } -var fileDescriptor_ff9e53a0a74267f7 = []byte{ - // 171 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, 0xa9, 0x2c, - 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0xc8, 0xea, 0x81, 0x65, 0x95, - 0x6c, 0xb9, 0xf8, 0x9d, 0x72, 0xf2, 0x93, 0xb3, 0x83, 0x41, 0xbc, 0xe0, 0x92, 0xc4, 0x92, 0x54, - 0x21, 0x21, 0x2e, 0x96, 0xa4, 0xc4, 0xe2, 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x30, - 0x5b, 0x48, 0x8c, 0x8b, 0x2d, 0x23, 0x35, 0x33, 0x3d, 0xa3, 0x44, 0x82, 0x09, 0x2c, 0x0a, 0xe5, - 0x39, 0xf9, 0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, - 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x71, 0x7a, 0x66, - 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x72, 0x7e, 0x6e, 0x6a, 0x49, 0x52, 0x5a, - 0x09, 0x82, 0x01, 0x76, 0x8e, 0x3e, 0xba, 0x5b, 0x93, 0xd8, 0xc0, 0xe2, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xb7, 0x2b, 0x34, 0x2a, 0xc6, 0x00, 0x00, 0x00, +var fileDescriptor_755135d936eb2f0b = []byte{ + // 191 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, + 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0xc9, 0xeb, 0x95, + 0x19, 0x5b, 0xe8, 0x81, 0xe5, 0x95, 0x6c, 0xb9, 0xf8, 0x9d, 0x72, 0xf2, 0x93, 0xb3, 0x83, 0x41, + 0xbc, 0xe0, 0x92, 0xc4, 0x92, 0x54, 0x21, 0x21, 0x2e, 0x96, 0xa4, 0xc4, 0xe2, 0x54, 0x09, 0x46, + 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x30, 0x5b, 0x48, 0x8c, 0x8b, 0x2d, 0x23, 0x35, 0x33, 0x3d, 0xa3, + 0x44, 0x82, 0x09, 0x2c, 0x0a, 0xe5, 0x39, 0x85, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, + 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, + 0x1c, 0x43, 0x94, 0x55, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0xbe, 0x77, + 0x64, 0x98, 0xab, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0xb6, 0x3e, 0x8a, 0x1b, 0xc1, 0xee, 0xd2, + 0x2f, 0x49, 0xcd, 0x4b, 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0x81, 0x38, 0x3a, 0x89, 0x0d, 0x2c, + 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x84, 0x4b, 0xe5, 0xdf, 0xd1, 0x00, 0x00, 0x00, } func (m *BlockStoreState) Marshal() (dAtA []byte, err error) { diff --git a/proto/cometbft/v38/store/types.proto b/proto/cometbft/v38/store/types.proto new file mode 100644 index 00000000000..caf96d0b467 --- /dev/null +++ b/proto/cometbft/v38/store/types.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +package cometbft.v38.store; + +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/store"; + +message BlockStoreState { + int64 base = 1; + int64 height = 2; +} diff --git a/proto/tendermint/types/block.pb.go b/proto/cometbft/v38/types/block.pb.go similarity index 82% rename from proto/tendermint/types/block.pb.go rename to proto/cometbft/v38/types/block.pb.go index 3b3e3811ffc..a3a7a891f72 100644 --- a/proto/tendermint/types/block.pb.go +++ b/proto/cometbft/v38/types/block.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/block.proto +// source: cometbft/v38/types/block.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -34,7 +34,7 @@ func (m *Block) Reset() { *m = Block{} } func (m *Block) String() string { return proto.CompactTextString(m) } func (*Block) ProtoMessage() {} func (*Block) Descriptor() ([]byte, []int) { - return fileDescriptor_70840e82f4357ab1, []int{0} + return fileDescriptor_72bdbdcb535e3f66, []int{0} } func (m *Block) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,30 +92,32 @@ func (m *Block) GetLastCommit() *Commit { } func init() { - proto.RegisterType((*Block)(nil), "tendermint.types.Block") + proto.RegisterType((*Block)(nil), "cometbft.v38.types.Block") } -func init() { proto.RegisterFile("tendermint/types/block.proto", fileDescriptor_70840e82f4357ab1) } +func init() { proto.RegisterFile("cometbft/v38/types/block.proto", fileDescriptor_72bdbdcb535e3f66) } -var fileDescriptor_70840e82f4357ab1 = []byte{ - // 272 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0xca, 0xc9, - 0x4f, 0xce, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0xc8, 0xea, 0x81, 0x65, 0xa5, - 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x92, 0xfa, 0x20, 0x16, 0x44, 0x9d, 0x14, 0xa6, 0x29, 0x60, - 0x12, 0x2a, 0x2b, 0x8f, 0x21, 0x9b, 0x5a, 0x96, 0x99, 0x92, 0x9a, 0x97, 0x9c, 0x0a, 0x51, 0xa0, - 0xf4, 0x8e, 0x91, 0x8b, 0xd5, 0x09, 0x64, 0xad, 0x90, 0x19, 0x17, 0x5b, 0x46, 0x6a, 0x62, 0x4a, - 0x6a, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x84, 0x1e, 0xba, 0x0b, 0xf4, 0x3c, 0xc0, - 0xf2, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0x55, 0x0b, 0x19, 0x70, 0xb1, 0xa4, 0x24, - 0x96, 0x24, 0x4a, 0x30, 0x81, 0x75, 0x89, 0x61, 0xea, 0x72, 0x49, 0x2c, 0x49, 0x84, 0xea, 0x01, - 0xab, 0x14, 0x72, 0xe0, 0xe2, 0x80, 0xb9, 0x42, 0x82, 0x19, 0xac, 0x4b, 0x0e, 0x53, 0x97, 0x2b, - 0x54, 0x85, 0x4f, 0x66, 0x71, 0x09, 0x54, 0x37, 0x5c, 0x97, 0x90, 0x25, 0x17, 0x77, 0x4e, 0x62, - 0x71, 0x49, 0x7c, 0x72, 0x7e, 0x6e, 0x6e, 0x66, 0x89, 0x04, 0x0b, 0x2e, 0x07, 0x3b, 0x83, 0xe5, - 0x83, 0xb8, 0x40, 0x8a, 0x21, 0x6c, 0x27, 0xdf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, - 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, - 0x63, 0x88, 0x32, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, - 0xcf, 0x4d, 0x2d, 0x49, 0x4a, 0x2b, 0x41, 0x30, 0x20, 0x01, 0x8f, 0x1e, 0x9c, 0x49, 0x6c, 0x60, - 0x71, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0xdf, 0xde, 0x0a, 0xcd, 0x01, 0x00, 0x00, +var fileDescriptor_72bdbdcb535e3f66 = []byte{ + // 291 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, + 0xca, 0xc9, 0x4f, 0xce, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0xc9, 0xeb, 0x95, + 0x19, 0x5b, 0xe8, 0x81, 0xe5, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xd2, 0xfa, 0x20, 0x16, + 0x44, 0xa5, 0x14, 0x36, 0x93, 0xc0, 0x24, 0x54, 0x5e, 0x11, 0x8b, 0x7c, 0x6a, 0x59, 0x66, 0x4a, + 0x6a, 0x5e, 0x72, 0x2a, 0x44, 0x89, 0xd2, 0x37, 0x46, 0x2e, 0x56, 0x27, 0x90, 0xe5, 0x42, 0x16, + 0x5c, 0x6c, 0x19, 0xa9, 0x89, 0x29, 0xa9, 0x45, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x52, + 0x7a, 0x98, 0xee, 0xd0, 0xf3, 0x00, 0xab, 0x70, 0x62, 0x39, 0x71, 0x4f, 0x9e, 0x21, 0x08, 0xaa, + 0x5e, 0xc8, 0x88, 0x8b, 0x25, 0x25, 0xb1, 0x24, 0x51, 0x82, 0x09, 0xac, 0x4f, 0x02, 0x9b, 0x3e, + 0x97, 0xc4, 0x92, 0x44, 0xa8, 0x2e, 0xb0, 0x5a, 0x21, 0x27, 0x2e, 0x0e, 0x98, 0x4b, 0x24, 0x98, + 0xc1, 0xfa, 0x14, 0xb0, 0xe9, 0x73, 0x85, 0xaa, 0xf1, 0xc9, 0x2c, 0x2e, 0x81, 0xea, 0x87, 0xeb, + 0x13, 0xb2, 0xe6, 0xe2, 0xce, 0x49, 0x2c, 0x2e, 0x89, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0x2c, 0x91, + 0x60, 0xc1, 0xed, 0x6c, 0x67, 0xb0, 0x8a, 0x20, 0x2e, 0x90, 0x72, 0x08, 0xdb, 0x29, 0xe4, 0xc4, + 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, + 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xac, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, + 0x40, 0xe6, 0xe8, 0x7b, 0x47, 0x86, 0xb9, 0xfa, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0xeb, 0xa3, + 0x04, 0x26, 0x24, 0x2e, 0x4a, 0x52, 0xf3, 0x52, 0x52, 0x8b, 0x72, 0x33, 0xf3, 0x4a, 0x20, 0xa1, + 0x9b, 0xc4, 0x06, 0x16, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xa4, 0x10, 0x8c, 0xe4, + 0x01, 0x00, 0x00, } func (m *Block) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/block.proto b/proto/cometbft/v38/types/block.proto similarity index 50% rename from proto/tendermint/types/block.proto rename to proto/cometbft/v38/types/block.proto index d531c06a005..30f4b573917 100644 --- a/proto/tendermint/types/block.proto +++ b/proto/cometbft/v38/types/block.proto @@ -1,15 +1,15 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v38.types; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/types"; import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; -import "tendermint/types/evidence.proto"; +import "cometbft/v38/types/types.proto"; +import "cometbft/v38/types/evidence.proto"; message Block { Header header = 1 [(gogoproto.nullable) = false]; Data data = 2 [(gogoproto.nullable) = false]; - tendermint.types.EvidenceList evidence = 3 [(gogoproto.nullable) = false]; + cometbft.v38.types.EvidenceList evidence = 3 [(gogoproto.nullable) = false]; Commit last_commit = 4; } diff --git a/proto/tendermint/types/canonical.pb.go b/proto/cometbft/v38/types/canonical.pb.go similarity index 87% rename from proto/tendermint/types/canonical.pb.go rename to proto/cometbft/v38/types/canonical.pb.go index 7e776e02d58..8e6ca28711e 100644 --- a/proto/tendermint/types/canonical.pb.go +++ b/proto/cometbft/v38/types/canonical.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/canonical.proto +// source: cometbft/v38/types/canonical.proto package types @@ -7,9 +7,9 @@ import ( encoding_binary "encoding/binary" fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -37,7 +37,7 @@ func (m *CanonicalBlockID) Reset() { *m = CanonicalBlockID{} } func (m *CanonicalBlockID) String() string { return proto.CompactTextString(m) } func (*CanonicalBlockID) ProtoMessage() {} func (*CanonicalBlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_8d1a1a84ff7267ed, []int{0} + return fileDescriptor_bc100f697e75c7b5, []int{0} } func (m *CanonicalBlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -89,7 +89,7 @@ func (m *CanonicalPartSetHeader) Reset() { *m = CanonicalPartSetHeader{} func (m *CanonicalPartSetHeader) String() string { return proto.CompactTextString(m) } func (*CanonicalPartSetHeader) ProtoMessage() {} func (*CanonicalPartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_8d1a1a84ff7267ed, []int{1} + return fileDescriptor_bc100f697e75c7b5, []int{1} } func (m *CanonicalPartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -133,7 +133,7 @@ func (m *CanonicalPartSetHeader) GetHash() []byte { } type CanonicalProposal struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.v38.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` POLRound int64 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` @@ -146,7 +146,7 @@ func (m *CanonicalProposal) Reset() { *m = CanonicalProposal{} } func (m *CanonicalProposal) String() string { return proto.CompactTextString(m) } func (*CanonicalProposal) ProtoMessage() {} func (*CanonicalProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_8d1a1a84ff7267ed, []int{2} + return fileDescriptor_bc100f697e75c7b5, []int{2} } func (m *CanonicalProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -225,7 +225,7 @@ func (m *CanonicalProposal) GetChainID() string { } type CanonicalVote struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.v38.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"fixed64,2,opt,name=height,proto3" json:"height,omitempty"` Round int64 `protobuf:"fixed64,3,opt,name=round,proto3" json:"round,omitempty"` BlockID *CanonicalBlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id,omitempty"` @@ -237,7 +237,7 @@ func (m *CanonicalVote) Reset() { *m = CanonicalVote{} } func (m *CanonicalVote) String() string { return proto.CompactTextString(m) } func (*CanonicalVote) ProtoMessage() {} func (*CanonicalVote) Descriptor() ([]byte, []int) { - return fileDescriptor_8d1a1a84ff7267ed, []int{3} + return fileDescriptor_bc100f697e75c7b5, []int{3} } func (m *CanonicalVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -321,7 +321,7 @@ func (m *CanonicalVoteExtension) Reset() { *m = CanonicalVoteExtension{} func (m *CanonicalVoteExtension) String() string { return proto.CompactTextString(m) } func (*CanonicalVoteExtension) ProtoMessage() {} func (*CanonicalVoteExtension) Descriptor() ([]byte, []int) { - return fileDescriptor_8d1a1a84ff7267ed, []int{4} + return fileDescriptor_bc100f697e75c7b5, []int{4} } func (m *CanonicalVoteExtension) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -379,50 +379,54 @@ func (m *CanonicalVoteExtension) GetChainId() string { } func init() { - proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.types.CanonicalBlockID") - proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.types.CanonicalPartSetHeader") - proto.RegisterType((*CanonicalProposal)(nil), "tendermint.types.CanonicalProposal") - proto.RegisterType((*CanonicalVote)(nil), "tendermint.types.CanonicalVote") - proto.RegisterType((*CanonicalVoteExtension)(nil), "tendermint.types.CanonicalVoteExtension") -} - -func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) } - -var fileDescriptor_8d1a1a84ff7267ed = []byte{ - // 525 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xc1, 0x6e, 0x9b, 0x40, - 0x10, 0x35, 0x0e, 0xb6, 0x61, 0x13, 0xb7, 0xee, 0x2a, 0x8a, 0xa8, 0x15, 0x01, 0xe2, 0x50, 0xd1, - 0x0b, 0x48, 0xf1, 0x1f, 0x90, 0x56, 0xaa, 0xab, 0x46, 0x8d, 0x48, 0x94, 0x43, 0x2f, 0xd6, 0x02, - 0x1b, 0x40, 0x05, 0x16, 0xc1, 0x5a, 0x6a, 0x2e, 0xed, 0x2f, 0xe4, 0x3b, 0xfa, 0x25, 0x39, 0xe6, - 0xd8, 0x5e, 0xdc, 0x0a, 0xff, 0x48, 0xb5, 0x0b, 0x06, 0x2b, 0xa9, 0x2c, 0x55, 0xad, 0x7a, 0x41, - 0x33, 0x6f, 0xde, 0xce, 0x3c, 0xbd, 0x61, 0x17, 0xe8, 0x14, 0x67, 0x01, 0x2e, 0xd2, 0x38, 0xa3, - 0x36, 0xbd, 0xc9, 0x71, 0x69, 0xfb, 0x28, 0x23, 0x59, 0xec, 0xa3, 0xc4, 0xca, 0x0b, 0x42, 0x09, - 0x9c, 0x74, 0x0c, 0x8b, 0x33, 0xa6, 0x87, 0x21, 0x09, 0x09, 0x2f, 0xda, 0x2c, 0xaa, 0x79, 0xd3, - 0xe3, 0x47, 0x9d, 0xf8, 0xb7, 0xa9, 0x6a, 0x21, 0x21, 0x61, 0x82, 0x6d, 0x9e, 0x79, 0xcb, 0x6b, - 0x9b, 0xc6, 0x29, 0x2e, 0x29, 0x4a, 0xf3, 0x9a, 0x60, 0x7c, 0x06, 0x93, 0xd3, 0xcd, 0x64, 0x27, - 0x21, 0xfe, 0xc7, 0xf9, 0x2b, 0x08, 0x81, 0x18, 0xa1, 0x32, 0x52, 0x04, 0x5d, 0x30, 0x0f, 0x5c, - 0x1e, 0xc3, 0x2b, 0xf0, 0x34, 0x47, 0x05, 0x5d, 0x94, 0x98, 0x2e, 0x22, 0x8c, 0x02, 0x5c, 0x28, - 0x7d, 0x5d, 0x30, 0xf7, 0x4f, 0x4c, 0xeb, 0xa1, 0x50, 0xab, 0x6d, 0x78, 0x8e, 0x0a, 0x7a, 0x81, - 0xe9, 0x1b, 0xce, 0x77, 0xc4, 0xbb, 0x95, 0xd6, 0x73, 0xc7, 0xf9, 0x36, 0x68, 0x38, 0xe0, 0xe8, - 0xf7, 0x74, 0x78, 0x08, 0x06, 0x94, 0x50, 0x94, 0x70, 0x19, 0x63, 0xb7, 0x4e, 0x5a, 0x6d, 0xfd, - 0x4e, 0x9b, 0xf1, 0xbd, 0x0f, 0x9e, 0x75, 0x4d, 0x0a, 0x92, 0x93, 0x12, 0x25, 0x70, 0x06, 0x44, - 0x26, 0x87, 0x1f, 0x7f, 0x72, 0xa2, 0x3d, 0x96, 0x79, 0x11, 0x87, 0x19, 0x0e, 0xce, 0xca, 0xf0, - 0xf2, 0x26, 0xc7, 0x2e, 0x27, 0xc3, 0x23, 0x30, 0x8c, 0x70, 0x1c, 0x46, 0x94, 0x0f, 0x98, 0xb8, - 0x4d, 0xc6, 0xc4, 0x14, 0x64, 0x99, 0x05, 0xca, 0x1e, 0x87, 0xeb, 0x04, 0xbe, 0x04, 0x72, 0x4e, - 0x92, 0x45, 0x5d, 0x11, 0x75, 0xc1, 0xdc, 0x73, 0x0e, 0xaa, 0x95, 0x26, 0x9d, 0xbf, 0x7f, 0xe7, - 0x32, 0xcc, 0x95, 0x72, 0x92, 0xf0, 0x08, 0xbe, 0x05, 0x92, 0xc7, 0xec, 0x5d, 0xc4, 0x81, 0x32, - 0xe0, 0xc6, 0x19, 0x3b, 0x8c, 0x6b, 0x36, 0xe1, 0xec, 0x57, 0x2b, 0x6d, 0xd4, 0x24, 0xee, 0x88, - 0x37, 0x98, 0x07, 0xd0, 0x01, 0x72, 0xbb, 0x46, 0x65, 0xc8, 0x9b, 0x4d, 0xad, 0x7a, 0xd1, 0xd6, - 0x66, 0xd1, 0xd6, 0xe5, 0x86, 0xe1, 0x48, 0xcc, 0xf7, 0xdb, 0x1f, 0x9a, 0xe0, 0x76, 0xc7, 0xe0, - 0x0b, 0x20, 0xf9, 0x11, 0x8a, 0x33, 0xa6, 0x67, 0xa4, 0x0b, 0xa6, 0x5c, 0xcf, 0x3a, 0x65, 0x18, - 0x9b, 0xc5, 0x8b, 0xf3, 0xc0, 0xf8, 0xda, 0x07, 0xe3, 0x56, 0xd6, 0x15, 0xa1, 0xf8, 0x7f, 0xf8, - 0xba, 0x6d, 0x96, 0xf8, 0x2f, 0xcd, 0x1a, 0xfc, 0xbd, 0x59, 0xc3, 0x1d, 0x66, 0x7d, 0xd9, 0xfa, - 0x99, 0x99, 0x57, 0xaf, 0x3f, 0x51, 0x9c, 0x95, 0x31, 0xc9, 0xe0, 0x31, 0x90, 0xf1, 0x26, 0x69, - 0xee, 0x55, 0x07, 0xfc, 0xa1, 0x3b, 0xcf, 0xb7, 0xd4, 0x30, 0x77, 0xe4, 0x56, 0x80, 0x73, 0x76, - 0x57, 0xa9, 0xc2, 0x7d, 0xa5, 0x0a, 0x3f, 0x2b, 0x55, 0xb8, 0x5d, 0xab, 0xbd, 0xfb, 0xb5, 0xda, - 0xfb, 0xb6, 0x56, 0x7b, 0x1f, 0x66, 0x61, 0x4c, 0xa3, 0xa5, 0x67, 0xf9, 0x24, 0xb5, 0x7d, 0x92, - 0x62, 0xea, 0x5d, 0xd3, 0x2e, 0xa8, 0x5f, 0x95, 0x87, 0x2f, 0x89, 0x37, 0xe4, 0xf8, 0xec, 0x57, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x22, 0x5b, 0x0b, 0xae, 0x04, 0x00, 0x00, + proto.RegisterType((*CanonicalBlockID)(nil), "cometbft.v38.types.CanonicalBlockID") + proto.RegisterType((*CanonicalPartSetHeader)(nil), "cometbft.v38.types.CanonicalPartSetHeader") + proto.RegisterType((*CanonicalProposal)(nil), "cometbft.v38.types.CanonicalProposal") + proto.RegisterType((*CanonicalVote)(nil), "cometbft.v38.types.CanonicalVote") + proto.RegisterType((*CanonicalVoteExtension)(nil), "cometbft.v38.types.CanonicalVoteExtension") +} + +func init() { + proto.RegisterFile("cometbft/v38/types/canonical.proto", fileDescriptor_bc100f697e75c7b5) +} + +var fileDescriptor_bc100f697e75c7b5 = []byte{ + // 551 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0x86, 0x33, 0x69, 0xfe, 0x3c, 0x6d, 0xbe, 0xaf, 0x8c, 0xaa, 0xca, 0x44, 0xc8, 0x0e, 0x16, + 0x42, 0x81, 0x85, 0x2d, 0x35, 0x42, 0xaa, 0x58, 0xba, 0x54, 0x22, 0xa2, 0x40, 0xe5, 0x46, 0x15, + 0xb0, 0x89, 0xc6, 0xf6, 0xd4, 0xb6, 0xea, 0x78, 0x2c, 0x7b, 0x52, 0xe8, 0x0a, 0x2e, 0xa1, 0x57, + 0xc2, 0x75, 0x74, 0xd9, 0x25, 0x1b, 0x02, 0x72, 0x6e, 0x04, 0xcd, 0xf8, 0x27, 0x41, 0x44, 0x95, + 0x10, 0x88, 0x4d, 0x34, 0xe7, 0x9c, 0x77, 0xce, 0x79, 0xf5, 0x9c, 0x78, 0xa0, 0xe6, 0xd0, 0x29, + 0x61, 0xf6, 0x19, 0x33, 0x2e, 0x86, 0xfb, 0x06, 0xbb, 0x8c, 0x49, 0x6a, 0x38, 0x38, 0xa2, 0x51, + 0xe0, 0xe0, 0x50, 0x8f, 0x13, 0xca, 0x28, 0x42, 0xa5, 0x46, 0xbf, 0x18, 0xee, 0xeb, 0x42, 0xd3, + 0xdb, 0xf1, 0xa8, 0x47, 0x45, 0xd9, 0xe0, 0xa7, 0x5c, 0xd9, 0x53, 0xd6, 0x74, 0x13, 0xbf, 0x45, + 0x5d, 0xf5, 0x28, 0xf5, 0x42, 0x62, 0x88, 0xc8, 0x9e, 0x9d, 0x19, 0x2c, 0x98, 0x92, 0x94, 0xe1, + 0x69, 0x9c, 0x0b, 0xb4, 0x4f, 0x00, 0x6e, 0x1f, 0x94, 0xe3, 0xcd, 0x90, 0x3a, 0xe7, 0xa3, 0x67, + 0x08, 0xc1, 0x86, 0x8f, 0x53, 0x5f, 0x06, 0x7d, 0x30, 0xd8, 0xb2, 0xc4, 0x19, 0xbd, 0x81, 0xff, + 0xc7, 0x38, 0x61, 0x93, 0x94, 0xb0, 0x89, 0x4f, 0xb0, 0x4b, 0x12, 0xb9, 0xde, 0x07, 0x83, 0xcd, + 0xbd, 0xc7, 0xfa, 0xaf, 0x6e, 0xf5, 0xaa, 0xe5, 0x31, 0x4e, 0xd8, 0x09, 0x61, 0xcf, 0xc5, 0x0d, + 0xb3, 0x71, 0x3d, 0x57, 0x6b, 0x56, 0x37, 0x5e, 0x4d, 0x6a, 0x26, 0xdc, 0x5d, 0x2f, 0x47, 0x3b, + 0xb0, 0xc9, 0x28, 0xc3, 0xa1, 0x30, 0xd2, 0xb5, 0xf2, 0xa0, 0x72, 0x57, 0x5f, 0xba, 0xd3, 0xbe, + 0xd6, 0xe1, 0x9d, 0x65, 0x93, 0x84, 0xc6, 0x34, 0xc5, 0x21, 0x7a, 0x02, 0x1b, 0xdc, 0x8e, 0xb8, + 0xfe, 0xdf, 0xde, 0xfd, 0x75, 0x46, 0x4f, 0x02, 0x2f, 0x22, 0xee, 0xcb, 0xd4, 0x1b, 0x5f, 0xc6, + 0xc4, 0x12, 0x72, 0xb4, 0x0b, 0x5b, 0x3e, 0x09, 0x3c, 0x9f, 0x89, 0x11, 0xdb, 0x56, 0x11, 0x71, + 0x3b, 0x09, 0x9d, 0x45, 0xae, 0xbc, 0x21, 0xd2, 0x79, 0x80, 0x1e, 0x41, 0x29, 0xa6, 0xe1, 0x24, + 0xaf, 0x34, 0xfa, 0x60, 0xb0, 0x61, 0x6e, 0x65, 0x73, 0xb5, 0x73, 0xfc, 0xfa, 0xc8, 0xe2, 0x39, + 0xab, 0x13, 0xd3, 0x50, 0x9c, 0xd0, 0x11, 0xec, 0xd8, 0x1c, 0xf1, 0x24, 0x70, 0xe5, 0xa6, 0x80, + 0xf7, 0xe0, 0x56, 0x78, 0xc5, 0x3e, 0xcc, 0xcd, 0x6c, 0xae, 0xb6, 0x8b, 0xc0, 0x6a, 0x8b, 0x16, + 0x23, 0x17, 0x99, 0x50, 0xaa, 0xb6, 0x29, 0xb7, 0x44, 0xbb, 0x9e, 0x9e, 0xef, 0x5b, 0x2f, 0xf7, + 0xad, 0x8f, 0x4b, 0x85, 0xd9, 0xe1, 0xec, 0xaf, 0xbe, 0xa9, 0xc0, 0x5a, 0x5e, 0x43, 0x0f, 0x61, + 0xc7, 0xf1, 0x71, 0x10, 0x71, 0x47, 0xed, 0x3e, 0x18, 0x48, 0xf9, 0xac, 0x03, 0x9e, 0xe3, 0xb3, + 0x44, 0x71, 0xe4, 0x6a, 0x9f, 0xeb, 0xb0, 0x5b, 0xd9, 0x3a, 0xa5, 0x8c, 0xfc, 0x1b, 0xb6, 0xab, + 0xc0, 0x1a, 0x7f, 0x17, 0x58, 0xf3, 0xcf, 0x81, 0xb5, 0x6e, 0x01, 0xf6, 0x71, 0xe5, 0x4f, 0xcd, + 0x79, 0x1d, 0x7e, 0x60, 0x24, 0x4a, 0x03, 0x1a, 0xa1, 0x7b, 0x50, 0x22, 0x65, 0x50, 0x7c, 0x61, + 0xcb, 0xc4, 0x6f, 0xf2, 0xb9, 0xbb, 0xe2, 0x86, 0xf3, 0x91, 0x2a, 0x03, 0xe6, 0xf8, 0x3a, 0x53, + 0xc0, 0x4d, 0xa6, 0x80, 0xef, 0x99, 0x02, 0xae, 0x16, 0x4a, 0xed, 0x66, 0xa1, 0xd4, 0xbe, 0x2c, + 0x94, 0xda, 0xbb, 0xa7, 0x5e, 0xc0, 0xfc, 0x99, 0xcd, 0x41, 0x1a, 0x2f, 0xde, 0x9e, 0x1e, 0xbe, + 0x22, 0xec, 0x3d, 0x4d, 0xce, 0x8d, 0x9f, 0x9e, 0x92, 0xfc, 0xa5, 0x61, 0x24, 0x72, 0x49, 0x32, + 0x0d, 0x22, 0x96, 0xbf, 0x2a, 0x76, 0x4b, 0xe4, 0x87, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1c, + 0xab, 0x13, 0xcc, 0xc6, 0x04, 0x00, 0x00, } func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) { @@ -527,7 +531,7 @@ func (m *CanonicalProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n2, err2 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n2, err2 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err2 != nil { return 0, err2 } @@ -599,7 +603,7 @@ func (m *CanonicalVote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n4, err4 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err4 != nil { return 0, err4 } @@ -752,7 +756,7 @@ func (m *CanonicalProposal) Size() (n int) { l = m.BlockID.Size() n += 1 + l + sovCanonical(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovCanonical(uint64(l)) l = len(m.ChainID) if l > 0 { @@ -780,7 +784,7 @@ func (m *CanonicalVote) Size() (n int) { l = m.BlockID.Size() n += 1 + l + sovCanonical(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovCanonical(uint64(l)) l = len(m.ChainID) if l > 0 { @@ -1190,7 +1194,7 @@ func (m *CanonicalProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1380,7 +1384,7 @@ func (m *CanonicalVote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/canonical.proto b/proto/cometbft/v38/types/canonical.proto similarity index 92% rename from proto/tendermint/types/canonical.proto rename to proto/cometbft/v38/types/canonical.proto index bbff09b6605..2114e81ec02 100644 --- a/proto/tendermint/types/canonical.proto +++ b/proto/cometbft/v38/types/canonical.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v38.types; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/types"; import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; +import "cometbft/v38/types/types.proto"; import "google/protobuf/timestamp.proto"; message CanonicalBlockID { diff --git a/proto/tendermint/types/events.pb.go b/proto/cometbft/v38/types/events.pb.go similarity index 82% rename from proto/tendermint/types/events.pb.go rename to proto/cometbft/v38/types/events.pb.go index 02607e6d9bc..c4078e86dd8 100644 --- a/proto/tendermint/types/events.pb.go +++ b/proto/cometbft/v38/types/events.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/events.proto +// source: cometbft/v38/types/events.proto package types import ( fmt "fmt" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -32,7 +32,7 @@ func (m *EventDataRoundState) Reset() { *m = EventDataRoundState{} } func (m *EventDataRoundState) String() string { return proto.CompactTextString(m) } func (*EventDataRoundState) ProtoMessage() {} func (*EventDataRoundState) Descriptor() ([]byte, []int) { - return fileDescriptor_72cfafd446dedf7c, []int{0} + return fileDescriptor_054f8524706832e7, []int{0} } func (m *EventDataRoundState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -83,26 +83,27 @@ func (m *EventDataRoundState) GetStep() string { } func init() { - proto.RegisterType((*EventDataRoundState)(nil), "tendermint.types.EventDataRoundState") + proto.RegisterType((*EventDataRoundState)(nil), "cometbft.v38.types.EventDataRoundState") } -func init() { proto.RegisterFile("tendermint/types/events.proto", fileDescriptor_72cfafd446dedf7c) } +func init() { proto.RegisterFile("cometbft/v38/types/events.proto", fileDescriptor_054f8524706832e7) } -var fileDescriptor_72cfafd446dedf7c = []byte{ - // 195 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, 0x2d, 0x4b, - 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x40, 0x48, 0xeb, 0x81, 0xa5, - 0x95, 0xc2, 0xb9, 0x84, 0x5d, 0x41, 0x2a, 0x5c, 0x12, 0x4b, 0x12, 0x83, 0xf2, 0x4b, 0xf3, 0x52, - 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0xc4, 0xb8, 0xd8, 0x32, 0x52, 0x33, 0xd3, 0x33, 0x4a, 0x24, - 0x18, 0x15, 0x18, 0x35, 0x98, 0x83, 0xa0, 0x3c, 0x21, 0x11, 0x2e, 0xd6, 0x22, 0x90, 0x2a, 0x09, - 0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x08, 0x47, 0x48, 0x88, 0x8b, 0xa5, 0xb8, 0x24, 0xb5, 0x40, - 0x82, 0x59, 0x81, 0x51, 0x83, 0x33, 0x08, 0xcc, 0x76, 0xf2, 0x3d, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, - 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, - 0xc6, 0x63, 0x39, 0x86, 0x28, 0xe3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, - 0xfd, 0xe4, 0xfc, 0xdc, 0xd4, 0x92, 0xa4, 0xb4, 0x12, 0x04, 0x03, 0xec, 0x50, 0x7d, 0x74, 0x6f, - 0x24, 0xb1, 0x81, 0xc5, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xb3, 0x7f, 0x37, 0xe1, - 0x00, 0x00, 0x00, +var fileDescriptor_054f8524706832e7 = []byte{ + // 216 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x4f, + 0x2d, 0x4b, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x29, 0xd0, + 0x2b, 0x33, 0xb6, 0xd0, 0x03, 0x2b, 0x50, 0x0a, 0xe7, 0x12, 0x76, 0x05, 0xa9, 0x71, 0x49, 0x2c, + 0x49, 0x0c, 0xca, 0x2f, 0xcd, 0x4b, 0x09, 0x2e, 0x49, 0x2c, 0x49, 0x15, 0x12, 0xe3, 0x62, 0xcb, + 0x48, 0xcd, 0x4c, 0xcf, 0x28, 0x91, 0x60, 0x54, 0x60, 0xd4, 0x60, 0x0e, 0x82, 0xf2, 0x84, 0x44, + 0xb8, 0x58, 0x8b, 0x40, 0xaa, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x83, 0x20, 0x1c, 0x21, 0x21, + 0x2e, 0x96, 0xe2, 0x92, 0xd4, 0x02, 0x09, 0x66, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x30, 0xdb, 0x29, + 0xe4, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, + 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xac, 0xd2, 0x33, 0x4b, 0x32, + 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xbd, 0x23, 0xc3, 0x5c, 0xfd, 0x52, 0x4b, 0xca, 0xf3, + 0x8b, 0xb2, 0xf5, 0x51, 0x9c, 0x0f, 0x76, 0xb1, 0x7e, 0x49, 0x6a, 0x5e, 0x4a, 0x6a, 0x51, 0x6e, + 0x66, 0x5e, 0x09, 0xc4, 0x3f, 0x49, 0x6c, 0x60, 0x71, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x2b, 0xbb, 0x10, 0x1e, 0xec, 0x00, 0x00, 0x00, } func (m *EventDataRoundState) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/events.proto b/proto/cometbft/v38/types/events.proto similarity index 51% rename from proto/tendermint/types/events.proto rename to proto/cometbft/v38/types/events.proto index 98ce811be7a..d6e459fb147 100644 --- a/proto/tendermint/types/events.proto +++ b/proto/cometbft/v38/types/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v38.types; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/types"; message EventDataRoundState { int64 height = 1; diff --git a/proto/tendermint/types/evidence.pb.go b/proto/cometbft/v38/types/evidence.pb.go similarity index 86% rename from proto/tendermint/types/evidence.pb.go rename to proto/cometbft/v38/types/evidence.pb.go index 1022d4daf45..0e4bafad962 100644 --- a/proto/tendermint/types/evidence.pb.go +++ b/proto/cometbft/v38/types/evidence.pb.go @@ -1,14 +1,14 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/evidence.proto +// source: cometbft/v38/types/evidence.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -38,7 +38,7 @@ func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} func (*Evidence) Descriptor() ([]byte, []int) { - return fileDescriptor_6825fabc78e0a168, []int{0} + return fileDescriptor_4fceee1bf46a012f, []int{0} } func (m *Evidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -125,7 +125,7 @@ func (m *DuplicateVoteEvidence) Reset() { *m = DuplicateVoteEvidence{} } func (m *DuplicateVoteEvidence) String() string { return proto.CompactTextString(m) } func (*DuplicateVoteEvidence) ProtoMessage() {} func (*DuplicateVoteEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_6825fabc78e0a168, []int{1} + return fileDescriptor_4fceee1bf46a012f, []int{1} } func (m *DuplicateVoteEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -202,7 +202,7 @@ func (m *LightClientAttackEvidence) Reset() { *m = LightClientAttackEvid func (m *LightClientAttackEvidence) String() string { return proto.CompactTextString(m) } func (*LightClientAttackEvidence) ProtoMessage() {} func (*LightClientAttackEvidence) Descriptor() ([]byte, []int) { - return fileDescriptor_6825fabc78e0a168, []int{2} + return fileDescriptor_4fceee1bf46a012f, []int{2} } func (m *LightClientAttackEvidence) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -274,7 +274,7 @@ func (m *EvidenceList) Reset() { *m = EvidenceList{} } func (m *EvidenceList) String() string { return proto.CompactTextString(m) } func (*EvidenceList) ProtoMessage() {} func (*EvidenceList) Descriptor() ([]byte, []int) { - return fileDescriptor_6825fabc78e0a168, []int{3} + return fileDescriptor_4fceee1bf46a012f, []int{3} } func (m *EvidenceList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -311,50 +311,51 @@ func (m *EvidenceList) GetEvidence() []Evidence { } func init() { - proto.RegisterType((*Evidence)(nil), "tendermint.types.Evidence") - proto.RegisterType((*DuplicateVoteEvidence)(nil), "tendermint.types.DuplicateVoteEvidence") - proto.RegisterType((*LightClientAttackEvidence)(nil), "tendermint.types.LightClientAttackEvidence") - proto.RegisterType((*EvidenceList)(nil), "tendermint.types.EvidenceList") + proto.RegisterType((*Evidence)(nil), "cometbft.v38.types.Evidence") + proto.RegisterType((*DuplicateVoteEvidence)(nil), "cometbft.v38.types.DuplicateVoteEvidence") + proto.RegisterType((*LightClientAttackEvidence)(nil), "cometbft.v38.types.LightClientAttackEvidence") + proto.RegisterType((*EvidenceList)(nil), "cometbft.v38.types.EvidenceList") } -func init() { proto.RegisterFile("tendermint/types/evidence.proto", fileDescriptor_6825fabc78e0a168) } +func init() { proto.RegisterFile("cometbft/v38/types/evidence.proto", fileDescriptor_4fceee1bf46a012f) } -var fileDescriptor_6825fabc78e0a168 = []byte{ - // 533 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xe3, 0x38, 0xa9, 0xc2, 0xb6, 0x40, 0x58, 0x5a, 0x48, 0x43, 0xe4, 0x44, 0xe1, 0xd0, - 0x48, 0x80, 0x2d, 0xb5, 0x57, 0x2e, 0x35, 0x20, 0x15, 0x29, 0x20, 0x64, 0xa1, 0x1e, 0xb8, 0x58, - 0xeb, 0xcd, 0xc6, 0x59, 0xd5, 0xde, 0x8d, 0xe2, 0x49, 0x50, 0x79, 0x8a, 0x3c, 0x56, 0x2f, 0x48, - 0x3d, 0x72, 0x02, 0x94, 0xf0, 0x20, 0xc8, 0xeb, 0x3f, 0x89, 0xea, 0x98, 0x13, 0x97, 0xc8, 0x99, - 0xf9, 0x7d, 0x3b, 0x33, 0x9f, 0x67, 0x8d, 0xba, 0xc0, 0xc4, 0x88, 0xcd, 0x42, 0x2e, 0xc0, 0x82, - 0xeb, 0x29, 0x8b, 0x2c, 0xb6, 0xe0, 0x23, 0x26, 0x28, 0x33, 0xa7, 0x33, 0x09, 0x12, 0x37, 0x37, - 0x80, 0xa9, 0x80, 0xf6, 0xa1, 0x2f, 0x7d, 0xa9, 0x92, 0x56, 0xfc, 0x94, 0x70, 0xed, 0xae, 0x2f, - 0xa5, 0x1f, 0x30, 0x4b, 0xfd, 0xf3, 0xe6, 0x63, 0x0b, 0x78, 0xc8, 0x22, 0x20, 0xe1, 0x34, 0x05, - 0x3a, 0x85, 0x4a, 0xea, 0x37, 0xcd, 0xf6, 0x0a, 0xd9, 0x05, 0x09, 0xf8, 0x88, 0x80, 0x9c, 0x25, - 0x44, 0xff, 0x8f, 0x86, 0x1a, 0xef, 0xd2, 0xde, 0x30, 0x41, 0x4f, 0x47, 0xf3, 0x69, 0xc0, 0x29, - 0x01, 0xe6, 0x2e, 0x24, 0x30, 0x37, 0x6b, 0xbb, 0xa5, 0xf5, 0xb4, 0xc1, 0xfe, 0xe9, 0x89, 0x79, - 0xb7, 0x6f, 0xf3, 0x6d, 0x26, 0xb8, 0x94, 0xc0, 0xb2, 0x93, 0x2e, 0x2a, 0xce, 0xd1, 0x68, 0x57, - 0x02, 0x0b, 0xd4, 0x09, 0xb8, 0x3f, 0x01, 0x97, 0x06, 0x9c, 0x09, 0x70, 0x09, 0x00, 0xa1, 0x57, - 0x9b, 0x3a, 0x55, 0x55, 0xe7, 0x45, 0xb1, 0xce, 0x30, 0x56, 0xbd, 0x51, 0xa2, 0x73, 0xa5, 0xd9, - 0xaa, 0x75, 0x1c, 0x94, 0x25, 0xed, 0x3a, 0xd2, 0xa3, 0x79, 0xd8, 0x5f, 0x56, 0xd1, 0xd1, 0xce, - 0x4e, 0xf1, 0x2b, 0xb4, 0xa7, 0x26, 0x25, 0xe9, 0x88, 0x4f, 0x8a, 0xa5, 0x63, 0xde, 0xa9, 0xc7, - 0xd4, 0x79, 0x8e, 0x7b, 0x69, 0xa7, 0xff, 0xc4, 0x6d, 0xfc, 0x12, 0x61, 0x90, 0x40, 0x82, 0xd8, - 0x4d, 0x2e, 0x7c, 0x77, 0x2a, 0xbf, 0xb2, 0x59, 0x4b, 0xef, 0x69, 0x03, 0xdd, 0x69, 0xaa, 0xcc, - 0xa5, 0x4a, 0x7c, 0x8a, 0xe3, 0xf8, 0x04, 0x3d, 0xcc, 0xdf, 0x4f, 0x8a, 0xd6, 0x14, 0xfa, 0x20, - 0x0f, 0x27, 0xa0, 0x8d, 0xee, 0xe5, 0x8b, 0xd0, 0xaa, 0xab, 0x46, 0xda, 0x66, 0xb2, 0x2a, 0x66, - 0xb6, 0x2a, 0xe6, 0xe7, 0x8c, 0xb0, 0x1b, 0x37, 0x3f, 0xbb, 0x95, 0xe5, 0xaf, 0xae, 0xe6, 0x6c, - 0x64, 0xfd, 0xef, 0x55, 0x74, 0x5c, 0x6a, 0x2a, 0x7e, 0x8f, 0x1e, 0x51, 0x29, 0xc6, 0x01, 0xa7, - 0xaa, 0x6f, 0x2f, 0x90, 0xf4, 0x2a, 0x75, 0xa8, 0x53, 0xf2, 0x72, 0xec, 0x98, 0x71, 0x9a, 0x5b, - 0x32, 0x15, 0xc1, 0xcf, 0xd1, 0x7d, 0x2a, 0xc3, 0x50, 0x0a, 0x77, 0xc2, 0x62, 0x4e, 0x39, 0xa7, - 0x3b, 0x07, 0x49, 0xf0, 0x42, 0xc5, 0xf0, 0x47, 0x74, 0xe8, 0x5d, 0x7f, 0x23, 0x02, 0xb8, 0x60, - 0x6e, 0x3e, 0x6d, 0xd4, 0xd2, 0x7b, 0xfa, 0x60, 0xff, 0xf4, 0xd9, 0x0e, 0x97, 0x33, 0xc6, 0x79, - 0x9c, 0x0b, 0xf3, 0x58, 0x54, 0x62, 0x7c, 0xad, 0xc4, 0xf8, 0xff, 0xe1, 0xe7, 0x10, 0x1d, 0x64, - 0xee, 0x0d, 0x79, 0x04, 0xf8, 0x35, 0x6a, 0x6c, 0xdd, 0x1e, 0x5d, 0x1d, 0x59, 0x98, 0x22, 0xdf, - 0xd3, 0x5a, 0x7c, 0xa4, 0x93, 0x2b, 0xec, 0x0f, 0x37, 0x2b, 0x43, 0xbb, 0x5d, 0x19, 0xda, 0xef, - 0x95, 0xa1, 0x2d, 0xd7, 0x46, 0xe5, 0x76, 0x6d, 0x54, 0x7e, 0xac, 0x8d, 0xca, 0x97, 0x33, 0x9f, - 0xc3, 0x64, 0xee, 0x99, 0x54, 0x86, 0x16, 0x95, 0x21, 0x03, 0x6f, 0x0c, 0x9b, 0x87, 0xe4, 0x0b, - 0x72, 0xf7, 0xda, 0x7b, 0x7b, 0x2a, 0x7e, 0xf6, 0x37, 0x00, 0x00, 0xff, 0xff, 0xab, 0xbe, 0xb8, - 0x21, 0x99, 0x04, 0x00, 0x00, +var fileDescriptor_4fceee1bf46a012f = []byte{ + // 556 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, + 0x14, 0x8d, 0xe3, 0xa4, 0xca, 0x37, 0xed, 0x07, 0x65, 0x68, 0x45, 0x1a, 0x15, 0x27, 0x84, 0x05, + 0x41, 0x02, 0x5b, 0x6a, 0x36, 0x15, 0x0b, 0xa4, 0x1a, 0x2a, 0x55, 0x6a, 0x55, 0x55, 0x56, 0x15, + 0x09, 0x36, 0x96, 0x3d, 0x99, 0x38, 0xa3, 0xd8, 0x1e, 0x2b, 0xbe, 0x71, 0x55, 0x9e, 0xa2, 0x0b, + 0x1e, 0xaa, 0xcb, 0xb2, 0x63, 0x05, 0x28, 0xd9, 0xf0, 0x18, 0x68, 0xc6, 0x3f, 0x0d, 0xc2, 0x16, + 0x1b, 0x36, 0x51, 0x7c, 0xcf, 0x39, 0x73, 0xcf, 0x3d, 0xbe, 0x1e, 0xf4, 0x8c, 0xf0, 0x80, 0x82, + 0x3b, 0x01, 0x23, 0x19, 0x1e, 0x1a, 0x70, 0x1d, 0xd1, 0xd8, 0xa0, 0x09, 0x1b, 0xd3, 0x90, 0x50, + 0x3d, 0x9a, 0x73, 0xe0, 0x18, 0xe7, 0x14, 0x3d, 0x19, 0x1e, 0xea, 0x92, 0xd2, 0xd9, 0xf1, 0xb8, + 0xc7, 0x25, 0x6c, 0x88, 0x7f, 0x29, 0xb3, 0xd3, 0xf5, 0x38, 0xf7, 0x7c, 0x6a, 0xc8, 0x27, 0x77, + 0x31, 0x31, 0x80, 0x05, 0x34, 0x06, 0x27, 0x88, 0x32, 0x82, 0x56, 0xd2, 0x4d, 0xfe, 0x66, 0x78, + 0xbf, 0x04, 0x4f, 0x1c, 0x9f, 0x8d, 0x1d, 0xe0, 0xf3, 0x94, 0xd3, 0xff, 0xa9, 0xa0, 0xd6, 0x71, + 0xe6, 0x10, 0x13, 0xf4, 0x64, 0xbc, 0x88, 0x7c, 0x46, 0x1c, 0xa0, 0x76, 0xc2, 0x81, 0xda, 0xb9, + 0xf9, 0xb6, 0xd2, 0x53, 0x06, 0x9b, 0x07, 0x2f, 0xf5, 0x3f, 0xdd, 0xeb, 0xef, 0x73, 0xc9, 0x88, + 0x03, 0xcd, 0xcf, 0x3a, 0xa9, 0x59, 0xbb, 0xe3, 0x32, 0x00, 0x47, 0x68, 0xdf, 0x67, 0xde, 0x14, + 0x6c, 0xe2, 0x33, 0x1a, 0x82, 0xed, 0x00, 0x38, 0x64, 0x76, 0xdf, 0xa9, 0x2e, 0x3b, 0xbd, 0x2e, + 0xeb, 0x74, 0x26, 0x74, 0xef, 0xa4, 0xec, 0x48, 0xaa, 0xd6, 0xba, 0xed, 0xf9, 0x55, 0xa0, 0xd9, + 0x44, 0x6a, 0xbc, 0x08, 0xfa, 0x9f, 0xeb, 0x68, 0xb7, 0xd4, 0x2b, 0x36, 0xd0, 0x86, 0x9c, 0xd6, + 0xc9, 0xc6, 0x6c, 0x97, 0x35, 0x17, 0x0a, 0xab, 0x29, 0x78, 0x47, 0x85, 0xc0, 0xcd, 0xdc, 0xfe, + 0x45, 0x60, 0xe2, 0x57, 0x08, 0x03, 0x07, 0xc7, 0x17, 0xa9, 0xb2, 0xd0, 0xb3, 0x23, 0x7e, 0x45, + 0xe7, 0x6d, 0xb5, 0xa7, 0x0c, 0x54, 0x6b, 0x5b, 0x22, 0x23, 0x09, 0x5c, 0x88, 0x3a, 0x7e, 0x81, + 0x1e, 0x16, 0xef, 0x29, 0xa3, 0x36, 0x24, 0xf5, 0x41, 0x51, 0x4e, 0x89, 0x26, 0xfa, 0xaf, 0x58, + 0x8a, 0x76, 0x53, 0x5a, 0xe9, 0xe8, 0xe9, 0xda, 0xe8, 0xf9, 0xda, 0xe8, 0x97, 0x39, 0xc3, 0x6c, + 0xdd, 0x7e, 0xeb, 0xd6, 0x6e, 0xbe, 0x77, 0x15, 0xeb, 0x5e, 0xd6, 0xff, 0x52, 0x47, 0x7b, 0x95, + 0xc1, 0xe2, 0x53, 0xf4, 0x88, 0xf0, 0x70, 0xe2, 0x33, 0x22, 0x7d, 0xbb, 0x3e, 0x27, 0xb3, 0x2c, + 0x25, 0xad, 0xf2, 0x15, 0x99, 0x82, 0x65, 0x6d, 0xaf, 0x09, 0x65, 0x05, 0x3f, 0x47, 0xff, 0x13, + 0x1e, 0x04, 0x3c, 0xb4, 0xa7, 0x54, 0xf0, 0x64, 0x7a, 0xaa, 0xb5, 0x95, 0x16, 0x4f, 0x64, 0x0d, + 0x5f, 0xa0, 0x1d, 0xf7, 0xfa, 0x93, 0x13, 0x02, 0x0b, 0xa9, 0x5d, 0xcc, 0x1b, 0xb7, 0xd5, 0x9e, + 0x3a, 0xd8, 0x3c, 0x78, 0x5a, 0x9a, 0x74, 0xce, 0xb2, 0x1e, 0x17, 0xd2, 0xa2, 0x16, 0x57, 0x84, + 0xdf, 0xa8, 0x08, 0xff, 0x5f, 0x64, 0x7a, 0x8e, 0xb6, 0xf2, 0x04, 0xcf, 0x58, 0x0c, 0xf8, 0x2d, + 0x6a, 0xad, 0x7d, 0x49, 0x62, 0x8e, 0xfd, 0xb2, 0x39, 0x8a, 0x8d, 0x6d, 0x88, 0x43, 0xad, 0x42, + 0x63, 0x5e, 0xde, 0x2e, 0x35, 0xe5, 0x6e, 0xa9, 0x29, 0x3f, 0x96, 0x9a, 0x72, 0xb3, 0xd2, 0x6a, + 0x77, 0x2b, 0xad, 0xf6, 0x75, 0xa5, 0xd5, 0x3e, 0xbe, 0xf1, 0x18, 0x4c, 0x17, 0xae, 0x38, 0xcd, + 0x38, 0xfd, 0x30, 0x3a, 0x3e, 0xa7, 0x70, 0xc5, 0xe7, 0x33, 0xe3, 0xb7, 0x4f, 0x3f, 0xbd, 0x5a, + 0x80, 0x86, 0x63, 0x3a, 0x0f, 0x58, 0x08, 0xe9, 0x5d, 0xe0, 0x6e, 0xc8, 0xfa, 0xf0, 0x57, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x37, 0x24, 0x11, 0x51, 0xb6, 0x04, 0x00, 0x00, } func (m *Evidence) Marshal() (dAtA []byte, err error) { @@ -451,7 +452,7 @@ func (m *DuplicateVoteEvidence) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n3, err3 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err3 != nil { return 0, err3 } @@ -516,7 +517,7 @@ func (m *LightClientAttackEvidence) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l - n6, err6 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err6 != nil { return 0, err6 } @@ -667,7 +668,7 @@ func (m *DuplicateVoteEvidence) Size() (n int) { if m.ValidatorPower != 0 { n += 1 + sovEvidence(uint64(m.ValidatorPower)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovEvidence(uint64(l)) return n } @@ -694,7 +695,7 @@ func (m *LightClientAttackEvidence) Size() (n int) { if m.TotalVotingPower != 0 { n += 1 + sovEvidence(uint64(m.TotalVotingPower)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovEvidence(uint64(l)) return n } @@ -1008,7 +1009,7 @@ func (m *DuplicateVoteEvidence) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1199,7 +1200,7 @@ func (m *LightClientAttackEvidence) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/evidence.proto b/proto/cometbft/v38/types/evidence.proto similarity index 71% rename from proto/tendermint/types/evidence.proto rename to proto/cometbft/v38/types/evidence.proto index 1f35049bdc4..d1f8ace877e 100644 --- a/proto/tendermint/types/evidence.proto +++ b/proto/cometbft/v38/types/evidence.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v38.types; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -import "tendermint/types/types.proto"; -import "tendermint/types/validator.proto"; +import "cometbft/v38/types/types.proto"; +import "cometbft/v38/types/validator.proto"; message Evidence { oneof sum { @@ -17,8 +17,8 @@ message Evidence { // DuplicateVoteEvidence contains evidence of a validator signed two conflicting votes. message DuplicateVoteEvidence { - tendermint.types.Vote vote_a = 1; - tendermint.types.Vote vote_b = 2; + cometbft.v38.types.Vote vote_a = 1; + cometbft.v38.types.Vote vote_b = 2; int64 total_voting_power = 3; int64 validator_power = 4; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -26,9 +26,9 @@ message DuplicateVoteEvidence { // LightClientAttackEvidence contains evidence of a set of validators attempting to mislead a light client. message LightClientAttackEvidence { - tendermint.types.LightBlock conflicting_block = 1; + cometbft.v38.types.LightBlock conflicting_block = 1; int64 common_height = 2; - repeated tendermint.types.Validator byzantine_validators = 3; + repeated cometbft.v38.types.Validator byzantine_validators = 3; int64 total_voting_power = 4; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; } diff --git a/proto/tendermint/types/params.pb.go b/proto/cometbft/v38/types/params.pb.go similarity index 89% rename from proto/tendermint/types/params.pb.go rename to proto/cometbft/v38/types/params.pb.go index 3184fdd1a1c..2b47ff6cf17 100644 --- a/proto/tendermint/types/params.pb.go +++ b/proto/cometbft/v38/types/params.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/params.proto +// source: cometbft/v38/types/params.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" io "io" math "math" @@ -41,7 +41,7 @@ func (m *ConsensusParams) Reset() { *m = ConsensusParams{} } func (m *ConsensusParams) String() string { return proto.CompactTextString(m) } func (*ConsensusParams) ProtoMessage() {} func (*ConsensusParams) Descriptor() ([]byte, []int) { - return fileDescriptor_e12598271a686f57, []int{0} + return fileDescriptor_5fdb314ed772d8fd, []int{0} } func (m *ConsensusParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -119,7 +119,7 @@ func (m *BlockParams) Reset() { *m = BlockParams{} } func (m *BlockParams) String() string { return proto.CompactTextString(m) } func (*BlockParams) ProtoMessage() {} func (*BlockParams) Descriptor() ([]byte, []int) { - return fileDescriptor_e12598271a686f57, []int{1} + return fileDescriptor_5fdb314ed772d8fd, []int{1} } func (m *BlockParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -185,7 +185,7 @@ func (m *EvidenceParams) Reset() { *m = EvidenceParams{} } func (m *EvidenceParams) String() string { return proto.CompactTextString(m) } func (*EvidenceParams) ProtoMessage() {} func (*EvidenceParams) Descriptor() ([]byte, []int) { - return fileDescriptor_e12598271a686f57, []int{2} + return fileDescriptor_5fdb314ed772d8fd, []int{2} } func (m *EvidenceParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -245,7 +245,7 @@ func (m *ValidatorParams) Reset() { *m = ValidatorParams{} } func (m *ValidatorParams) String() string { return proto.CompactTextString(m) } func (*ValidatorParams) ProtoMessage() {} func (*ValidatorParams) Descriptor() ([]byte, []int) { - return fileDescriptor_e12598271a686f57, []int{3} + return fileDescriptor_5fdb314ed772d8fd, []int{3} } func (m *ValidatorParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -290,7 +290,7 @@ func (m *VersionParams) Reset() { *m = VersionParams{} } func (m *VersionParams) String() string { return proto.CompactTextString(m) } func (*VersionParams) ProtoMessage() {} func (*VersionParams) Descriptor() ([]byte, []int) { - return fileDescriptor_e12598271a686f57, []int{4} + return fileDescriptor_5fdb314ed772d8fd, []int{4} } func (m *VersionParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -338,7 +338,7 @@ func (m *HashedParams) Reset() { *m = HashedParams{} } func (m *HashedParams) String() string { return proto.CompactTextString(m) } func (*HashedParams) ProtoMessage() {} func (*HashedParams) Descriptor() ([]byte, []int) { - return fileDescriptor_e12598271a686f57, []int{5} + return fileDescriptor_5fdb314ed772d8fd, []int{5} } func (m *HashedParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -399,7 +399,7 @@ func (m *ABCIParams) Reset() { *m = ABCIParams{} } func (m *ABCIParams) String() string { return proto.CompactTextString(m) } func (*ABCIParams) ProtoMessage() {} func (*ABCIParams) Descriptor() ([]byte, []int) { - return fileDescriptor_e12598271a686f57, []int{6} + return fileDescriptor_5fdb314ed772d8fd, []int{6} } func (m *ABCIParams) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -436,55 +436,57 @@ func (m *ABCIParams) GetVoteExtensionsEnableHeight() int64 { } func init() { - proto.RegisterType((*ConsensusParams)(nil), "tendermint.types.ConsensusParams") - proto.RegisterType((*BlockParams)(nil), "tendermint.types.BlockParams") - proto.RegisterType((*EvidenceParams)(nil), "tendermint.types.EvidenceParams") - proto.RegisterType((*ValidatorParams)(nil), "tendermint.types.ValidatorParams") - proto.RegisterType((*VersionParams)(nil), "tendermint.types.VersionParams") - proto.RegisterType((*HashedParams)(nil), "tendermint.types.HashedParams") - proto.RegisterType((*ABCIParams)(nil), "tendermint.types.ABCIParams") -} - -func init() { proto.RegisterFile("tendermint/types/params.proto", fileDescriptor_e12598271a686f57) } - -var fileDescriptor_e12598271a686f57 = []byte{ - // 576 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x93, 0x3f, 0x6f, 0xd3, 0x4e, - 0x18, 0xc7, 0x73, 0x75, 0xda, 0xa6, 0x4f, 0x7e, 0x69, 0xa2, 0xd3, 0x4f, 0xc2, 0x14, 0xe2, 0x04, - 0x0f, 0xa8, 0x52, 0x25, 0x1b, 0x91, 0x09, 0x84, 0x54, 0x25, 0x25, 0x6a, 0x0b, 0x2a, 0x7f, 0x2c, - 0xc4, 0xd0, 0xc5, 0x3a, 0x27, 0x57, 0xc7, 0x6a, 0xec, 0xb3, 0x7c, 0xe7, 0x28, 0x79, 0x17, 0x8c, - 0x8c, 0x1d, 0x61, 0x65, 0xe2, 0x25, 0x74, 0xec, 0xc8, 0x04, 0x28, 0x59, 0x78, 0x19, 0xc8, 0x67, - 0xbb, 0x6e, 0x12, 0xb6, 0xbb, 0x7b, 0x3e, 0x9f, 0xfb, 0xf3, 0x7d, 0x74, 0xd0, 0x14, 0x34, 0x18, - 0xd2, 0xc8, 0xf7, 0x02, 0x61, 0x8a, 0x59, 0x48, 0xb9, 0x19, 0x92, 0x88, 0xf8, 0xdc, 0x08, 0x23, - 0x26, 0x18, 0x6e, 0x14, 0x65, 0x43, 0x96, 0xf7, 0xfe, 0x77, 0x99, 0xcb, 0x64, 0xd1, 0x4c, 0x46, - 0x29, 0xb7, 0xa7, 0xb9, 0x8c, 0xb9, 0x63, 0x6a, 0xca, 0x99, 0x13, 0x5f, 0x98, 0xc3, 0x38, 0x22, - 0xc2, 0x63, 0x41, 0x5a, 0xd7, 0xbf, 0x6d, 0x40, 0xfd, 0x88, 0x05, 0x9c, 0x06, 0x3c, 0xe6, 0xef, - 0xe4, 0x09, 0xb8, 0x03, 0x9b, 0xce, 0x98, 0x0d, 0x2e, 0x55, 0xd4, 0x46, 0xfb, 0xd5, 0xa7, 0x4d, - 0x63, 0xf5, 0x2c, 0xa3, 0x97, 0x94, 0x53, 0xda, 0x4a, 0x59, 0xfc, 0x02, 0x2a, 0x74, 0xe2, 0x0d, - 0x69, 0x30, 0xa0, 0xea, 0x86, 0xf4, 0xda, 0xeb, 0x5e, 0x3f, 0x23, 0x32, 0xf5, 0xd6, 0xc0, 0x87, - 0xb0, 0x33, 0x21, 0x63, 0x6f, 0x48, 0x04, 0x8b, 0x54, 0x45, 0xea, 0x8f, 0xd6, 0xf5, 0x8f, 0x39, - 0x92, 0xf9, 0x85, 0x83, 0x9f, 0xc1, 0xf6, 0x84, 0x46, 0xdc, 0x63, 0x81, 0x5a, 0x96, 0x7a, 0xeb, - 0x1f, 0x7a, 0x0a, 0x64, 0x72, 0xce, 0xe3, 0x27, 0x50, 0x26, 0xce, 0xc0, 0x53, 0x37, 0xa5, 0xf7, - 0x70, 0xdd, 0xeb, 0xf6, 0x8e, 0x4e, 0x33, 0x49, 0x92, 0xfa, 0x29, 0x54, 0xef, 0x24, 0x80, 0x1f, - 0xc0, 0x8e, 0x4f, 0xa6, 0xb6, 0x33, 0x13, 0x94, 0xcb, 0xcc, 0x14, 0xab, 0xe2, 0x93, 0x69, 0x2f, - 0x99, 0xe3, 0x7b, 0xb0, 0x9d, 0x14, 0x5d, 0xc2, 0x65, 0x2c, 0x8a, 0xb5, 0xe5, 0x93, 0xe9, 0x31, - 0xe1, 0xaf, 0xca, 0x15, 0xa5, 0x51, 0xd6, 0xbf, 0x22, 0xd8, 0x5d, 0x4e, 0x05, 0x1f, 0x00, 0x4e, - 0x0c, 0xe2, 0x52, 0x3b, 0x88, 0x7d, 0x5b, 0xc6, 0x9b, 0xef, 0x5b, 0xf7, 0xc9, 0xb4, 0xeb, 0xd2, - 0x37, 0xb1, 0x2f, 0x2f, 0xc0, 0xf1, 0x19, 0x34, 0x72, 0x38, 0xef, 0x6c, 0x16, 0xff, 0x7d, 0x23, - 0x6d, 0xbd, 0x91, 0xb7, 0xde, 0x78, 0x99, 0x01, 0xbd, 0xca, 0xf5, 0xcf, 0x56, 0xe9, 0xf3, 0xaf, - 0x16, 0xb2, 0x76, 0xd3, 0xfd, 0xf2, 0xca, 0xf2, 0x53, 0x94, 0xe5, 0xa7, 0xe8, 0x87, 0x50, 0x5f, - 0xe9, 0x00, 0xd6, 0xa1, 0x16, 0xc6, 0x8e, 0x7d, 0x49, 0x67, 0xb6, 0xcc, 0x4a, 0x45, 0x6d, 0x65, - 0x7f, 0xc7, 0xaa, 0x86, 0xb1, 0xf3, 0x9a, 0xce, 0x3e, 0x24, 0x4b, 0xcf, 0x2b, 0xdf, 0xaf, 0x5a, - 0xe8, 0xcf, 0x55, 0x0b, 0xe9, 0x07, 0x50, 0x5b, 0xea, 0x01, 0x6e, 0x80, 0x42, 0xc2, 0x50, 0xbe, - 0xad, 0x6c, 0x25, 0xc3, 0x3b, 0xf0, 0x39, 0xfc, 0x77, 0x42, 0xf8, 0x88, 0x0e, 0x33, 0xf6, 0x31, - 0xd4, 0x65, 0x14, 0xf6, 0x6a, 0xd6, 0x35, 0xb9, 0x7c, 0x96, 0x07, 0xae, 0x43, 0xad, 0xe0, 0x8a, - 0xd8, 0xab, 0x39, 0x75, 0x4c, 0xb8, 0xfe, 0x16, 0xa0, 0x68, 0x2a, 0xee, 0x42, 0x73, 0xc2, 0x04, - 0xb5, 0xe9, 0x54, 0xd0, 0x20, 0xb9, 0x1d, 0xb7, 0x69, 0x40, 0x9c, 0x31, 0xb5, 0x47, 0xd4, 0x73, - 0x47, 0x22, 0x3b, 0x67, 0x2f, 0x81, 0xfa, 0xb7, 0x4c, 0x5f, 0x22, 0x27, 0x92, 0xe8, 0xbd, 0xff, - 0x32, 0xd7, 0xd0, 0xf5, 0x5c, 0x43, 0x37, 0x73, 0x0d, 0xfd, 0x9e, 0x6b, 0xe8, 0xd3, 0x42, 0x2b, - 0xdd, 0x2c, 0xb4, 0xd2, 0x8f, 0x85, 0x56, 0x3a, 0xef, 0xb8, 0x9e, 0x18, 0xc5, 0x8e, 0x31, 0x60, - 0xbe, 0x39, 0x60, 0x3e, 0x15, 0xce, 0x85, 0x28, 0x06, 0xe9, 0x9f, 0x5d, 0xfd, 0xee, 0xce, 0x96, - 0x5c, 0xef, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xb9, 0xe8, 0xce, 0x9a, 0x09, 0x04, 0x00, 0x00, + proto.RegisterType((*ConsensusParams)(nil), "cometbft.v38.types.ConsensusParams") + proto.RegisterType((*BlockParams)(nil), "cometbft.v38.types.BlockParams") + proto.RegisterType((*EvidenceParams)(nil), "cometbft.v38.types.EvidenceParams") + proto.RegisterType((*ValidatorParams)(nil), "cometbft.v38.types.ValidatorParams") + proto.RegisterType((*VersionParams)(nil), "cometbft.v38.types.VersionParams") + proto.RegisterType((*HashedParams)(nil), "cometbft.v38.types.HashedParams") + proto.RegisterType((*ABCIParams)(nil), "cometbft.v38.types.ABCIParams") +} + +func init() { proto.RegisterFile("cometbft/v38/types/params.proto", fileDescriptor_5fdb314ed772d8fd) } + +var fileDescriptor_5fdb314ed772d8fd = []byte{ + // 598 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x94, 0xc1, 0x6e, 0xd3, 0x30, + 0x18, 0xc7, 0x9b, 0xa5, 0xdb, 0x3a, 0x97, 0xae, 0x93, 0x85, 0x44, 0x28, 0x22, 0x19, 0x41, 0x42, + 0x93, 0x26, 0x25, 0xd2, 0x2a, 0xa4, 0x69, 0x48, 0xa0, 0x76, 0x54, 0xdb, 0x98, 0x36, 0x50, 0x84, + 0x26, 0xd8, 0x25, 0x72, 0xda, 0x6f, 0x69, 0xd4, 0x26, 0x8e, 0x62, 0x27, 0xb4, 0x6f, 0xc1, 0x91, + 0xe3, 0x8e, 0xf0, 0x06, 0x1c, 0x78, 0x80, 0x1d, 0x77, 0xe4, 0x04, 0xa8, 0xbd, 0xf0, 0x18, 0x28, + 0x4e, 0xb2, 0xae, 0xa3, 0xb7, 0xd8, 0xdf, 0xef, 0xff, 0xb7, 0xfd, 0xff, 0xec, 0x20, 0xad, 0x4b, + 0x7d, 0xe0, 0xce, 0x05, 0x37, 0x93, 0xe6, 0xae, 0xc9, 0xc7, 0x21, 0x30, 0x33, 0x24, 0x11, 0xf1, + 0x99, 0x11, 0x46, 0x94, 0x53, 0x8c, 0x0b, 0xc0, 0x48, 0x9a, 0xbb, 0x86, 0x00, 0x1a, 0xf7, 0x5d, + 0xea, 0x52, 0x51, 0x36, 0xd3, 0xaf, 0x8c, 0x6c, 0xa8, 0x2e, 0xa5, 0xee, 0x10, 0x4c, 0x31, 0x72, + 0xe2, 0x0b, 0xb3, 0x17, 0x47, 0x84, 0x7b, 0x34, 0xc8, 0xea, 0xfa, 0x8f, 0x25, 0x54, 0xdf, 0xa7, + 0x01, 0x83, 0x80, 0xc5, 0xec, 0x9d, 0x58, 0x03, 0x3f, 0x47, 0xcb, 0xce, 0x90, 0x76, 0x07, 0x8a, + 0xb4, 0x29, 0x6d, 0x55, 0x77, 0x34, 0xe3, 0xff, 0xd5, 0x8c, 0x76, 0x0a, 0x64, 0xbc, 0x95, 0xd1, + 0xf8, 0x25, 0xaa, 0x40, 0xe2, 0xf5, 0x20, 0xe8, 0x82, 0xb2, 0x24, 0x94, 0xfa, 0x22, 0x65, 0x27, + 0x67, 0x72, 0xf1, 0x8d, 0x06, 0xb7, 0xd0, 0x5a, 0x42, 0x86, 0x5e, 0x8f, 0x70, 0x1a, 0x29, 0xb2, + 0x30, 0x78, 0xba, 0xc8, 0xe0, 0xac, 0x80, 0x72, 0x87, 0x99, 0x0a, 0xbf, 0x40, 0xab, 0x09, 0x44, + 0xcc, 0xa3, 0x81, 0x52, 0x16, 0x06, 0x4f, 0x16, 0x1a, 0x64, 0x48, 0x2e, 0x2f, 0x14, 0x78, 0x07, + 0x95, 0x89, 0xd3, 0xf5, 0x94, 0x65, 0xa1, 0x54, 0x17, 0x29, 0x5b, 0xed, 0xfd, 0xa3, 0x5c, 0x26, + 0x58, 0xfd, 0x08, 0x55, 0x6f, 0x25, 0x81, 0x1f, 0xa1, 0x35, 0x9f, 0x8c, 0x6c, 0x67, 0xcc, 0x81, + 0x89, 0xf4, 0x64, 0xab, 0xe2, 0x93, 0x51, 0x3b, 0x1d, 0xe3, 0x07, 0x68, 0x35, 0x2d, 0xba, 0x84, + 0x89, 0x78, 0x64, 0x6b, 0xc5, 0x27, 0xa3, 0x03, 0xc2, 0xde, 0x94, 0x2b, 0xf2, 0x46, 0x59, 0xff, + 0x26, 0xa1, 0xf5, 0xf9, 0x6c, 0xf0, 0x36, 0xc2, 0xa9, 0x82, 0xb8, 0x60, 0x07, 0xb1, 0x6f, 0x8b, + 0x98, 0x0b, 0xdf, 0xba, 0x4f, 0x46, 0x2d, 0x17, 0x4e, 0x63, 0x5f, 0x6c, 0x80, 0xe1, 0x13, 0xb4, + 0x51, 0xc0, 0x45, 0x8f, 0xf3, 0x36, 0x3c, 0x34, 0xb2, 0x4b, 0x60, 0x14, 0x97, 0xc0, 0x78, 0x9d, + 0x03, 0xed, 0xca, 0xd5, 0x2f, 0xad, 0xf4, 0xe5, 0xb7, 0x26, 0x59, 0xeb, 0x99, 0x5f, 0x51, 0x99, + 0x3f, 0x8a, 0x3c, 0x7f, 0x14, 0xfd, 0x15, 0xaa, 0xdf, 0xe9, 0x02, 0xd6, 0x51, 0x2d, 0x8c, 0x1d, + 0x7b, 0x00, 0x63, 0x5b, 0x64, 0xa5, 0x48, 0x9b, 0xf2, 0xd6, 0x9a, 0x55, 0x0d, 0x63, 0xe7, 0x18, + 0xc6, 0xef, 0xd3, 0xa9, 0xbd, 0xca, 0xf7, 0x4b, 0x4d, 0xfa, 0x7b, 0xa9, 0x49, 0xfa, 0x36, 0xaa, + 0xcd, 0x75, 0x01, 0x6f, 0x20, 0x99, 0x84, 0xa1, 0x38, 0x5b, 0xd9, 0x4a, 0x3f, 0x6f, 0xc1, 0xe7, + 0xe8, 0xde, 0x21, 0x61, 0x7d, 0xe8, 0xe5, 0xec, 0x33, 0x54, 0x17, 0x51, 0xd8, 0x77, 0xb3, 0xae, + 0x89, 0xe9, 0x93, 0x22, 0x70, 0x1d, 0xd5, 0x66, 0xdc, 0x2c, 0xf6, 0x6a, 0x41, 0x1d, 0x10, 0xa6, + 0xbf, 0x45, 0x68, 0xd6, 0x54, 0xdc, 0x42, 0x8f, 0x13, 0xca, 0xc1, 0x86, 0x11, 0x87, 0x20, 0xdd, + 0x1d, 0xb3, 0x21, 0x20, 0xce, 0x10, 0xec, 0x3e, 0x78, 0x6e, 0x9f, 0xe7, 0xeb, 0x34, 0x52, 0xa8, + 0x73, 0xc3, 0x74, 0x04, 0x72, 0x28, 0x88, 0xf6, 0x87, 0xaf, 0x13, 0x55, 0xba, 0x9a, 0xa8, 0xd2, + 0xf5, 0x44, 0x95, 0xfe, 0x4c, 0x54, 0xe9, 0xf3, 0x54, 0x2d, 0x5d, 0x4f, 0xd5, 0xd2, 0xcf, 0xa9, + 0x5a, 0x3a, 0xdf, 0x73, 0x3d, 0xde, 0x8f, 0x9d, 0xf4, 0x6e, 0x99, 0xc7, 0x1f, 0xcf, 0x3a, 0xa7, + 0xc0, 0x3f, 0xd1, 0x68, 0x60, 0xce, 0x3d, 0xf8, 0xec, 0x11, 0x73, 0x08, 0x7a, 0x10, 0xf9, 0x5e, + 0xc0, 0xb3, 0x3f, 0x80, 0xb3, 0x22, 0xe6, 0x9b, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x4a, + 0x22, 0x4d, 0x1e, 0x04, 0x00, 0x00, } func (this *ConsensusParams) Equal(that interface{}) bool { @@ -825,7 +827,7 @@ func (m *EvidenceParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x18 } - n6, err6 := github_com_cosmos_gogoproto_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.MaxAgeDuration):]) + n6, err6 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.MaxAgeDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration):]) if err6 != nil { return 0, err6 } @@ -1118,7 +1120,7 @@ func (m *EvidenceParams) Size() (n int) { if m.MaxAgeNumBlocks != 0 { n += 1 + sovParams(uint64(m.MaxAgeNumBlocks)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdDuration(m.MaxAgeDuration) + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.MaxAgeDuration) n += 1 + l + sovParams(uint64(l)) if m.MaxBytes != 0 { n += 1 + sovParams(uint64(m.MaxBytes)) @@ -1581,7 +1583,7 @@ func (m *EvidenceParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdDurationUnmarshal(&m.MaxAgeDuration, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.MaxAgeDuration, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/params.proto b/proto/cometbft/v38/types/params.proto similarity index 96% rename from proto/tendermint/types/params.proto rename to proto/cometbft/v38/types/params.proto index f96a2e2f572..787cb91dee8 100644 --- a/proto/tendermint/types/params.proto +++ b/proto/cometbft/v38/types/params.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v38.types; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/types"; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; diff --git a/proto/tendermint/types/types.pb.go b/proto/cometbft/v38/types/types.pb.go similarity index 90% rename from proto/tendermint/types/types.pb.go rename to proto/cometbft/v38/types/types.pb.go index 2b2c819b4f4..e21b8357b99 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/cometbft/v38/types/types.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/types.proto +// source: cometbft/v38/types/types.proto package types import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - version "github.com/cometbft/cometbft/proto/tendermint/version" + crypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + version "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/version" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" _ "github.com/cosmos/gogoproto/types" - github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" + proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" math_bits "math/bits" @@ -60,7 +60,7 @@ func (x SignedMsgType) String() string { } func (SignedMsgType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{0} + return fileDescriptor_824e18055b054f88, []int{0} } // PartsetHeader @@ -73,7 +73,7 @@ func (m *PartSetHeader) Reset() { *m = PartSetHeader{} } func (m *PartSetHeader) String() string { return proto.CompactTextString(m) } func (*PartSetHeader) ProtoMessage() {} func (*PartSetHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{0} + return fileDescriptor_824e18055b054f88, []int{0} } func (m *PartSetHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -126,7 +126,7 @@ func (m *Part) Reset() { *m = Part{} } func (m *Part) String() string { return proto.CompactTextString(m) } func (*Part) ProtoMessage() {} func (*Part) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{1} + return fileDescriptor_824e18055b054f88, []int{1} } func (m *Part) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -186,7 +186,7 @@ func (m *BlockID) Reset() { *m = BlockID{} } func (m *BlockID) String() string { return proto.CompactTextString(m) } func (*BlockID) ProtoMessage() {} func (*BlockID) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{2} + return fileDescriptor_824e18055b054f88, []int{2} } func (m *BlockID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -256,7 +256,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{3} + return fileDescriptor_824e18055b054f88, []int{3} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -395,7 +395,7 @@ func (m *Data) Reset() { *m = Data{} } func (m *Data) String() string { return proto.CompactTextString(m) } func (*Data) ProtoMessage() {} func (*Data) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{4} + return fileDescriptor_824e18055b054f88, []int{4} } func (m *Data) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -434,7 +434,7 @@ func (m *Data) GetTxs() [][]byte { // Vote represents a prevote or precommit vote from validators for // consensus. type Vote struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.v38.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` BlockID BlockID `protobuf:"bytes,4,opt,name=block_id,json=blockId,proto3" json:"block_id"` @@ -457,7 +457,7 @@ func (m *Vote) Reset() { *m = Vote{} } func (m *Vote) String() string { return proto.CompactTextString(m) } func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{5} + return fileDescriptor_824e18055b054f88, []int{5} } func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -568,7 +568,7 @@ func (m *Commit) Reset() { *m = Commit{} } func (m *Commit) String() string { return proto.CompactTextString(m) } func (*Commit) ProtoMessage() {} func (*Commit) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{6} + return fileDescriptor_824e18055b054f88, []int{6} } func (m *Commit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -627,7 +627,7 @@ func (m *Commit) GetSignatures() []CommitSig { // CommitSig is a part of the Vote included in a Commit. type CommitSig struct { - BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.v38.types.BlockIDFlag" json:"block_id_flag,omitempty"` ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` @@ -637,7 +637,7 @@ func (m *CommitSig) Reset() { *m = CommitSig{} } func (m *CommitSig) String() string { return proto.CompactTextString(m) } func (*CommitSig) ProtoMessage() {} func (*CommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{7} + return fileDescriptor_824e18055b054f88, []int{7} } func (m *CommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -705,7 +705,7 @@ func (m *ExtendedCommit) Reset() { *m = ExtendedCommit{} } func (m *ExtendedCommit) String() string { return proto.CompactTextString(m) } func (*ExtendedCommit) ProtoMessage() {} func (*ExtendedCommit) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{8} + return fileDescriptor_824e18055b054f88, []int{8} } func (m *ExtendedCommit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -766,7 +766,7 @@ func (m *ExtendedCommit) GetExtendedSignatures() []ExtendedCommitSig { // extension-related fields. We use two signatures to ensure backwards compatibility. // That is the digest of the original signature is still the same in prior versions type ExtendedCommitSig struct { - BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=tendermint.types.BlockIDFlag" json:"block_id_flag,omitempty"` + BlockIdFlag BlockIDFlag `protobuf:"varint,1,opt,name=block_id_flag,json=blockIdFlag,proto3,enum=cometbft.v38.types.BlockIDFlag" json:"block_id_flag,omitempty"` ValidatorAddress []byte `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` @@ -780,7 +780,7 @@ func (m *ExtendedCommitSig) Reset() { *m = ExtendedCommitSig{} } func (m *ExtendedCommitSig) String() string { return proto.CompactTextString(m) } func (*ExtendedCommitSig) ProtoMessage() {} func (*ExtendedCommitSig) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{9} + return fileDescriptor_824e18055b054f88, []int{9} } func (m *ExtendedCommitSig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -852,7 +852,7 @@ func (m *ExtendedCommitSig) GetExtensionSignature() []byte { } type Proposal struct { - Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=tendermint.types.SignedMsgType" json:"type,omitempty"` + Type SignedMsgType `protobuf:"varint,1,opt,name=type,proto3,enum=cometbft.v38.types.SignedMsgType" json:"type,omitempty"` Height int64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` Round int32 `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"` PolRound int32 `protobuf:"varint,4,opt,name=pol_round,json=polRound,proto3" json:"pol_round,omitempty"` @@ -865,7 +865,7 @@ func (m *Proposal) Reset() { *m = Proposal{} } func (m *Proposal) String() string { return proto.CompactTextString(m) } func (*Proposal) ProtoMessage() {} func (*Proposal) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{10} + return fileDescriptor_824e18055b054f88, []int{10} } func (m *Proposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -952,7 +952,7 @@ func (m *SignedHeader) Reset() { *m = SignedHeader{} } func (m *SignedHeader) String() string { return proto.CompactTextString(m) } func (*SignedHeader) ProtoMessage() {} func (*SignedHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{11} + return fileDescriptor_824e18055b054f88, []int{11} } func (m *SignedHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1004,7 +1004,7 @@ func (m *LightBlock) Reset() { *m = LightBlock{} } func (m *LightBlock) String() string { return proto.CompactTextString(m) } func (*LightBlock) ProtoMessage() {} func (*LightBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{12} + return fileDescriptor_824e18055b054f88, []int{12} } func (m *LightBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1058,7 +1058,7 @@ func (m *BlockMeta) Reset() { *m = BlockMeta{} } func (m *BlockMeta) String() string { return proto.CompactTextString(m) } func (*BlockMeta) ProtoMessage() {} func (*BlockMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{13} + return fileDescriptor_824e18055b054f88, []int{13} } func (m *BlockMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1126,7 +1126,7 @@ func (m *TxProof) Reset() { *m = TxProof{} } func (m *TxProof) String() string { return proto.CompactTextString(m) } func (*TxProof) ProtoMessage() {} func (*TxProof) Descriptor() ([]byte, []int) { - return fileDescriptor_d3a6e55e2345de56, []int{14} + return fileDescriptor_824e18055b054f88, []int{14} } func (m *TxProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1177,110 +1177,112 @@ func (m *TxProof) GetProof() *crypto.Proof { } func init() { - proto.RegisterEnum("tendermint.types.SignedMsgType", SignedMsgType_name, SignedMsgType_value) - proto.RegisterType((*PartSetHeader)(nil), "tendermint.types.PartSetHeader") - proto.RegisterType((*Part)(nil), "tendermint.types.Part") - proto.RegisterType((*BlockID)(nil), "tendermint.types.BlockID") - proto.RegisterType((*Header)(nil), "tendermint.types.Header") - proto.RegisterType((*Data)(nil), "tendermint.types.Data") - proto.RegisterType((*Vote)(nil), "tendermint.types.Vote") - proto.RegisterType((*Commit)(nil), "tendermint.types.Commit") - proto.RegisterType((*CommitSig)(nil), "tendermint.types.CommitSig") - proto.RegisterType((*ExtendedCommit)(nil), "tendermint.types.ExtendedCommit") - proto.RegisterType((*ExtendedCommitSig)(nil), "tendermint.types.ExtendedCommitSig") - proto.RegisterType((*Proposal)(nil), "tendermint.types.Proposal") - proto.RegisterType((*SignedHeader)(nil), "tendermint.types.SignedHeader") - proto.RegisterType((*LightBlock)(nil), "tendermint.types.LightBlock") - proto.RegisterType((*BlockMeta)(nil), "tendermint.types.BlockMeta") - proto.RegisterType((*TxProof)(nil), "tendermint.types.TxProof") -} - -func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } - -var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1310 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0xda, 0xeb, 0x5f, 0xcf, 0x76, 0xe2, 0x2c, 0x11, 0x75, 0xdd, 0xc6, 0xb1, 0x5c, 0x01, - 0xa1, 0xa0, 0x4d, 0x95, 0x22, 0x04, 0x07, 0x0e, 0xf9, 0x45, 0x1b, 0x51, 0x27, 0xd6, 0xda, 0x2d, - 0xa2, 0x97, 0xd5, 0xda, 0x3b, 0xb1, 0x97, 0xda, 0x3b, 0xab, 0xdd, 0x71, 0x70, 0xfa, 0x17, 0xa0, - 0x9e, 0x7a, 0xe2, 0xd6, 0x13, 0x1c, 0xb8, 0x83, 0xc4, 0x15, 0x71, 0xea, 0xb1, 0x37, 0xb8, 0x50, - 0x20, 0x95, 0xf8, 0x3b, 0xd0, 0xbc, 0x99, 0xdd, 0xb5, 0xe3, 0x18, 0xaa, 0xa8, 0x02, 0x89, 0x8b, - 0xb5, 0xf3, 0xde, 0xf7, 0xde, 0xbc, 0x79, 0xdf, 0x37, 0xa3, 0x67, 0xb8, 0xca, 0x88, 0x6b, 0x13, - 0x7f, 0xe8, 0xb8, 0x6c, 0x83, 0x9d, 0x78, 0x24, 0x10, 0xbf, 0xba, 0xe7, 0x53, 0x46, 0xb5, 0x52, - 0xec, 0xd5, 0xd1, 0x5e, 0x59, 0xe9, 0xd1, 0x1e, 0x45, 0xe7, 0x06, 0xff, 0x12, 0xb8, 0xca, 0x5a, - 0x8f, 0xd2, 0xde, 0x80, 0x6c, 0xe0, 0xaa, 0x33, 0x3a, 0xda, 0x60, 0xce, 0x90, 0x04, 0xcc, 0x1a, - 0x7a, 0x12, 0xb0, 0x3a, 0xb1, 0x4d, 0xd7, 0x3f, 0xf1, 0x18, 0xe5, 0x58, 0x7a, 0x24, 0xdd, 0xd5, - 0x09, 0xf7, 0x31, 0xf1, 0x03, 0x87, 0xba, 0x93, 0x75, 0x54, 0x6a, 0x33, 0x55, 0x1e, 0x5b, 0x03, - 0xc7, 0xb6, 0x18, 0xf5, 0x05, 0xa2, 0xfe, 0x21, 0x14, 0x9b, 0x96, 0xcf, 0x5a, 0x84, 0xdd, 0x26, - 0x96, 0x4d, 0x7c, 0x6d, 0x05, 0x52, 0x8c, 0x32, 0x6b, 0x50, 0x56, 0x6a, 0xca, 0x7a, 0xd1, 0x10, - 0x0b, 0x4d, 0x03, 0xb5, 0x6f, 0x05, 0xfd, 0x72, 0xa2, 0xa6, 0xac, 0x17, 0x0c, 0xfc, 0xae, 0xf7, - 0x41, 0xe5, 0xa1, 0x3c, 0xc2, 0x71, 0x6d, 0x32, 0x0e, 0x23, 0x70, 0xc1, 0xad, 0x9d, 0x13, 0x46, - 0x02, 0x19, 0x22, 0x16, 0xda, 0x7b, 0x90, 0xc2, 0xfa, 0xcb, 0xc9, 0x9a, 0xb2, 0x9e, 0xdf, 0x2c, - 0xeb, 0x13, 0x8d, 0x12, 0xe7, 0xd3, 0x9b, 0xdc, 0xbf, 0xad, 0x3e, 0x7d, 0xbe, 0xb6, 0x60, 0x08, - 0x70, 0x7d, 0x00, 0x99, 0xed, 0x01, 0xed, 0x3e, 0xd8, 0xdf, 0x8d, 0x0a, 0x51, 0xe2, 0x42, 0xb4, - 0x06, 0x2c, 0x79, 0x96, 0xcf, 0xcc, 0x80, 0x30, 0xb3, 0x8f, 0xa7, 0xc0, 0x4d, 0xf3, 0x9b, 0x6b, - 0xfa, 0x59, 0x1e, 0xf4, 0xa9, 0xc3, 0xca, 0x5d, 0x8a, 0xde, 0xa4, 0xb1, 0xfe, 0xa7, 0x0a, 0x69, - 0xd9, 0x8c, 0x8f, 0x20, 0x23, 0xdb, 0x8a, 0x1b, 0xe6, 0x37, 0x57, 0x27, 0x33, 0x4a, 0x97, 0xbe, - 0x43, 0xdd, 0x80, 0xb8, 0xc1, 0x28, 0x90, 0xf9, 0xc2, 0x18, 0xed, 0x4d, 0xc8, 0x76, 0xfb, 0x96, - 0xe3, 0x9a, 0x8e, 0x8d, 0x15, 0xe5, 0xb6, 0xf3, 0xa7, 0xcf, 0xd7, 0x32, 0x3b, 0xdc, 0xb6, 0xbf, - 0x6b, 0x64, 0xd0, 0xb9, 0x6f, 0x6b, 0xaf, 0x43, 0xba, 0x4f, 0x9c, 0x5e, 0x9f, 0x61, 0x5b, 0x92, - 0x86, 0x5c, 0x69, 0x1f, 0x80, 0xca, 0x05, 0x51, 0x56, 0x71, 0xef, 0x8a, 0x2e, 0xd4, 0xa2, 0x87, - 0x6a, 0xd1, 0xdb, 0xa1, 0x5a, 0xb6, 0xb3, 0x7c, 0xe3, 0xc7, 0xbf, 0xad, 0x29, 0x06, 0x46, 0x68, - 0x3b, 0x50, 0x1c, 0x58, 0x01, 0x33, 0x3b, 0xbc, 0x6d, 0x7c, 0xfb, 0x14, 0xa6, 0xb8, 0x3c, 0xdb, - 0x10, 0xd9, 0x58, 0x59, 0x7a, 0x9e, 0x47, 0x09, 0x93, 0xad, 0xad, 0x43, 0x09, 0x93, 0x74, 0xe9, - 0x70, 0xe8, 0x30, 0x13, 0xfb, 0x9e, 0xc6, 0xbe, 0x2f, 0x72, 0xfb, 0x0e, 0x9a, 0x6f, 0x73, 0x06, - 0xae, 0x40, 0xce, 0xb6, 0x98, 0x25, 0x20, 0x19, 0x84, 0x64, 0xb9, 0x01, 0x9d, 0x6f, 0xc1, 0x52, - 0xa4, 0xba, 0x40, 0x40, 0xb2, 0x22, 0x4b, 0x6c, 0x46, 0xe0, 0x0d, 0x58, 0x71, 0xc9, 0x98, 0x99, - 0x67, 0xd1, 0x39, 0x44, 0x6b, 0xdc, 0x77, 0x6f, 0x3a, 0xe2, 0x0d, 0x58, 0xec, 0x86, 0xcd, 0x17, - 0x58, 0x40, 0x6c, 0x31, 0xb2, 0x22, 0xec, 0x32, 0x64, 0x2d, 0xcf, 0x13, 0x80, 0x3c, 0x02, 0x32, - 0x96, 0xe7, 0xa1, 0xeb, 0x3a, 0x2c, 0xe3, 0x19, 0x7d, 0x12, 0x8c, 0x06, 0x4c, 0x26, 0x29, 0x20, - 0x66, 0x89, 0x3b, 0x0c, 0x61, 0x47, 0xec, 0x35, 0x28, 0x92, 0x63, 0xc7, 0x26, 0x6e, 0x97, 0x08, - 0x5c, 0x11, 0x71, 0x85, 0xd0, 0x88, 0xa0, 0xb7, 0xa1, 0xe4, 0xf9, 0xd4, 0xa3, 0x01, 0xf1, 0x4d, - 0xcb, 0xb6, 0x7d, 0x12, 0x04, 0xe5, 0x45, 0x91, 0x2f, 0xb4, 0x6f, 0x09, 0x73, 0xbd, 0x0c, 0xea, - 0xae, 0xc5, 0x2c, 0xad, 0x04, 0x49, 0x36, 0x0e, 0xca, 0x4a, 0x2d, 0xb9, 0x5e, 0x30, 0xf8, 0x67, - 0xfd, 0x87, 0x24, 0xa8, 0xf7, 0x28, 0x23, 0xda, 0x4d, 0x50, 0x39, 0x4d, 0xa8, 0xbe, 0xc5, 0xf3, - 0xf4, 0xdc, 0x72, 0x7a, 0x2e, 0xb1, 0x1b, 0x41, 0xaf, 0x7d, 0xe2, 0x11, 0x03, 0xc1, 0x13, 0x72, - 0x4a, 0x4c, 0xc9, 0x69, 0x05, 0x52, 0x3e, 0x1d, 0xb9, 0x36, 0xaa, 0x2c, 0x65, 0x88, 0x85, 0xb6, - 0x07, 0xd9, 0x48, 0x25, 0xea, 0x3f, 0xa9, 0x64, 0x89, 0xab, 0x84, 0x6b, 0x58, 0x1a, 0x8c, 0x4c, - 0x47, 0x8a, 0x65, 0x1b, 0x72, 0xd1, 0xe3, 0x25, 0xd5, 0xf6, 0x72, 0x82, 0x8d, 0xc3, 0xb4, 0x77, - 0x60, 0x39, 0xe2, 0x3e, 0x6a, 0x9e, 0x50, 0x5c, 0x29, 0x72, 0xc8, 0xee, 0x4d, 0xc9, 0xca, 0x14, - 0x0f, 0x50, 0x06, 0xcf, 0x15, 0xcb, 0x6a, 0x1f, 0x5f, 0xa2, 0xab, 0x90, 0x0b, 0x9c, 0x9e, 0x6b, - 0xb1, 0x91, 0x4f, 0xa4, 0xf2, 0x62, 0x03, 0xf7, 0x92, 0x31, 0x23, 0x2e, 0x5e, 0x72, 0xa1, 0xb4, - 0xd8, 0xa0, 0x6d, 0xc0, 0x6b, 0xd1, 0xc2, 0x8c, 0xb3, 0x08, 0x95, 0x69, 0x91, 0xab, 0x15, 0x7a, - 0xea, 0x3f, 0x2a, 0x90, 0x16, 0x17, 0x63, 0x82, 0x06, 0xe5, 0x7c, 0x1a, 0x12, 0xf3, 0x68, 0x48, - 0x5e, 0x9c, 0x86, 0x2d, 0x80, 0xa8, 0xcc, 0xa0, 0xac, 0xd6, 0x92, 0xeb, 0xf9, 0xcd, 0x2b, 0xb3, - 0x89, 0x44, 0x89, 0x2d, 0xa7, 0x27, 0xef, 0xfd, 0x44, 0x50, 0xfd, 0x57, 0x05, 0x72, 0x91, 0x5f, - 0xdb, 0x82, 0x62, 0x58, 0x97, 0x79, 0x34, 0xb0, 0x7a, 0x52, 0x8a, 0xab, 0x73, 0x8b, 0xfb, 0x78, - 0x60, 0xf5, 0x8c, 0xbc, 0xac, 0x87, 0x2f, 0xce, 0xa7, 0x35, 0x31, 0x87, 0xd6, 0x29, 0x1d, 0x25, - 0x2f, 0xa6, 0xa3, 0x29, 0xc6, 0xd5, 0x33, 0x8c, 0xd7, 0xff, 0x50, 0x60, 0x71, 0x6f, 0x8c, 0xe5, - 0xdb, 0xff, 0x25, 0x55, 0xf7, 0xa5, 0xb6, 0x6c, 0x62, 0x9b, 0x33, 0x9c, 0x5d, 0x9b, 0xcd, 0x38, - 0x5d, 0x73, 0xcc, 0x9d, 0x16, 0x66, 0x69, 0xc5, 0x1c, 0x7e, 0x9f, 0x80, 0xe5, 0x19, 0xfc, 0xff, - 0x8f, 0xcb, 0xe9, 0xdb, 0x9b, 0x7a, 0xc9, 0xdb, 0x9b, 0x9e, 0x7b, 0x7b, 0xbf, 0x4b, 0x40, 0xb6, - 0x89, 0xaf, 0xb4, 0x35, 0xf8, 0x37, 0xde, 0xde, 0x2b, 0x90, 0xf3, 0xe8, 0xc0, 0x14, 0x1e, 0x15, - 0x3d, 0x59, 0x8f, 0x0e, 0x8c, 0x19, 0x99, 0xa5, 0x5e, 0xd1, 0xc3, 0x9c, 0x7e, 0x05, 0x24, 0x64, - 0xce, 0x5e, 0x28, 0x1f, 0x0a, 0xa2, 0x15, 0x72, 0x6a, 0xba, 0xc1, 0x7b, 0x80, 0x63, 0x98, 0x32, - 0x3b, 0xe5, 0x89, 0xb2, 0x05, 0xd2, 0x90, 0x38, 0x1e, 0x21, 0x86, 0x0c, 0x39, 0xb8, 0x95, 0xe7, - 0xbd, 0x58, 0x86, 0xc4, 0xd5, 0xbf, 0x52, 0x00, 0xee, 0xf0, 0xce, 0xe2, 0x79, 0xf9, 0xbc, 0x13, - 0x60, 0x09, 0xe6, 0xd4, 0xce, 0xd5, 0x79, 0xa4, 0xc9, 0xfd, 0x0b, 0xc1, 0x64, 0xdd, 0x3b, 0x50, - 0x8c, 0xb5, 0x1d, 0x90, 0xb0, 0x98, 0x73, 0x92, 0x44, 0x63, 0x48, 0x8b, 0x30, 0xa3, 0x70, 0x3c, - 0xb1, 0xaa, 0xff, 0xa4, 0x40, 0x0e, 0x6b, 0x6a, 0x10, 0x66, 0x4d, 0x71, 0xa8, 0x5c, 0x9c, 0xc3, - 0x55, 0x00, 0x91, 0x26, 0x70, 0x1e, 0x12, 0xa9, 0xac, 0x1c, 0x5a, 0x5a, 0xce, 0x43, 0xa2, 0xbd, - 0x1f, 0x35, 0x3c, 0xf9, 0xf7, 0x0d, 0x97, 0x2f, 0x46, 0xd8, 0xf6, 0x4b, 0x90, 0x71, 0x47, 0x43, - 0x93, 0x0f, 0x1f, 0xaa, 0x50, 0xab, 0x3b, 0x1a, 0xb6, 0xc7, 0x41, 0xfd, 0x73, 0xc8, 0xb4, 0xc7, - 0x38, 0x88, 0x73, 0x89, 0xfa, 0x94, 0xca, 0xe9, 0x4f, 0x4c, 0xdd, 0x59, 0x6e, 0xc0, 0x61, 0x47, - 0x03, 0x95, 0x8f, 0x79, 0xe1, 0xdf, 0x02, 0xfe, 0xad, 0xe9, 0x2f, 0x39, 0xe2, 0xcb, 0xe1, 0xfe, - 0xfa, 0xcf, 0x0a, 0x14, 0xa7, 0x6e, 0x92, 0xf6, 0x2e, 0x5c, 0x6a, 0xed, 0xdf, 0x3a, 0xd8, 0xdb, - 0x35, 0x1b, 0xad, 0x5b, 0x66, 0xfb, 0xb3, 0xe6, 0x9e, 0x79, 0xf7, 0xe0, 0x93, 0x83, 0xc3, 0x4f, - 0x0f, 0x4a, 0x0b, 0x95, 0xa5, 0x47, 0x4f, 0x6a, 0xf9, 0xbb, 0xee, 0x03, 0x97, 0x7e, 0xe1, 0xce, - 0x43, 0x37, 0x8d, 0xbd, 0x7b, 0x87, 0xed, 0xbd, 0x92, 0x22, 0xd0, 0x4d, 0x9f, 0x1c, 0x53, 0x46, - 0x10, 0x7d, 0x03, 0x2e, 0x9f, 0x83, 0xde, 0x39, 0x6c, 0x34, 0xf6, 0xdb, 0xa5, 0x44, 0x65, 0xf9, - 0xd1, 0x93, 0x5a, 0xb1, 0xe9, 0x13, 0xa1, 0x32, 0x8c, 0xd0, 0xa1, 0x3c, 0x1b, 0x71, 0xd8, 0x3c, - 0x6c, 0x6d, 0xdd, 0x29, 0xd5, 0x2a, 0xa5, 0x47, 0x4f, 0x6a, 0x85, 0xf0, 0xc9, 0xe0, 0xf8, 0x4a, - 0xf6, 0xcb, 0xaf, 0xab, 0x0b, 0xdf, 0x7e, 0x53, 0x55, 0xb6, 0x1b, 0x4f, 0x4f, 0xab, 0xca, 0xb3, - 0xd3, 0xaa, 0xf2, 0xfb, 0x69, 0x55, 0x79, 0xfc, 0xa2, 0xba, 0xf0, 0xec, 0x45, 0x75, 0xe1, 0x97, - 0x17, 0xd5, 0x85, 0xfb, 0x37, 0x7b, 0x0e, 0xeb, 0x8f, 0x3a, 0x7a, 0x97, 0x0e, 0x37, 0xba, 0x74, - 0x48, 0x58, 0xe7, 0x88, 0xc5, 0x1f, 0xe2, 0x6f, 0xe2, 0xd9, 0xbf, 0x6e, 0x9d, 0x34, 0xda, 0x6f, - 0xfe, 0x15, 0x00, 0x00, 0xff, 0xff, 0x8c, 0xb6, 0xa1, 0x4e, 0x7b, 0x0e, 0x00, 0x00, + proto.RegisterEnum("cometbft.v38.types.SignedMsgType", SignedMsgType_name, SignedMsgType_value) + proto.RegisterType((*PartSetHeader)(nil), "cometbft.v38.types.PartSetHeader") + proto.RegisterType((*Part)(nil), "cometbft.v38.types.Part") + proto.RegisterType((*BlockID)(nil), "cometbft.v38.types.BlockID") + proto.RegisterType((*Header)(nil), "cometbft.v38.types.Header") + proto.RegisterType((*Data)(nil), "cometbft.v38.types.Data") + proto.RegisterType((*Vote)(nil), "cometbft.v38.types.Vote") + proto.RegisterType((*Commit)(nil), "cometbft.v38.types.Commit") + proto.RegisterType((*CommitSig)(nil), "cometbft.v38.types.CommitSig") + proto.RegisterType((*ExtendedCommit)(nil), "cometbft.v38.types.ExtendedCommit") + proto.RegisterType((*ExtendedCommitSig)(nil), "cometbft.v38.types.ExtendedCommitSig") + proto.RegisterType((*Proposal)(nil), "cometbft.v38.types.Proposal") + proto.RegisterType((*SignedHeader)(nil), "cometbft.v38.types.SignedHeader") + proto.RegisterType((*LightBlock)(nil), "cometbft.v38.types.LightBlock") + proto.RegisterType((*BlockMeta)(nil), "cometbft.v38.types.BlockMeta") + proto.RegisterType((*TxProof)(nil), "cometbft.v38.types.TxProof") +} + +func init() { proto.RegisterFile("cometbft/v38/types/types.proto", fileDescriptor_824e18055b054f88) } + +var fileDescriptor_824e18055b054f88 = []byte{ + // 1333 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x4f, 0x6f, 0xdb, 0xc6, + 0x12, 0x37, 0x25, 0xea, 0xdf, 0x48, 0xb2, 0x65, 0x3e, 0xe3, 0x45, 0x51, 0x5e, 0x64, 0x3d, 0x3e, + 0xe4, 0xd5, 0x4d, 0x0b, 0x29, 0x70, 0xd0, 0xc2, 0xed, 0xa5, 0x88, 0x6d, 0x35, 0x31, 0x12, 0xdb, + 0x02, 0xa5, 0xb8, 0x48, 0x51, 0x80, 0xa0, 0xc4, 0xb5, 0xc4, 0x46, 0xe2, 0x12, 0xe4, 0x4a, 0xb1, + 0xf3, 0x09, 0x8a, 0x9c, 0x72, 0x2e, 0x90, 0x53, 0x7b, 0xe8, 0x27, 0x68, 0x0f, 0xbd, 0x16, 0x45, + 0x8e, 0xb9, 0xb5, 0xa7, 0xa4, 0x70, 0xd0, 0x4b, 0x3f, 0x45, 0xb1, 0xb3, 0x4b, 0x4a, 0x8c, 0xe5, + 0x26, 0x68, 0x82, 0x16, 0xe8, 0x45, 0xd0, 0xce, 0xfc, 0x66, 0x76, 0x76, 0x7e, 0xbf, 0x5d, 0x0c, + 0xa1, 0xda, 0xa3, 0x23, 0xc2, 0xba, 0x87, 0xac, 0x31, 0xb9, 0xba, 0xd1, 0x60, 0xc7, 0x1e, 0x09, + 0xc4, 0x6f, 0xdd, 0xf3, 0x29, 0xa3, 0x9a, 0x16, 0xfa, 0xeb, 0x93, 0xab, 0x1b, 0x75, 0xf4, 0x54, + 0x56, 0xfa, 0xb4, 0x4f, 0xd1, 0xdd, 0xe0, 0xff, 0x04, 0xb2, 0xb2, 0xda, 0xa7, 0xb4, 0x3f, 0x24, + 0x0d, 0x5c, 0x75, 0xc7, 0x87, 0x0d, 0xe6, 0x8c, 0x48, 0xc0, 0xac, 0x91, 0x17, 0x02, 0x62, 0x5b, + 0xf5, 0xfc, 0x63, 0x8f, 0x51, 0x8e, 0xa6, 0x87, 0x12, 0x50, 0x8b, 0x01, 0x26, 0xc4, 0x0f, 0x1c, + 0xea, 0xce, 0x56, 0x53, 0xd1, 0xe7, 0x54, 0x3b, 0xb1, 0x86, 0x8e, 0x6d, 0x31, 0xea, 0x0b, 0x8c, + 0xfe, 0x01, 0x14, 0x5b, 0x96, 0xcf, 0xda, 0x84, 0xdd, 0x20, 0x96, 0x4d, 0x7c, 0x6d, 0x05, 0x52, + 0x8c, 0x32, 0x6b, 0x58, 0x56, 0x6a, 0xca, 0x5a, 0xd1, 0x10, 0x0b, 0x4d, 0x03, 0x75, 0x60, 0x05, + 0x83, 0x72, 0xa2, 0xa6, 0xac, 0x15, 0x0c, 0xfc, 0xaf, 0x7f, 0x0e, 0x2a, 0x0f, 0xe5, 0x11, 0x8e, + 0x6b, 0x93, 0xa3, 0x30, 0x02, 0x17, 0xdc, 0xda, 0x3d, 0x66, 0x24, 0x90, 0x21, 0x62, 0xa1, 0xbd, + 0x0f, 0x29, 0x3c, 0x43, 0x39, 0x59, 0x53, 0xd6, 0xf2, 0xeb, 0x95, 0x7a, 0xac, 0x61, 0xe2, 0x94, + 0xf5, 0x16, 0x47, 0x6c, 0xaa, 0x8f, 0x9f, 0xae, 0x2e, 0x18, 0x02, 0xae, 0xbb, 0x90, 0xd9, 0x1c, + 0xd2, 0xde, 0xdd, 0x9d, 0xed, 0xa8, 0x14, 0x65, 0x5a, 0x8a, 0xb6, 0x0f, 0x4b, 0x9e, 0xe5, 0x33, + 0x33, 0x20, 0xcc, 0x1c, 0xe0, 0x39, 0x70, 0xdb, 0xfc, 0xfa, 0x7f, 0xeb, 0xa7, 0x19, 0xa9, 0xc7, + 0x0e, 0x2c, 0xf7, 0x29, 0x7a, 0xb3, 0x46, 0xfd, 0x37, 0x15, 0xd2, 0xb2, 0x21, 0x1f, 0x41, 0x46, + 0x36, 0x17, 0xb7, 0xcc, 0xaf, 0xaf, 0xc6, 0x73, 0x4a, 0x67, 0x7d, 0x8b, 0xba, 0x01, 0x71, 0x83, + 0x71, 0x20, 0x33, 0x86, 0x51, 0xda, 0xff, 0x21, 0xdb, 0x1b, 0x58, 0x8e, 0x6b, 0x3a, 0x36, 0x56, + 0x95, 0xdb, 0xcc, 0x9f, 0x3c, 0x5d, 0xcd, 0x6c, 0x71, 0xdb, 0xce, 0xb6, 0x91, 0x41, 0xe7, 0x8e, + 0xad, 0xfd, 0x1b, 0xd2, 0x03, 0xe2, 0xf4, 0x07, 0x0c, 0x9b, 0x93, 0x34, 0xe4, 0x4a, 0xdb, 0x00, + 0x95, 0x8b, 0xa3, 0xac, 0xca, 0x96, 0x09, 0xe5, 0xd4, 0x43, 0xe5, 0xd4, 0x3b, 0xa1, 0x72, 0x36, + 0xb3, 0x7c, 0xe3, 0x87, 0xcf, 0x56, 0x15, 0x03, 0x23, 0xb4, 0x26, 0x14, 0x87, 0x56, 0xc0, 0xcc, + 0x2e, 0x6f, 0x1d, 0xdf, 0x3e, 0x85, 0x29, 0x2e, 0xcc, 0x6b, 0x8a, 0x6c, 0xaf, 0x2c, 0x3e, 0xcf, + 0xe3, 0x84, 0xc9, 0xd6, 0xd6, 0xa0, 0x84, 0x69, 0x7a, 0x74, 0x34, 0x72, 0x98, 0x89, 0xdd, 0x4f, + 0x63, 0xf7, 0x17, 0xb9, 0x7d, 0x0b, 0xcd, 0x37, 0x38, 0x0f, 0x17, 0x20, 0x67, 0x5b, 0xcc, 0x12, + 0x90, 0x0c, 0x42, 0xb2, 0xdc, 0x80, 0xce, 0xb7, 0x60, 0x29, 0x52, 0x5f, 0x20, 0x20, 0x59, 0x91, + 0x65, 0x6a, 0x46, 0xe0, 0x15, 0x58, 0x71, 0xc9, 0x11, 0x33, 0x5f, 0x44, 0xe7, 0x10, 0xad, 0x71, + 0xdf, 0x41, 0x3c, 0xe2, 0x12, 0x2c, 0xf6, 0xc2, 0xf6, 0x0b, 0x2c, 0x20, 0xb6, 0x18, 0x59, 0x11, + 0x76, 0x1e, 0xb2, 0x96, 0xe7, 0x09, 0x40, 0x1e, 0x01, 0x19, 0xcb, 0xf3, 0xd0, 0x75, 0x19, 0x96, + 0xf1, 0x8c, 0x3e, 0x09, 0xc6, 0x43, 0x26, 0x93, 0x14, 0x10, 0xb3, 0xc4, 0x1d, 0x86, 0xb0, 0x23, + 0xf6, 0x7f, 0x50, 0x24, 0x13, 0xc7, 0x26, 0x6e, 0x8f, 0x08, 0x5c, 0x11, 0x71, 0x85, 0xd0, 0x88, + 0xa0, 0xb7, 0xa1, 0xe4, 0xf9, 0xd4, 0xa3, 0x01, 0xf1, 0x4d, 0xcb, 0xb6, 0x7d, 0x12, 0x04, 0xe5, + 0x45, 0x91, 0x2f, 0xb4, 0x5f, 0x13, 0x66, 0xbd, 0x0c, 0xea, 0xb6, 0xc5, 0x2c, 0xad, 0x04, 0x49, + 0x76, 0x14, 0x94, 0x95, 0x5a, 0x72, 0xad, 0x60, 0xf0, 0xbf, 0xfa, 0xf7, 0x49, 0x50, 0x0f, 0x28, + 0x23, 0xda, 0x7b, 0xa0, 0x72, 0x9a, 0x50, 0x81, 0x8b, 0xf3, 0x55, 0xdd, 0x76, 0xfa, 0x2e, 0xb1, + 0x77, 0x83, 0x7e, 0xe7, 0xd8, 0x23, 0x06, 0xc2, 0x67, 0x24, 0x95, 0x88, 0x49, 0x6a, 0x05, 0x52, + 0x3e, 0x1d, 0xbb, 0x36, 0x2a, 0x2d, 0x65, 0x88, 0x85, 0x76, 0x1d, 0xb2, 0x91, 0x52, 0xd4, 0x97, + 0x2b, 0x65, 0x89, 0x2b, 0x85, 0x2b, 0x59, 0x1a, 0x8c, 0x4c, 0x57, 0x0a, 0x66, 0x13, 0x72, 0xd1, + 0x73, 0x26, 0x35, 0xf7, 0x6a, 0xb2, 0x9d, 0x86, 0x69, 0xef, 0xc0, 0x72, 0xc4, 0x7f, 0xd4, 0x40, + 0xa1, 0xba, 0x52, 0xe4, 0x90, 0x1d, 0x8c, 0x49, 0xcb, 0x14, 0x8f, 0x51, 0x06, 0x4f, 0x36, 0x95, + 0xd6, 0x0e, 0xbe, 0x4a, 0xff, 0x81, 0x5c, 0xe0, 0xf4, 0x5d, 0x8b, 0x8d, 0x7d, 0x22, 0xd5, 0x37, + 0x35, 0x70, 0x2f, 0x39, 0x62, 0xc4, 0xc5, 0xcb, 0x2e, 0xd4, 0x36, 0x35, 0x68, 0x0d, 0xf8, 0x57, + 0xb4, 0x30, 0xa7, 0x59, 0x84, 0xd2, 0xb4, 0xc8, 0xd5, 0x0e, 0x3d, 0xfa, 0x0f, 0x0a, 0xa4, 0xc5, + 0xe5, 0x98, 0x21, 0x42, 0x99, 0x4f, 0x44, 0xe2, 0x2c, 0x22, 0x92, 0xaf, 0x43, 0xc4, 0x16, 0x40, + 0x54, 0x68, 0x50, 0x56, 0x6b, 0xc9, 0xb5, 0xfc, 0xfa, 0xc5, 0x79, 0xa9, 0x44, 0x99, 0x6d, 0xa7, + 0x2f, 0xef, 0xff, 0x4c, 0x98, 0xfe, 0x4c, 0x81, 0x5c, 0xe4, 0xd7, 0xb6, 0xa0, 0x18, 0xd6, 0x66, + 0x1e, 0x0e, 0xad, 0xbe, 0x94, 0xe4, 0xea, 0x1f, 0x14, 0xf8, 0xf1, 0xd0, 0xea, 0x1b, 0x79, 0x59, + 0x13, 0x5f, 0xcc, 0x27, 0x37, 0x71, 0x06, 0xb9, 0x31, 0x35, 0x25, 0xff, 0x9c, 0x9a, 0x62, 0xbc, + 0xab, 0x2f, 0xf0, 0xae, 0xff, 0xaa, 0xc0, 0x62, 0x93, 0xf3, 0x67, 0x13, 0xfb, 0xef, 0x25, 0xec, + 0x33, 0xa9, 0x31, 0x9b, 0xd8, 0xe6, 0x29, 0xe6, 0x2e, 0xcd, 0xcb, 0x19, 0xaf, 0x7b, 0xca, 0xa0, + 0x16, 0xe6, 0x69, 0x4f, 0x99, 0xfc, 0x36, 0x01, 0xcb, 0xa7, 0xf0, 0xff, 0x44, 0x46, 0xe3, 0x37, + 0x39, 0xf5, 0x8a, 0x37, 0x39, 0x7d, 0xe6, 0x4d, 0xfe, 0x2e, 0x01, 0xd9, 0x16, 0xbe, 0xda, 0xd6, + 0xf0, 0xaf, 0x79, 0x8b, 0x2f, 0x40, 0xce, 0xa3, 0x43, 0x53, 0x78, 0x54, 0xf4, 0x64, 0x3d, 0x3a, + 0x34, 0x4e, 0xc9, 0x2d, 0xf5, 0xc6, 0x1e, 0xea, 0xf4, 0x1b, 0x20, 0x22, 0xf3, 0xe2, 0xd5, 0x9a, + 0x40, 0x41, 0x34, 0x43, 0x4e, 0x53, 0xeb, 0xbc, 0x0b, 0x38, 0xa0, 0x29, 0xf3, 0x26, 0x40, 0x51, + 0xb8, 0xc0, 0x1a, 0x12, 0xc9, 0x63, 0xc4, 0xe8, 0x21, 0x87, 0xba, 0xca, 0xd9, 0x2f, 0x98, 0x21, + 0x91, 0xfa, 0x97, 0x0a, 0xc0, 0x2d, 0xde, 0x5f, 0x3c, 0x33, 0x9f, 0x84, 0x02, 0x2c, 0xc3, 0x8c, + 0xed, 0x5e, 0x3b, 0x9b, 0x3c, 0x59, 0x43, 0x21, 0x98, 0xad, 0xbe, 0x09, 0xc5, 0xa9, 0xca, 0x03, + 0x12, 0x16, 0x34, 0x37, 0x4d, 0x34, 0xa2, 0xb4, 0x09, 0x33, 0x0a, 0x93, 0x99, 0x95, 0xfe, 0xa3, + 0x02, 0x39, 0xac, 0x6b, 0x97, 0x30, 0x2b, 0xc6, 0xa6, 0xf2, 0x3a, 0x6c, 0x5e, 0x04, 0x10, 0x89, + 0x02, 0xe7, 0x3e, 0x91, 0x2a, 0xcb, 0xa1, 0xa5, 0xed, 0xdc, 0x27, 0xda, 0x46, 0xd4, 0xfa, 0xe4, + 0xcb, 0x5a, 0x2f, 0xdf, 0x90, 0x90, 0x80, 0x73, 0x90, 0x71, 0xc7, 0x23, 0x93, 0x0f, 0x27, 0xaa, + 0xd0, 0xae, 0x3b, 0x1e, 0x75, 0x8e, 0x02, 0x7d, 0x08, 0x99, 0xce, 0x11, 0x8e, 0xeb, 0x5c, 0xb0, + 0x3e, 0xa5, 0x72, 0x3a, 0x14, 0xb3, 0x79, 0x96, 0x1b, 0x70, 0x18, 0xd2, 0x40, 0xe5, 0x63, 0x60, + 0xf8, 0xf9, 0xc0, 0xff, 0x6b, 0x57, 0x5e, 0xf9, 0x53, 0x40, 0x7e, 0x04, 0x5c, 0xfe, 0x49, 0x81, + 0x62, 0xec, 0x66, 0x69, 0xef, 0xc2, 0xb9, 0xf6, 0xce, 0xf5, 0xbd, 0xe6, 0xb6, 0xb9, 0xdb, 0xbe, + 0x6e, 0x76, 0xee, 0xb4, 0x9a, 0xe6, 0xed, 0xbd, 0x9b, 0x7b, 0xfb, 0x9f, 0xec, 0x95, 0x16, 0x2a, + 0x4b, 0x0f, 0x1e, 0xd5, 0xf2, 0xb7, 0xdd, 0xbb, 0x2e, 0xbd, 0xe7, 0x9e, 0x85, 0x6e, 0x19, 0xcd, + 0x83, 0xfd, 0x4e, 0xb3, 0xa4, 0x08, 0x74, 0xcb, 0x27, 0x13, 0xca, 0x08, 0xa2, 0xaf, 0xc0, 0xf9, + 0x39, 0xe8, 0xad, 0xfd, 0xdd, 0xdd, 0x9d, 0x4e, 0x29, 0x51, 0x59, 0x7e, 0xf0, 0xa8, 0x56, 0x6c, + 0xf9, 0x44, 0xe8, 0x0d, 0x23, 0xea, 0x50, 0x3e, 0x1d, 0xb1, 0xdf, 0xda, 0x6f, 0x5f, 0xbb, 0x55, + 0xaa, 0x55, 0x4a, 0x0f, 0x1e, 0xd5, 0x0a, 0xe1, 0x23, 0xc2, 0xf1, 0x95, 0xec, 0x17, 0x5f, 0x55, + 0x17, 0xbe, 0xf9, 0xba, 0xaa, 0x6c, 0x76, 0x1e, 0x9f, 0x54, 0x95, 0x27, 0x27, 0x55, 0xe5, 0x97, + 0x93, 0xaa, 0xf2, 0xf0, 0x79, 0x75, 0xe1, 0xc9, 0xf3, 0xea, 0xc2, 0xcf, 0xcf, 0xab, 0x0b, 0x9f, + 0x7e, 0xd8, 0x77, 0xd8, 0x60, 0xdc, 0xe5, 0xcd, 0x69, 0xdc, 0xbc, 0x73, 0xd0, 0xdc, 0x23, 0xec, + 0x1e, 0xf5, 0xef, 0x36, 0x62, 0x9f, 0x76, 0xe2, 0xeb, 0x12, 0xdf, 0x75, 0x7f, 0xe4, 0xb8, 0x4c, + 0x7c, 0xeb, 0x75, 0xd3, 0x68, 0xbf, 0xfa, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x58, 0x51, + 0x51, 0xb6, 0x0e, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1496,7 +1498,7 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x2a - n4, err4 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time):]) + n4, err4 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Time, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Time):]) if err4 != nil { return 0, err4 } @@ -1614,7 +1616,7 @@ func (m *Vote) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } - n6, err6 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err6 != nil { return 0, err6 } @@ -1734,7 +1736,7 @@ func (m *CommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - n9, err9 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n9, err9 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err9 != nil { return 0, err9 } @@ -1855,7 +1857,7 @@ func (m *ExtendedCommitSig) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x22 } - n11, err11 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n11, err11 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err11 != nil { return 0, err11 } @@ -1905,7 +1907,7 @@ func (m *Proposal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a } - n12, err12 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) + n12, err12 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err12 != nil { return 0, err12 } @@ -2217,7 +2219,7 @@ func (m *Header) Size() (n int) { if m.Height != 0 { n += 1 + sovTypes(uint64(m.Height)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Time) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Time) n += 1 + l + sovTypes(uint64(l)) l = m.LastBlockId.Size() n += 1 + l + sovTypes(uint64(l)) @@ -2292,7 +2294,7 @@ func (m *Vote) Size() (n int) { } l = m.BlockID.Size() n += 1 + l + sovTypes(uint64(l)) - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.ValidatorAddress) if l > 0 { @@ -2352,7 +2354,7 @@ func (m *CommitSig) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.Signature) if l > 0 { @@ -2397,7 +2399,7 @@ func (m *ExtendedCommitSig) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.Signature) if l > 0 { @@ -2434,7 +2436,7 @@ func (m *Proposal) Size() (n int) { } l = m.BlockID.Size() n += 1 + l + sovTypes(uint64(l)) - l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovTypes(uint64(l)) l = len(m.Signature) if l > 0 { @@ -3021,7 +3023,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Time, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3615,7 +3617,7 @@ func (m *Vote) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4061,7 +4063,7 @@ func (m *CommitSig) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4386,7 +4388,7 @@ func (m *ExtendedCommitSig) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4680,7 +4682,7 @@ func (m *Proposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/proto/tendermint/types/types.proto b/proto/cometbft/v38/types/types.proto similarity index 90% rename from proto/tendermint/types/types.proto rename to proto/cometbft/v38/types/types.proto index a527e2ffb21..6db4e0d5d84 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/cometbft/v38/types/types.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v38.types; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -import "tendermint/crypto/proof.proto"; -import "tendermint/version/types.proto"; -import "tendermint/types/validator.proto"; +import "cometbft/v38/crypto/proof.proto"; +import "cometbft/v38/version/types.proto"; +import "cometbft/v38/types/validator.proto"; // SignedMsgType is a type of signed message in the consensus. enum SignedMsgType { @@ -32,7 +32,7 @@ message PartSetHeader { message Part { uint32 index = 1; bytes bytes = 2; - tendermint.crypto.Proof proof = 3 [(gogoproto.nullable) = false]; + cometbft.v38.crypto.Proof proof = 3 [(gogoproto.nullable) = false]; } // BlockID @@ -46,7 +46,7 @@ message BlockID { // Header defines the structure of a block header. message Header { // basic block info - tendermint.version.Consensus version = 1 [(gogoproto.nullable) = false]; + cometbft.v38.version.Consensus version = 1 [(gogoproto.nullable) = false]; string chain_id = 2 [(gogoproto.customname) = "ChainID"]; int64 height = 3; google.protobuf.Timestamp time = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -112,7 +112,7 @@ message Commit { // CommitSig is a part of the Vote included in a Commit. message CommitSig { - tendermint.types.BlockIDFlag block_id_flag = 1; + cometbft.v38.types.BlockIDFlag block_id_flag = 1; bytes validator_address = 2; google.protobuf.Timestamp timestamp = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -131,7 +131,7 @@ message ExtendedCommit { // extension-related fields. We use two signatures to ensure backwards compatibility. // That is the digest of the original signature is still the same in prior versions message ExtendedCommitSig { - tendermint.types.BlockIDFlag block_id_flag = 1; + cometbft.v38.types.BlockIDFlag block_id_flag = 1; bytes validator_address = 2; google.protobuf.Timestamp timestamp = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -160,7 +160,7 @@ message SignedHeader { message LightBlock { SignedHeader signed_header = 1; - tendermint.types.ValidatorSet validator_set = 2; + cometbft.v38.types.ValidatorSet validator_set = 2; } message BlockMeta { @@ -174,5 +174,5 @@ message BlockMeta { message TxProof { bytes root_hash = 1; bytes data = 2; - tendermint.crypto.Proof proof = 3; + cometbft.v38.crypto.Proof proof = 3; } diff --git a/proto/tendermint/types/validator.pb.go b/proto/cometbft/v38/types/validator.pb.go similarity index 84% rename from proto/tendermint/types/validator.pb.go rename to proto/cometbft/v38/types/validator.pb.go index 45faec7e6ea..91f926b22d8 100644 --- a/proto/tendermint/types/validator.pb.go +++ b/proto/cometbft/v38/types/validator.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/types/validator.proto +// source: cometbft/v38/types/validator.proto package types import ( fmt "fmt" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + crypto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -53,7 +53,7 @@ func (x BlockIDFlag) String() string { } func (BlockIDFlag) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_4e92274df03d3088, []int{0} + return fileDescriptor_7be5b553a3c703a4, []int{0} } type ValidatorSet struct { @@ -66,7 +66,7 @@ func (m *ValidatorSet) Reset() { *m = ValidatorSet{} } func (m *ValidatorSet) String() string { return proto.CompactTextString(m) } func (*ValidatorSet) ProtoMessage() {} func (*ValidatorSet) Descriptor() ([]byte, []int) { - return fileDescriptor_4e92274df03d3088, []int{0} + return fileDescriptor_7be5b553a3c703a4, []int{0} } func (m *ValidatorSet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -127,7 +127,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_4e92274df03d3088, []int{1} + return fileDescriptor_7be5b553a3c703a4, []int{1} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -193,7 +193,7 @@ func (m *SimpleValidator) Reset() { *m = SimpleValidator{} } func (m *SimpleValidator) String() string { return proto.CompactTextString(m) } func (*SimpleValidator) ProtoMessage() {} func (*SimpleValidator) Descriptor() ([]byte, []int) { - return fileDescriptor_4e92274df03d3088, []int{2} + return fileDescriptor_7be5b553a3c703a4, []int{2} } func (m *SimpleValidator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -237,48 +237,51 @@ func (m *SimpleValidator) GetVotingPower() int64 { } func init() { - proto.RegisterEnum("tendermint.types.BlockIDFlag", BlockIDFlag_name, BlockIDFlag_value) - proto.RegisterType((*ValidatorSet)(nil), "tendermint.types.ValidatorSet") - proto.RegisterType((*Validator)(nil), "tendermint.types.Validator") - proto.RegisterType((*SimpleValidator)(nil), "tendermint.types.SimpleValidator") -} - -func init() { proto.RegisterFile("tendermint/types/validator.proto", fileDescriptor_4e92274df03d3088) } - -var fileDescriptor_4e92274df03d3088 = []byte{ - // 502 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcd, 0x6e, 0xd3, 0x40, - 0x14, 0x85, 0x3d, 0x4d, 0xd5, 0x96, 0x49, 0x04, 0xce, 0xa8, 0x45, 0x91, 0xa9, 0x8c, 0xe9, 0x2a, - 0xfc, 0xc8, 0x16, 0x54, 0x88, 0x45, 0x57, 0x49, 0x4a, 0x51, 0x94, 0xc4, 0x89, 0x92, 0xb6, 0x48, - 0x6c, 0xac, 0x38, 0x19, 0xcc, 0xc8, 0x3f, 0x33, 0x1a, 0x4f, 0x52, 0xf9, 0x0d, 0x50, 0x56, 0xbc, - 0x40, 0x56, 0xb0, 0x60, 0xcd, 0x53, 0x74, 0xd9, 0x1d, 0xac, 0x10, 0x4a, 0x5e, 0x04, 0xc5, 0x6e, - 0x62, 0xb7, 0x01, 0x75, 0x77, 0x7d, 0xcf, 0x39, 0xf7, 0x7e, 0x1e, 0xe9, 0x42, 0x4d, 0xe0, 0x60, - 0x88, 0xb9, 0x4f, 0x02, 0x61, 0x88, 0x88, 0xe1, 0xd0, 0x18, 0xf7, 0x3d, 0x32, 0xec, 0x0b, 0xca, - 0x75, 0xc6, 0xa9, 0xa0, 0x48, 0x4e, 0x1d, 0x7a, 0xec, 0x50, 0x76, 0x1d, 0xea, 0xd0, 0x58, 0x34, - 0x16, 0x55, 0xe2, 0x53, 0xf6, 0x33, 0x93, 0x06, 0x3c, 0x62, 0x82, 0x1a, 0x2e, 0x8e, 0xc2, 0x44, - 0x3d, 0xf8, 0x01, 0x60, 0xe1, 0x7c, 0x39, 0xb9, 0x87, 0x05, 0x3a, 0x82, 0x70, 0xb5, 0x29, 0x2c, - 0x01, 0x2d, 0x57, 0xce, 0xbf, 0x7a, 0xa4, 0xdf, 0xde, 0xa5, 0xaf, 0x32, 0xdd, 0x8c, 0x1d, 0xbd, - 0x81, 0x3b, 0x8c, 0x53, 0x46, 0x43, 0xcc, 0x4b, 0x1b, 0x1a, 0xb8, 0x2b, 0xba, 0x32, 0xa3, 0x17, - 0x10, 0x09, 0x2a, 0xfa, 0x9e, 0x35, 0xa6, 0x82, 0x04, 0x8e, 0xc5, 0xe8, 0x05, 0xe6, 0xa5, 0x9c, - 0x06, 0xca, 0xb9, 0xae, 0x1c, 0x2b, 0xe7, 0xb1, 0xd0, 0x59, 0xf4, 0x17, 0xd0, 0xf7, 0x56, 0x53, - 0x50, 0x09, 0x6e, 0xf7, 0x87, 0x43, 0x8e, 0xc3, 0x05, 0x2e, 0x28, 0x17, 0xba, 0xcb, 0x4f, 0x74, - 0x04, 0xb7, 0xd9, 0xc8, 0xb6, 0x5c, 0x1c, 0x5d, 0xd3, 0xec, 0x67, 0x69, 0x92, 0xc7, 0xd0, 0x3b, - 0x23, 0xdb, 0x23, 0x83, 0x06, 0x8e, 0xaa, 0x9b, 0x97, 0xbf, 0x1f, 0x4b, 0xdd, 0x2d, 0x36, 0xb2, - 0x1b, 0x38, 0x42, 0x4f, 0x60, 0xe1, 0x1f, 0x30, 0xf9, 0x71, 0xca, 0x81, 0x9e, 0xc3, 0xe2, 0xf2, - 0x0f, 0x2c, 0xc6, 0x09, 0xe5, 0x44, 0x44, 0xa5, 0xcd, 0x04, 0x7a, 0x29, 0x74, 0xae, 0xfb, 0x07, - 0x2e, 0x7c, 0xd0, 0x23, 0x3e, 0xf3, 0x70, 0x4a, 0xfe, 0x3a, 0xe5, 0x03, 0x77, 0xf3, 0xfd, 0x97, - 0x6c, 0x63, 0x8d, 0xec, 0xd9, 0x4f, 0x00, 0xf3, 0x55, 0x8f, 0x0e, 0xdc, 0xfa, 0xf1, 0x89, 0xd7, - 0x77, 0xd0, 0x4b, 0xb8, 0x57, 0x6d, 0xb6, 0x6b, 0x0d, 0xab, 0x7e, 0x6c, 0x9d, 0x34, 0x2b, 0xef, - 0xac, 0x33, 0xb3, 0x61, 0xb6, 0xdf, 0x9b, 0xb2, 0xa4, 0x3c, 0x9c, 0x4c, 0x35, 0x94, 0xf1, 0x9e, - 0x05, 0x6e, 0x40, 0x2f, 0x02, 0x64, 0xc0, 0xdd, 0x9b, 0x91, 0x4a, 0xb5, 0xf7, 0xd6, 0x3c, 0x95, - 0x81, 0xb2, 0x37, 0x99, 0x6a, 0xc5, 0x4c, 0xa2, 0x62, 0x87, 0x38, 0x10, 0xeb, 0x81, 0x5a, 0xbb, - 0xd5, 0xaa, 0x9f, 0xca, 0x1b, 0x6b, 0x81, 0x1a, 0xf5, 0x7d, 0x22, 0xd0, 0x53, 0x58, 0xbc, 0x19, - 0x30, 0xeb, 0x4d, 0x39, 0xa7, 0xa0, 0xc9, 0x54, 0xbb, 0x9f, 0x71, 0x9b, 0xc4, 0x53, 0x76, 0x3e, - 0x7f, 0x55, 0xa5, 0xef, 0xdf, 0x54, 0x50, 0x6d, 0x5d, 0xce, 0x54, 0x70, 0x35, 0x53, 0xc1, 0x9f, - 0x99, 0x0a, 0xbe, 0xcc, 0x55, 0xe9, 0x6a, 0xae, 0x4a, 0xbf, 0xe6, 0xaa, 0xf4, 0xe1, 0xd0, 0x21, - 0xe2, 0xd3, 0xc8, 0xd6, 0x07, 0xd4, 0x37, 0x06, 0xd4, 0xc7, 0xc2, 0xfe, 0x28, 0xd2, 0x22, 0xb9, - 0x8b, 0xdb, 0x57, 0x65, 0x6f, 0xc5, 0xfd, 0xc3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x8c, - 0xe3, 0x20, 0x70, 0x03, 0x00, 0x00, + proto.RegisterEnum("cometbft.v38.types.BlockIDFlag", BlockIDFlag_name, BlockIDFlag_value) + proto.RegisterType((*ValidatorSet)(nil), "cometbft.v38.types.ValidatorSet") + proto.RegisterType((*Validator)(nil), "cometbft.v38.types.Validator") + proto.RegisterType((*SimpleValidator)(nil), "cometbft.v38.types.SimpleValidator") +} + +func init() { + proto.RegisterFile("cometbft/v38/types/validator.proto", fileDescriptor_7be5b553a3c703a4) +} + +var fileDescriptor_7be5b553a3c703a4 = []byte{ + // 522 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x4f, 0x6f, 0x12, 0x41, + 0x18, 0xc6, 0x77, 0x4a, 0xd3, 0xd6, 0x81, 0x28, 0x4c, 0x5a, 0x43, 0x36, 0x71, 0x5c, 0x39, 0xe1, + 0x9f, 0xec, 0x46, 0x39, 0x58, 0x4d, 0x7a, 0x00, 0xda, 0x1a, 0x02, 0x5d, 0x08, 0x50, 0x8c, 0x5e, + 0x36, 0x2c, 0x8c, 0x38, 0x61, 0x77, 0x67, 0x32, 0x3b, 0x40, 0xf6, 0x1b, 0x18, 0x4e, 0x7e, 0x01, + 0x4e, 0x7a, 0xf0, 0x03, 0x18, 0x3f, 0x43, 0x8f, 0xbd, 0xe9, 0xc9, 0x18, 0xf8, 0x22, 0x06, 0xb6, + 0xfc, 0xd9, 0xa0, 0xd1, 0xdb, 0xee, 0xfb, 0x3c, 0xcf, 0xfb, 0xfe, 0xe6, 0x4d, 0x5e, 0x98, 0xe9, + 0x30, 0x97, 0x48, 0xfb, 0x9d, 0x34, 0x86, 0xb9, 0x63, 0x43, 0x06, 0x9c, 0xf8, 0xc6, 0xb0, 0xed, + 0xd0, 0x6e, 0x5b, 0x32, 0xa1, 0x73, 0xc1, 0x24, 0x43, 0x68, 0xe9, 0xd1, 0x87, 0xb9, 0x63, 0x7d, + 0xe1, 0x51, 0x0f, 0x7b, 0xac, 0xc7, 0x16, 0xb2, 0x31, 0xff, 0x0a, 0x9d, 0x2a, 0x8e, 0x74, 0xeb, + 0x88, 0x80, 0x4b, 0x66, 0xf4, 0x49, 0xe0, 0x87, 0x7a, 0xe6, 0x1b, 0x80, 0x89, 0xd6, 0xb2, 0x7b, + 0x83, 0x48, 0x74, 0x02, 0xe1, 0x6a, 0x9a, 0x9f, 0x06, 0x5a, 0x2c, 0x1b, 0x7f, 0x76, 0x4f, 0xdf, + 0x9e, 0xa7, 0xaf, 0x52, 0xf5, 0x8d, 0x00, 0x7a, 0x01, 0x0f, 0xb8, 0x60, 0x9c, 0xf9, 0x44, 0xa4, + 0x77, 0x34, 0xf0, 0xef, 0xf0, 0xca, 0x8e, 0x9e, 0x40, 0x24, 0x99, 0x6c, 0x3b, 0xd6, 0x90, 0x49, + 0xea, 0xf5, 0x2c, 0xce, 0x46, 0x44, 0xa4, 0x63, 0x1a, 0xc8, 0xc6, 0xea, 0xc9, 0x85, 0xd2, 0x5a, + 0x08, 0xb5, 0x79, 0x3d, 0xf3, 0x15, 0xc0, 0x5b, 0xab, 0x2e, 0x28, 0x0d, 0xf7, 0xdb, 0xdd, 0xae, + 0x20, 0xfe, 0x1c, 0x19, 0x64, 0x13, 0xf5, 0xe5, 0x2f, 0x3a, 0x81, 0xfb, 0x7c, 0x60, 0x5b, 0x7d, + 0x12, 0xdc, 0xf0, 0xe0, 0x28, 0x4f, 0xb8, 0x12, 0xbd, 0x36, 0xb0, 0x1d, 0xda, 0x29, 0x93, 0xa0, + 0xb0, 0x7b, 0xf5, 0xf3, 0xbe, 0x52, 0xdf, 0xe3, 0x03, 0xbb, 0x4c, 0x02, 0xf4, 0x00, 0x26, 0xfe, + 0x80, 0x13, 0x1f, 0xae, 0x49, 0xd0, 0x63, 0x98, 0x5a, 0xbe, 0xc1, 0xe2, 0x82, 0x32, 0x41, 0x65, + 0x90, 0xde, 0x0d, 0xb1, 0x97, 0x42, 0xed, 0xa6, 0x9e, 0x71, 0xe1, 0x9d, 0x06, 0x75, 0xb9, 0x43, + 0xd6, 0xec, 0xcf, 0xd7, 0x84, 0xe0, 0x7f, 0x08, 0xff, 0xca, 0xb6, 0xb3, 0xc5, 0xf6, 0xe8, 0x3b, + 0x80, 0xf1, 0x82, 0xc3, 0x3a, 0xfd, 0xd2, 0xe9, 0xb9, 0xd3, 0xee, 0xa1, 0xa7, 0xf0, 0xa8, 0x50, + 0xa9, 0x16, 0xcb, 0x56, 0xe9, 0xd4, 0x3a, 0xaf, 0xe4, 0x5f, 0x59, 0x97, 0x66, 0xd9, 0xac, 0xbe, + 0x36, 0x93, 0x8a, 0x7a, 0x77, 0x3c, 0xd1, 0xd0, 0x86, 0xf7, 0xd2, 0xeb, 0x7b, 0x6c, 0xe4, 0x21, + 0x03, 0x1e, 0x46, 0x23, 0xf9, 0x42, 0xe3, 0xcc, 0x6c, 0x26, 0x81, 0x7a, 0x34, 0x9e, 0x68, 0xa9, + 0x8d, 0x44, 0xde, 0xf6, 0x89, 0x27, 0xb7, 0x03, 0xc5, 0xea, 0xc5, 0x45, 0xa9, 0x99, 0xdc, 0xd9, + 0x0a, 0x14, 0x99, 0xeb, 0x52, 0x89, 0x1e, 0xc2, 0x54, 0x34, 0x60, 0x96, 0x2a, 0xc9, 0x98, 0x8a, + 0xc6, 0x13, 0xed, 0xf6, 0x86, 0xdb, 0xa4, 0x8e, 0x7a, 0xf0, 0xe1, 0x13, 0x56, 0xbe, 0x7c, 0xc6, + 0xa0, 0xd0, 0xbc, 0x9a, 0x62, 0x70, 0x3d, 0xc5, 0xe0, 0xd7, 0x14, 0x83, 0x8f, 0x33, 0xac, 0x5c, + 0xcf, 0xb0, 0xf2, 0x63, 0x86, 0x95, 0xb7, 0x2f, 0x7b, 0x54, 0xbe, 0x1f, 0xd8, 0xf3, 0x25, 0x1a, + 0xe5, 0x37, 0xad, 0x33, 0x93, 0xc8, 0x11, 0x13, 0x7d, 0x23, 0x72, 0x09, 0xe1, 0xa1, 0x48, 0xe2, + 0x75, 0x89, 0x70, 0xa9, 0x27, 0xc3, 0x43, 0xb3, 0xf7, 0x16, 0xf5, 0xdc, 0xef, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x5c, 0x6f, 0x31, 0xa0, 0x85, 0x03, 0x00, 0x00, } func (m *ValidatorSet) Marshal() (dAtA []byte, err error) { diff --git a/proto/tendermint/types/validator.proto b/proto/cometbft/v38/types/validator.proto similarity index 79% rename from proto/tendermint/types/validator.proto rename to proto/cometbft/v38/types/validator.proto index 7b55956fcdd..53dd2052be2 100644 --- a/proto/tendermint/types/validator.proto +++ b/proto/cometbft/v38/types/validator.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.types; +package cometbft.v38.types; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/types"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/types"; import "gogoproto/gogo.proto"; -import "tendermint/crypto/keys.proto"; +import "cometbft/v38/crypto/keys.proto"; // BlockIdFlag indicates which BlockID the signature is for enum BlockIDFlag { @@ -26,12 +26,12 @@ message ValidatorSet { message Validator { bytes address = 1; - tendermint.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false]; + cometbft.v38.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false]; int64 voting_power = 3; int64 proposer_priority = 4; } message SimpleValidator { - tendermint.crypto.PublicKey pub_key = 1; + cometbft.v38.crypto.PublicKey pub_key = 1; int64 voting_power = 2; } diff --git a/proto/tendermint/version/types.pb.go b/proto/cometbft/v38/version/types.pb.go similarity index 85% rename from proto/tendermint/version/types.pb.go rename to proto/cometbft/v38/version/types.pb.go index f7393bf9037..b1a9e76ea48 100644 --- a/proto/tendermint/version/types.pb.go +++ b/proto/cometbft/v38/version/types.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/version/types.proto +// source: cometbft/v38/version/types.proto package version import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -35,7 +35,7 @@ func (m *App) Reset() { *m = App{} } func (m *App) String() string { return proto.CompactTextString(m) } func (*App) ProtoMessage() {} func (*App) Descriptor() ([]byte, []int) { - return fileDescriptor_f9b42966edc5edad, []int{0} + return fileDescriptor_fe974d1228b22093, []int{0} } func (m *App) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,7 +90,7 @@ func (m *Consensus) Reset() { *m = Consensus{} } func (m *Consensus) String() string { return proto.CompactTextString(m) } func (*Consensus) ProtoMessage() {} func (*Consensus) Descriptor() ([]byte, []int) { - return fileDescriptor_f9b42966edc5edad, []int{1} + return fileDescriptor_fe974d1228b22093, []int{1} } func (m *Consensus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -134,28 +134,30 @@ func (m *Consensus) GetApp() uint64 { } func init() { - proto.RegisterType((*App)(nil), "tendermint.version.App") - proto.RegisterType((*Consensus)(nil), "tendermint.version.Consensus") + proto.RegisterType((*App)(nil), "cometbft.v38.version.App") + proto.RegisterType((*Consensus)(nil), "cometbft.v38.version.Consensus") } -func init() { proto.RegisterFile("tendermint/version/types.proto", fileDescriptor_f9b42966edc5edad) } +func init() { proto.RegisterFile("cometbft/v38/version/types.proto", fileDescriptor_fe974d1228b22093) } -var fileDescriptor_f9b42966edc5edad = []byte{ - // 223 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x49, 0xcd, 0x4b, - 0x49, 0x2d, 0xca, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0xd3, 0x2f, - 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x41, - 0xe5, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xd2, 0xfa, 0x20, 0x16, 0x44, 0xa5, 0x92, 0x2d, - 0x17, 0xb3, 0x63, 0x41, 0x81, 0x90, 0x14, 0x17, 0x07, 0x98, 0x9f, 0x9c, 0x9f, 0x23, 0xc1, 0xa8, - 0xc0, 0xa8, 0xc1, 0x12, 0x04, 0xe7, 0x83, 0xe4, 0x8a, 0xf3, 0xd3, 0x4a, 0xca, 0x13, 0x8b, 0x52, - 0x25, 0x98, 0x14, 0x18, 0x35, 0x38, 0x83, 0xe0, 0x7c, 0x25, 0x4b, 0x2e, 0x4e, 0xe7, 0xfc, 0xbc, - 0xe2, 0xd4, 0xbc, 0xe2, 0xd2, 0x62, 0x21, 0x11, 0x2e, 0xd6, 0xa4, 0x9c, 0xfc, 0xe4, 0x6c, 0xa8, - 0x09, 0x10, 0x8e, 0x90, 0x00, 0x17, 0x73, 0x62, 0x41, 0x01, 0x58, 0x27, 0x4b, 0x10, 0x88, 0x69, - 0xc5, 0xf2, 0x62, 0x81, 0x3c, 0xa3, 0x93, 0xff, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, - 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, - 0x31, 0x44, 0x99, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x27, 0xe7, - 0xe7, 0xa6, 0x96, 0x24, 0xa5, 0x95, 0x20, 0x18, 0x10, 0x2f, 0x60, 0x06, 0x40, 0x12, 0x1b, 0x58, - 0xc6, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xc7, 0x18, 0x2b, 0x1d, 0x01, 0x00, 0x00, +var fileDescriptor_fe974d1228b22093 = []byte{ + // 244 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, + 0xd3, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0xa9, + 0xd0, 0x2b, 0x33, 0xb6, 0xd0, 0x83, 0xaa, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, + 0x07, 0xb1, 0x20, 0x6a, 0x95, 0x6c, 0xb9, 0x98, 0x1d, 0x0b, 0x0a, 0x84, 0xa4, 0xb8, 0x38, 0xc0, + 0xfc, 0xe4, 0xfc, 0x1c, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x96, 0x20, 0x38, 0x1f, 0x24, 0x57, 0x9c, + 0x9f, 0x56, 0x52, 0x9e, 0x58, 0x94, 0x2a, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x19, 0x04, 0xe7, 0x2b, + 0x59, 0x72, 0x71, 0x3a, 0xe7, 0xe7, 0x15, 0xa7, 0xe6, 0x15, 0x97, 0x16, 0x0b, 0x89, 0x70, 0xb1, + 0x26, 0xe5, 0xe4, 0x27, 0x67, 0x43, 0x4d, 0x80, 0x70, 0x84, 0x04, 0xb8, 0x98, 0x13, 0x0b, 0x0a, + 0xc0, 0x3a, 0x59, 0x82, 0x40, 0x4c, 0x2b, 0x96, 0x17, 0x0b, 0xe4, 0x19, 0x9d, 0xc2, 0x4e, 0x3c, + 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, + 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x26, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, + 0x2f, 0x39, 0x3f, 0x57, 0xdf, 0x3b, 0x32, 0xcc, 0xd5, 0x2f, 0xb5, 0xa4, 0x3c, 0xbf, 0x28, 0x5b, + 0x1f, 0xc5, 0xe3, 0x10, 0x9f, 0x94, 0xa4, 0xe6, 0xa5, 0xa4, 0x16, 0xe5, 0x66, 0xe6, 0x95, 0xc0, + 0x42, 0x22, 0x89, 0x0d, 0x2c, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xef, 0xec, 0x38, 0xc6, + 0x28, 0x01, 0x00, 0x00, } func (this *Consensus) Equal(that interface{}) bool { diff --git a/proto/tendermint/version/types.proto b/proto/cometbft/v38/version/types.proto similarity index 83% rename from proto/tendermint/version/types.proto rename to proto/cometbft/v38/version/types.proto index 3b6ef45479e..89398ae0ea6 100644 --- a/proto/tendermint/version/types.proto +++ b/proto/cometbft/v38/version/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.version; +package cometbft.v38.version; -option go_package = "github.com/cometbft/cometbft/proto/tendermint/version"; +option go_package = "github.com/KYVENetwork/cometbft/v38/proto/tendermint/version"; import "gogoproto/gogo.proto"; diff --git a/proto/tendermint/libs/bits/types.proto b/proto/tendermint/libs/bits/types.proto deleted file mode 100644 index e6afc5e8ec2..00000000000 --- a/proto/tendermint/libs/bits/types.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; -package tendermint.libs.bits; - -option go_package = "github.com/cometbft/cometbft/proto/tendermint/libs/bits"; - -message BitArray { - int64 bits = 1; - repeated uint64 elems = 2; -} diff --git a/proto/tendermint/store/types.proto b/proto/tendermint/store/types.proto deleted file mode 100644 index b510169a4c0..00000000000 --- a/proto/tendermint/store/types.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; -package tendermint.store; - -option go_package = "github.com/cometbft/cometbft/proto/tendermint/store"; - -message BlockStoreState { - int64 base = 1; - int64 height = 2; -} diff --git a/proxy/app_conn.go b/proxy/app_conn.go index 064f32891ff..1fdfbbdf757 100644 --- a/proxy/app_conn.go +++ b/proxy/app_conn.go @@ -6,8 +6,8 @@ import ( "github.com/go-kit/kit/metrics" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/types" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/types" ) //go:generate ../scripts/mockery_generate.sh AppConnConsensus|AppConnMempool|AppConnQuery|AppConnSnapshot diff --git a/proxy/app_conn_test.go b/proxy/app_conn_test.go index cbe73d11b7c..3ea33edaade 100644 --- a/proxy/app_conn_test.go +++ b/proxy/app_conn_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/abci/server" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/abci/server" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) var SOCKET = "socket" diff --git a/proxy/client.go b/proxy/client.go index 97f10673327..7c63fd97841 100644 --- a/proxy/client.go +++ b/proxy/client.go @@ -3,11 +3,11 @@ package proxy import ( "fmt" - abcicli "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/abci/types" - cmtsync "github.com/cometbft/cometbft/libs/sync" - e2e "github.com/cometbft/cometbft/test/e2e/app" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/app" ) //go:generate ../scripts/mockery_generate.sh ClientCreator diff --git a/proxy/mocks/app_conn_consensus.go b/proxy/mocks/app_conn_consensus.go index 7dee0b1c5ce..ac917019402 100644 --- a/proxy/mocks/app_conn_consensus.go +++ b/proxy/mocks/app_conn_consensus.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/KYVENetwork/cometbft/v38/abci/types" ) // AppConnConsensus is an autogenerated mock type for the AppConnConsensus type diff --git a/proxy/mocks/app_conn_mempool.go b/proxy/mocks/app_conn_mempool.go index 281ff21c9f9..fb6b66deffe 100644 --- a/proxy/mocks/app_conn_mempool.go +++ b/proxy/mocks/app_conn_mempool.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - abcicli "github.com/cometbft/cometbft/abci/client" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/KYVENetwork/cometbft/v38/abci/types" ) // AppConnMempool is an autogenerated mock type for the AppConnMempool type diff --git a/proxy/mocks/app_conn_query.go b/proxy/mocks/app_conn_query.go index b10838ac01e..5502a58132b 100644 --- a/proxy/mocks/app_conn_query.go +++ b/proxy/mocks/app_conn_query.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/KYVENetwork/cometbft/v38/abci/types" ) // AppConnQuery is an autogenerated mock type for the AppConnQuery type diff --git a/proxy/mocks/app_conn_snapshot.go b/proxy/mocks/app_conn_snapshot.go index cb313d522d5..a28a585b881 100644 --- a/proxy/mocks/app_conn_snapshot.go +++ b/proxy/mocks/app_conn_snapshot.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/KYVENetwork/cometbft/v38/abci/types" ) // AppConnSnapshot is an autogenerated mock type for the AppConnSnapshot type diff --git a/proxy/mocks/client_creator.go b/proxy/mocks/client_creator.go index 798afe88fb2..ff0ae740261 100644 --- a/proxy/mocks/client_creator.go +++ b/proxy/mocks/client_creator.go @@ -3,7 +3,7 @@ package mocks import ( - abcicli "github.com/cometbft/cometbft/abci/client" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" mock "github.com/stretchr/testify/mock" ) diff --git a/proxy/multi_app_conn.go b/proxy/multi_app_conn.go index 9117c304664..f4de6c2ca1a 100644 --- a/proxy/multi_app_conn.go +++ b/proxy/multi_app_conn.go @@ -3,10 +3,10 @@ package proxy import ( "fmt" - abcicli "github.com/cometbft/cometbft/abci/client" - cmtlog "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - "github.com/cometbft/cometbft/libs/service" + abcicli "github.com/KYVENetwork/cometbft/v38/abci/client" + cmtlog "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) const ( diff --git a/proxy/multi_app_conn_test.go b/proxy/multi_app_conn_test.go index 2c6e3e51ef0..997d2400155 100644 --- a/proxy/multi_app_conn_test.go +++ b/proxy/multi_app_conn_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abcimocks "github.com/cometbft/cometbft/abci/client/mocks" - "github.com/cometbft/cometbft/proxy/mocks" + abcimocks "github.com/KYVENetwork/cometbft/v38/abci/client/mocks" + "github.com/KYVENetwork/cometbft/v38/proxy/mocks" ) func TestAppConns_Start_Stop(t *testing.T) { diff --git a/proxy/version.go b/proxy/version.go index 134dfc4aea0..a5e91335588 100644 --- a/proxy/version.go +++ b/proxy/version.go @@ -1,8 +1,8 @@ package proxy import ( - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/version" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/version" ) // RequestInfo contains all the information for sending diff --git a/rpc/client/event_test.go b/rpc/client/event_test.go index ca38b8e0e46..59606f18a31 100644 --- a/rpc/client/event_test.go +++ b/rpc/client/event_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + "github.com/KYVENetwork/cometbft/v38/types" ) var waitForEventTimeout = 8 * time.Second diff --git a/rpc/client/evidence_test.go b/rpc/client/evidence_test.go index 432f0868844..cab0ccb9889 100644 --- a/rpc/client/evidence_test.go +++ b/rpc/client/evidence_test.go @@ -9,17 +9,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/rpc/client" - rpctest "github.com/cometbft/cometbft/rpc/test" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/rpc/client" + rpctest "github.com/KYVENetwork/cometbft/v38/rpc/test" + "github.com/KYVENetwork/cometbft/v38/types" ) // For some reason the empty node used in tests has a time of diff --git a/rpc/client/examples_test.go b/rpc/client/examples_test.go index 4c8d8eed656..9c2f76e26ac 100644 --- a/rpc/client/examples_test.go +++ b/rpc/client/examples_test.go @@ -6,10 +6,10 @@ import ( "fmt" "log" - "github.com/cometbft/cometbft/abci/example/kvstore" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctest "github.com/cometbft/cometbft/rpc/test" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctest "github.com/KYVENetwork/cometbft/v38/rpc/test" ) func ExampleHTTP_simple() { diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go index fe34d0480b1..7233545783c 100644 --- a/rpc/client/helpers.go +++ b/rpc/client/helpers.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // Waiter is informed of current height, decided whether to quit early diff --git a/rpc/client/helpers_test.go b/rpc/client/helpers_test.go index 65f55a4c32a..a6872e768e1 100644 --- a/rpc/client/helpers_test.go +++ b/rpc/client/helpers_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/rpc/client" - "github.com/cometbft/cometbft/rpc/client/mock" - ctypes "github.com/cometbft/cometbft/rpc/core/types" + "github.com/KYVENetwork/cometbft/v38/rpc/client" + "github.com/KYVENetwork/cometbft/v38/rpc/client/mock" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" ) func TestWaitForHeight(t *testing.T) { diff --git a/rpc/client/http/http.go b/rpc/client/http/http.go index f9ccaeb5a4c..239b24a5ecf 100644 --- a/rpc/client/http/http.go +++ b/rpc/client/http/http.go @@ -7,16 +7,16 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - rpcclient "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - jsonrpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + jsonrpcclient "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/client" + "github.com/KYVENetwork/cometbft/v38/types" ) /* diff --git a/rpc/client/interface.go b/rpc/client/interface.go index 285ac74e533..1c5d5bdde65 100644 --- a/rpc/client/interface.go +++ b/rpc/client/interface.go @@ -23,10 +23,10 @@ implementation. import ( "context" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/service" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/service" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // Client wraps most important rpc calls a client would make if you want to diff --git a/rpc/client/local/local.go b/rpc/client/local/local.go index 7115af1deb8..bb71cb9fbfb 100644 --- a/rpc/client/local/local.go +++ b/rpc/client/local/local.go @@ -5,16 +5,16 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - nm "github.com/cometbft/cometbft/node" - rpcclient "github.com/cometbft/cometbft/rpc/client" - "github.com/cometbft/cometbft/rpc/core" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + nm "github.com/KYVENetwork/cometbft/v38/node" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/client" + "github.com/KYVENetwork/cometbft/v38/rpc/core" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/types" ) /* diff --git a/rpc/client/main_test.go b/rpc/client/main_test.go index 7d7692a7417..561a7b816aa 100644 --- a/rpc/client/main_test.go +++ b/rpc/client/main_test.go @@ -4,9 +4,9 @@ import ( "os" "testing" - "github.com/cometbft/cometbft/abci/example/kvstore" - nm "github.com/cometbft/cometbft/node" - rpctest "github.com/cometbft/cometbft/rpc/test" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + nm "github.com/KYVENetwork/cometbft/v38/node" + rpctest "github.com/KYVENetwork/cometbft/v38/rpc/test" ) var node *nm.Node diff --git a/rpc/client/mock/client.go b/rpc/client/mock/client.go index 0607954251f..196ee1025d9 100644 --- a/rpc/client/mock/client.go +++ b/rpc/client/mock/client.go @@ -18,13 +18,13 @@ import ( "context" "reflect" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/rpc/client" - "github.com/cometbft/cometbft/rpc/core" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/rpc/client" + "github.com/KYVENetwork/cometbft/v38/rpc/core" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // Client wraps arbitrary implementations of the various interfaces. diff --git a/rpc/client/mock/status.go b/rpc/client/mock/status.go index 69b60674778..673414d8870 100644 --- a/rpc/client/mock/status.go +++ b/rpc/client/mock/status.go @@ -3,8 +3,8 @@ package mock import ( "context" - "github.com/cometbft/cometbft/rpc/client" - ctypes "github.com/cometbft/cometbft/rpc/core/types" + "github.com/KYVENetwork/cometbft/v38/rpc/client" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" ) // StatusMock returns the result specified by the Call diff --git a/rpc/client/mock/status_test.go b/rpc/client/mock/status_test.go index 26bb33caa80..031c78b9b4e 100644 --- a/rpc/client/mock/status_test.go +++ b/rpc/client/mock/status_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/rpc/client/mock" - ctypes "github.com/cometbft/cometbft/rpc/core/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/rpc/client/mock" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" ) func TestStatus(t *testing.T) { diff --git a/rpc/client/mocks/client.go b/rpc/client/mocks/client.go index aa612af26cb..2018383dbc8 100644 --- a/rpc/client/mocks/client.go +++ b/rpc/client/mocks/client.go @@ -3,18 +3,18 @@ package mocks import ( - bytes "github.com/cometbft/cometbft/libs/bytes" - client "github.com/cometbft/cometbft/rpc/client" + bytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + client "github.com/KYVENetwork/cometbft/v38/rpc/client" context "context" - coretypes "github.com/cometbft/cometbft/rpc/core/types" + coretypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" - log "github.com/cometbft/cometbft/libs/log" + log "github.com/KYVENetwork/cometbft/v38/libs/log" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // Client is an autogenerated mock type for the Client type diff --git a/rpc/client/rpc_test.go b/rpc/client/rpc_test.go index 8832ef040c1..a4203633298 100644 --- a/rpc/client/rpc_test.go +++ b/rpc/client/rpc_test.go @@ -14,18 +14,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - cmtmath "github.com/cometbft/cometbft/libs/math" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/rpc/client" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpclocal "github.com/cometbft/cometbft/rpc/client/local" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" - rpctest "github.com/cometbft/cometbft/rpc/test" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/rpc/client" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + rpclocal "github.com/KYVENetwork/cometbft/v38/rpc/client/local" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/client" + rpctest "github.com/KYVENetwork/cometbft/v38/rpc/test" + "github.com/KYVENetwork/cometbft/v38/types" ) var ( diff --git a/rpc/core/abci.go b/rpc/core/abci.go index f925d0fb649..616650ef692 100644 --- a/rpc/core/abci.go +++ b/rpc/core/abci.go @@ -3,11 +3,11 @@ package core import ( "context" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/proxy" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/proxy" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // ABCIQuery queries the application for some information. diff --git a/rpc/core/blocks.go b/rpc/core/blocks.go index dc1b4b61464..7c6013f6f0a 100644 --- a/rpc/core/blocks.go +++ b/rpc/core/blocks.go @@ -5,13 +5,13 @@ import ( "fmt" "sort" - "github.com/cometbft/cometbft/libs/bytes" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - blockidxnull "github.com/cometbft/cometbft/state/indexer/block/null" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtquery "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + blockidxnull "github.com/KYVENetwork/cometbft/v38/state/indexer/block/null" + "github.com/KYVENetwork/cometbft/v38/types" ) // BlockchainInfo gets block headers for minHeight <= height <= maxHeight. diff --git a/rpc/core/blocks_test.go b/rpc/core/blocks_test.go index 88bf57ceb4d..f5dbb49a574 100644 --- a/rpc/core/blocks_test.go +++ b/rpc/core/blocks_test.go @@ -9,11 +9,11 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/mocks" ) func TestBlockchainInfo(t *testing.T) { diff --git a/rpc/core/consensus.go b/rpc/core/consensus.go index 6f1a52b168a..7c9462c02fc 100644 --- a/rpc/core/consensus.go +++ b/rpc/core/consensus.go @@ -1,11 +1,11 @@ package core import ( - cm "github.com/cometbft/cometbft/consensus" - cmtmath "github.com/cometbft/cometbft/libs/math" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + cm "github.com/KYVENetwork/cometbft/v38/consensus" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // Validators gets the validator set at the given block height. diff --git a/rpc/core/dev.go b/rpc/core/dev.go index 389c96ee03c..3a3f37db57d 100644 --- a/rpc/core/dev.go +++ b/rpc/core/dev.go @@ -1,8 +1,8 @@ package core import ( - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // UnsafeFlushMempool removes all transactions from the mempool. diff --git a/rpc/core/doc.go b/rpc/core/doc.go index 3032d1cc1dd..4cfd3de0de8 100644 --- a/rpc/core/doc.go +++ b/rpc/core/doc.go @@ -2,7 +2,7 @@ Package core defines the CometBFT RPC endpoints. CometBFT ships with its own JSONRPC library - -https://github.com/cometbft/cometbft/tree/v0.38.x/rpc/jsonrpc. +https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/rpc/jsonrpc. ## Get the list diff --git a/rpc/core/env.go b/rpc/core/env.go index 9dc27b7c131..80943477b0c 100644 --- a/rpc/core/env.go +++ b/rpc/core/env.go @@ -5,17 +5,17 @@ import ( "fmt" "time" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/rpc/core/events.go b/rpc/core/events.go index b130f38f0ac..3797b43810e 100644 --- a/rpc/core/events.go +++ b/rpc/core/events.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) const ( diff --git a/rpc/core/evidence.go b/rpc/core/evidence.go index b742f985c17..fc3758b19d8 100644 --- a/rpc/core/evidence.go +++ b/rpc/core/evidence.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // BroadcastEvidence broadcasts evidence of the misbehavior. diff --git a/rpc/core/health.go b/rpc/core/health.go index e1b0017c850..adb22cac0cb 100644 --- a/rpc/core/health.go +++ b/rpc/core/health.go @@ -1,8 +1,8 @@ package core import ( - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // Health gets node health. Returns empty result (200 OK) on success, no diff --git a/rpc/core/mempool.go b/rpc/core/mempool.go index 93442dfe765..0ffce15bd9c 100644 --- a/rpc/core/mempool.go +++ b/rpc/core/mempool.go @@ -6,11 +6,11 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" - mempl "github.com/cometbft/cometbft/mempool" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/types" ) //----------------------------------------------------------------------------- diff --git a/rpc/core/net.go b/rpc/core/net.go index a79e2eb76aa..338e673aa48 100644 --- a/rpc/core/net.go +++ b/rpc/core/net.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/p2p" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/p2p" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // NetInfo returns network info. diff --git a/rpc/core/net_test.go b/rpc/core/net_test.go index 5791621129e..646d5b8e23c 100644 --- a/rpc/core/net_test.go +++ b/rpc/core/net_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cfg "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) func TestUnsafeDialSeeds(t *testing.T) { diff --git a/rpc/core/routes.go b/rpc/core/routes.go index c7c13a52781..6e9c47f50d6 100644 --- a/rpc/core/routes.go +++ b/rpc/core/routes.go @@ -1,7 +1,7 @@ package core import ( - rpc "github.com/cometbft/cometbft/rpc/jsonrpc/server" + rpc "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" ) // TODO: better system than "unsafe" prefix diff --git a/rpc/core/status.go b/rpc/core/status.go index 5e3d6d1892e..c5c7666c9ed 100644 --- a/rpc/core/status.go +++ b/rpc/core/status.go @@ -3,11 +3,11 @@ package core import ( "time" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/p2p" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/types" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/p2p" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // Status returns CometBFT status including node info, pubkey, latest block diff --git a/rpc/core/tx.go b/rpc/core/tx.go index 6c1bac48d46..91fb9fbc4b0 100644 --- a/rpc/core/tx.go +++ b/rpc/core/tx.go @@ -5,12 +5,12 @@ import ( "fmt" "sort" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" - "github.com/cometbft/cometbft/state/txindex/null" - "github.com/cometbft/cometbft/types" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtquery "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/state/txindex/null" + "github.com/KYVENetwork/cometbft/v38/types" ) // Tx allows you to query the transaction results. `nil` could mean the diff --git a/rpc/core/types/responses.go b/rpc/core/types/responses.go index 36d3ef87306..c3a63066ff4 100644 --- a/rpc/core/types/responses.go +++ b/rpc/core/types/responses.go @@ -4,12 +4,12 @@ import ( "encoding/json" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/p2p" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/p2p" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // List of blocks diff --git a/rpc/core/types/responses_test.go b/rpc/core/types/responses_test.go index 772fb6d6166..24b1fd2e6bf 100644 --- a/rpc/core/types/responses_test.go +++ b/rpc/core/types/responses_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) func TestStatusIndexer(t *testing.T) { diff --git a/rpc/grpc/api.go b/rpc/grpc/api.go index d237953b1a6..0c5240c5732 100644 --- a/rpc/grpc/api.go +++ b/rpc/grpc/api.go @@ -3,9 +3,9 @@ package coregrpc import ( "context" - abci "github.com/cometbft/cometbft/abci/types" - core "github.com/cometbft/cometbft/rpc/core" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + core "github.com/KYVENetwork/cometbft/v38/rpc/core" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) type broadcastAPI struct { diff --git a/rpc/grpc/client_server.go b/rpc/grpc/client_server.go index b2105e84120..4852b54ef1a 100644 --- a/rpc/grpc/client_server.go +++ b/rpc/grpc/client_server.go @@ -6,8 +6,8 @@ import ( "golang.org/x/net/context" "google.golang.org/grpc" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/rpc/core" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + "github.com/KYVENetwork/cometbft/v38/rpc/core" ) // Config is an gRPC server configuration. diff --git a/rpc/grpc/grpc_test.go b/rpc/grpc/grpc_test.go index ed06eeb9646..f05b39705fc 100644 --- a/rpc/grpc/grpc_test.go +++ b/rpc/grpc/grpc_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/abci/example/kvstore" - core_grpc "github.com/cometbft/cometbft/rpc/grpc" - rpctest "github.com/cometbft/cometbft/rpc/test" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + core_grpc "github.com/KYVENetwork/cometbft/v38/rpc/grpc" + rpctest "github.com/KYVENetwork/cometbft/v38/rpc/test" ) func TestMain(m *testing.M) { diff --git a/rpc/grpc/types.pb.go b/rpc/grpc/types.pb.go index 393c7394764..b4dbdd3fac8 100644 --- a/rpc/grpc/types.pb.go +++ b/rpc/grpc/types.pb.go @@ -1,14 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: tendermint/rpc/grpc/types.proto +// source: cometbft/v38/rpc/grpc/types.proto package coregrpc import ( context "context" fmt "fmt" - types "github.com/cometbft/cometbft/abci/types" - grpc1 "github.com/cosmos/gogoproto/grpc" - proto "github.com/cosmos/gogoproto/proto" + types "github.com/KYVENetwork/cometbft/v38/abci/types" + proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -35,7 +34,7 @@ func (m *RequestPing) Reset() { *m = RequestPing{} } func (m *RequestPing) String() string { return proto.CompactTextString(m) } func (*RequestPing) ProtoMessage() {} func (*RequestPing) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{0} + return fileDescriptor_96a066730637149c, []int{0} } func (m *RequestPing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -72,7 +71,7 @@ func (m *RequestBroadcastTx) Reset() { *m = RequestBroadcastTx{} } func (m *RequestBroadcastTx) String() string { return proto.CompactTextString(m) } func (*RequestBroadcastTx) ProtoMessage() {} func (*RequestBroadcastTx) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{1} + return fileDescriptor_96a066730637149c, []int{1} } func (m *RequestBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -115,7 +114,7 @@ func (m *ResponsePing) Reset() { *m = ResponsePing{} } func (m *ResponsePing) String() string { return proto.CompactTextString(m) } func (*ResponsePing) ProtoMessage() {} func (*ResponsePing) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{2} + return fileDescriptor_96a066730637149c, []int{2} } func (m *ResponsePing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -153,7 +152,7 @@ func (m *ResponseBroadcastTx) Reset() { *m = ResponseBroadcastTx{} } func (m *ResponseBroadcastTx) String() string { return proto.CompactTextString(m) } func (*ResponseBroadcastTx) ProtoMessage() {} func (*ResponseBroadcastTx) Descriptor() ([]byte, []int) { - return fileDescriptor_0ffff5682c662b95, []int{3} + return fileDescriptor_96a066730637149c, []int{3} } func (m *ResponseBroadcastTx) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -197,37 +196,37 @@ func (m *ResponseBroadcastTx) GetTxResult() *types.ExecTxResult { } func init() { - proto.RegisterType((*RequestPing)(nil), "tendermint.rpc.grpc.RequestPing") - proto.RegisterType((*RequestBroadcastTx)(nil), "tendermint.rpc.grpc.RequestBroadcastTx") - proto.RegisterType((*ResponsePing)(nil), "tendermint.rpc.grpc.ResponsePing") - proto.RegisterType((*ResponseBroadcastTx)(nil), "tendermint.rpc.grpc.ResponseBroadcastTx") -} - -func init() { proto.RegisterFile("tendermint/rpc/grpc/types.proto", fileDescriptor_0ffff5682c662b95) } - -var fileDescriptor_0ffff5682c662b95 = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x31, 0x4f, 0x02, 0x31, - 0x14, 0xc7, 0x29, 0x31, 0x8a, 0x05, 0x19, 0xca, 0x42, 0x30, 0x9e, 0x48, 0x4c, 0x64, 0x2a, 0x09, - 0x6e, 0x32, 0x89, 0x31, 0xd1, 0xb8, 0x90, 0x86, 0xc9, 0x05, 0xb9, 0xf2, 0x84, 0x8b, 0x72, 0x3d, - 0xdb, 0x47, 0x52, 0xbf, 0x84, 0xf1, 0x0b, 0xb9, 0x3b, 0x32, 0x3a, 0x1a, 0xf8, 0x22, 0xa6, 0x27, - 0x27, 0x35, 0x46, 0x96, 0xe6, 0xdf, 0xe6, 0xff, 0x7b, 0xfd, 0xbf, 0xd7, 0xd2, 0x43, 0x84, 0x78, - 0x04, 0x7a, 0x1a, 0xc5, 0xd8, 0xd2, 0x89, 0x6c, 0x8d, 0xdd, 0x82, 0xcf, 0x09, 0x18, 0x9e, 0x68, - 0x85, 0x8a, 0x55, 0xd6, 0x06, 0xae, 0x13, 0xc9, 0x9d, 0xa1, 0xb6, 0xef, 0x51, 0xc3, 0x50, 0x46, - 0x3e, 0xd1, 0xd8, 0xa3, 0x45, 0x01, 0x4f, 0x33, 0x30, 0xd8, 0x8b, 0xe2, 0x71, 0xe3, 0x98, 0xb2, - 0xd5, 0xb6, 0xab, 0xd5, 0x70, 0x24, 0x87, 0x06, 0xfb, 0x96, 0x95, 0x69, 0x1e, 0x6d, 0x95, 0xd4, - 0x49, 0xb3, 0x24, 0xf2, 0x68, 0x1b, 0x65, 0x5a, 0x12, 0x60, 0x12, 0x15, 0x1b, 0x48, 0xa9, 0x17, - 0x42, 0x2b, 0xd9, 0x81, 0xcf, 0x75, 0x68, 0x41, 0x4e, 0x40, 0x3e, 0x0c, 0x56, 0x74, 0xb1, 0x5d, - 0xe7, 0x5e, 0x42, 0x17, 0x86, 0x67, 0xdc, 0x85, 0x33, 0xf6, 0xad, 0xd8, 0x91, 0xdf, 0x82, 0x9d, - 0xd1, 0x5d, 0xb4, 0x03, 0x0d, 0x66, 0xf6, 0x88, 0xd5, 0x7c, 0x4a, 0x1f, 0xfc, 0xa1, 0x2f, 0x2d, - 0xc8, 0xbe, 0x15, 0xa9, 0x49, 0x14, 0x70, 0xa5, 0xda, 0x6f, 0x84, 0x96, 0x7e, 0x82, 0x9c, 0xf7, - 0xae, 0xd9, 0x0d, 0xdd, 0x72, 0x49, 0xd9, 0xaf, 0xfb, 0xb3, 0x09, 0x71, 0x6f, 0x02, 0xb5, 0xa3, - 0x7f, 0x1c, 0xeb, 0x76, 0xd9, 0x1d, 0x2d, 0xfa, 0x5d, 0x9e, 0x6c, 0xaa, 0xe9, 0x19, 0x6b, 0xcd, - 0x8d, 0xa5, 0x3d, 0x67, 0xf7, 0xea, 0x7d, 0x11, 0x90, 0xf9, 0x22, 0x20, 0x9f, 0x8b, 0x80, 0xbc, - 0x2e, 0x83, 0xdc, 0x7c, 0x19, 0xe4, 0x3e, 0x96, 0x41, 0xee, 0x96, 0x8f, 0x23, 0x9c, 0xcc, 0x42, - 0x2e, 0xd5, 0xb4, 0x25, 0xd5, 0x14, 0x30, 0xbc, 0xc7, 0xb5, 0xc8, 0x3e, 0x45, 0x47, 0x2a, 0x0d, - 0x4e, 0x84, 0xdb, 0xe9, 0x33, 0x9f, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xca, 0xdb, 0xe7, - 0x3b, 0x02, 0x00, 0x00, + proto.RegisterType((*RequestPing)(nil), "cometbft.v38.rpc.grpc.RequestPing") + proto.RegisterType((*RequestBroadcastTx)(nil), "cometbft.v38.rpc.grpc.RequestBroadcastTx") + proto.RegisterType((*ResponsePing)(nil), "cometbft.v38.rpc.grpc.ResponsePing") + proto.RegisterType((*ResponseBroadcastTx)(nil), "cometbft.v38.rpc.grpc.ResponseBroadcastTx") +} + +func init() { proto.RegisterFile("cometbft/v38/rpc/grpc/types.proto", fileDescriptor_96a066730637149c) } + +var fileDescriptor_96a066730637149c = []byte{ + // 334 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xce, 0xcf, 0x4d, + 0x2d, 0x49, 0x4a, 0x2b, 0xd1, 0x2f, 0x33, 0xb6, 0xd0, 0x2f, 0x2a, 0x48, 0xd6, 0x4f, 0x07, 0x11, + 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xa2, 0x30, 0x25, 0x7a, + 0x65, 0xc6, 0x16, 0x7a, 0x45, 0x05, 0xc9, 0x7a, 0x20, 0x25, 0x52, 0xb2, 0x28, 0x3a, 0x13, 0x93, + 0x92, 0x33, 0x91, 0x75, 0x29, 0xf1, 0x72, 0x71, 0x07, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x04, + 0x64, 0xe6, 0xa5, 0x2b, 0xa9, 0x70, 0x09, 0x41, 0xb9, 0x4e, 0x45, 0xf9, 0x89, 0x29, 0xc9, 0x89, + 0xc5, 0x25, 0x21, 0x15, 0x42, 0x7c, 0x5c, 0x4c, 0x25, 0x15, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x3c, + 0x41, 0x4c, 0x25, 0x15, 0x4a, 0x7c, 0x5c, 0x3c, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, + 0x60, 0x5d, 0x93, 0x18, 0xb9, 0x84, 0x61, 0x02, 0xc8, 0xfa, 0x6c, 0xb9, 0x38, 0x92, 0x33, 0x52, + 0x93, 0xb3, 0xe3, 0xa1, 0xba, 0xb9, 0x8d, 0x94, 0xf4, 0x50, 0x5c, 0x09, 0x72, 0x8e, 0x1e, 0x4c, + 0xa7, 0x33, 0x48, 0x69, 0x48, 0x45, 0x10, 0x7b, 0x32, 0x84, 0x21, 0x64, 0xc3, 0xc5, 0x59, 0x52, + 0x11, 0x5f, 0x94, 0x5a, 0x5c, 0x9a, 0x53, 0x22, 0xc1, 0x04, 0xd6, 0x2f, 0x8f, 0x45, 0xbf, 0x6b, + 0x45, 0x6a, 0x72, 0x48, 0x45, 0x10, 0x58, 0x59, 0x10, 0x47, 0x09, 0x94, 0x65, 0x74, 0x94, 0x91, + 0x8b, 0x07, 0xee, 0x18, 0xc7, 0x00, 0x4f, 0x21, 0x7f, 0x2e, 0x16, 0x90, 0x6b, 0x85, 0xd0, 0xdc, + 0x00, 0x0b, 0x29, 0x3d, 0xa4, 0x70, 0x90, 0x52, 0xc6, 0xa9, 0x06, 0xe1, 0x6d, 0xa1, 0x14, 0x2e, + 0x6e, 0x64, 0xdf, 0x6a, 0xe2, 0x37, 0x17, 0x49, 0xa9, 0x94, 0x16, 0x01, 0xe3, 0x91, 0xd4, 0x3a, + 0xf9, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, + 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x69, 0x7a, 0x66, 0x49, + 0x46, 0x69, 0x12, 0xc8, 0x2c, 0x7d, 0xef, 0xc8, 0x30, 0x57, 0xbf, 0xd4, 0x92, 0xf2, 0xfc, 0xa2, + 0x6c, 0x7d, 0xac, 0x69, 0xc5, 0x3a, 0x39, 0xbf, 0x28, 0x15, 0xc4, 0x48, 0x62, 0x03, 0xc7, 0xbc, + 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xad, 0x54, 0x8a, 0x58, 0x54, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -247,16 +246,16 @@ type BroadcastAPIClient interface { } type broadcastAPIClient struct { - cc grpc1.ClientConn + cc *grpc.ClientConn } -func NewBroadcastAPIClient(cc grpc1.ClientConn) BroadcastAPIClient { +func NewBroadcastAPIClient(cc *grpc.ClientConn) BroadcastAPIClient { return &broadcastAPIClient{cc} } func (c *broadcastAPIClient) Ping(ctx context.Context, in *RequestPing, opts ...grpc.CallOption) (*ResponsePing, error) { out := new(ResponsePing) - err := c.cc.Invoke(ctx, "/tendermint.rpc.grpc.BroadcastAPI/Ping", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.rpc.grpc.BroadcastAPI/Ping", in, out, opts...) if err != nil { return nil, err } @@ -265,7 +264,7 @@ func (c *broadcastAPIClient) Ping(ctx context.Context, in *RequestPing, opts ... func (c *broadcastAPIClient) BroadcastTx(ctx context.Context, in *RequestBroadcastTx, opts ...grpc.CallOption) (*ResponseBroadcastTx, error) { out := new(ResponseBroadcastTx) - err := c.cc.Invoke(ctx, "/tendermint.rpc.grpc.BroadcastAPI/BroadcastTx", in, out, opts...) + err := c.cc.Invoke(ctx, "/cometbft.v38.rpc.grpc.BroadcastAPI/BroadcastTx", in, out, opts...) if err != nil { return nil, err } @@ -289,7 +288,7 @@ func (*UnimplementedBroadcastAPIServer) BroadcastTx(ctx context.Context, req *Re return nil, status.Errorf(codes.Unimplemented, "method BroadcastTx not implemented") } -func RegisterBroadcastAPIServer(s grpc1.Server, srv BroadcastAPIServer) { +func RegisterBroadcastAPIServer(s *grpc.Server, srv BroadcastAPIServer) { s.RegisterService(&_BroadcastAPI_serviceDesc, srv) } @@ -303,7 +302,7 @@ func _BroadcastAPI_Ping_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.rpc.grpc.BroadcastAPI/Ping", + FullMethod: "/cometbft.v38.rpc.grpc.BroadcastAPI/Ping", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).Ping(ctx, req.(*RequestPing)) @@ -321,7 +320,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/tendermint.rpc.grpc.BroadcastAPI/BroadcastTx", + FullMethod: "/cometbft.v38.rpc.grpc.BroadcastAPI/BroadcastTx", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(BroadcastAPIServer).BroadcastTx(ctx, req.(*RequestBroadcastTx)) @@ -330,7 +329,7 @@ func _BroadcastAPI_BroadcastTx_Handler(srv interface{}, ctx context.Context, dec } var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ - ServiceName: "tendermint.rpc.grpc.BroadcastAPI", + ServiceName: "cometbft.v38.rpc.grpc.BroadcastAPI", HandlerType: (*BroadcastAPIServer)(nil), Methods: []grpc.MethodDesc{ { @@ -343,7 +342,7 @@ var _BroadcastAPI_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "tendermint/rpc/grpc/types.proto", + Metadata: "cometbft/v38/rpc/grpc/types.proto", } func (m *RequestPing) Marshal() (dAtA []byte, err error) { diff --git a/rpc/jsonrpc/client/decode.go b/rpc/jsonrpc/client/decode.go index 2ae917d97d1..4d070e21a30 100644 --- a/rpc/jsonrpc/client/decode.go +++ b/rpc/jsonrpc/client/decode.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - cmtjson "github.com/cometbft/cometbft/libs/json" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) func unmarshalResponseBytes( diff --git a/rpc/jsonrpc/client/encode.go b/rpc/jsonrpc/client/encode.go index 42d997be478..9b976edbf33 100644 --- a/rpc/jsonrpc/client/encode.go +++ b/rpc/jsonrpc/client/encode.go @@ -5,7 +5,7 @@ import ( "net/url" "reflect" - cmtjson "github.com/cometbft/cometbft/libs/json" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" ) func argsToURLValues(args map[string]interface{}) (url.Values, error) { diff --git a/rpc/jsonrpc/client/http_json_client.go b/rpc/jsonrpc/client/http_json_client.go index a41d385cc40..14a966cb65b 100644 --- a/rpc/jsonrpc/client/http_json_client.go +++ b/rpc/jsonrpc/client/http_json_client.go @@ -12,8 +12,8 @@ import ( "regexp" "strings" - cmtsync "github.com/cometbft/cometbft/libs/sync" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/http_uri_client.go b/rpc/jsonrpc/client/http_uri_client.go index b8bce3cfc09..f44efa0164e 100644 --- a/rpc/jsonrpc/client/http_uri_client.go +++ b/rpc/jsonrpc/client/http_uri_client.go @@ -7,7 +7,7 @@ import ( "net/http" "strings" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/integration_test.go b/rpc/jsonrpc/client/integration_test.go index 45ce6afd11f..a0c475aac3f 100644 --- a/rpc/jsonrpc/client/integration_test.go +++ b/rpc/jsonrpc/client/integration_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) func TestWSClientReconnectWithJitter(t *testing.T) { diff --git a/rpc/jsonrpc/client/ws_client.go b/rpc/jsonrpc/client/ws_client.go index ea14d0229d4..d7569c0e8d0 100644 --- a/rpc/jsonrpc/client/ws_client.go +++ b/rpc/jsonrpc/client/ws_client.go @@ -13,11 +13,11 @@ import ( "github.com/gorilla/websocket" metrics "github.com/rcrowley/go-metrics" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/libs/service" - cmtsync "github.com/cometbft/cometbft/libs/sync" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/libs/service" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) const ( diff --git a/rpc/jsonrpc/client/ws_client_test.go b/rpc/jsonrpc/client/ws_client_test.go index 0ba7fd269ea..cca34c1d56f 100644 --- a/rpc/jsonrpc/client/ws_client_test.go +++ b/rpc/jsonrpc/client/ws_client_test.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) var wsCallTimeout = 5 * time.Second diff --git a/rpc/jsonrpc/doc.go b/rpc/jsonrpc/doc.go index 652ab685aa2..b07e5f6da1f 100644 --- a/rpc/jsonrpc/doc.go +++ b/rpc/jsonrpc/doc.go @@ -80,5 +80,5 @@ // // # Examples // -// - [CometBFT](https://github.com/cometbft/cometbft/blob/v0.38.x/rpc/core/routes.go) +// - [CometBFT](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/rpc/core/routes.go) package jsonrpc diff --git a/rpc/jsonrpc/jsonrpc_test.go b/rpc/jsonrpc/jsonrpc_test.go index 1f12c817a0d..c1249c21691 100644 --- a/rpc/jsonrpc/jsonrpc_test.go +++ b/rpc/jsonrpc/jsonrpc_test.go @@ -18,13 +18,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - cmtrand "github.com/cometbft/cometbft/libs/rand" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" - client "github.com/cometbft/cometbft/rpc/jsonrpc/client" - server "github.com/cometbft/cometbft/rpc/jsonrpc/server" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + client "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/client" + server "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // Client and Server should work over tcp or unix sockets diff --git a/rpc/jsonrpc/server/http_json_handler.go b/rpc/jsonrpc/server/http_json_handler.go index 8e5b363f151..83291c1d5b5 100644 --- a/rpc/jsonrpc/server/http_json_handler.go +++ b/rpc/jsonrpc/server/http_json_handler.go @@ -9,9 +9,9 @@ import ( "reflect" "sort" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // HTTP + JSON handler diff --git a/rpc/jsonrpc/server/http_json_handler_test.go b/rpc/jsonrpc/server/http_json_handler_test.go index 9bb7948b5dd..e1c63011a77 100644 --- a/rpc/jsonrpc/server/http_json_handler_test.go +++ b/rpc/jsonrpc/server/http_json_handler_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) func testMux() *http.ServeMux { diff --git a/rpc/jsonrpc/server/http_server.go b/rpc/jsonrpc/server/http_server.go index 4393abf29df..e086ba110d3 100644 --- a/rpc/jsonrpc/server/http_server.go +++ b/rpc/jsonrpc/server/http_server.go @@ -15,8 +15,8 @@ import ( "golang.org/x/net/netutil" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // Config is a RPC server configuration. diff --git a/rpc/jsonrpc/server/http_server_test.go b/rpc/jsonrpc/server/http_server_test.go index 56f6dba2bfe..638915fa410 100644 --- a/rpc/jsonrpc/server/http_server_test.go +++ b/rpc/jsonrpc/server/http_server_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) type sampleResult struct { diff --git a/rpc/jsonrpc/server/http_uri_handler.go b/rpc/jsonrpc/server/http_uri_handler.go index 6381d91d70f..2615d2fce8e 100644 --- a/rpc/jsonrpc/server/http_uri_handler.go +++ b/rpc/jsonrpc/server/http_uri_handler.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/libs/log" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // HTTP + URI handler diff --git a/rpc/jsonrpc/server/parse_test.go b/rpc/jsonrpc/server/parse_test.go index c29224ea2e4..54441efcc78 100644 --- a/rpc/jsonrpc/server/parse_test.go +++ b/rpc/jsonrpc/server/parse_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/libs/bytes" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) func TestParseJSONMap(t *testing.T) { diff --git a/rpc/jsonrpc/server/rpc_func.go b/rpc/jsonrpc/server/rpc_func.go index c1984e51fa0..c447d52c48b 100644 --- a/rpc/jsonrpc/server/rpc_func.go +++ b/rpc/jsonrpc/server/rpc_func.go @@ -6,7 +6,7 @@ import ( "reflect" "strings" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) // RegisterRPCFuncs adds a route for each function in the funcMap, as well as diff --git a/rpc/jsonrpc/server/ws_handler.go b/rpc/jsonrpc/server/ws_handler.go index 8e07d68dd7a..d87b8861f76 100644 --- a/rpc/jsonrpc/server/ws_handler.go +++ b/rpc/jsonrpc/server/ws_handler.go @@ -12,9 +12,9 @@ import ( "github.com/gorilla/websocket" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/service" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/service" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) // WebSocket handler diff --git a/rpc/jsonrpc/server/ws_handler_test.go b/rpc/jsonrpc/server/ws_handler_test.go index da370088ca6..6f379788f81 100644 --- a/rpc/jsonrpc/server/ws_handler_test.go +++ b/rpc/jsonrpc/server/ws_handler_test.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/websocket" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/libs/log" - types "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + types "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) func TestWebsocketManagerHandler(t *testing.T) { diff --git a/rpc/jsonrpc/test/main.go b/rpc/jsonrpc/test/main.go index 74ed3495185..665b0cc7646 100644 --- a/rpc/jsonrpc/test/main.go +++ b/rpc/jsonrpc/test/main.go @@ -5,10 +5,10 @@ import ( "net/http" "os" - "github.com/cometbft/cometbft/libs/log" - cmtos "github.com/cometbft/cometbft/libs/os" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + rpcserver "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) var routes = map[string]*rpcserver.RPCFunc{ diff --git a/rpc/jsonrpc/types/types.go b/rpc/jsonrpc/types/types.go index 08ee2f2bbd5..339033c8f0b 100644 --- a/rpc/jsonrpc/types/types.go +++ b/rpc/jsonrpc/types/types.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - cmtjson "github.com/cometbft/cometbft/libs/json" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" ) // a wrapper to emulate a sum type: jsonrpcid = string | int diff --git a/rpc/openapi/openapi.yaml b/rpc/openapi/openapi.yaml index 97b4490aa73..2b213036604 100644 --- a/rpc/openapi/openapi.yaml +++ b/rpc/openapi/openapi.yaml @@ -65,7 +65,7 @@ info: version: "v0.38.x" license: name: Apache 2.0 - url: https://github.com/cometbft/cometbft/blob/v0.38.x/LICENSE + url: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/LICENSE servers: - url: https://rpc.cosmos.directory/cosmoshub description: Interact with the CometBFT RPC from a public node in the Cosmos registry @@ -750,7 +750,7 @@ paths: description: | Complete consensus state. - See https://pkg.go.dev/github.com/cometbft/cometbft/types?tab=doc#Vote.String for Vote string description. + See https://pkg.go.dev/github.com/KYVENetwork/cometbft/v38/types?tab=doc#Vote.String for Vote string description. content: application/json: schema: @@ -1178,7 +1178,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/v38/PubKeyEd25519" value: type: string example: "A6DoBUypNtUAyEHWtQ9bFjfNg8Bo9CrnkUGl6k6OHN4=" @@ -1608,7 +1608,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/v38/PubKeyEd25519" value: type: string example: "9tK9IT+FPdf2qm+5c2qaxi10sWP+3erWTKgftn2PaQM=" @@ -1767,7 +1767,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/v38/PubKeyEd25519" value: type: string example: "cOQZvh/h9ZioSeUMZB/1Vy1Xo5x2sjrVjlE/qHnYifM=" @@ -2720,7 +2720,7 @@ components: properties: type: type: string - example: "tendermint/PubKeyEd25519" + example: "cometbft/v38/PubKeyEd25519" value: type: string example: "9tK9IT+FPdf2qm+5c2qaxi10sWP+3erWTKgftn2PaQM=" diff --git a/rpc/test/helpers.go b/rpc/test/helpers.go index 3aeece081c6..cc5ad56eb20 100644 --- a/rpc/test/helpers.go +++ b/rpc/test/helpers.go @@ -8,19 +8,19 @@ import ( "strings" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - - cfg "github.com/cometbft/cometbft/config" - cmtnet "github.com/cometbft/cometbft/libs/net" - nm "github.com/cometbft/cometbft/node" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - ctypes "github.com/cometbft/cometbft/rpc/core/types" - core_grpc "github.com/cometbft/cometbft/rpc/grpc" - rpcclient "github.com/cometbft/cometbft/rpc/jsonrpc/client" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + + cfg "github.com/KYVENetwork/cometbft/v38/config" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + nm "github.com/KYVENetwork/cometbft/v38/node" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/proxy" + ctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + core_grpc "github.com/KYVENetwork/cometbft/v38/rpc/grpc" + rpcclient "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/client" ) // Options helps with specifying some parameters for our RPC testing for greater diff --git a/scripts/dist.sh b/scripts/dist.sh index c615dc6dbf6..e9de40f148a 100755 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -21,7 +21,7 @@ mkdir -p build/pkg # Get the git commit VERSION := "$(shell git describe --always)" -GIT_IMPORT="github.com/cometbft/cometbft/version" +GIT_IMPORT="github.com/KYVENetwork/cometbft/v38/version" # Determine the arch/os combos we're building for XC_ARCH=${XC_ARCH:-"386 amd64 arm"} diff --git a/scripts/json2wal/main.go b/scripts/json2wal/main.go index 48470858708..de4753f72d8 100644 --- a/scripts/json2wal/main.go +++ b/scripts/json2wal/main.go @@ -14,9 +14,9 @@ import ( "os" "strings" - cs "github.com/cometbft/cometbft/consensus" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/types" + cs "github.com/KYVENetwork/cometbft/v38/consensus" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/types" ) func main() { diff --git a/scripts/linkify_changelog.py b/scripts/linkify_changelog.py index 00a8165553a..2ade15bd3fe 100644 --- a/scripts/linkify_changelog.py +++ b/scripts/linkify_changelog.py @@ -3,11 +3,11 @@ # This script goes through the provided file, and replaces any " \#", # with the valid mark down formatted link to it. e.g. -# " [\#number](https://github.com/cometbft/cometbft/issues/) +# " [\#number](https://github.com/KYVENetwork/cometbft/v38/issues/) # Note that if the number is for a PR, github will auto-redirect you when you click the link. -# It is safe to run the script multiple times in succession. +# It is safe to run the script multiple times in succession. # # Example usage $ python3 linkify_changelog.py ../CHANGELOG_PENDING.md for line in fileinput.input(inplace=1): - line = re.sub(r"\s\\#([0-9]*)", r" [\\#\1](https://github.com/cometbft/cometbft/issues/\1)", line.rstrip()) + line = re.sub(r"\s\\#([0-9]*)", r" [\\#\1](https://github.com/KYVENetwork/cometbft/v38/issues/\1)", line.rstrip()) print(line) diff --git a/scripts/metricsgen/metricsdiff/metricsdiff_test.go b/scripts/metricsgen/metricsdiff/metricsdiff_test.go index 122eaf67393..23bcc5d069d 100644 --- a/scripts/metricsgen/metricsdiff/metricsdiff_test.go +++ b/scripts/metricsgen/metricsdiff/metricsdiff_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - metricsdiff "github.com/cometbft/cometbft/scripts/metricsgen/metricsdiff" + metricsdiff "github.com/KYVENetwork/cometbft/v38/scripts/metricsgen/metricsdiff" ) func TestDiff(t *testing.T) { diff --git a/scripts/metricsgen/metricsgen_test.go b/scripts/metricsgen/metricsgen_test.go index 8a797dca4e8..fcf6a4b762c 100644 --- a/scripts/metricsgen/metricsgen_test.go +++ b/scripts/metricsgen/metricsgen_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" - metricsgen "github.com/cometbft/cometbft/scripts/metricsgen" + metricsgen "github.com/KYVENetwork/cometbft/v38/scripts/metricsgen" ) const testDataDir = "./testdata" diff --git a/scripts/qa/reporting/latency_throughput.py b/scripts/qa/reporting/latency_throughput.py index cf890e0fd01..9894044f90d 100755 --- a/scripts/qa/reporting/latency_throughput.py +++ b/scripts/qa/reporting/latency_throughput.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ A simple script to parse the CSV output from the loadtime reporting tool (see -https://github.com/cometbft/cometbft/tree/v0.38.x/test/loadtime/cmd/report). +https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/test/loadtime/cmd/report). Produces a plot of average transaction latency vs total transaction throughput according to the number of load testing tool WebSocket connections to the diff --git a/scripts/wal2json/main.go b/scripts/wal2json/main.go index 7c2c3c87c7e..5db4858d346 100644 --- a/scripts/wal2json/main.go +++ b/scripts/wal2json/main.go @@ -12,8 +12,8 @@ import ( "io" "os" - cs "github.com/cometbft/cometbft/consensus" - cmtjson "github.com/cometbft/cometbft/libs/json" + cs "github.com/KYVENetwork/cometbft/v38/consensus" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" ) func main() { diff --git a/spec/abci/README.md b/spec/abci/README.md index dc2fc9eb5df..f51decc4bbf 100644 --- a/spec/abci/README.md +++ b/spec/abci/README.md @@ -20,7 +20,7 @@ for handling all ABCI++ methods. Thus, CometBFT always sends the `Request*` messages and receives the `Response*` messages in return. -All ABCI++ messages and methods are defined in [protocol buffers](https://github.com/cometbft/cometbft/blob/v0.38.x/proto/tendermint/abci/types.proto). +All ABCI++ messages and methods are defined in [protocol buffers](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/proto/tendermint/abci/types.proto). This allows CometBFT to run with applications written in many programming languages. This specification is split as follows: diff --git a/spec/abci/abci++_app_requirements.md b/spec/abci/abci++_app_requirements.md index 3c5c5e1c775..d13ab41c854 100644 --- a/spec/abci/abci++_app_requirements.md +++ b/spec/abci/abci++_app_requirements.md @@ -265,9 +265,9 @@ the state for each connection, which are synchronized upon `Commit` calls. In principle, each of the four ABCI++ connections operates concurrently with one another. This means applications need to ensure access to state is thread safe. Both the -[default in-process ABCI client](https://github.com/cometbft/cometbft/blob/v0.38.x/abci/client/local_client.go#L13) +[default in-process ABCI client](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/abci/client/local_client.go#L13) and the -[default Go ABCI server](https://github.com/cometbft/cometbft/blob/v0.38.x/abci/server/socket_server.go#L20) +[default Go ABCI server](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/abci/server/socket_server.go#L20) use a global lock to guard the handling of events across all connections, so they are not concurrent at all. This means whether your app is compiled in-process with CometBFT using the `NewLocalClient`, or run out-of-process using the `SocketServer`, @@ -1024,7 +1024,7 @@ from the genesis file and light client RPC servers. It also calls `Info` to veri Once the state machine has been restored and CometBFT has gathered this additional information, it transitions to consensus. As of ABCI 2.0, CometBFT ensures the necessary conditions -to switch are met [RFC-100](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#base-implementation-persist-and-propagate-extended-commit-history). +to switch are met [RFC-100](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#base-implementation-persist-and-propagate-extended-commit-history). From the application's point of view, these operations are transparent, unless the application has just upgraded to ABCI 2.0. In that case, the application needs to be properly configured and aware of certain constraints in terms of when to provide vote extensions. More details can be found in the section below. @@ -1037,7 +1037,7 @@ Introducing vote extensions requires changes to the configuration of the applica First of all, switching to a version of CometBFT with vote extensions, requires a coordinated upgrade. For a detailed description on the upgrade path, please refer to the corresponding -[section](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#upgrade-path) in RFC-100. +[section](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#upgrade-path) in RFC-100. There is a newly introduced [**consensus parameter**](./abci%2B%2B_app_requirements.md#abciparamsvoteextensionsenableheight): `VoteExtensionsEnableHeight`. This parameter represents the height at which vote extensions are diff --git a/spec/abci/abci++_client_server.md b/spec/abci/abci++_client_server.md index 2a5fb5414d5..40e5137643a 100644 --- a/spec/abci/abci++_client_server.md +++ b/spec/abci/abci++_client_server.md @@ -17,7 +17,7 @@ You are expected to have read all previous sections of ABCI++ specification, nam ## Message Protocol and Synchrony The message protocol consists of pairs of requests and responses defined in the -[protobuf file](https://github.com/cometbft/cometbft/blob/v0.38.x/proto/tendermint/abci/types.proto). +[protobuf file](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/proto/tendermint/abci/types.proto). Some messages have no fields, while others may include byte-arrays, strings, integers, or custom protobuf types. @@ -46,7 +46,7 @@ The implementations in CometBFT's repository can be tested using `abci-cli` by s the `--abci` flag appropriately. See examples, in various stages of maintenance, in -[Go](https://github.com/cometbft/cometbft/tree/master/abci/server), +[Go](https://github.com/KYVENetwork/cometbft/v38/tree/master/abci/server), [JavaScript](https://github.com/tendermint/js-abci), [C++](https://github.com/mdyring/cpp-tmsp), and [Java](https://github.com/jTendermint/jabci). diff --git a/spec/abci/abci++_comet_expected_behavior.md b/spec/abci/abci++_comet_expected_behavior.md index d9269ca5380..4c9b49ad641 100644 --- a/spec/abci/abci++_comet_expected_behavior.md +++ b/spec/abci/abci++_comet_expected_behavior.md @@ -120,7 +120,7 @@ Let us now examine the grammar line by line, providing further details. At the end of a successful attempt, CometBFT calls `Info` to make sure the reconstructed state's _AppHash_ matches the one in the block header at the corresponding height. Note that the state of the application does not contain vote extensions itself. The application can rely on - [CometBFT to ensure](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#base-implementation-persist-and-propagate-extended-commit-history) + [CometBFT to ensure](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#base-implementation-persist-and-propagate-extended-commit-history) the node has all the relevant data to proceed with the execution beyond this point. >```abnf @@ -255,7 +255,7 @@ However, the application can use the existing `retain_height` parameter to decid history it wants to keep, just as is done with the block history. The network-wide implications of the usage of `retain_height` stay the same. The decision to store -historical commits and potential optimizations, are discussed in detail in [RFC-100](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#current-limitations-and-possible-implementations) +historical commits and potential optimizations, are discussed in detail in [RFC-100](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/rfc/rfc-100-abci-vote-extension-propag.md#current-limitations-and-possible-implementations) ## Handling upgrades to ABCI 2.0 diff --git a/spec/consensus/consensus.md b/spec/consensus/consensus.md index 9fe30bf9e72..9c0e553980c 100644 --- a/spec/consensus/consensus.md +++ b/spec/consensus/consensus.md @@ -15,7 +15,7 @@ order: 1 - A node is said to be _at_ a given height, round, and step, or at `(H,R,S)`, or at `(H,R)` in short to omit the step. - To _prevote_ or _precommit_ something means to broadcast a prevote - or precommit [vote](https://github.com/cometbft/cometbft/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/types/vote.go#L50) + or precommit [vote](https://github.com/KYVENetwork/cometbft/v38/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/types/vote.go#L50) for something. - A vote _at_ `(H,R)` is a vote signed with the bytes for `H` and `R` included in its [sign-bytes](../core/data_structures.md#vote). @@ -106,7 +106,7 @@ example, - Nodes gossip prevotes for the proposed PoLC (proof-of-lock-change) round if one is proposed. - Nodes gossip to nodes lagging in blockchain height with block - [commits](https://github.com/cometbft/cometbft/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/types/block.go#L738) + [commits](https://github.com/KYVENetwork/cometbft/v38/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/types/block.go#L738) for older blocks. - Nodes opportunistically gossip `ReceivedVote` messages to hint peers what votes it already has. @@ -121,7 +121,7 @@ A proposal is signed and published by the designated proposer at each round. The proposer is chosen by a deterministic and non-choking round robin selection algorithm that selects proposers in proportion to their voting power (see -[implementation](https://github.com/cometbft/cometbft/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/types/validator_set.go#L51)). +[implementation](https://github.com/KYVENetwork/cometbft/v38/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/types/validator_set.go#L51)). A proposal at `(H,R)` is composed of a block and an optional latest `PoLC-Round < R` which is included iff the proposer knows of one. This @@ -293,7 +293,7 @@ may make JSet verification/gossip logic easier to implement. ### Censorship Attacks Due to the definition of a block -[commit](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/core/validators.md), any 1/3+ coalition of +[commit](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/core/validators.md), any 1/3+ coalition of validators can halt the blockchain by not broadcasting their votes. Such a coalition can also censor particular transactions by rejecting blocks that include these transactions, though this would result in a diff --git a/spec/consensus/light-client/accountability.md b/spec/consensus/light-client/accountability.md index 3907e8d4723..73d80bb1bd9 100644 --- a/spec/consensus/light-client/accountability.md +++ b/spec/consensus/light-client/accountability.md @@ -1,3 +1,3 @@ # Fork accountability -Deprecated, please see [light-client/accountability](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/accountability). +Deprecated, please see [light-client/accountability](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/accountability). diff --git a/spec/consensus/light-client/detection.md b/spec/consensus/light-client/detection.md index 9e70726c76e..d0f32ee775d 100644 --- a/spec/consensus/light-client/detection.md +++ b/spec/consensus/light-client/detection.md @@ -1,3 +1,3 @@ # Detection -Deprecated, please see [light-client/detection](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection). +Deprecated, please see [light-client/detection](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection). diff --git a/spec/consensus/light-client/verification.md b/spec/consensus/light-client/verification.md index d0e2bf1e5c8..598e714806a 100644 --- a/spec/consensus/light-client/verification.md +++ b/spec/consensus/light-client/verification.md @@ -1,3 +1,3 @@ # Core Verification -Deprecated, please see [light-client/verification](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification). +Deprecated, please see [light-client/verification](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification). diff --git a/spec/consensus/proposer-based-timestamp/pbts-sysmodel_001_draft.md b/spec/consensus/proposer-based-timestamp/pbts-sysmodel_001_draft.md index 06f9e8ea58e..9991cd6dbb5 100644 --- a/spec/consensus/proposer-based-timestamp/pbts-sysmodel_001_draft.md +++ b/spec/consensus/proposer-based-timestamp/pbts-sysmodel_001_draft.md @@ -188,4 +188,4 @@ Back to [main document][main]. [arXiv]: https://arxiv.org/abs/1807.04938 -[CMBC-FM-2THIRDS-link]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 +[CMBC-FM-2THIRDS-link]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 diff --git a/spec/consensus/proposer-based-timestamp/tla/TendermintPBT_001_draft.tla b/spec/consensus/proposer-based-timestamp/tla/TendermintPBT_001_draft.tla index d8524540faa..fcccec9abee 100644 --- a/spec/consensus/proposer-based-timestamp/tla/TendermintPBT_001_draft.tla +++ b/spec/consensus/proposer-based-timestamp/tla/TendermintPBT_001_draft.tla @@ -1,10 +1,10 @@ -------------------- MODULE TendermintPBT_001_draft --------------------------- (* - A TLA+ specification of a simplified Tendermint consensus algorithm, with added clocks - and proposer-based timestamps. This TLA+ specification extends and modifies - the Tendermint TLA+ specification for fork accountability: - https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/accountability/TendermintAcc_004_draft.tla - + A TLA+ specification of a simplified Tendermint consensus algorithm, with added clocks + and proposer-based timestamps. This TLA+ specification extends and modifies + the Tendermint TLA+ specification for fork accountability: + https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/accountability/TendermintAcc_004_draft.tla + * Version 1. A preliminary specification. Zarko Milosevic, Igor Konnov, Informal Systems, 2019-2020. @@ -15,7 +15,7 @@ EXTENDS Integers, FiniteSets (********************* PROTOCOL PARAMETERS **********************************) CONSTANTS - Corr, \* the set of correct processes + Corr, \* the set of correct processes Faulty, \* the set of Byzantine processes, may be empty N, \* the total number of processes: correct, defective, and Byzantine T, \* an upper bound on the number of Byzantine processes @@ -24,7 +24,7 @@ CONSTANTS MaxRound, \* the maximal round number MaxTimestamp, \* the maximal value of the clock tick Delay, \* message delay - Precision, \* clock precision: the maximal difference between two local clocks + Precision, \* clock precision: the maximal difference between two local clocks Accuracy, \* clock accuracy: the maximal difference between a local clock and the real time Proposer, \* the proposer function from 0..NRounds to 1..N ClockDrift \* is there clock drift between the local clocks and the global clock @@ -69,12 +69,12 @@ a <: b == a MT == [type |-> STRING, src |-> STRING, round |-> Int, proposal |-> <>, validRound |-> Int, id |-> <>] -RP == <> +RP == <> \* a type annotation for a message AsMsg(m) == m <: MT \* a type annotation for a set of messages -SetOfMsgs(S) == S <: {MT} +SetOfMsgs(S) == S <: {MT} \* a type annotation for an empty set of messages EmptyMsgSet == SetOfMsgs({}) @@ -111,8 +111,8 @@ VARIABLES proposalTime, \* the real time when a proposer proposes in a round, [Rounds -> Int] proposalReceivedTime \* the real time when a correct process first receives a proposal message in a round, [Rounds -> Int] -(* to see a type invariant, check TendermintAccInv3 *) - +(* to see a type invariant, check TendermintAccInv3 *) + \* a handy definition used in UNCHANGED vars == < + \A p \in Corr : \A q \in Corr : + p /= q => \/ /\ localClock[p] >= localClock[q] - /\ localClock[p] - localClock[q] < Precision + /\ localClock[p] - localClock[q] < Precision \/ /\ localClock[p] < localClock[q] /\ localClock[q] - localClock[p] < Precision - + \* [PBTS-PROPOSE.0] Proposal(v, t) == <> @@ -229,21 +229,21 @@ Decision(v, t, r) == StartRound(p, r) == /\ step[p] /= "DECIDED" \* a decided process does not participate in consensus /\ round' = [round EXCEPT ![p] = r] - /\ step' = [step EXCEPT ![p] = "PROPOSE"] + /\ step' = [step EXCEPT ![p] = "PROPOSE"] \* lines 14-19, a proposal may be sent later -InsertProposal(p) == +InsertProposal(p) == LET r == round[p] IN /\ p = Proposer[r] /\ step[p] = "PROPOSE" \* if the proposer is sending a proposal, then there are no other proposals \* by the correct processes for the same round /\ \A m \in msgsPropose[r]: m.src /= p - /\ \E v \in ValidValues: - LET proposal == IF validValue[p] /= NilValue - THEN Proposal(validValue[p], localClock[p]) + /\ \E v \in ValidValues: + LET proposal == IF validValue[p] /= NilValue + THEN Proposal(validValue[p], localClock[p]) ELSE Proposal(v, localClock[p]) IN - + /\ BroadcastProposal(p, round[p], proposal, validRound[p]) /\ proposalTime' = [proposalTime EXCEPT ![r] = realTime] /\ UNCHANGED <> /\ action' = "InsertProposal" - + \* a new action used to filter messages that are not on time \* [PBTS-RECEPTION-STEP.0] ReceiveProposal(p) == @@ -260,11 +260,11 @@ ReceiveProposal(p) == LET msg == AsMsg([type |-> "PROPOSAL", src |-> Proposer[round[p]], round |-> round[p], proposal |-> Proposal(v, t), validRound |-> NilRound]) IN - /\ msg \in msgsPropose[round[p]] + /\ msg \in msgsPropose[round[p]] /\ p \notin inspectedProposal[r] /\ <> \notin receivedTimelyProposal /\ inspectedProposal' = [inspectedProposal EXCEPT ![r] = @ \union {p}] - /\ \/ /\ localClock[p] - Precision < t + /\ \/ /\ localClock[p] - Precision < t /\ t < localClock[p] + Precision + Delay /\ receivedTimelyProposal' = receivedTimelyProposal \union {<>} /\ \/ /\ proposalReceivedTime[r] = NilTimestamp @@ -278,7 +278,7 @@ ReceiveProposal(p) == validValue, validRound, evidence, msgsPropose, msgsPrevote, msgsPrecommit, localClock, realTime, beginConsensus, endConsensus, lastBeginConsensus, proposalTime>> /\ action' = "ReceiveProposal" - + \* lines 22-27 UponProposalInPropose(p) == \E v \in Values, t \in Timestamps: @@ -301,7 +301,7 @@ UponProposalInPropose(p) == beginConsensus, endConsensus, lastBeginConsensus, proposalTime, proposalReceivedTime>> /\ action' = "UponProposalInPropose" -\* lines 28-33 +\* lines 28-33 \* [PBTS-ALG-OLD-PREVOTE.0] UponProposalInProposeAndPrevote(p) == \E v \in Values, t1 \in Timestamps, t2 \in Timestamps, vr \in Rounds: @@ -316,8 +316,8 @@ UponProposalInProposeAndPrevote(p) == /\ evidence' = PV \union {msg} \union evidence /\ LET mid == (* line 29 *) IF IsValid(v) /\ (lockedRound[p] <= vr \/ lockedValue[p] = v) - THEN Id(Proposal(v, t1)) - ELSE NilProposal + THEN Id(Proposal(v, t1)) + ELSE NilProposal IN BroadcastPrevote(p, round[p], mid) \* lines 24-26 /\ step' = [step EXCEPT ![p] = "PREVOTE"] @@ -326,7 +326,7 @@ UponProposalInProposeAndPrevote(p) == localClock, realTime, receivedTimelyProposal, inspectedProposal, beginConsensus, endConsensus, lastBeginConsensus, proposalTime, proposalReceivedTime>> /\ action' = "UponProposalInProposeAndPrevote" - + \* lines 34-35 + lines 61-64 (onTimeoutPrevote) UponQuorumOfPrevotesAny(p) == /\ step[p] = "PREVOTE" \* line 34 and 61 @@ -343,7 +343,7 @@ UponQuorumOfPrevotesAny(p) == localClock, realTime, receivedTimelyProposal, inspectedProposal, beginConsensus, endConsensus, lastBeginConsensus, proposalTime, proposalReceivedTime>> /\ action' = "UponQuorumOfPrevotesAny" - + \* lines 36-46 \* [PBTS-ALG-NEW-PREVOTE.0] UponProposalInPrevoteOrCommitAndPrevote(p) == @@ -381,14 +381,14 @@ UponQuorumOfPrecommitsAny(p) == /\ Cardinality(Committers) >= THRESHOLD2 \* line 47 /\ evidence' = MyEvidence \union evidence /\ round[p] + 1 \in Rounds - /\ StartRound(p, round[p] + 1) + /\ StartRound(p, round[p] + 1) /\ UNCHANGED <> /\ action' = "UponQuorumOfPrecommitsAny" - -\* lines 49-54 + +\* lines 49-54 \* [PBTS-ALG-DECIDE.0] UponProposalInPrecommitNoDecision(p) == /\ decision[p] = NilDecision \* line 49 @@ -410,7 +410,7 @@ UponProposalInPrecommitNoDecision(p) == localClock, realTime, receivedTimelyProposal, inspectedProposal, beginConsensus, lastBeginConsensus, proposalTime, proposalReceivedTime>> /\ action' = "UponProposalInPrecommitNoDecision" - + \* the actions below are not essential for safety, but added for completeness \* lines 20-21 + 57-60 @@ -457,19 +457,19 @@ OnRoundCatchup(p) == (********************* PROTOCOL TRANSITIONS ******************************) \* advance the global clock -AdvanceRealTime == +AdvanceRealTime == /\ realTime < MaxTimestamp /\ realTime' = realTime + 1 /\ \/ /\ ~ClockDrift - /\ localClock' = [p \in Corr |-> localClock[p] + 1] + /\ localClock' = [p \in Corr |-> localClock[p] + 1] \/ /\ ClockDrift /\ UNCHANGED localClock /\ UNCHANGED <> + beginConsensus, endConsensus, lastBeginConsensus, proposalTime, proposalReceivedTime>> /\ action' = "AdvanceRealTime" - + \* advance the local clock of node p AdvanceLocalClock(p) == /\ localClock[p] < MaxTimestamp @@ -518,13 +518,13 @@ AgreementOnValue == \A p, q \in Corr: /\ decision[p] /= NilDecision /\ decision[q] /= NilDecision - => \E v \in ValidValues, t1 \in Timestamps, t2 \in Timestamps, r1 \in Rounds, r2 \in Rounds : + => \E v \in ValidValues, t1 \in Timestamps, t2 \in Timestamps, r1 \in Rounds, r2 \in Rounds : /\ decision[p] = Decision(v, t1, r1) /\ decision[q] = Decision(v, t2, r2) \* [PBTS-INV-TIME-AGR.0] AgreementOnTime == - \A p, q \in Corr: + \A p, q \in Corr: \A v1 \in ValidValues, v2 \in ValidValues, t1 \in Timestamps, t2 \in Timestamps, r \in Rounds : /\ decision[p] = Decision(v1, t1, r) /\ decision[q] = Decision(v2, t2, r) @@ -532,11 +532,11 @@ AgreementOnTime == \* [PBTS-CONSENSUS-TIME-VALID.0] ConsensusTimeValid == - \A p \in Corr, t \in Timestamps : + \A p \in Corr, t \in Timestamps : \* if a process decides on v and t (\E v \in ValidValues, r \in Rounds : decision[p] = Decision(v, t, r)) - \* then - => /\ beginConsensus - Precision <= t + \* then + => /\ beginConsensus - Precision <= t /\ t < endConsensus[p] + Precision + Delay \* [PBTS-CONSENSUS-SAFE-VALID-CORR-PROP.0] @@ -544,16 +544,16 @@ ConsensusSafeValidCorrProp == \A v \in ValidValues, t \in Timestamps : \* if the proposer in the first round is correct (/\ Proposer[0] \in Corr - \* and there exists a process that decided on v, t + \* and there exists a process that decided on v, t /\ \E p \in Corr, r \in Rounds : decision[p] = Decision(v, t, r)) \* then t is between the minimal and maximal initial local time - => /\ beginConsensus <= t + => /\ beginConsensus <= t /\ t <= lastBeginConsensus \* [PBTS-CONSENSUS-REALTIME-VALID-CORR.0] ConsensusRealTimeValidCorr == \A t \in Timestamps, r \in Rounds : - (/\ \E p \in Corr, v \in ValidValues : decision[p] = Decision(v, t, r) + (/\ \E p \in Corr, v \in ValidValues : decision[p] = Decision(v, t, r) /\ proposalTime[r] /= NilTimestamp) => /\ proposalTime[r] - Accuracy < t /\ t < proposalTime[r] + Accuracy @@ -561,29 +561,29 @@ ConsensusRealTimeValidCorr == \* [PBTS-CONSENSUS-REALTIME-VALID.0] ConsensusRealTimeValid == \A t \in Timestamps, r \in Rounds : - (\E p \in Corr, v \in ValidValues : decision[p] = Decision(v, t, r)) + (\E p \in Corr, v \in ValidValues : decision[p] = Decision(v, t, r)) => /\ proposalReceivedTime[r] - Accuracy - Precision < t /\ t < proposalReceivedTime[r] + Accuracy + Precision + Delay \* [PBTS-MSG-FAIR.0] BoundedDelay == - \A r \in Rounds : + \A r \in Rounds : (/\ proposalTime[r] /= NilTimestamp /\ proposalTime[r] + Delay < realTime) => inspectedProposal[r] = Corr \* [PBTS-CONSENSUS-TIME-LIVE.0] ConsensusTimeLive == - \A r \in Rounds, p \in Corr : + \A r \in Rounds, p \in Corr : (/\ proposalTime[r] /= NilTimestamp - /\ proposalTime[r] + Delay < realTime + /\ proposalTime[r] + Delay < realTime /\ Proposer[r] \in Corr /\ round[p] <= r) => \E msg \in RoundProposals(r) : <> \in receivedTimelyProposal \* a conjunction of all invariants Inv == - /\ AgreementOnValue + /\ AgreementOnValue /\ AgreementOnTime /\ ConsensusTimeValid /\ ConsensusSafeValidCorrProp @@ -592,6 +592,6 @@ Inv == /\ BoundedDelay Liveness == - ConsensusTimeLive + ConsensusTimeLive -============================================================================= +============================================================================= diff --git a/spec/consensus/wal.md b/spec/consensus/wal.md index 599d63d3553..848d2b4702a 100644 --- a/spec/consensus/wal.md +++ b/spec/consensus/wal.md @@ -10,7 +10,7 @@ It also issues fsync syscall through node (to prevent double signing). Under the hood, it uses -[autofile.Group](https://github.com/cometbft/cometbft/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/libs/autofile/group.go#L54), +[autofile.Group](https://github.com/KYVENetwork/cometbft/v38/blob/af3bc47df982e271d4d340a3c5e0d773e440466d/libs/autofile/group.go#L54), which rotates files when those get too big (> 10MB). The total maximum size is 1GB. We only need the latest block and the block before it, @@ -31,5 +31,5 @@ WAL. Then it will go to precommit, and that time it will work because the private validator contains the `LastSignBytes` and then we’ll replay the precommit from the WAL. -Make sure to read about [WAL corruption](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/core/running-in-production.md#wal-corruption) +Make sure to read about [WAL corruption](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/core/running-in-production.md#wal-corruption) and recovery strategies. diff --git a/spec/core/data_structures.md b/spec/core/data_structures.md index 6f81b87bbe9..f3b9774b860 100644 --- a/spec/core/data_structures.md +++ b/spec/core/data_structures.md @@ -51,7 +51,7 @@ and a list of evidence of malfeasance (ie. signing conflicting votes). | Name | Type | Description | Validation | |--------|-------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------| | Header | [Header](#header) | Header corresponding to the block. This field contains information used throughout consensus and other areas of the protocol. To find out what it contains, visit [header](#header) | Must adhere to the validation rules of [header](#header) | -| Data | [Data](#data) | Data contains a list of transactions. The contents of the transaction is unknown to CometBFT. | This field can be empty or populated, but no validation is performed. Applications can perform validation on individual transactions prior to block creation using [checkTx](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/abci/abci%2B%2B_methods.md#checktx). +| Data | [Data](#data) | Data contains a list of transactions. The contents of the transaction is unknown to CometBFT. | This field can be empty or populated, but no validation is performed. Applications can perform validation on individual transactions prior to block creation using [checkTx](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/abci/abci%2B%2B_methods.md#checktx). | Evidence | [EvidenceList](#evidencelist) | Evidence contains a list of infractions committed by validators. | Can be empty, but when populated the validations rules from [evidenceList](#evidencelist) apply | | LastCommit | [Commit](#commit) | `LastCommit` includes one vote for every validator. All votes must either be for the previous block, nil or absent. If a vote is for the previous block it must have a valid signature from the corresponding validator. The sum of the voting power of the validators that voted must be greater than 2/3 of the total voting power of the complete validator set. The number of votes in a commit is limited to 10000 (see `types.MaxVotesCount`). | Must be empty for the initial height and must adhere to the validation rules of [commit](#commit). | @@ -145,7 +145,7 @@ versioning that this can refer to) | Name | type | Description | Validation | |-------|--------|-----------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------| | Block | uint64 | This number represents the version of the block protocol and must be the same throughout an operational network | Must be equal to protocol version being used in a network (`block.Version.Block == state.Version.Consensus.Block`) | -| App | uint64 | App version is decided on by the application. Read [here](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/abci/abci++_app_requirements.md) | `block.Version.App == state.Version.Consensus.App` | +| App | uint64 | App version is decided on by the application. Read [here](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/abci/abci++_app_requirements.md) | `block.Version.App == state.Version.Consensus.App` | ## BlockID @@ -225,7 +225,7 @@ to reconstruct the vote set given the validator set. | Signature | [Signature](#signature) | Signature corresponding to the validators participation in consensus. | The length of the signature must be > 0 and < than 64 | NOTE: `ValidatorAddress` and `Timestamp` fields may be removed in the future -(see [ADR-25](https://github.com/cometbft/cometbft/blob/v0.38.x/docs/architecture/tendermint-core/adr-025-commit.md)). +(see [ADR-25](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/docs/architecture/tendermint-core/adr-025-commit.md)). ## ExtendedCommitSig diff --git a/spec/core/encoding.md b/spec/core/encoding.md index 0c2fdb1f63e..5ed9157ab4a 100644 --- a/spec/core/encoding.md +++ b/spec/core/encoding.md @@ -266,7 +266,7 @@ For instance, an ED25519 PubKey would look like: ```json { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "uZ4h63OFWuQ36ZZ4Bd6NF+/w9fWUwrOncrQsackrsTk=" } ``` diff --git a/spec/light-client/README.md b/spec/light-client/README.md index 46dbe1792f6..dbbc9e56086 100644 --- a/spec/light-client/README.md +++ b/spec/light-client/README.md @@ -10,7 +10,7 @@ parent: This directory contains work-in-progress English and TLA+ specifications for the Light Client protocol. Implementations of the light client can be found in [Rust](https://github.com/informalsystems/tendermint-rs/tree/master/light-client) and -[Go](https://github.com/cometbft/cometbft/tree/v0.38.x/light). +[Go](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/light). Light clients are assumed to be initialized once from a trusted source with a trusted header and validator set. The light client @@ -31,8 +31,8 @@ In case a lightclient attack is detected, the lightclient submits evidence to a The [English specification](verification/verification_001_published.md) describes the light client commit verification problem in terms of the temporal properties -[LCV-DIST-SAFE.1](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) and -[LCV-DIST-LIVE.1](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live1). +[LCV-DIST-SAFE.1](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) and +[LCV-DIST-LIVE.1](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live1). Commit verification is assumed to operate within the Cosmos Failure Model, where +2/3 of validators are correct for some time period and validator sets can change arbitrarily at each height. diff --git a/spec/light-client/attacks/Isolation_001_draft.tla b/spec/light-client/attacks/Isolation_001_draft.tla index 6e1b0b8a5bb..899b5b1875f 100644 --- a/spec/light-client/attacks/Isolation_001_draft.tla +++ b/spec/light-client/attacks/Isolation_001_draft.tla @@ -7,7 +7,7 @@ * * It follows the English specification: * - * https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/attacks/isolate-attackers_001_draft.md + * https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/attacks/isolate-attackers_001_draft.md * * The assumptions made in this specification: * @@ -37,7 +37,7 @@ CONSTANTS (* a pair <> that limits that ratio of faulty validator in the blockchain from above (exclusive). Cosmos security model prescribes 1 / 3. *) -VARIABLES +VARIABLES blockchain, (* the chain at the full node *) refClock, (* the reference clock at the full node *) Faulty, (* the set of faulty validators *) @@ -45,10 +45,10 @@ VARIABLES state, (* the state of the attack isolation machine at the full node *) attackers (* the set of the identified attackers *) -vars == <> - +vars == <> + \* instantiate the chain at the full node -ULTIMATE_HEIGHT == CONFLICT_HEIGHT + 1 +ULTIMATE_HEIGHT == CONFLICT_HEIGHT + 1 BC == INSTANCE Blockchain_003_draft \* use the light client API @@ -92,7 +92,7 @@ Init == VS |-> VS, NextVS |-> NextVS, lastCommit |-> lastCommit] ] - IN + IN LET refBlock == [ header |-> blockchain[COMMON_HEIGHT], Commits |-> blockchain[COMMON_HEIGHT + 1].lastCommit ] IN @@ -106,7 +106,7 @@ Init == => conflicting.Commits \subseteq Faulty /\ conflictingBlock := conflicting - + \* This is a specification of isolateMisbehavingProcesses. \* \* [LCAI-FUNC-MAIN.1::TLA.1] diff --git a/spec/light-client/attacks/isolate-attackers_001_draft.md b/spec/light-client/attacks/isolate-attackers_001_draft.md index e66920a3c5e..e17847f2c6e 100644 --- a/spec/light-client/attacks/isolate-attackers_001_draft.md +++ b/spec/light-client/attacks/isolate-attackers_001_draft.md @@ -28,7 +28,7 @@ This specification considers how a full node in a Cosmos blockchain can isolate # Part I - Basics -For definitions of data structures used here, in particular LightBlocks [[LCV-DATA-LIGHTBLOCK.1]](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightblock1), cf. [Light Client Verification][verification]. +For definitions of data structures used here, in particular LightBlocks [[LCV-DATA-LIGHTBLOCK.1]](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightblock1), cf. [Light Client Verification][verification]. # Part II - Definition of the Problem @@ -139,12 +139,12 @@ func violatesTMValidity(ref Header, ev Header) boolean - Expected precondition - `ref.Height == ev.Height` - Expected postcondition - - returns evaluation of the following disjunction - **[[LCAI-NONVALID-OUTPUT.1]]** == - `ref.ValidatorsHash != ev.ValidatorsHash` or - `ref.NextValidatorsHash != ev.NextValidatorsHash` or - `ref.ConsensusHash != ev.ConsensusHash` or - `ref.AppHash != ev.AppHash` or + - returns evaluation of the following disjunction + **[[LCAI-NONVALID-OUTPUT.1]]** == + `ref.ValidatorsHash != ev.ValidatorsHash` or + `ref.NextValidatorsHash != ev.NextValidatorsHash` or + `ref.ConsensusHash != ev.ConsensusHash` or + `ref.AppHash != ev.AppHash` or `ref.LastResultsHash != ev.LastResultsHash` ```go @@ -191,7 +191,7 @@ The main function `isolateMisbehavingProcesses` distinguishes three kinds of wro The question is whether this captures all attacks. First observe that the first checking in `isolateMisbehavingProcesses` is `violatesTMValidity`. It takes care of lunatic attacks. If this check passes, that is, if `violatesTMValidity` returns `FALSE` this means that [FN-NONVALID-OUTPUT] evaluates to false, which implies that `ref.ValidatorsHash = ev.ValidatorsHash`. Hence after `violatesTMValidity`, all the involved validators are the ones from the blockchain. It is thus sufficient to analyze one instance of Tendermint consensus with a fixed group membership (set of validators). Also it is sufficient to consider two different valid consensus values, that is, binary consensus. -**TODO** we have analyzed Tendermint consensus algorithm with TLA+ and have accompanied Galois in an independent study of the protocol based on [Ivy proofs](https://github.com/cometbft/cometbft/tree/v0.38.x/spec/ivy-proofs). +**TODO** we have analyzed Tendermint consensus algorithm with TLA+ and have accompanied Galois in an independent study of the protocol based on [Ivy proofs](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/ivy-proofs). # References @@ -202,22 +202,22 @@ First observe that the first checking in `isolateMisbehavingProcesses` is `viola [[detection]] The specification of the light client attack detection mechanism. [supervisor]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md -[verification]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md +[verification]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md [detection]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md [LC-DATA-EVIDENCE-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#lc-data-evidence1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#lc-data-evidence1 [CMBC-LC-EVIDENCE-DATA-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-lc-evidence-data1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-lc-evidence-data1 [node-based-attack-characterization]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#block-based-characterization-of-attacks +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#block-based-characterization-of-attacks -[CMBC-FM-2THIRDS-link]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 +[CMBC-FM-2THIRDS-link]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 -[LCV-FUNC-VALID.link]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-valid2 +[LCV-FUNC-VALID.link]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-valid2 diff --git a/spec/light-client/attacks/isolate-attackers_002_reviewed.md b/spec/light-client/attacks/isolate-attackers_002_reviewed.md index e83a4ca32a4..8e326693c28 100644 --- a/spec/light-client/attacks/isolate-attackers_002_reviewed.md +++ b/spec/light-client/attacks/isolate-attackers_002_reviewed.md @@ -26,7 +26,7 @@ After providing the [problem statement](#Part-I---Basics-and-Definition-of-the-P # Part I - Basics and Definition of the Problem -For definitions of data structures used here, in particular LightBlocks [[LCV-DATA-LIGHTBLOCK.1]](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightblock1), we refer to the specification of [Light Client Verification][verification]. +For definitions of data structures used here, in particular LightBlocks [[LCV-DATA-LIGHTBLOCK.1]](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightblock1), we refer to the specification of [Light Client Verification][verification]. The specification of the [detection mechanism][detection] describes @@ -135,12 +135,12 @@ func violatesTMValidity(ref Header, ev Header) boolean - Expected precondition - `ref.Height == ev.Height` - Expected postcondition - - returns evaluation of the following disjunction - **[LCAI-NONVALID-OUTPUT.1]** == - `ref.ValidatorsHash != ev.ValidatorsHash` or - `ref.NextValidatorsHash != ev.NextValidatorsHash` or - `ref.ConsensusHash != ev.ConsensusHash` or - `ref.AppHash != ev.AppHash` or + - returns evaluation of the following disjunction + **[LCAI-NONVALID-OUTPUT.1]** == + `ref.ValidatorsHash != ev.ValidatorsHash` or + `ref.NextValidatorsHash != ev.NextValidatorsHash` or + `ref.ConsensusHash != ev.ConsensusHash` or + `ref.AppHash != ev.AppHash` or `ref.LastResultsHash != ev.LastResultsHash` ```go @@ -189,7 +189,7 @@ The main function `isolateMisbehavingProcesses` distinguishes three kinds of wro The question is whether this captures all attacks. First observe that the first check in `isolateMisbehavingProcesses` is `violatesTMValidity`. It takes care of lunatic attacks. If this check passes, that is, if `violatesTMValidity` returns `FALSE` this means that [[LCAI-NONVALID-OUTPUT.1]](#LCAI-FUNC-NONVALID1]) evaluates to false, which implies that `ref.ValidatorsHash = ev.ValidatorsHash`. Hence, after `violatesTMValidity`, all the involved validators are the ones from the blockchain. It is thus sufficient to analyze one instance of Tendermint consensus with a fixed group membership (set of validators). Also, as we have two different blocks for the same height, it is sufficient to consider two different valid consensus values, that is, binary consensus. -For this fixed group membership, we have analyzed the attacks using the TLA+ specification of [Tendermint Consensus in TLA+][tendermint-accountability]. We checked that indeed the only possible scenarios that can lead to violation of agreement are **equivocation** and **amnesia**. An independent study by Galois of the protocol based on [Ivy proofs](https://github.com/cometbft/cometbft/tree/v0.38.x/spec/ivy-proofs) led to the same conclusion. +For this fixed group membership, we have analyzed the attacks using the TLA+ specification of [Tendermint Consensus in TLA+][tendermint-accountability]. We checked that indeed the only possible scenarios that can lead to violation of agreement are **equivocation** and **amnesia**. An independent study by Galois of the protocol based on [Ivy proofs](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/ivy-proofs) led to the same conclusion. # References @@ -201,25 +201,25 @@ For this fixed group membership, we have analyzed the attacks using the TLA+ spe [tendermint-accountability]: -https://github.com/cometbft/cometbft/tree/v0.38.x/spec/light-client/accountability +https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/light-client/accountability [supervisor]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md -[verification]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md +[verification]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md [detection]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md [LC-DATA-EVIDENCE-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#lc-data-evidence1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#lc-data-evidence1 [CMBC-LC-EVIDENCE-DATA-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-lc-evidence-data1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-lc-evidence-data1 [node-based-attack-characterization]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#block-based-characterization-of-attacks +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#block-based-characterization-of-attacks -[CMBC-FM-2THIRDS-link]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 +[CMBC-FM-2THIRDS-link]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 -[LCV-FUNC-VALID.link]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-valid2 +[LCV-FUNC-VALID.link]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-valid2 diff --git a/spec/light-client/attacks/notes-on-evidence-handling.md b/spec/light-client/attacks/notes-on-evidence-handling.md index 3d61efc7646..8842068cb9d 100644 --- a/spec/light-client/attacks/notes-on-evidence-handling.md +++ b/spec/light-client/attacks/notes-on-evidence-handling.md @@ -19,7 +19,7 @@ detects an attack, it needs to send to a witness only missing data (common heigh and conflicting light block) as it has its trace. Keeping light client attack data of constant size saves bandwidth and reduces an attack surface. As we will explain below, although in the context of light client core -[verification](https://github.com/cometbft/cometbft/tree/v0.38.x/spec/light-client/verification) +[verification](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/light-client/verification) the roles of primary and witness are clearly defined, in case of the attack, we run the same attack detection procedure twice where the roles are swapped. The rationale is that the light client does not know what peer is correct (on a right main branch) @@ -68,7 +68,7 @@ The following invariant holds for the primary trace: ### Witness with a conflicting header The verified header at height `h` is cross-checked with every witness as part of -[detection](https://github.com/cometbft/cometbft/tree/v0.38.x/spec/light-client/detection). +[detection](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/light-client/detection). If a witness returns the conflicting header at the height `h` the following procedure is executed to verify if the conflicting header comes from the valid trace and if that's the case to create an attack evidence: @@ -137,7 +137,7 @@ light client: - lunatic attack - equivocation attack and -- amnesia attack. +- amnesia attack. We now specify the evidence handling logic. @@ -195,14 +195,14 @@ Detecting faulty processes in case of the amnesia attack is more complex and can purely based on attack evidence data. In this case, in order to detect misbehaving processes we need access to votes processes sent/received during the conflicting height. Therefore, amnesia handling assumes that validators persist all votes received and sent during multi-round heights (as amnesia attack -is only possible in heights that executes over multiple rounds, i.e., commit round > 0). +is only possible in heights that executes over multiple rounds, i.e., commit round > 0). To simplify description of the algorithm we assume existence of the trusted oracle called monitor that will drive the algorithm and output faulty processes at the end. Monitor can be implemented in a distributed setting as on-chain module. The algorithm works as follows: 1) Monitor sends votesets request to validators of the conflicting height. Validators are expected to send their votesets within predefined timeout. - 2) Upon receiving votesets request, validators send their votesets to a monitor. + 2) Upon receiving votesets request, validators send their votesets to a monitor. 2) Validators which have not sent its votesets within timeout are considered faulty. 3) The preprocessing of the votesets is done. That means that the received votesets are analyzed and each vote (valid) sent by process p is added to the voteset of the sender p. This phase ensures that diff --git a/spec/light-client/detection/LCDetector_003_draft.tla b/spec/light-client/detection/LCDetector_003_draft.tla index ecc52ee32f4..5c9c025fa36 100644 --- a/spec/light-client/detection/LCDetector_003_draft.tla +++ b/spec/light-client/detection/LCDetector_003_draft.tla @@ -3,7 +3,7 @@ * This is a specification of the light client detector module. * It follows the English specification: * - * https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md + * https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md * * The assumptions made in this specification: * @@ -62,9 +62,9 @@ vars == < ref, Commits |-> lastCommit] + block = [header |-> ref, Commits |-> lastCommit] \* Either the primary is correct and the block comes from the reference chain, \* or the block is produced by a faulty primary. @@ -243,7 +243,7 @@ CreateEvidence(peer, isPeerCorrect, refBlocks, targetBlocks) == /\ state' = IF nextHeightToTry' >= 0 THEN state ELSE <<"NoEvidence", peer>> - /\ UNCHANGED evidences + /\ UNCHANGED evidences SwitchToPrimary == /\ state = <<"FoundEvidence", "SECONDARY">> @@ -280,7 +280,7 @@ AdvanceClocks == /\ tm >= localClock /\ LC!IsLocalClockWithinDrift(tm, refClock') /\ localClock' = tm - + (** Execute AttackDetector for one secondary. @@ -290,7 +290,7 @@ Next == /\ AdvanceClocks /\ \/ CompareLast \/ CreateEvidenceForSecondary - \/ SwitchToPrimary + \/ SwitchToPrimary \/ CreateEvidenceForPrimary diff --git a/spec/light-client/detection/detection_001_reviewed.md b/spec/light-client/detection/detection_001_reviewed.md index 8505fc5f4d2..7193c1f8956 100644 --- a/spec/light-client/detection/detection_001_reviewed.md +++ b/spec/light-client/detection/detection_001_reviewed.md @@ -251,7 +251,7 @@ of v(i) and v(i+1) such that > - check that v(i+1) differs from its block at that height, and > - verify v(i+1) in one step from v(i) as v is a verification trace. -**Proposition.** In the case of attack, evidence exists. +**Proposition.** In the case of attack, evidence exists. *Proof.* First observe that - (A). (NOT E2(i)) implies E1(i+1) @@ -284,7 +284,7 @@ operational. > They might be relevant for a closer analysis of fork scenarios on the > chain, which is out of the scope of this specification. - + #### **[CMBC-SIGN-UNIQUE.1]** Let *b* and *c* be light blocks, we define the predicate @@ -336,7 +336,7 @@ Let *b* be a light block and *t* a time. We define *bogus(b,t)* iff - *sequ-rooted(b) = false* and - for all *a*, *sequ-rooted(a)* implies *skip-trace(a,b,t) = false* - + ### Informal Problem statement There is no sequential specification: the detector only makes sense @@ -392,7 +392,7 @@ agreed on in the past), and Whenever AttackDetector is called, the detector should for each secondary try to replay the verification trace `verifiedLS` with the secondary - + - in case replaying leads to detection of a light client attack (one of the lightblocks differ from the one in verifiedLS with the same height), we should return evidence @@ -427,7 +427,7 @@ node among the primary and the secondaries. > `root-of-trust` is always the one from the blockchain, and we can > use it as starting point for the evidence computation. Moreover, it > allows us to establish the invariant at the supervisor that any -> lightblock in the (top-level) lightstore is from the blockchain. +> lightblock in the (top-level) lightstore is from the blockchain. > In the future we might design a lightclient based on the assumption > that at least in regular intervals the lightclient is connected to a > correct full node. This will require the detector to reconsider @@ -607,7 +607,7 @@ a conflicting header is downloaded from a secondary, indeed an attack is confirmed. It could be that the secondary reports a bogus block, which means that there need not be an attack, and the secondary is replaced. - + ## Details of the functions #### **[LCD-FUNC-DETECTOR.1]:** @@ -676,7 +676,7 @@ func CreateEvidenceForPeer(peer PeerID, root LightBlock, trace LightStore) for i in 1 .. len(trace) { auxLS, result := VerifyToTarget(peer, common, trace[i].Header.Height) - + if result != ResultSuccess { // something went wrong; peer did not provide a verifyable block return (nil, nil, nil, FaultyPeer) @@ -767,19 +767,19 @@ Once a bogus block is recognized as such the secondary is removed. [[supervisor]] The specification of the light client supervisor. -[verification]: https://github.com/cometbft/cometbft/tree/v0.38.x/spec/light-client/verification +[verification]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/light-client/verification -[supervisor]: https://github.com/cometbft/cometbft/tree/v0.38.x/spec/light-client/supervisor +[supervisor]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/light-client/supervisor [CMBC-VAL-CONTAINS-CORR-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-val-contains-corr1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-val-contains-corr1 [fetch]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-fetch1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-fetch1 [LCV-INV-TP1-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-inv-tp1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-inv-tp1 diff --git a/spec/light-client/detection/detection_003_reviewed.md b/spec/light-client/detection/detection_003_reviewed.md index 2024598bf21..f7712d2b6aa 100644 --- a/spec/light-client/detection/detection_003_reviewed.md +++ b/spec/light-client/detection/detection_003_reviewed.md @@ -74,12 +74,12 @@ the secondaries using this specification. - [Part II](#part-ii---problem-statement): Problem statement of lightclient attack detection - + - [Informal Problem Statement](#informal-problem-statement) - [Assumptions](#Assumptions) - [Definitions](#definitions) - [Distributed Problem statement](#Distributed-Problem-statement) - + - [Part III](#part-iii---protocol): The protocol - [Functions and Data defined in other Specifications](#Functions-and-Data-defined-in-other-Specifications) @@ -280,7 +280,7 @@ operational. > They might be relevant for a closer analysis of fork scenarios on the > chain, which is out of the scope of this specification. - + #### **[CMBC-SIGN-UNIQUE.1]** Let *b* and *c* be light blocks, we define the predicate @@ -332,9 +332,9 @@ Let *b* be a light block and *t* a time. We define *bogus(b,t)* iff - *sequ-rooted(b) = false* and - for all *a*, *sequ-rooted(a)* implies *skip-trace(a,b,t) = false* - + # Part II - Problem Statement - + ## Informal Problem statement There is no sequential specification: the detector only makes sense @@ -393,7 +393,7 @@ corresponding header of the same height provided by the secondary. If there is a deviation, the detector should try to replay the verification trace `verifiedLS` with the secondary - + - in case replaying leads to detection of a light client attack (one of the lightblocks differ from the one in verifiedLS with the same height), we should return evidence @@ -426,7 +426,7 @@ node among the primary and the secondaries. > `root-of-trust` is always the one from the blockchain, and we can > use it as starting point for the evidence computation. Moreover, it > allows us to establish the invariant at the supervisor that any -> lightblock in the (top-level) lightstore is from the blockchain. +> lightblock in the (top-level) lightstore is from the blockchain. > In the future we might design a lightclient based on the assumption > that at least in regular intervals the lightclient is connected to a > correct full node. This will require the detector to reconsider @@ -612,7 +612,7 @@ a conflicting header is downloaded from a secondary, it calls indeed an attack is confirmed. It could be that the secondary reports a bogus block, which means that there need not be an attack, and the secondary is replaced. - + ## Details of the functions #### **[LCD-FUNC-DETECTOR.2]:** @@ -629,7 +629,7 @@ func AttackDetector(root LightBlock, primary_trace []LightBlock) Replace_Secondary(root); } else if lb.Header != primary_trace.Latest().Header { - + // we replay the primary trace with the secondary, in // order to generate evidence that we can submit to the // secondary. We return the evidence + the trace the @@ -690,7 +690,7 @@ func CreateEvidenceForPeer(peer PeerID, root LightBlock, trace LightStore) for i in 1 .. len(trace) { auxLS, result := VerifyToTarget(peer, common, trace[i].Header.Height) - + if result != ResultSuccess { // something went wrong; peer did not provide a verifiable block return (nil, nil, nil, FaultyPeer) @@ -704,7 +704,7 @@ func CreateEvidenceForPeer(peer PeerID, root LightBlock, trace LightStore) ev := new InternalEvidence; ev.Evidence.ConflictingBlock := trace[i]; // CommonHeight is used to indicate the type of attack - // if the CommonHeight != ConflictingBlock.Height this + // if the CommonHeight != ConflictingBlock.Height this // is by definition a lunatic attack else it is an // equivocation attack ev.Evidence.CommonHeight := common.Height; @@ -741,7 +741,7 @@ func CreateEvidenceForPeer(peer PeerID, root LightBlock, trace LightStore) **Proposition.** In the case of attack, evidence [[CMBC-LC-ATTACK-EVIDENCE.1]](#CMBC-LC-ATTACK-EVIDENCE1) - exists. + exists. *Proof.* First observe that - (A). (NOT E2(i)) implies E1(i+1) @@ -803,37 +803,37 @@ Once a bogus block is recognized as such the secondary is removed. [[supervisor]] The specification of the light client supervisor. -[verification]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md +[verification]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md -[supervisor]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md +[supervisor]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md -[CMBC-FM-2THIRDS-link]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 +[CMBC-FM-2THIRDS-link]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-fm-2thirds1 -[CMBC-SOUND-DISTR-POSS-COMMIT-link]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-sound-distr-poss-commit1 +[CMBC-SOUND-DISTR-POSS-COMMIT-link]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-sound-distr-poss-commit1 -[LCV-SEQ-SAFE-link]:https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-seq-safe1 +[LCV-SEQ-SAFE-link]:https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-seq-safe1 [CMBC-VAL-CONTAINS-CORR-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-val-contains-corr1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-val-contains-corr1 [fetch]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-fetch1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-fetch1 [LCV-INV-TP1-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-inv-tp1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-inv-tp1 [LCV-LB-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightblock1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightblock1 [LCV-LS-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightstore2 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-data-lightstore2 [LVC-HD-link]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-header-fields2 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#cmbc-header-fields2 [repl]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md#lc-func-replace-secondary1 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/supervisor/supervisor_001_draft.md#lc-func-replace-secondary1 [vtt]: -https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-main2 +https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_002_draft.md#lcv-func-main2 diff --git a/spec/light-client/supervisor/supervisor_001_draft.md b/spec/light-client/supervisor/supervisor_001_draft.md index 66758a85eaa..9e80219664a 100644 --- a/spec/light-client/supervisor/supervisor_001_draft.md +++ b/spec/light-client/supervisor/supervisor_001_draft.md @@ -307,7 +307,7 @@ type LCInitData struct { where only one of the components must be provided. `GenesisDoc` is defined in the [CometBFT -Types](https://github.com/cometbft/cometbft/blob/v0.38.x/types/genesis.go). +Types](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/types/genesis.go). #### **[LC-DATA-GENESIS.1]** @@ -420,9 +420,9 @@ func Sequential-Supervisor (initdata LCInitData) (Error) { loop { // get the next height nextHeight := input(); - + lightStore,result := VerifyAndDetect(lightStore, nextHeight); - + if result == OK { output(LightStore.Get(targetHeight)); // we only output a trusted lightblock @@ -506,7 +506,7 @@ func InitLightClient (initData LCInitData) (LightStore, Error) { result = ResultSuccess } } - + // cross-check auxLS := new LightStore auxLS.Add(current) @@ -558,16 +558,16 @@ func VerifyAndDetect (lightStore LightStore, targetHeight Height) return (lightStore, ResultSuccess) } else { - // We have a lightblock in the store, but it has not been + // We have a lightblock in the store, but it has not been // cross-checked by now. We do that now. root_of_trust, auxLS := lightstore.TraceTo(b1); - + // Cross-check Evidences := AttackDetector(root_of_trust, auxLS); if Evidences.Empty { // no attack detected, we trust the new lightblock - lightStore.Update(auxLS.Latest(), - StateTrusted, + lightStore.Update(auxLS.Latest(), + StateTrusted, verfiedLS.Latest().verification-root); return (lightStore, OK); } @@ -610,8 +610,8 @@ func VerifyAndDetect (lightStore LightStore, targetHeight Height) Evidences := AttackDetector(root_of_trust, verifiedLS); if Evidences.Empty { // no attack detected, we trust the new lightblock - verifiedLS.Update(verfiedLS.Latest(), - StateTrusted, + verifiedLS.Update(verfiedLS.Latest(), + StateTrusted, verfiedLS.Latest().verification-root); lightStore.store_chain(verifidLS); return (lightStore, OK); diff --git a/spec/light-client/supervisor/supervisor_002_draft.md b/spec/light-client/supervisor/supervisor_002_draft.md index a9b6890d3c6..447162cd385 100644 --- a/spec/light-client/supervisor/supervisor_002_draft.md +++ b/spec/light-client/supervisor/supervisor_002_draft.md @@ -17,7 +17,7 @@ type LCInitData struct { where only one of the components must be provided. `GenesisDoc` is defined in the [CometBFT -Types](https://github.com/cometbft/cometbft/blob/v0.38.x/types/genesis.go). +Types](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/types/genesis.go). ### Initialization @@ -45,8 +45,8 @@ able to verify anything. Cross-checking this trusted block with providers upon initialization is helpful for ensuring that the node is responsive and correctly configured but does not increase trust since proving a conflicting block is a -[light client attack](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-lc-attack1) -and not just a [bogus](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-bogus1) block could result in +[light client attack](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-lc-attack1) +and not just a [bogus](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_003_reviewed.md#cmbc-bogus1) block could result in performing backwards verification beyond the trusted period, thus a fruitless endeavour. @@ -68,18 +68,18 @@ func InitLightClient(initData LCInitData) (LightStore, Error) { case LCInitData.TrustedHash != nil: untrustedBlock := FetchLightBlock(PeerList.Primary(), LCInitData.TrustedHeight) - + // verify that the hashes match if untrustedBlock.Hash() != LCInitData.TrustedHash { return nil, Error("Primary returned block with different hash") } // after checking the hash we now trust the block - initialBlock = untrustedBlock + initialBlock = untrustedBlock } case LCInitData.Genesis != nil: untrustedBlock := FetchLightBlock(PeerList.Primary(), LCInitData.Genesis.InitialHeight) - + // verify that 2/3+ of the validator set signed the untrustedBlock if err := VerifyCommitFull(untrustedBlock.Commit, LCInitData.Genesis.Validators); err != nil { return nil, err diff --git a/spec/light-client/verification/verification_001_published.md b/spec/light-client/verification/verification_001_published.md index 5d60fb04276..4a034fefd1b 100644 --- a/spec/light-client/verification/verification_001_published.md +++ b/spec/light-client/verification/verification_001_published.md @@ -60,7 +60,7 @@ of the problem addressed by the Lightclient Verification protocol. - [Incentives](#incentives): how faulty full nodes may benefit from misbehaving and how correct full nodes benefit from cooperating. - + - [Computational Model](#computational-model): timing and correctness assumptions. @@ -152,7 +152,7 @@ Given a full node, a - *peerID* is the PeerID (public key) of a full node, - *voting_power* is an integer (representing the full node's voting power in a certain consensus instance). - + > In the Golang implementation the data type for *validator pair* is called `Validator` @@ -264,7 +264,7 @@ If for a block *b*, a commit *c* - contains at least one validator pair *(v,p)* such that *v* is a **correct** validator node, and - is contained in *PossibleCommit(b)* - + then the block *b* is on the blockchain. ## Context of this document @@ -400,15 +400,15 @@ Each instance must eventually terminate. - the *primary* is correct (and locally has the block of *targetHeight*), and - *LightStore* always contains a verified header whose age is less than the - trusting period, + trusting period, then *Core Verification* adds a verified header *hd* with height *targetHeight* to *LightStore* and it **terminates successfully** > These definitions imply that if the primary is faulty, a header may or > may not be added to *LightStore*. In any case, -> [**[LCV-DIST-SAFE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) must hold. -> The invariant [**[LCV-DIST-SAFE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) and the liveness -> requirement [**[LCV-DIST-LIVE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-life1) +> [**[LCV-DIST-SAFE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) must hold. +> The invariant [**[LCV-DIST-SAFE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) and the liveness +> requirement [**[LCV-DIST-LIVE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-life1) > allow that verified headers are added to *LightStore* whose > height was not passed > to the verifier (e.g., intermediate headers used in bisection; see below). @@ -425,16 +425,16 @@ Each instance must eventually terminate. This specification provides a partial solution to the sequential specification. The *Verifier* solves the invariant of the sequential part -[**[LCV-DIST-SAFE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) => [**[LCV-SEQ-SAFE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-seq-inv) +[**[LCV-DIST-SAFE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) => [**[LCV-SEQ-SAFE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-seq-inv) In the case the primary is correct, and there is a recent header in *LightStore*, the verifier satisfies the liveness requirements. -⋀ *primary is correct* -⋀ always ∃ verified header in LightStore. *header.Time* > *now* - *trustingPeriod* -⋀ [**[LCV-A-Comm.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-a-comm) ⋀ ( +⋀ *primary is correct* +⋀ always ∃ verified header in LightStore. *header.Time* > *now* - *trustingPeriod* +⋀ [**[LCV-A-Comm.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-a-comm) ⋀ ( ( [**[CMBC-CorrFull.1]**][CMBC-CorrFull-link] ⋀ - [**[LCV-DIST-LIVE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live1) ) - ⟹ [**[LCV-SEQ-LIVE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-seq-live1) + [**[LCV-DIST-LIVE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live1) ) + ⟹ [**[LCV-SEQ-LIVE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-seq-live1) ) # Part IV - Light Client Verification Protocol @@ -455,7 +455,7 @@ independently: underspecified as different implementations (currently in Goland and Rust) may implement different optimizations here. We just provide necessary conditions on how the height may evolve. - + @@ -528,7 +528,7 @@ func (ls LightStore) LatestVerified() LightBlock #### **[LCV-FUNC-UPDATE.2]** ```go -func (ls LightStore) Update(lightBlock LightBlock, +func (ls LightStore) Update(lightBlock LightBlock, verfiedState VerifiedState verifiedBy Height) ``` @@ -767,8 +767,8 @@ func VerifyToTarget(primary PeerID, lightStore LightStore, - Error conditions - if the precondition is violated - if `ValidAndVerified` or `FetchLightBlock` report an error - - if [**[LCV-INV-TP.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-inv-tp1) is violated - + - if [**[LCV-INV-TP.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-inv-tp1) is violated + ### Details of the Functions #### **[LCV-FUNC-VALID.1]** @@ -833,12 +833,12 @@ func Schedule(lightStore, nextHeight, targetHeight) Height - Expected postcondition: **[LCV-SCHEDULE-POST.1]** Return *H* s.t. 1. if *lightStore.LatestVerified.Height = nextHeight* and - *lightStore.LatestVerified < targetHeight* then + *lightStore.LatestVerified < targetHeight* then *nextHeight < H <= targetHeight* 2. if *lightStore.LatestVerified.Height < nextHeight* and - *lightStore.LatestVerified.Height < targetHeight* then + *lightStore.LatestVerified.Height < targetHeight* then *lightStore.LatestVerified.Height < H < nextHeight* - 3. if *lightStore.LatestVerified.Height = targetHeight* then + 3. if *lightStore.LatestVerified.Height = targetHeight* then *H = targetHeight* > Case i. captures the case where the light block at height *nextHeight* @@ -854,7 +854,7 @@ func Schedule(lightStore, nextHeight, targetHeight) Height *trustedStore* is implemented by the light blocks in lightStore that have the state *StateVerified*. -#### Argument for [**[LCV-DIST-SAFE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe) +#### Argument for [**[LCV-DIST-SAFE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe) - `ValidAndVerified` implements the soundness checks and the checks [**[CMBC-VAL-CONTAINS-CORR.1]**][CMBC-VAL-CONTAINS-CORR-link] and @@ -863,7 +863,7 @@ have the state *StateVerified*. - Only if `ValidAndVerified` returns with `SUCCESS`, the state of a light block is set to *StateVerified*. -#### Argument for [**[LCV-DIST-LIVE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-life) +#### Argument for [**[LCV-DIST-LIVE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-life) - If *primary* is correct, - `FetchLightBlock` will always return a light block consistent @@ -871,7 +871,7 @@ have the state *StateVerified*. - `ValidAndVerified` either verifies the header using the trusting period or falls back to sequential verification - - If [**[LCV-INV-TP.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-inv-tp1) holds, eventually every + - If [**[LCV-INV-TP.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-inv-tp1) holds, eventually every header will be verified and core verification **terminates successfully**. - successful termination depends on the age of *lightStore.LatestVerified* (for instance, initially on the age of *trustedHeader*) and the @@ -887,7 +887,7 @@ have the state *StateVerified*. ## Liveness Scenarios -The liveness argument above assumes [**[LCV-INV-TP.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-inv-tp1) +The liveness argument above assumes [**[LCV-INV-TP.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-inv-tp1) which requires that there is a header that does not expire before the target height is reached. Here we discuss scenarios to ensure this. @@ -929,7 +929,7 @@ header of height *startHeader.Height + 1* is added to *LightStore*. expired, that is only the case if - startHeader.Time > startTime + WCG * (Comp + 2 Delta) - trustingPeriod, - - that is, if core verification is started at + - that is, if core verification is started at startTime < startHeader.Time + trustingPeriod - WCG * (Comp + 2 Delta) - one may then do an inductive argument from this point on, depending @@ -993,7 +993,7 @@ the following cases: - otherwise. In this case we need to do "backwards verification" using the hash of the previous block in the `LastBlockID` field of a header. - + **Open Question:** what are the security assumptions for backward verification. Should we check that the light block we verify from (and/or the checked light block) is within the trusting period? @@ -1041,7 +1041,7 @@ following function: ```go func Backwards (primary PeerID, lightStore LightStore, targetHeight Height) (LightStore, Result) { - + lb,res = lightStore.MinVerified() if res = false { return (lightStore, ResultFailure) @@ -1130,7 +1130,7 @@ func Main (primary PeerID, lightStore LightStore, targetHeight Height) - + @@ -1150,7 +1150,7 @@ func Main (primary PeerID, lightStore LightStore, targetHeight Height) [RPC]: https://docs.cometbft.com/v0.34/rpc/ -[block]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/core/data_structures.md +[block]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/core/data_structures.md [CMBC-SEQ-link]: #cmbc-seq1 [CMBC-CorrFull-link]: #cmbc-corr-full1 @@ -1161,8 +1161,8 @@ func Main (primary PeerID, lightStore LightStore, targetHeight Height) [CMBC-VAL-COMMIT-link]: #cmbc-val-commit1 [lightclient]: https://github.com/interchainio/tendermint-rs/blob/e2cb9aca0b95430fca2eac154edddc9588038982/docs/architecture/adr-002-lite-client.md -[fork-detector]: https://github.com/cometbft/cometbft/tree/v0.38.x/spec/light-client/detection -[fullnode]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/blockchain +[fork-detector]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/light-client/detection +[fullnode]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/blockchain [ibc-rs]:https://github.com/informalsystems/ibc-rs diff --git a/spec/light-client/verification/verification_002_draft.md b/spec/light-client/verification/verification_002_draft.md index 9bbccba8f75..77e9bc619cb 100644 --- a/spec/light-client/verification/verification_002_draft.md +++ b/spec/light-client/verification/verification_002_draft.md @@ -42,7 +42,7 @@ client. As a result of the work on - light client [supervisor](https://github.com/tendermint/spec/pull/159) (also in [Rust proposal](https://github.com/informalsystems/tendermint-rs/pull/509)) - + adaptations to the semantics and functions exposed by the LightStore needed to be made. In contrast to [version 001](./verification_001_published.md) we specify the following: @@ -53,7 +53,7 @@ needed to be made. In contrast to [version - During verification, we record for each lightblock which other lightblock can be used to verify it in one step. This is needed to generate verification traces that are needed for IBC. - + # Outline - [Part I](#part-i---cosmos-blockchain): Introduction of @@ -77,7 +77,7 @@ of the problem addressed by the Lightclient Verification protocol. - [Incentives](#incentives): how faulty full nodes may benefit from misbehaving and how correct full nodes benefit from cooperating. - + - [Computational Model](#computational-model): timing and correctness assumptions. @@ -169,7 +169,7 @@ Given a full node, a - *peerID* is the PeerID (public key) of a full node, - *voting_power* is an integer (representing the full node's voting power in a certain consensus instance). - + > In the Golang implementation the data type for *validator pair* is called `Validator` @@ -281,7 +281,7 @@ If for a block *b*, a commit *c* - contains at least one validator pair *(v,p)* such that *v* is a **correct** validator node, and - is contained in *PossibleCommit(b)* - + then the block *b* is on the blockchain. ## Context of this document @@ -414,15 +414,15 @@ must eventually terminate. - If - the *primary* is correct (and locally has the block of *targetHeight*), and - - the age of root is always less than the trusting period, + - the age of root is always less than the trusting period, then *Core Verification* adds a verified header *hd* with height *targetHeight* to *LightStore* and it **terminates successfully** > These definitions imply that if the primary is faulty, a header may or > may not be added to *LightStore*. In any case, -> [**[LCV-DIST-SAFE.2]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe2) must hold. -> The invariant [**[LCV-DIST-SAFE.2]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe2) and the liveness -> requirement [**[LCV-DIST-LIVE.2]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-life) +> [**[LCV-DIST-SAFE.2]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe2) must hold. +> The invariant [**[LCV-DIST-SAFE.2]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe2) and the liveness +> requirement [**[LCV-DIST-LIVE.2]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-life) > allow that verified headers are added to *LightStore* whose > height was not passed > to the verifier (e.g., intermediate headers used in bisection; see below). @@ -439,16 +439,16 @@ must eventually terminate. This specification provides a partial solution to the sequential specification. The *Verifier* solves the invariant of the sequential part -[**[LCV-DIST-SAFE.2]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe2) => [**[LCV-SEQ-SAFE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) +[**[LCV-DIST-SAFE.2]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe2) => [**[LCV-SEQ-SAFE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-safe1) In the case the primary is correct, and *root* is a recent header in *LightStore*, the verifier satisfies the liveness requirements. -⋀ *primary is correct* -⋀ *root.header.Time* > *now* - *trustingPeriod* -⋀ [**[LCV-A-Comm.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-a-comm) ⋀ ( +⋀ *primary is correct* +⋀ *root.header.Time* > *now* - *trustingPeriod* +⋀ [**[LCV-A-Comm.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-a-comm) ⋀ ( ( [**[CMBC-CorrFull.1]**][CMBC-CorrFull-link] ⋀ - [**[LCV-DIST-LIVE.2]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live2) ) - ⟹ [**[LCV-SEQ-LIVE.1]**](https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live1) + [**[LCV-DIST-LIVE.2]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live2) ) + ⟹ [**[LCV-SEQ-LIVE.1]**](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/verification/verification_001_published.md#lcv-dist-live1) ) # Part IV - Light Client Verification Protocol @@ -469,7 +469,7 @@ independently: underspecified as different implementations (currently in Goland and Rust) may implement different optimizations here. We just provide necessary conditions on how the height may evolve. - + @@ -612,7 +612,7 @@ func (ls LightStore) TraceTo(lightBlock LightBlock) (LightBlock, LightStore) - returns a **trusted** lightblock `root` from the lightstore with a height less than `lightBlock` - returns a lightstore that contains lightblocks that constitute a - [verification trace](https://github.com/cometbft/cometbft/tree/v0.38.x/spec/light-client/detection) from + [verification trace](https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/light-client/detection) from `root` to `lightBlock` (including `lightBlock`) ### Inputs @@ -649,7 +649,7 @@ It is always the case that *LightStore.LatestTrusted.Header.Time > now - trustin > If the invariant is violated, the light client does not have a > header it can trust. A trusted header must be obtained externally, -> its trust can only be based on social consensus. +> its trust can only be based on social consensus. > We use the convention that root is assumed to be verified. ### Used Remote Functions @@ -824,7 +824,7 @@ func VerifyToTarget(primary PeerID, root LightBlock, - if the precondition is violated - if `ValidAndVerified` or `FetchLightBlock` report an error - if [**[LCV-INV-TP.1]**](#lcv-inv-tp1) is violated - + ### Details of the Functions #### **[LCV-FUNC-VALID.2]** @@ -886,12 +886,12 @@ func Schedule(lightStore, nextHeight, targetHeight) Height - Expected postcondition: **[LCV-SCHEDULE-POST.1]** Return *H* s.t. 1. if *lightStore.LatestVerified.Height = nextHeight* and - *lightStore.LatestVerified < targetHeight* then + *lightStore.LatestVerified < targetHeight* then *nextHeight < H <= targetHeight* 2. if *lightStore.LatestVerified.Height < nextHeight* and - *lightStore.LatestVerified.Height < targetHeight* then + *lightStore.LatestVerified.Height < targetHeight* then *lightStore.LatestVerified.Height < H < nextHeight* - 3. if *lightStore.LatestVerified.Height = targetHeight* then + 3. if *lightStore.LatestVerified.Height = targetHeight* then *H = targetHeight* > Case i. captures the case where the light block at height *nextHeight* @@ -991,7 +991,7 @@ following function: ```go func Backwards (primary PeerID, root LightBlock, targetHeight Height) (LightStore, Result) { - + lb := root; lightStore := new LightStore; lightStore.Update(lb, StateTrusted, lb.verifiedBy) @@ -1035,7 +1035,7 @@ func Backwards (primary PeerID, root LightBlock, targetHeight Height) [RPC]: https://docs.cometbft.com/v0.34/rpc/ -[block]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/core/data_structures.md +[block]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/core/data_structures.md [CMBC-HEADER-link]: #cmbc-header1 [CMBC-SEQ-link]: #cmbc-seq1 @@ -1047,8 +1047,8 @@ func Backwards (primary PeerID, root LightBlock, targetHeight Height) [CMBC-VAL-COMMIT-link]: #cmbc-val-commit1 [lightclient]: https://github.com/interchainio/tendermint-rs/blob/e2cb9aca0b95430fca2eac154edddc9588038982/docs/architecture/adr-002-lite-client.md -[attack-detector]: https://github.com/cometbft/cometbft/blob/v0.38.x/spec/light-client/detection/detection_001_reviewed.md -[fullnode]: https://github.com/cometbft/cometbft/tree/v0.38.x/spec/core +[attack-detector]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/light-client/detection/detection_001_reviewed.md +[fullnode]: https://github.com/KYVENetwork/cometbft/v38/tree/v0.38.x/spec/core [ibc-rs]:https://github.com/informalsystems/ibc-rs diff --git a/spec/p2p/README.md b/spec/p2p/README.md index 29efd8ecadf..809b8da5ac7 100644 --- a/spec/p2p/README.md +++ b/spec/p2p/README.md @@ -23,7 +23,7 @@ The peer-to-peer (p2p) communication layer is then the component of CometBFT tha 3. intermediates the exchange of messages between peers in CometBFT protocols The specification the p2p layer is a work in progress, -tracked by [issue #19](https://github.com/cometbft/cometbft/issues/19). +tracked by [issue #19](https://github.com/KYVENetwork/cometbft/v38/issues/19). The current content is organized as follows: - [`implementation`](./implementation/README.md): documents the current state @@ -34,12 +34,12 @@ The current content is organized as follows: p2p layer to the protocol layer, through the `Reactor` abstraction. This is a high-level specification (i.e., it should not be implementation-specific) of the p2p layer API, covering item 3. from the list above. -- [`legacy-docs`](./legacy-docs/): We keep older documentation in - the `legacy-docs` directory, as overall, it contains useful information. +- [`legacy-docs`](./legacy-docs/): We keep older documentation in + the `legacy-docs` directory, as overall, it contains useful information. However, part of this content is redundant, being more comprehensively covered in more recent documents, and some implementation details might be outdated - (see [issue #981](https://github.com/cometbft/cometbft/issues/981)). + (see [issue #981](https://github.com/KYVENetwork/cometbft/v38/issues/981)). In addition to this content, some unfinished, work in progress, and auxiliary material can be found in the diff --git a/spec/p2p/implementation/README.md b/spec/p2p/implementation/README.md index 9011536b9b8..969521b5ec6 100644 --- a/spec/p2p/implementation/README.md +++ b/spec/p2p/implementation/README.md @@ -10,7 +10,7 @@ communication layer in CometBFT. The documentation was [produced](https://github.com/tendermint/tendermint/pull/9348) using the `v0.34.*` releases -and the branch [`v0.34.x`](https://github.com/cometbft/cometbft/tree/v0.34.x) +and the branch [`v0.34.x`](https://github.com/KYVENetwork/cometbft/v38/tree/v0.34.x) of this repository as reference. As there were no substancial changes in the p2p implementation, the documentation also applies to the releases `v0.37.*` and `v0.38.*` [^v35]. @@ -23,7 +23,7 @@ documentation also applies to the releases `v0.37.*` and `v0.38.*` [^v35]. ## Contents The documentation follows the organization of the -[`p2p` package](https://github.com/cometbft/cometbft/tree/v0.34.x/p2p), +[`p2p` package](https://github.com/KYVENetwork/cometbft/v38/tree/v0.34.x/p2p), which implements the following abstractions: - [Transport](./transport.md): establishes secure and authenticated diff --git a/spec/p2p/implementation/switch.md b/spec/p2p/implementation/switch.md index 4497fef96e2..6dfa26cc76c 100644 --- a/spec/p2p/implementation/switch.md +++ b/spec/p2p/implementation/switch.md @@ -50,11 +50,11 @@ The `DialPeersAsync` method receives a list of peer addresses (strings) and dials all of them in parallel. It is invoked in two situations: -- In the [setup](https://github.com/cometbft/cometbft/blob/v0.34.x/node/node.go#L987) +- In the [setup](https://github.com/KYVENetwork/cometbft/v38/blob/v0.34.x/node/node.go#L987) of a node, to establish connections with every configured persistent peer - In the RPC package, to implement two unsafe RPC commands, not used in production: - [`DialSeeds`](https://github.com/cometbft/cometbft/blob/v0.34.x/rpc/core/net.go#L47) and - [`DialPeers`](https://github.com/cometbft/cometbft/blob/v0.34.x/rpc/core/net.go#L87) + [`DialSeeds`](https://github.com/KYVENetwork/cometbft/v38/blob/v0.34.x/rpc/core/net.go#L47) and + [`DialPeers`](https://github.com/KYVENetwork/cometbft/v38/blob/v0.34.x/rpc/core/net.go#L87) The received list of peer addresses to dial is parsed into `NetAddress` instances. In case of parsing errors, the method returns. An exception is made for diff --git a/spec/p2p/implementation/transport.md b/spec/p2p/implementation/transport.md index 20d4db87a43..6a58a0c143a 100644 --- a/spec/p2p/implementation/transport.md +++ b/spec/p2p/implementation/transport.md @@ -43,9 +43,9 @@ The `NetAddress` method exports the listen address configured for the transport. The maximum number of simultaneous incoming connections accepted by the listener is bound to `MaxNumInboundPeer` plus the configured number of unconditional peers, using the `MultiplexTransportMaxIncomingConnections` option, -in the node [initialization](https://github.com/cometbft/cometbft/blob/v0.34.x/node/node.go#L563). +in the node [initialization](https://github.com/KYVENetwork/cometbft/v38/blob/v0.34.x/node/node.go#L563). -This method is called when a node is [started](https://github.com/cometbft/cometbft/blob/v0.34.x/node/node.go#L974). +This method is called when a node is [started](https://github.com/KYVENetwork/cometbft/v38/blob/v0.34.x/node/node.go#L974). In case of errors, the `acceptPeers` routine is not started and the error is returned. ## Accept @@ -191,7 +191,7 @@ an `ErrRejected` error with reason `isIncompatible` is returned. The `Close` method closes the TCP listener created by the `Listen` method, and sends a signal for interrupting the `acceptPeers` routine. -This method is called when a node is [stopped](https://github.com/cometbft/cometbft/blob/v0.34.x/node/node.go#L1023). +This method is called when a node is [stopped](https://github.com/KYVENetwork/cometbft/v38/blob/v0.34.x/node/node.go#L1023). ## Cleanup diff --git a/spec/p2p/implementation/types.md b/spec/p2p/implementation/types.md index cef2632936b..45267cd5bf5 100644 --- a/spec/p2p/implementation/types.md +++ b/spec/p2p/implementation/types.md @@ -5,7 +5,7 @@ implement the p2p layer, and summarizes the main types they implement. Types play the role of classes in Go. The reference version for this documentation is the branch -[`v0.34.x`](https://github.com/cometbft/cometbft/tree/v0.34.x/p2p). +[`v0.34.x`](https://github.com/KYVENetwork/cometbft/v38/tree/v0.34.x/p2p). State of August 2022. diff --git a/spec/p2p/legacy-docs/README.md b/spec/p2p/legacy-docs/README.md index 5206ccbefd4..c541192bb7f 100644 --- a/spec/p2p/legacy-docs/README.md +++ b/spec/p2p/legacy-docs/README.md @@ -7,7 +7,7 @@ title: Legacy Docs This section contains useful information. However, part of this content is redundant, being more comprehensively covered in more recent documents, and some implementation details might be outdated -(see issue [#981](https://github.com/cometbft/cometbft/issues/981)). +(see issue [#981](https://github.com/KYVENetwork/cometbft/v38/issues/981)). - [Messages](./messages) - [P2P Config](./config.md) diff --git a/spec/p2p/reactor-api/README.md b/spec/p2p/reactor-api/README.md index b3bcabd1106..2b719a2c992 100644 --- a/spec/p2p/reactor-api/README.md +++ b/spec/p2p/reactor-api/README.md @@ -44,4 +44,4 @@ The remaining of the documentation is organized as follows: layer to the reactors, through the `Switch` and `Peer` abstractions. In other words, the interaction of the protocol layer with the p2p layer (top-down). -[reactor-interface]: https://github.com/cometbft/cometbft/blob/v0.38.x/p2p/base_reactor.go +[reactor-interface]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/p2p/base_reactor.go diff --git a/spec/p2p/reactor-api/p2p-api.md b/spec/p2p/reactor-api/p2p-api.md index ad1fbff3110..2726b223f76 100644 --- a/spec/p2p/reactor-api/p2p-api.md +++ b/spec/p2p/reactor-api/p2p-api.md @@ -304,11 +304,11 @@ could not be enqueued, because the channel's send queue is still full, after a The `TrySend()` method is a _non-blocking_ method, it _immediately_ returns `false` when the channel's send queue is full. -[peer-interface]: https://github.com/cometbft/cometbft/blob/v0.38.x/p2p/peer.go -[service-interface]: https://github.com/cometbft/cometbft/blob/v0.38.x/libs/service/service.go -[switch-type]: https://github.com/cometbft/cometbft/blob/v0.38.x/p2p/switch.go +[peer-interface]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/p2p/peer.go +[service-interface]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/libs/service/service.go +[switch-type]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/p2p/switch.go -[reactor-interface]: https://github.com/cometbft/cometbft/blob/v0.38.x/p2p/base_reactor.go +[reactor-interface]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/p2p/base_reactor.go [reactor-registration]: ./reactor.md#registration [reactor-channels]: ./reactor.md#registration [reactor-addpeer]: ./reactor.md#peer-management diff --git a/spec/p2p/reactor-api/reactor.md b/spec/p2p/reactor-api/reactor.md index a7862faeab0..fbba144fdf7 100644 --- a/spec/p2p/reactor-api/reactor.md +++ b/spec/p2p/reactor-api/reactor.md @@ -106,7 +106,7 @@ documented in the companion [API for Reactors](./p2p-api.md#switch-api) document ## Service interface -A reactor must implement the [`Service`](https://github.com/cometbft/cometbft/blob/v0.38.x/libs/service/service.go) interface, +A reactor must implement the [`Service`](https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/libs/service/service.go) interface, in particular, a startup `OnStart()` and a shutdown `OnStop()` methods: ```abnf @@ -230,5 +230,5 @@ Two important observations regarding the implementation of the `Receive` method: In other words, while `Receive` does not return, other messages from the same sender are not delivered to any reactor. -[reactor-interface]: https://github.com/cometbft/cometbft/blob/v0.38.x/p2p/base_reactor.go +[reactor-interface]: https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/p2p/base_reactor.go [quint-repo]: https://github.com/informalsystems/quint diff --git a/spec/p2p/reactor-api/reactor.qnt b/spec/p2p/reactor-api/reactor.qnt index 002c57023af..bb73f42348e 100644 --- a/spec/p2p/reactor-api/reactor.qnt +++ b/spec/p2p/reactor-api/reactor.qnt @@ -6,7 +6,7 @@ * when the peer is stopped. Receive is called when a message is received on a * channel associated with this reactor. */ -// Code: https://github.com/cometbft/cometbft/blob/main/p2p/base_reactor.go +// Code: https://github.com/KYVENetwork/cometbft/v38/blob/main/p2p/base_reactor.go module reactor { // Unique ID of a node. @@ -119,7 +119,7 @@ module reactor { (s.with("peers", s.peers.union(Set(peer.ID))), updatedPeer) } - /* + /* * AddPeer is called by the switch after the peer is added and successfully * started. Use it to start goroutines communicating with the peer. */ diff --git a/spec/rpc/README.md b/spec/rpc/README.md index ff9ce2ce9e4..899eca861c0 100644 --- a/spec/rpc/README.md +++ b/spec/rpc/README.md @@ -11,14 +11,14 @@ This file defines the JSON-RPC spec of CometBFT. This is meant to be implemented ## Support - | | [CometBFT](https://github.com/cometbft/cometbft/) | [Tendermint-Rs](https://github.com/informalsystems/tendermint-rs) | + | | [CometBFT](https://github.com/KYVENetwork/cometbft/v38/) | [Tendermint-Rs](https://github.com/informalsystems/tendermint-rs) | |--------------|:----------------------------------------------------------:|:----------------------------------------------------------------:| | JSON-RPC 2.0 | ✅ | ✅ | | HTTP | ✅ | ✅ | | HTTPS | ✅ | ❌ | | WS | ✅ | ✅ | - - | Routes | [CometBFT](https://github.com/cometbft/cometbft/) | [Tendermint-Rs](https://github.com/informalsystems/tendermint-rs) | + + | Routes | [CometBFT](https://github.com/KYVENetwork/cometbft/v38/) | [Tendermint-Rs](https://github.com/informalsystems/tendermint-rs) | |-----------------------------------------|:----------------------------------------------------------:|:-----------------------------------------------------------------:| | [Health](#health) | ✅ | ✅ | | [Status](#status) | ✅ | ✅ | @@ -144,7 +144,7 @@ curl -X POST https://localhost:26657 -d "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\ "validator_info": { "address": "38FB765D0092470989360ECA1C89CD06C2C1583C", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "Z+8kntVegi1sQiWLYwFSVLNWqdAUGEy7lskL78gxLZI=" }, "voting_power": "0" @@ -347,7 +347,7 @@ curl -X POST https://localhost:26657 -d "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\ "total_voting_power": 0, "validator": { "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "A6DoBUypNtUAyEHWtQ9bFjfNg8Bo9CrnkUGl6k6OHN4=" }, "voting_power": 0, @@ -460,7 +460,7 @@ curl -X POST https://localhost:26657 -d "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\ "total_voting_power": 0, "validator": { "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "A6DoBUypNtUAyEHWtQ9bFjfNg8Bo9CrnkUGl6k6OHN4=" }, "voting_power": 0, @@ -584,7 +584,7 @@ curl -X POST https://localhost:26657 -d "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\ "validator_updates": [ { "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "9tK9IT+FPdf2qm+5c2qaxi10sWP+3erWTKgftn2PaQM=" }, "power": "300" @@ -724,7 +724,7 @@ curl -X POST https://localhost:26657 -d "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\ { "address": "000001E443FD237E4B616E2FA69DF4EE3D49A94F", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "9tK9IT+FPdf2qm+5c2qaxi10sWP+3erWTKgftn2PaQM=" }, "voting_power": "239727", @@ -786,7 +786,7 @@ curl -X POST https://localhost:26657 -d "{\"jsonrpc\":\"2.0\",\"id\":1,\"method\ { "address": "B00A6323737F321EB0B8D59C6FD497A14B60938A", "pub_key": { - "type": "tendermint/PubKeyEd25519", + "type": "cometbft/v38/PubKeyEd25519", "value": "cOQZvh/h9ZioSeUMZB/1Vy1Xo5x2sjrVjlE/qHnYifM=" }, "power": "9328525", diff --git a/state/execution.go b/state/execution.go index e8e6b26b850..0ad1ec537b4 100644 --- a/state/execution.go +++ b/state/execution.go @@ -6,14 +6,14 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/fail" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/mempool" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/libs/fail" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/mempool" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + "github.com/KYVENetwork/cometbft/v38/types" ) //----------------------------------------------------------------------------- diff --git a/state/execution_test.go b/state/execution_test.go index 797bd8a5778..74411208304 100644 --- a/state/execution_test.go +++ b/state/execution_test.go @@ -3,6 +3,7 @@ package state_test import ( "context" "errors" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "testing" "time" @@ -12,26 +13,25 @@ import ( dbm "github.com/cometbft/cometbft-db" - abciclientmocks "github.com/cometbft/cometbft/abci/client/mocks" - abci "github.com/cometbft/cometbft/abci/types" - abcimocks "github.com/cometbft/cometbft/abci/types/mocks" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - mpmocks "github.com/cometbft/cometbft/mempool/mocks" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/proxy" - pmocks "github.com/cometbft/cometbft/proxy/mocks" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + abciclientmocks "github.com/KYVENetwork/cometbft/v38/abci/client/mocks" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + abcimocks "github.com/KYVENetwork/cometbft/v38/abci/types/mocks" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + mpmocks "github.com/KYVENetwork/cometbft/v38/mempool/mocks" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + pmocks "github.com/KYVENetwork/cometbft/v38/proxy/mocks" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/mocks" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" + "github.com/KYVENetwork/cometbft/v38/version" ) var ( diff --git a/state/export_test.go b/state/export_test.go index 62d51e19769..be42fc16e21 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -3,8 +3,8 @@ package state import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/types" ) // diff --git a/state/helpers_test.go b/state/helpers_test.go index f094b79ab85..555d98a3eb5 100644 --- a/state/helpers_test.go +++ b/state/helpers_test.go @@ -8,15 +8,15 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/internal/test" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) type paramsChangeTestCase struct { diff --git a/state/indexer/block.go b/state/indexer/block.go index 4044d2aaa7b..a6e214f1693 100644 --- a/state/indexer/block.go +++ b/state/indexer/block.go @@ -3,9 +3,9 @@ package indexer import ( "context" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/types" ) //go:generate ../../scripts/mockery_generate.sh BlockIndexer diff --git a/state/indexer/block/indexer.go b/state/indexer/block/indexer.go index b489e022daf..d6916f5c5a0 100644 --- a/state/indexer/block/indexer.go +++ b/state/indexer/block/indexer.go @@ -6,14 +6,14 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/state/indexer" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - blockidxnull "github.com/cometbft/cometbft/state/indexer/block/null" - "github.com/cometbft/cometbft/state/indexer/sink/psql" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/kv" - "github.com/cometbft/cometbft/state/txindex/null" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + blockidxkv "github.com/KYVENetwork/cometbft/v38/state/indexer/block/kv" + blockidxnull "github.com/KYVENetwork/cometbft/v38/state/indexer/block/null" + "github.com/KYVENetwork/cometbft/v38/state/indexer/sink/psql" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/state/txindex/kv" + "github.com/KYVENetwork/cometbft/v38/state/txindex/null" ) // EventSinksFromConfig constructs a slice of indexer.EventSink using the provided diff --git a/state/indexer/block/kv/kv.go b/state/indexer/block/kv/kv.go index 689758e5b60..21bcc258176 100644 --- a/state/indexer/block/kv/kv.go +++ b/state/indexer/block/kv/kv.go @@ -14,13 +14,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - idxutil "github.com/cometbft/cometbft/internal/indexer" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + idxutil "github.com/KYVENetwork/cometbft/v38/internal/indexer" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/types" ) var _ indexer.BlockIndexer = (*BlockerIndexer)(nil) diff --git a/state/indexer/block/kv/kv_test.go b/state/indexer/block/kv/kv_test.go index 2f4e3f085ac..c8348feaf4d 100644 --- a/state/indexer/block/kv/kv_test.go +++ b/state/indexer/block/kv/kv_test.go @@ -9,10 +9,10 @@ import ( db "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + blockidxkv "github.com/KYVENetwork/cometbft/v38/state/indexer/block/kv" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestBlockIndexer(t *testing.T) { diff --git a/state/indexer/block/kv/util.go b/state/indexer/block/kv/util.go index a20a0fd81e7..655cc2f556a 100644 --- a/state/indexer/block/kv/util.go +++ b/state/indexer/block/kv/util.go @@ -8,10 +8,10 @@ import ( "github.com/google/orderedcode" - idxutil "github.com/cometbft/cometbft/internal/indexer" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + idxutil "github.com/KYVENetwork/cometbft/v38/internal/indexer" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/types" ) type HeightInfo struct { diff --git a/state/indexer/block/null/null.go b/state/indexer/block/null/null.go index 0a62a4273e0..9002045b07b 100644 --- a/state/indexer/block/null/null.go +++ b/state/indexer/block/null/null.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/types" ) var _ indexer.BlockIndexer = (*BlockerIndexer)(nil) diff --git a/state/indexer/mocks/block_indexer.go b/state/indexer/mocks/block_indexer.go index 60ee57dc5f3..930e1b864fd 100644 --- a/state/indexer/mocks/block_indexer.go +++ b/state/indexer/mocks/block_indexer.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - log "github.com/cometbft/cometbft/libs/log" + log "github.com/KYVENetwork/cometbft/v38/libs/log" mock "github.com/stretchr/testify/mock" - query "github.com/cometbft/cometbft/libs/pubsub/query" + query "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // BlockIndexer is an autogenerated mock type for the BlockIndexer type diff --git a/state/indexer/query_range.go b/state/indexer/query_range.go index eb85b9bfee8..3485ddd3cc7 100644 --- a/state/indexer/query_range.go +++ b/state/indexer/query_range.go @@ -4,8 +4,8 @@ import ( "math/big" "time" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/types" ) // QueryRanges defines a mapping between a composite event key and a QueryRange. diff --git a/state/indexer/sink/psql/backport.go b/state/indexer/sink/psql/backport.go index 81a59ce1ffb..16fb16b23a0 100644 --- a/state/indexer/sink/psql/backport.go +++ b/state/indexer/sink/psql/backport.go @@ -17,12 +17,12 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/state/indexer/sink/psql/backport_test.go b/state/indexer/sink/psql/backport_test.go index d8ff29e808b..718822d738f 100644 --- a/state/indexer/sink/psql/backport_test.go +++ b/state/indexer/sink/psql/backport_test.go @@ -1,8 +1,8 @@ package psql import ( - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/txindex" ) var ( diff --git a/state/indexer/sink/psql/psql.go b/state/indexer/sink/psql/psql.go index e383c7aa289..b5049e88714 100644 --- a/state/indexer/sink/psql/psql.go +++ b/state/indexer/sink/psql/psql.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/gogoproto/proto" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/state/indexer/sink/psql/psql_test.go b/state/indexer/sink/psql/psql_test.go index 04bc704e84e..22767a613a8 100644 --- a/state/indexer/sink/psql/psql_test.go +++ b/state/indexer/sink/psql/psql_test.go @@ -18,10 +18,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - tmlog "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + tmlog "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/types" // Register the Postgres database driver. _ "github.com/lib/pq" diff --git a/state/mocks/block_store.go b/state/mocks/block_store.go index d7467eeb708..71fd2b59627 100644 --- a/state/mocks/block_store.go +++ b/state/mocks/block_store.go @@ -3,10 +3,10 @@ package mocks import ( - state "github.com/cometbft/cometbft/state" + state "github.com/KYVENetwork/cometbft/v38/state" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // BlockStore is an autogenerated mock type for the BlockStore type diff --git a/state/mocks/evidence_pool.go b/state/mocks/evidence_pool.go index b5a3a8ac14c..64dd19a9214 100644 --- a/state/mocks/evidence_pool.go +++ b/state/mocks/evidence_pool.go @@ -3,10 +3,10 @@ package mocks import ( - state "github.com/cometbft/cometbft/state" + state "github.com/KYVENetwork/cometbft/v38/state" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // EvidencePool is an autogenerated mock type for the EvidencePool type diff --git a/state/mocks/store.go b/state/mocks/store.go index 421a2dc812c..2d7fa27ab88 100644 --- a/state/mocks/store.go +++ b/state/mocks/store.go @@ -3,12 +3,12 @@ package mocks import ( - abcitypes "github.com/cometbft/cometbft/abci/types" + abcitypes "github.com/KYVENetwork/cometbft/v38/abci/types" mock "github.com/stretchr/testify/mock" - state "github.com/cometbft/cometbft/state" + state "github.com/KYVENetwork/cometbft/v38/state" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // Store is an autogenerated mock type for the Store type diff --git a/state/rollback.go b/state/rollback.go index 57ea0396820..5f50d6ee0d4 100644 --- a/state/rollback.go +++ b/state/rollback.go @@ -3,10 +3,10 @@ package state import ( "errors" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/version" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + cmtstate "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/version" ) // Rollback overwrites the current CometBFT state (height n) with the most diff --git a/state/rollback_test.go b/state/rollback_test.go index 46f1f94f78e..9577ddac5e4 100644 --- a/state/rollback_test.go +++ b/state/rollback_test.go @@ -2,6 +2,7 @@ package state_test import ( "crypto/rand" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "testing" "time" @@ -9,15 +10,14 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtstate "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/mocks" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) func TestRollback(t *testing.T) { diff --git a/state/services.go b/state/services.go index 280a945668f..b802487a249 100644 --- a/state/services.go +++ b/state/services.go @@ -1,7 +1,7 @@ package state import ( - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/types" ) //------------------------------------------------------ diff --git a/state/state.go b/state/state.go index 15fb8e5e62b..0b9e13b68cb 100644 --- a/state/state.go +++ b/state/state.go @@ -4,16 +4,16 @@ import ( "bytes" "errors" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/version" "os" "time" "github.com/cosmos/gogoproto/proto" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + cmtstate "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" + "github.com/KYVENetwork/cometbft/v38/version" ) // database keys diff --git a/state/state_test.go b/state/state_test.go index 69e5f33ae3c..77a7dcfb7b3 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -13,13 +13,13 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) // setupTestCase does setup common to all test cases. diff --git a/state/store.go b/state/store.go index cbcd20935e9..9cd58f45d46 100644 --- a/state/store.go +++ b/state/store.go @@ -9,12 +9,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtos "github.com/cometbft/cometbft/libs/os" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + cmtstate "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/state" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/state/store_test.go b/state/store_test.go index f90654ac02d..15a291f19c8 100644 --- a/state/store_test.go +++ b/state/store_test.go @@ -10,12 +10,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/internal/test" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtstate "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/state" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestStoreLoadValidators(t *testing.T) { diff --git a/state/tx_filter.go b/state/tx_filter.go index 337a7a5e7fd..37e24722ef9 100644 --- a/state/tx_filter.go +++ b/state/tx_filter.go @@ -1,8 +1,8 @@ package state import ( - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/types" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/types" ) // TxPreCheck returns a function to filter transactions before processing. diff --git a/state/tx_filter_test.go b/state/tx_filter_test.go index 4c5384720a6..4dc9a7d98fd 100644 --- a/state/tx_filter_test.go +++ b/state/tx_filter_test.go @@ -9,9 +9,9 @@ import ( dbm "github.com/cometbft/cometbft-db" - cmtrand "github.com/cometbft/cometbft/libs/rand" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestTxFilter(t *testing.T) { diff --git a/state/txindex/indexer.go b/state/txindex/indexer.go index 083e8288e5e..689f07e673e 100644 --- a/state/txindex/indexer.go +++ b/state/txindex/indexer.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" ) // XXX/TODO: These types should be moved to the indexer package. diff --git a/state/txindex/indexer_service.go b/state/txindex/indexer_service.go index 6d31b38d92e..9df685c4a19 100644 --- a/state/txindex/indexer_service.go +++ b/state/txindex/indexer_service.go @@ -3,9 +3,9 @@ package txindex import ( "context" - "github.com/cometbft/cometbft/libs/service" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/service" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/types" ) // XXX/TODO: These types should be moved to the indexer package. diff --git a/state/txindex/indexer_service_test.go b/state/txindex/indexer_service_test.go index 399cd728085..c8158011e50 100644 --- a/state/txindex/indexer_service_test.go +++ b/state/txindex/indexer_service_test.go @@ -8,12 +8,12 @@ import ( db "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - blockidxkv "github.com/cometbft/cometbft/state/indexer/block/kv" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/state/txindex/kv" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + blockidxkv "github.com/KYVENetwork/cometbft/v38/state/indexer/block/kv" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/state/txindex/kv" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestIndexerServiceIndexesBlocks(t *testing.T) { diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go index ec0d1096b70..97f3a5c827a 100644 --- a/state/txindex/kv/kv.go +++ b/state/txindex/kv/kv.go @@ -9,19 +9,19 @@ import ( "strconv" "strings" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" "github.com/cosmos/gogoproto/proto" dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - idxutil "github.com/cometbft/cometbft/internal/indexer" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + idxutil "github.com/KYVENetwork/cometbft/v38/internal/indexer" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/state/txindex/kv/kv_bench_test.go b/state/txindex/kv/kv_bench_test.go index 035948c2ce6..6c3df635941 100644 --- a/state/txindex/kv/kv_bench_test.go +++ b/state/txindex/kv/kv_bench_test.go @@ -9,9 +9,9 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/types" ) func BenchmarkTxSearch(b *testing.B) { diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go index ea8d4ea308b..7004fa1a4cf 100644 --- a/state/txindex/kv/kv_test.go +++ b/state/txindex/kv/kv_test.go @@ -12,11 +12,11 @@ import ( db "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - cmtrand "github.com/cometbft/cometbft/libs/rand" - "github.com/cometbft/cometbft/state/txindex" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + "github.com/KYVENetwork/cometbft/v38/state/txindex" + "github.com/KYVENetwork/cometbft/v38/types" ) func TestTxIndex(t *testing.T) { diff --git a/state/txindex/kv/utils.go b/state/txindex/kv/utils.go index 753b64e4d2a..837536ca28c 100644 --- a/state/txindex/kv/utils.go +++ b/state/txindex/kv/utils.go @@ -4,10 +4,10 @@ import ( "fmt" "math/big" - idxutil "github.com/cometbft/cometbft/internal/indexer" - cmtsyntax "github.com/cometbft/cometbft/libs/pubsub/query/syntax" - "github.com/cometbft/cometbft/state/indexer" - "github.com/cometbft/cometbft/types" + idxutil "github.com/KYVENetwork/cometbft/v38/internal/indexer" + cmtsyntax "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query/syntax" + "github.com/KYVENetwork/cometbft/v38/state/indexer" + "github.com/KYVENetwork/cometbft/v38/types" "github.com/google/orderedcode" ) diff --git a/state/txindex/mocks/tx_indexer.go b/state/txindex/mocks/tx_indexer.go index dcffdb3ab38..e10d056f4d3 100644 --- a/state/txindex/mocks/tx_indexer.go +++ b/state/txindex/mocks/tx_indexer.go @@ -5,14 +5,14 @@ package mocks import ( context "context" - log "github.com/cometbft/cometbft/libs/log" + log "github.com/KYVENetwork/cometbft/v38/libs/log" mock "github.com/stretchr/testify/mock" - query "github.com/cometbft/cometbft/libs/pubsub/query" + query "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" - txindex "github.com/cometbft/cometbft/state/txindex" + txindex "github.com/KYVENetwork/cometbft/v38/state/txindex" - types "github.com/cometbft/cometbft/abci/types" + types "github.com/KYVENetwork/cometbft/v38/abci/types" ) // TxIndexer is an autogenerated mock type for the TxIndexer type diff --git a/state/txindex/null/null.go b/state/txindex/null/null.go index 49338154c39..29d4a3d3a17 100644 --- a/state/txindex/null/null.go +++ b/state/txindex/null/null.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/pubsub/query" - "github.com/cometbft/cometbft/state/txindex" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" + "github.com/KYVENetwork/cometbft/v38/state/txindex" ) var _ txindex.TxIndexer = (*TxIndex)(nil) diff --git a/state/validation.go b/state/validation.go index 287aec31aaa..126cfe258a2 100644 --- a/state/validation.go +++ b/state/validation.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/types" ) //----------------------------------------------------- diff --git a/state/validation_test.go b/state/validation_test.go index b4efcd75989..e6274e6769d 100644 --- a/state/validation_test.go +++ b/state/validation_test.go @@ -10,18 +10,18 @@ import ( dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - "github.com/cometbft/cometbft/libs/log" - mpmocks "github.com/cometbft/cometbft/mempool/mocks" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/state/mocks" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/internal/test" + "github.com/KYVENetwork/cometbft/v38/libs/log" + mpmocks "github.com/KYVENetwork/cometbft/v38/mempool/mocks" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/state/mocks" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) const validationTestsStopHeight int64 = 10 diff --git a/statesync/chunks.go b/statesync/chunks.go index d392b708a1d..5aeaeed0897 100644 --- a/statesync/chunks.go +++ b/statesync/chunks.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" ) // errDone is returned by chunkQueue.Next() when all chunks have been returned. diff --git a/statesync/chunks_test.go b/statesync/chunks_test.go index 5c893c5233f..805a263d27a 100644 --- a/statesync/chunks_test.go +++ b/statesync/chunks_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/p2p" + "github.com/KYVENetwork/cometbft/v38/p2p" ) func setupChunkQueue(t *testing.T) (*chunkQueue, func()) { diff --git a/statesync/messages.go b/statesync/messages.go index eff6646106d..17e691fddde 100644 --- a/statesync/messages.go +++ b/statesync/messages.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/gogoproto/proto" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" + ssproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/statesync" ) const ( diff --git a/statesync/messages_test.go b/statesync/messages_test.go index 97a888aba01..705f30a6bb8 100644 --- a/statesync/messages_test.go +++ b/statesync/messages_test.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/p2p" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/p2p" + ssproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/statesync" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) func TestValidateMsg(t *testing.T) { diff --git a/statesync/mocks/state_provider.go b/statesync/mocks/state_provider.go index cbbe3c0b5a5..1ef2ce12ce7 100644 --- a/statesync/mocks/state_provider.go +++ b/statesync/mocks/state_provider.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - state "github.com/cometbft/cometbft/state" + state "github.com/KYVENetwork/cometbft/v38/state" mock "github.com/stretchr/testify/mock" - types "github.com/cometbft/cometbft/types" + types "github.com/KYVENetwork/cometbft/v38/types" ) // StateProvider is an autogenerated mock type for the StateProvider type diff --git a/statesync/reactor.go b/statesync/reactor.go index a7374a29182..c060b423eef 100644 --- a/statesync/reactor.go +++ b/statesync/reactor.go @@ -6,14 +6,14 @@ import ( "sort" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/config" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" + ssproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/statesync" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/statesync/reactor_test.go b/statesync/reactor_test.go index a057cb69781..6ee1fd1566f 100644 --- a/statesync/reactor_test.go +++ b/statesync/reactor_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - proxymocks "github.com/cometbft/cometbft/proxy/mocks" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v38/p2p/mocks" + ssproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/statesync" + proxymocks "github.com/KYVENetwork/cometbft/v38/proxy/mocks" ) func TestReactor_Receive_ChunkRequest(t *testing.T) { diff --git a/statesync/snapshots.go b/statesync/snapshots.go index 5d4f9fe4d34..4bcafe3006d 100644 --- a/statesync/snapshots.go +++ b/statesync/snapshots.go @@ -6,8 +6,8 @@ import ( "math/rand" "sort" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" ) // snapshotKey is a snapshot key used for lookups. diff --git a/statesync/snapshots_test.go b/statesync/snapshots_test.go index d2c52976662..0c1d7b6b499 100644 --- a/statesync/snapshots_test.go +++ b/statesync/snapshots_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" + "github.com/KYVENetwork/cometbft/v38/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v38/p2p/mocks" ) func TestSnapshot_Key(t *testing.T) { diff --git a/statesync/stateprovider.go b/statesync/stateprovider.go index 25bfcb39bfa..4a4fdee4c93 100644 --- a/statesync/stateprovider.go +++ b/statesync/stateprovider.go @@ -8,18 +8,18 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light" - lightprovider "github.com/cometbft/cometbft/light/provider" - lighthttp "github.com/cometbft/cometbft/light/provider/http" - lightrpc "github.com/cometbft/cometbft/light/rpc" - lightdb "github.com/cometbft/cometbft/light/store/db" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/light" + lightprovider "github.com/KYVENetwork/cometbft/v38/light/provider" + lighthttp "github.com/KYVENetwork/cometbft/v38/light/provider/http" + lightrpc "github.com/KYVENetwork/cometbft/v38/light/rpc" + lightdb "github.com/KYVENetwork/cometbft/v38/light/store/db" + cmtstate "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/state" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) //go:generate ../scripts/mockery_generate.sh StateProvider diff --git a/statesync/syncer.go b/statesync/syncer.go index 38bdedfd1b6..5f1602b485d 100644 --- a/statesync/syncer.go +++ b/statesync/syncer.go @@ -7,16 +7,16 @@ import ( "fmt" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/light" - "github.com/cometbft/cometbft/p2p" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - "github.com/cometbft/cometbft/proxy" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/light" + "github.com/KYVENetwork/cometbft/v38/p2p" + ssproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/statesync" + "github.com/KYVENetwork/cometbft/v38/proxy" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/statesync/syncer_test.go b/statesync/syncer_test.go index 4fbb47a2e13..a570a420301 100644 --- a/statesync/syncer_test.go +++ b/statesync/syncer_test.go @@ -2,6 +2,7 @@ package statesync import ( "errors" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "testing" "time" @@ -9,21 +10,20 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" - cmtsync "github.com/cometbft/cometbft/libs/sync" - "github.com/cometbft/cometbft/p2p" - p2pmocks "github.com/cometbft/cometbft/p2p/mocks" - cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - ssproto "github.com/cometbft/cometbft/proto/tendermint/statesync" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/proxy" - proxymocks "github.com/cometbft/cometbft/proxy/mocks" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/statesync/mocks" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + "github.com/KYVENetwork/cometbft/v38/p2p" + p2pmocks "github.com/KYVENetwork/cometbft/v38/p2p/mocks" + cmtstate "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/state" + ssproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/statesync" + "github.com/KYVENetwork/cometbft/v38/proxy" + proxymocks "github.com/KYVENetwork/cometbft/v38/proxy/mocks" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/statesync/mocks" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) const testAppVersion = 9 diff --git a/store/store.go b/store/store.go index 6fcede49693..d0e53ffa293 100644 --- a/store/store.go +++ b/store/store.go @@ -9,12 +9,12 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/evidence" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtstore "github.com/cometbft/cometbft/proto/tendermint/store" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/evidence" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + cmtstore "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/store" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" ) // Assuming the length of a block part is 64kB (`types.BlockPartSizeBytes`), diff --git a/store/store_test.go b/store/store_test.go index 63b6d5492ac..6f6860e3b88 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -3,6 +3,7 @@ package store import ( "encoding/json" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "os" "runtime/debug" "strings" @@ -15,15 +16,14 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/internal/test" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtstore "github.com/cometbft/cometbft/proto/tendermint/store" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - sm "github.com/cometbft/cometbft/state" - "github.com/cometbft/cometbft/types" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtstore "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/store" + sm "github.com/KYVENetwork/cometbft/v38/state" + "github.com/KYVENetwork/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" + "github.com/KYVENetwork/cometbft/v38/version" ) // A cleanupFunc cleans up any config / test files created for a particular diff --git a/test/app/grpc_client.go b/test/app/grpc_client.go index 5c7e2a1133a..e9bf5ff76b8 100644 --- a/test/app/grpc_client.go +++ b/test/app/grpc_client.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - cmtjson "github.com/cometbft/cometbft/libs/json" - coregrpc "github.com/cometbft/cometbft/rpc/grpc" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + coregrpc "github.com/KYVENetwork/cometbft/v38/rpc/grpc" ) var grpcAddr = "tcp://localhost:36656" diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go index 34489a892d3..748bcc9ac5a 100644 --- a/test/e2e/app/app.go +++ b/test/e2e/app/app.go @@ -15,16 +15,16 @@ import ( "strings" "time" - "github.com/cometbft/cometbft/abci/example/kvstore" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/libs/protoio" - cryptoproto "github.com/cometbft/cometbft/proto/tendermint/crypto" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttypes "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + cryptoproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/crypto" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + cmttypes "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) const ( diff --git a/test/e2e/app/snapshots.go b/test/e2e/app/snapshots.go index 79a223a4694..40ccc4bf46b 100644 --- a/test/e2e/app/snapshots.go +++ b/test/e2e/app/snapshots.go @@ -9,7 +9,7 @@ import ( "path/filepath" "sync" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" ) const ( diff --git a/test/e2e/generator/generate.go b/test/e2e/generator/generate.go index 7fecbe726df..3ee6e4bf62e 100644 --- a/test/e2e/generator/generate.go +++ b/test/e2e/generator/generate.go @@ -9,9 +9,9 @@ import ( "strings" "time" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/version" "github.com/Masterminds/semver/v3" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/version" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/test/e2e/generator/generate_test.go b/test/e2e/generator/generate_test.go index 670f701e4b3..d46edeceb24 100644 --- a/test/e2e/generator/generate_test.go +++ b/test/e2e/generator/generate_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" ) // TestGenerator tests that only valid manifests are generated diff --git a/test/e2e/generator/main.go b/test/e2e/generator/main.go index f4f8140c0c1..795a967ff87 100644 --- a/test/e2e/generator/main.go +++ b/test/e2e/generator/main.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" + "github.com/KYVENetwork/cometbft/v38/libs/log" ) const ( diff --git a/test/e2e/node/config.go b/test/e2e/node/config.go index f06ddc80d3d..0a4d949f851 100644 --- a/test/e2e/node/config.go +++ b/test/e2e/node/config.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" - "github.com/cometbft/cometbft/test/e2e/app" + "github.com/KYVENetwork/cometbft/v38/test/e2e/app" ) // Config is the application configuration. diff --git a/test/e2e/node/main.go b/test/e2e/node/main.go index b6451e493be..9c9e93b5072 100644 --- a/test/e2e/node/main.go +++ b/test/e2e/node/main.go @@ -12,23 +12,23 @@ import ( "github.com/spf13/viper" - "github.com/cometbft/cometbft/abci/server" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtflags "github.com/cometbft/cometbft/libs/cli/flags" - "github.com/cometbft/cometbft/libs/log" - cmtnet "github.com/cometbft/cometbft/libs/net" - "github.com/cometbft/cometbft/light" - lproxy "github.com/cometbft/cometbft/light/proxy" - lrpc "github.com/cometbft/cometbft/light/rpc" - dbs "github.com/cometbft/cometbft/light/store/db" - "github.com/cometbft/cometbft/node" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - "github.com/cometbft/cometbft/proxy" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - "github.com/cometbft/cometbft/test/e2e/app" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/abci/server" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtflags "github.com/KYVENetwork/cometbft/v38/libs/cli/flags" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtnet "github.com/KYVENetwork/cometbft/v38/libs/net" + "github.com/KYVENetwork/cometbft/v38/light" + lproxy "github.com/KYVENetwork/cometbft/v38/light/proxy" + lrpc "github.com/KYVENetwork/cometbft/v38/light/rpc" + dbs "github.com/KYVENetwork/cometbft/v38/light/store/db" + "github.com/KYVENetwork/cometbft/v38/node" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/privval" + "github.com/KYVENetwork/cometbft/v38/proxy" + rpcserver "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" + "github.com/KYVENetwork/cometbft/v38/test/e2e/app" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" ) var logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout)) diff --git a/test/e2e/pkg/infra/digitalocean/digitalocean.go b/test/e2e/pkg/infra/digitalocean/digitalocean.go index f30a11664bf..e3c5711eccf 100644 --- a/test/e2e/pkg/infra/digitalocean/digitalocean.go +++ b/test/e2e/pkg/infra/digitalocean/digitalocean.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strings" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/exec" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra" ) var _ infra.Provider = (*Provider)(nil) diff --git a/test/e2e/pkg/infra/docker/docker.go b/test/e2e/pkg/infra/docker/docker.go index 660b400309d..db1e24a6502 100644 --- a/test/e2e/pkg/infra/docker/docker.go +++ b/test/e2e/pkg/infra/docker/docker.go @@ -7,9 +7,9 @@ import ( "path/filepath" "text/template" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/exec" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra" ) var _ infra.Provider = (*Provider)(nil) diff --git a/test/e2e/pkg/infra/provider.go b/test/e2e/pkg/infra/provider.go index de9077282f9..faf789be838 100644 --- a/test/e2e/pkg/infra/provider.go +++ b/test/e2e/pkg/infra/provider.go @@ -3,7 +3,7 @@ package infra import ( "context" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" ) // Provider defines an API for manipulating the infrastructure of a diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go index 683825a603f..aa14371bd72 100644 --- a/test/e2e/pkg/testnet.go +++ b/test/e2e/pkg/testnet.go @@ -14,11 +14,11 @@ import ( "text/template" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/secp256k1" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/secp256k1" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + "github.com/KYVENetwork/cometbft/v38/types" _ "embed" ) diff --git a/test/e2e/runner/benchmark.go b/test/e2e/runner/benchmark.go index bd671fc4f58..b75fb3237b7 100644 --- a/test/e2e/runner/benchmark.go +++ b/test/e2e/runner/benchmark.go @@ -8,8 +8,8 @@ import ( "path/filepath" "time" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/types" ) // Benchmark is a simple function for fetching, calculating and printing diff --git a/test/e2e/runner/cleanup.go b/test/e2e/runner/cleanup.go index 852612312be..7cd9236b36e 100644 --- a/test/e2e/runner/cleanup.go +++ b/test/e2e/runner/cleanup.go @@ -7,10 +7,10 @@ import ( "os" "path/filepath" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/docker" + "github.com/KYVENetwork/cometbft/v38/libs/log" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/exec" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra/docker" ) // Cleanup removes the Docker Compose containers and testnet directory. diff --git a/test/e2e/runner/evidence.go b/test/e2e/runner/evidence.go index 9cc446761ed..0ed1dae0c46 100644 --- a/test/e2e/runner/evidence.go +++ b/test/e2e/runner/evidence.go @@ -5,21 +5,21 @@ import ( "context" "errors" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "math/rand" "os" "path/filepath" "time" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/internal/test" - cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/privval" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/internal/test" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + "github.com/KYVENetwork/cometbft/v38/privval" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) // 1 in 4 evidence is light client evidence, the rest is duplicate vote evidence diff --git a/test/e2e/runner/load.go b/test/e2e/runner/load.go index bd7744dfc91..de2deca27f3 100644 --- a/test/e2e/runner/load.go +++ b/test/e2e/runner/load.go @@ -7,11 +7,11 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/log" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/loadtime/payload" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v38/types" "github.com/google/uuid" ) diff --git a/test/e2e/runner/main.go b/test/e2e/runner/main.go index 23c14a1833d..6010e73f104 100644 --- a/test/e2e/runner/main.go +++ b/test/e2e/runner/main.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/cobra" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/digitalocean" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/docker" + "github.com/KYVENetwork/cometbft/v38/libs/log" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra/digitalocean" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra/docker" ) const randomSeed = 2308084734268 @@ -302,7 +302,7 @@ func NewCLI() *CLI { Min Block Interval Max Block Interval over a 100 block sampling period. - + Does not run any perturbations. `, RunE: func(cmd *cobra.Command, args []string) error { diff --git a/test/e2e/runner/perturb.go b/test/e2e/runner/perturb.go index db8de63de0b..db5da61fd96 100644 --- a/test/e2e/runner/perturb.go +++ b/test/e2e/runner/perturb.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/log" - rpctypes "github.com/cometbft/cometbft/rpc/core/types" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra/docker" + "github.com/KYVENetwork/cometbft/v38/libs/log" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra/docker" ) // Perturbs a running testnet. diff --git a/test/e2e/runner/rpc.go b/test/e2e/runner/rpc.go index f6f17384230..8368d1c09a9 100644 --- a/test/e2e/runner/rpc.go +++ b/test/e2e/runner/rpc.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpctypes "github.com/cometbft/cometbft/rpc/core/types" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/types" ) // waitForHeight waits for the network to reach a certain height (or above), diff --git a/test/e2e/runner/setup.go b/test/e2e/runner/setup.go index 5fc25fd65d9..b22f386ee89 100644 --- a/test/e2e/runner/setup.go +++ b/test/e2e/runner/setup.go @@ -15,14 +15,14 @@ import ( "github.com/BurntSushi/toml" - "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/p2p" - "github.com/cometbft/cometbft/privval" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/config" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/log" + "github.com/KYVENetwork/cometbft/v38/p2p" + "github.com/KYVENetwork/cometbft/v38/privval" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra" + "github.com/KYVENetwork/cometbft/v38/types" ) const ( diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go index 7a223aa33cb..f4ec46cd1e4 100644 --- a/test/e2e/runner/start.go +++ b/test/e2e/runner/start.go @@ -6,9 +6,9 @@ import ( "sort" "time" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/infra" + "github.com/KYVENetwork/cometbft/v38/libs/log" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/infra" ) func Start(ctx context.Context, testnet *e2e.Testnet, p infra.Provider) error { diff --git a/test/e2e/runner/test.go b/test/e2e/runner/test.go index cea4441ee43..7131f4cc1ac 100644 --- a/test/e2e/runner/test.go +++ b/test/e2e/runner/test.go @@ -4,8 +4,8 @@ import ( "context" "os" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/test/e2e/pkg/exec" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg/exec" ) // Test runs test cases under tests/ diff --git a/test/e2e/runner/wait.go b/test/e2e/runner/wait.go index 6defc0ee670..5842cb4a3d2 100644 --- a/test/e2e/runner/wait.go +++ b/test/e2e/runner/wait.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/cometbft/cometbft/libs/log" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/libs/log" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" ) // Wait waits for a number of blocks to be produced, and for all nodes to catch diff --git a/test/e2e/tests/app_test.go b/test/e2e/tests/app_test.go index d4f0f91561e..abf265a5a33 100644 --- a/test/e2e/tests/app_test.go +++ b/test/e2e/tests/app_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/types" ) // Tests that any initial state given in genesis has made it into the app. diff --git a/test/e2e/tests/block_test.go b/test/e2e/tests/block_test.go index e76e622eb11..f2b768b639e 100644 --- a/test/e2e/tests/block_test.go +++ b/test/e2e/tests/block_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" ) // Tests that block headers are identical across nodes where present. diff --git a/test/e2e/tests/e2e_test.go b/test/e2e/tests/e2e_test.go index 536d4014fc0..729ae5f3ad5 100644 --- a/test/e2e/tests/e2e_test.go +++ b/test/e2e/tests/e2e_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - rpchttp "github.com/cometbft/cometbft/rpc/client/http" - rpctypes "github.com/cometbft/cometbft/rpc/core/types" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + rpchttp "github.com/KYVENetwork/cometbft/v38/rpc/client/http" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/core/types" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/types" ) func init() { diff --git a/test/e2e/tests/net_test.go b/test/e2e/tests/net_test.go index ab1d6705c63..41d1678caff 100644 --- a/test/e2e/tests/net_test.go +++ b/test/e2e/tests/net_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" ) // Tests that all nodes have peered with each other, regardless of discovery method. diff --git a/test/e2e/tests/validator_test.go b/test/e2e/tests/validator_test.go index c13c775846f..f379591a002 100644 --- a/test/e2e/tests/validator_test.go +++ b/test/e2e/tests/validator_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - e2e "github.com/cometbft/cometbft/test/e2e/pkg" - "github.com/cometbft/cometbft/types" + e2e "github.com/KYVENetwork/cometbft/v38/test/e2e/pkg" + "github.com/KYVENetwork/cometbft/v38/types" ) // Tests that validator sets are available and correct according to diff --git a/test/fuzz/mempool/checktx.go b/test/fuzz/mempool/checktx.go index 79865f8fcc3..537344cefa9 100644 --- a/test/fuzz/mempool/checktx.go +++ b/test/fuzz/mempool/checktx.go @@ -1,10 +1,10 @@ package reactor import ( - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/config" - mempl "github.com/cometbft/cometbft/mempool" - "github.com/cometbft/cometbft/proxy" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/config" + mempl "github.com/KYVENetwork/cometbft/v38/mempool" + "github.com/KYVENetwork/cometbft/v38/proxy" ) var mempool mempl.Mempool diff --git a/test/fuzz/mempool/fuzz_test.go b/test/fuzz/mempool/fuzz_test.go index 215703206cb..4980873a248 100644 --- a/test/fuzz/mempool/fuzz_test.go +++ b/test/fuzz/mempool/fuzz_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - mempl "github.com/cometbft/cometbft/test/fuzz/mempool" + mempl "github.com/KYVENetwork/cometbft/v38/test/fuzz/mempool" ) const testdataCasesDir = "testdata/cases" diff --git a/test/fuzz/tests/mempool_test.go b/test/fuzz/tests/mempool_test.go index a1b08d83577..66d26b1abd1 100644 --- a/test/fuzz/tests/mempool_test.go +++ b/test/fuzz/tests/mempool_test.go @@ -5,11 +5,11 @@ package tests import ( "testing" - abciclient "github.com/cometbft/cometbft/abci/client" - "github.com/cometbft/cometbft/abci/example/kvstore" - "github.com/cometbft/cometbft/config" - cmtsync "github.com/cometbft/cometbft/libs/sync" - mempool "github.com/cometbft/cometbft/mempool" + abciclient "github.com/KYVENetwork/cometbft/v38/abci/client" + "github.com/KYVENetwork/cometbft/v38/abci/example/kvstore" + "github.com/KYVENetwork/cometbft/v38/config" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + mempool "github.com/KYVENetwork/cometbft/v38/mempool" ) func FuzzMempool(f *testing.F) { diff --git a/test/fuzz/tests/p2p_secretconnection_test.go b/test/fuzz/tests/p2p_secretconnection_test.go index f16ce964a99..6bcf3e30fc4 100644 --- a/test/fuzz/tests/p2p_secretconnection_test.go +++ b/test/fuzz/tests/p2p_secretconnection_test.go @@ -9,9 +9,9 @@ import ( "log" "testing" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/libs/async" - sc "github.com/cometbft/cometbft/p2p/conn" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/libs/async" + sc "github.com/KYVENetwork/cometbft/v38/p2p/conn" ) func FuzzP2PSecretConnection(f *testing.F) { diff --git a/test/fuzz/tests/rpc_jsonrpc_server_test.go b/test/fuzz/tests/rpc_jsonrpc_server_test.go index 846ab2db9ae..9a303a4cd5b 100644 --- a/test/fuzz/tests/rpc_jsonrpc_server_test.go +++ b/test/fuzz/tests/rpc_jsonrpc_server_test.go @@ -10,9 +10,9 @@ import ( "net/http/httptest" "testing" - "github.com/cometbft/cometbft/libs/log" - rpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" - rpctypes "github.com/cometbft/cometbft/rpc/jsonrpc/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + rpcserver "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/server" + rpctypes "github.com/KYVENetwork/cometbft/v38/rpc/jsonrpc/types" ) func FuzzRPCJSONRPCServer(f *testing.F) { diff --git a/test/loadtime/Makefile b/test/loadtime/Makefile index 1b2eb45a2f3..41274e37044 100644 --- a/test/loadtime/Makefile +++ b/test/loadtime/Makefile @@ -1,4 +1,4 @@ -GOMOD="github.com/cometbft/cometbft/test/loadtime" +GOMOD="github.com/KYVENetwork/cometbft/v38/test/loadtime" OUTPUT?=build/ build: diff --git a/test/loadtime/cmd/load/main.go b/test/loadtime/cmd/load/main.go index d6bb798bc1d..8f4ec059f95 100644 --- a/test/loadtime/cmd/load/main.go +++ b/test/loadtime/cmd/load/main.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/informalsystems/tm-load-test/pkg/loadtest" - "github.com/cometbft/cometbft/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v38/test/loadtime/payload" ) // Ensure all of the interfaces are correctly satisfied. diff --git a/test/loadtime/cmd/report/main.go b/test/loadtime/cmd/report/main.go index 4b00f6adb72..92952dc9e4e 100644 --- a/test/loadtime/cmd/report/main.go +++ b/test/loadtime/cmd/report/main.go @@ -11,8 +11,8 @@ import ( dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/store" - "github.com/cometbft/cometbft/test/loadtime/report" + "github.com/KYVENetwork/cometbft/v38/store" + "github.com/KYVENetwork/cometbft/v38/test/loadtime/report" ) var ( diff --git a/test/loadtime/payload/payload.proto b/test/loadtime/payload/payload.proto index 59438a058c4..fb0806b33de 100644 --- a/test/loadtime/payload/payload.proto +++ b/test/loadtime/payload/payload.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package loadtime.payload; -option go_package = "github.com/cometbft/cometbft/test/loadtime/payload"; +option go_package = "github.com/KYVENetwork/cometbft/v38/test/loadtime/payload"; import "google/protobuf/timestamp.proto"; diff --git a/test/loadtime/payload/payload_test.go b/test/loadtime/payload/payload_test.go index 62ea3919f79..e871d49a486 100644 --- a/test/loadtime/payload/payload_test.go +++ b/test/loadtime/payload/payload_test.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" - "github.com/cometbft/cometbft/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v38/test/loadtime/payload" ) const payloadSizeTarget = 1024 // 1kb diff --git a/test/loadtime/report/report.go b/test/loadtime/report/report.go index 32ee960f915..0cd04b7b6f8 100644 --- a/test/loadtime/report/report.go +++ b/test/loadtime/report/report.go @@ -9,8 +9,8 @@ import ( "github.com/gofrs/uuid" "gonum.org/v1/gonum/stat" - "github.com/cometbft/cometbft/test/loadtime/payload" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v38/types" ) // BlockStore defines the set of methods needed by the report generator from diff --git a/test/loadtime/report/report_test.go b/test/loadtime/report/report_test.go index a8525b42723..03d2f445eed 100644 --- a/test/loadtime/report/report_test.go +++ b/test/loadtime/report/report_test.go @@ -7,9 +7,9 @@ import ( "github.com/google/uuid" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/cometbft/cometbft/test/loadtime/payload" - "github.com/cometbft/cometbft/test/loadtime/report" - "github.com/cometbft/cometbft/types" + "github.com/KYVENetwork/cometbft/v38/test/loadtime/payload" + "github.com/KYVENetwork/cometbft/v38/test/loadtime/report" + "github.com/KYVENetwork/cometbft/v38/types" ) type mockBlockStore struct { diff --git a/test/test_cover.sh b/test/test_cover.sh index 5e13cbba24a..56711eff345 100644 --- a/test/test_cover.sh +++ b/test/test_cover.sh @@ -1,6 +1,6 @@ #! /bin/bash -PKGS=$(go list github.com/cometbft/cometbft/...) +PKGS=$(go list github.com/KYVENetwork/cometbft/v38/...) set -e diff --git a/types/block.go b/types/block.go index 82d0fa4d989..c5087783125 100644 --- a/types/block.go +++ b/types/block.go @@ -4,22 +4,22 @@ import ( "bytes" "errors" "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/version" "strings" "time" "github.com/cosmos/gogoproto/proto" gogotypes "github.com/cosmos/gogoproto/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bits" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) const ( @@ -320,7 +320,7 @@ func MaxDataBytesNoEvidence(maxBytes int64, valsCount int) int64 { // NOTE: changes to the Header should be duplicated in: // - header.Hash() // - abci.Header -// - https://github.com/cometbft/cometbft/blob/v0.38.x/spec/blockchain/blockchain.md +// - https://github.com/KYVENetwork/cometbft/v38/blob/v0.38.x/spec/blockchain/blockchain.md type Header struct { // basic block info Version cmtversion.Consensus `json:"version"` diff --git a/types/block_meta.go b/types/block_meta.go index d66cc8f36cd..423852c63f8 100644 --- a/types/block_meta.go +++ b/types/block_meta.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) // BlockMeta contains meta information. diff --git a/types/block_meta_test.go b/types/block_meta_test.go index b557f284a50..57680f9c971 100644 --- a/types/block_meta_test.go +++ b/types/block_meta_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) func TestBlockMeta_ToProto(t *testing.T) { diff --git a/types/block_test.go b/types/block_test.go index f9c97a7e840..156292f1b31 100644 --- a/types/block_test.go +++ b/types/block_test.go @@ -6,6 +6,7 @@ import ( "crypto/rand" "encoding/hex" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "math" "os" "reflect" @@ -16,16 +17,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/bits" - "github.com/cometbft/cometbft/libs/bytes" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - cmttime "github.com/cometbft/cometbft/types/time" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" + "github.com/KYVENetwork/cometbft/v38/version" ) func TestMain(m *testing.M) { diff --git a/types/canonical.go b/types/canonical.go index 64f4bac2b04..323d11600ae 100644 --- a/types/canonical.go +++ b/types/canonical.go @@ -3,8 +3,8 @@ package types import ( "time" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) // Canonical* wraps the structs in types for amino encoding them for use in SignBytes / the Signable interface. diff --git a/types/canonical_test.go b/types/canonical_test.go index 1dc439f5856..964f2079434 100644 --- a/types/canonical_test.go +++ b/types/canonical_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) func TestCanonicalizeBlockID(t *testing.T) { diff --git a/types/encoding_helper.go b/types/encoding_helper.go index 3590ac9a252..8d87aedf250 100644 --- a/types/encoding_helper.go +++ b/types/encoding_helper.go @@ -3,7 +3,7 @@ package types import ( gogotypes "github.com/cosmos/gogoproto/types" - "github.com/cometbft/cometbft/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/bytes" ) // cdcEncode returns nil if the input is nil, otherwise returns diff --git a/types/event_bus.go b/types/event_bus.go index 0abb87aa51f..c6564b21958 100644 --- a/types/event_bus.go +++ b/types/event_bus.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - "github.com/cometbft/cometbft/libs/service" + "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/libs/log" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + "github.com/KYVENetwork/cometbft/v38/libs/service" ) const defaultCapacity = 0 diff --git a/types/event_bus_test.go b/types/event_bus_test.go index de9e61ed285..a22cafe976d 100644 --- a/types/event_bus_test.go +++ b/types/event_bus_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" ) func TestEventBusPublishEventTx(t *testing.T) { diff --git a/types/events.go b/types/events.go index 3dbf9a78db6..b9b84351c0f 100644 --- a/types/events.go +++ b/types/events.go @@ -3,10 +3,10 @@ package types import ( "fmt" - abci "github.com/cometbft/cometbft/abci/types" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtpubsub "github.com/cometbft/cometbft/libs/pubsub" - cmtquery "github.com/cometbft/cometbft/libs/pubsub/query" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtpubsub "github.com/KYVENetwork/cometbft/v38/libs/pubsub" + cmtquery "github.com/KYVENetwork/cometbft/v38/libs/pubsub/query" ) // Reserved event types (alphabetically sorted). @@ -47,17 +47,17 @@ type TMEventData interface { } func init() { - cmtjson.RegisterType(EventDataNewBlock{}, "tendermint/event/NewBlock") - cmtjson.RegisterType(EventDataNewBlockHeader{}, "tendermint/event/NewBlockHeader") - cmtjson.RegisterType(EventDataNewBlockEvents{}, "tendermint/event/NewBlockEvents") - cmtjson.RegisterType(EventDataNewEvidence{}, "tendermint/event/NewEvidence") - cmtjson.RegisterType(EventDataTx{}, "tendermint/event/Tx") - cmtjson.RegisterType(EventDataRoundState{}, "tendermint/event/RoundState") - cmtjson.RegisterType(EventDataNewRound{}, "tendermint/event/NewRound") - cmtjson.RegisterType(EventDataCompleteProposal{}, "tendermint/event/CompleteProposal") - cmtjson.RegisterType(EventDataVote{}, "tendermint/event/Vote") - cmtjson.RegisterType(EventDataValidatorSetUpdates{}, "tendermint/event/ValidatorSetUpdates") - cmtjson.RegisterType(EventDataString(""), "tendermint/event/ProposalString") + cmtjson.RegisterType(EventDataNewBlock{}, "cometbft/v38/event/NewBlock") + cmtjson.RegisterType(EventDataNewBlockHeader{}, "cometbft/v38/event/NewBlockHeader") + cmtjson.RegisterType(EventDataNewBlockEvents{}, "cometbft/v38/event/NewBlockEvents") + cmtjson.RegisterType(EventDataNewEvidence{}, "cometbft/v38/event/NewEvidence") + cmtjson.RegisterType(EventDataTx{}, "cometbft/v38/event/Tx") + cmtjson.RegisterType(EventDataRoundState{}, "cometbft/v38/event/RoundState") + cmtjson.RegisterType(EventDataNewRound{}, "cometbft/v38/event/NewRound") + cmtjson.RegisterType(EventDataCompleteProposal{}, "cometbft/v38/event/CompleteProposal") + cmtjson.RegisterType(EventDataVote{}, "cometbft/v38/event/Vote") + cmtjson.RegisterType(EventDataValidatorSetUpdates{}, "cometbft/v38/event/ValidatorSetUpdates") + cmtjson.RegisterType(EventDataString(""), "cometbft/v38/event/ProposalString") } // Most event messages are basic types (a block, a transaction) diff --git a/types/evidence.go b/types/evidence.go index c849b3ecbe3..66ba696a3ee 100644 --- a/types/evidence.go +++ b/types/evidence.go @@ -9,12 +9,12 @@ import ( "strings" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) // Evidence represents any provable malicious activity by a validator. @@ -337,10 +337,10 @@ func (l *LightClientAttackEvidence) Height() int64 { // String returns a string representation of LightClientAttackEvidence func (l *LightClientAttackEvidence) String() string { return fmt.Sprintf(`LightClientAttackEvidence{ - ConflictingBlock: %v, - CommonHeight: %d, - ByzatineValidators: %v, - TotalVotingPower: %d, + ConflictingBlock: %v, + CommonHeight: %d, + ByzatineValidators: %v, + TotalVotingPower: %d, Timestamp: %v}#%X`, l.ConflictingBlock.String(), l.CommonHeight, l.ByzantineValidators, l.TotalVotingPower, l.Timestamp, l.Hash()) @@ -540,8 +540,8 @@ func EvidenceFromProto(evidence *cmtproto.Evidence) (Evidence, error) { } func init() { - cmtjson.RegisterType(&DuplicateVoteEvidence{}, "tendermint/DuplicateVoteEvidence") - cmtjson.RegisterType(&LightClientAttackEvidence{}, "tendermint/LightClientAttackEvidence") + cmtjson.RegisterType(&DuplicateVoteEvidence{}, "cometbft/v38/DuplicateVoteEvidence") + cmtjson.RegisterType(&LightClientAttackEvidence{}, "cometbft/v38/LightClientAttackEvidence") } //-------------------------------------------- ERRORS -------------------------------------- diff --git a/types/evidence_test.go b/types/evidence_test.go index 89968c248eb..414e17d3220 100644 --- a/types/evidence_test.go +++ b/types/evidence_test.go @@ -1,6 +1,7 @@ package types import ( + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "math" "testing" "time" @@ -8,12 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" ) var defaultVoteTime = time.Date(2019, 1, 1, 0, 0, 0, 0, time.UTC) diff --git a/types/genesis.go b/types/genesis.go index d6d0b2afaa4..8096c61e72e 100644 --- a/types/genesis.go +++ b/types/genesis.go @@ -8,11 +8,11 @@ import ( "os" "time" - "github.com/cometbft/cometbft/crypto" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtos "github.com/cometbft/cometbft/libs/os" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtos "github.com/KYVENetwork/cometbft/v38/libs/os" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) const ( diff --git a/types/genesis_test.go b/types/genesis_test.go index 65dcf0bc44e..b821ca40e66 100644 --- a/types/genesis_test.go +++ b/types/genesis_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) func TestGenesisBad(t *testing.T) { @@ -28,7 +28,7 @@ func TestGenesisBad(t *testing.T) { []byte( `{"validators":[` + `{"pub_key":{` + - `"type":"tendermint/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="` + + `"type":"cometbft/v38/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="` + `},"power":"10","name":""}` + `]}`, ), @@ -36,7 +36,7 @@ func TestGenesisBad(t *testing.T) { []byte( `{"chain_id": "Lorem ipsum dolor sit amet, consectetuer adipiscing", "validators": [` + `{"pub_key":{` + - `"type":"tendermint/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="` + + `"type":"cometbft/v38/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="` + `},"power":"10","name":""}` + `]}`, ), @@ -44,7 +44,7 @@ func TestGenesisBad(t *testing.T) { []byte( `{"chain_id":"mychain", "validators":[` + `{"address": "A", "pub_key":{` + - `"type":"tendermint/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="` + + `"type":"cometbft/v38/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="` + `},"power":"10","name":""}` + `]}`, ), @@ -65,7 +65,7 @@ func TestGenesisGood(t *testing.T) { "initial_height": "1000", "consensus_params": null, "validators": [{ - "pub_key":{"type":"tendermint/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="}, + "pub_key":{"type":"cometbft/v38/PubKeyEd25519","value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="}, "power":"10", "name":"" }], diff --git a/types/light.go b/types/light.go index e3ef1f63db5..3f86247d859 100644 --- a/types/light.go +++ b/types/light.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) // LightBlock is a SignedHeader and a ValidatorSet. diff --git a/types/light_test.go b/types/light_test.go index 82af25277f1..1d8070dac47 100644 --- a/types/light_test.go +++ b/types/light_test.go @@ -1,15 +1,15 @@ package types import ( + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/v38/version" "math" "testing" "time" "github.com/stretchr/testify/assert" - "github.com/cometbft/cometbft/crypto" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/version" ) func TestLightBlockValidateBasic(t *testing.T) { diff --git a/types/params.go b/types/params.go index 81bfa5aa2bc..5fbeb0b97bc 100644 --- a/types/params.go +++ b/types/params.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/secp256k1" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/secp256k1" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) const ( diff --git a/types/params_test.go b/types/params_test.go index f3e758237c9..9548bf4149e 100644 --- a/types/params_test.go +++ b/types/params_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) var ( diff --git a/types/part_set.go b/types/part_set.go index 87a81f1c6bc..875dde06688 100644 --- a/types/part_set.go +++ b/types/part_set.go @@ -6,13 +6,13 @@ import ( "fmt" "io" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/libs/bits" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) var ( diff --git a/types/part_set_test.go b/types/part_set_test.go index 260618dab1d..7786b45c7ae 100644 --- a/types/part_set_test.go +++ b/types/part_set_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/merkle" - cmtrand "github.com/cometbft/cometbft/libs/rand" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" ) const ( diff --git a/types/priv_validator.go b/types/priv_validator.go index 340794d00c5..baaac25eb5b 100644 --- a/types/priv_validator.go +++ b/types/priv_validator.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) // PrivValidator defines the functionality of a local CometBFT validator diff --git a/types/proposal.go b/types/proposal.go index 9bae5e4efa4..6b5ab40e872 100644 --- a/types/proposal.go +++ b/types/proposal.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/protoio" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) var ( diff --git a/types/proposal_test.go b/types/proposal_test.go index 0e7f574c4ac..7909597b55a 100644 --- a/types/proposal_test.go +++ b/types/proposal_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/protoio" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) var ( diff --git a/types/protobuf.go b/types/protobuf.go index 4393f571c6e..956d72386e5 100644 --- a/types/protobuf.go +++ b/types/protobuf.go @@ -1,10 +1,10 @@ package types import ( - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) //------------------------------------------------------- diff --git a/types/protobuf_test.go b/types/protobuf_test.go index 73a2c02a16b..3dd296afa5c 100644 --- a/types/protobuf_test.go +++ b/types/protobuf_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cryptoenc "github.com/cometbft/cometbft/crypto/encoding" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cryptoenc "github.com/KYVENetwork/cometbft/v38/crypto/encoding" ) func TestABCIPubKey(t *testing.T) { diff --git a/types/results.go b/types/results.go index 2c6728a6d3e..f1bf1e748fa 100644 --- a/types/results.go +++ b/types/results.go @@ -1,8 +1,8 @@ package types import ( - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/merkle" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" ) // ABCIResults wraps the deliver tx results to return a proof. diff --git a/types/results_test.go b/types/results_test.go index bf3db01ecaa..96c05022b4e 100644 --- a/types/results_test.go +++ b/types/results_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" + abci "github.com/KYVENetwork/cometbft/v38/abci/types" ) func TestABCIResults(t *testing.T) { diff --git a/types/signable.go b/types/signable.go index 8ba2e6599a1..ba6514f86f7 100644 --- a/types/signable.go +++ b/types/signable.go @@ -1,8 +1,8 @@ package types import ( - "github.com/cometbft/cometbft/crypto/ed25519" - cmtmath "github.com/cometbft/cometbft/libs/math" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" ) var ( diff --git a/types/signed_msg_type.go b/types/signed_msg_type.go index e8daccbb1b3..d4d1ad86053 100644 --- a/types/signed_msg_type.go +++ b/types/signed_msg_type.go @@ -1,6 +1,6 @@ package types -import cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" +import cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" // IsVoteTypeValid returns true if t is a valid vote type. func IsVoteTypeValid(t cmtproto.SignedMsgType) bool { diff --git a/types/test_util.go b/types/test_util.go index 8f94e6d91be..b78c50d7a30 100644 --- a/types/test_util.go +++ b/types/test_util.go @@ -2,12 +2,12 @@ package types import ( "fmt" + cmtversion "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/version" "testing" "time" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmtversion "github.com/cometbft/cometbft/proto/tendermint/version" - "github.com/cometbft/cometbft/version" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + "github.com/KYVENetwork/cometbft/v38/version" "github.com/stretchr/testify/require" ) diff --git a/types/tx.go b/types/tx.go index 5cbb2cc40df..f6c2a005fe8 100644 --- a/types/tx.go +++ b/types/tx.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto/merkle" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) // TxKeySize is the size of the transaction key index diff --git a/types/tx_test.go b/types/tx_test.go index f5de93ae276..f1645327848 100644 --- a/types/tx_test.go +++ b/types/tx_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtrand "github.com/cometbft/cometbft/libs/rand" - ctest "github.com/cometbft/cometbft/libs/test" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + ctest "github.com/KYVENetwork/cometbft/v38/libs/test" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) func makeTxs(cnt, size int) Txs { diff --git a/types/validation.go b/types/validation.go index d15b35f7e50..fbb5ca3bea3 100644 --- a/types/validation.go +++ b/types/validation.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/cometbft/cometbft/crypto/batch" - "github.com/cometbft/cometbft/crypto/tmhash" - cmtmath "github.com/cometbft/cometbft/libs/math" + "github.com/KYVENetwork/cometbft/v38/crypto/batch" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" ) const batchVerifyThreshold = 2 diff --git a/types/validation_test.go b/types/validation_test.go index b44c63643cd..51b61c88f88 100644 --- a/types/validation_test.go +++ b/types/validation_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) // Check VerifyCommit, VerifyCommitLight and VerifyCommitLightTrusting basic diff --git a/types/validator.go b/types/validator.go index 3e95c467bc7..fddf1417aa0 100644 --- a/types/validator.go +++ b/types/validator.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/crypto" - ce "github.com/cometbft/cometbft/crypto/encoding" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + ce "github.com/KYVENetwork/cometbft/v38/crypto/encoding" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) // Volatile state for each Validator diff --git a/types/validator_set.go b/types/validator_set.go index 65113215191..d5b0b0bf600 100644 --- a/types/validator_set.go +++ b/types/validator_set.go @@ -9,9 +9,9 @@ import ( "sort" "strings" - "github.com/cometbft/cometbft/crypto/merkle" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto/merkle" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) const ( diff --git a/types/validator_set_test.go b/types/validator_set_test.go index 65e18f2b546..cbe6d5d96ab 100644 --- a/types/validator_set_test.go +++ b/types/validator_set_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - cmtmath "github.com/cometbft/cometbft/libs/math" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + cmtmath "github.com/KYVENetwork/cometbft/v38/libs/math" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) func TestValidatorSetBasic(t *testing.T) { diff --git a/types/vote.go b/types/vote.go index 9d7b1575462..9d1ffd2c7f4 100644 --- a/types/vote.go +++ b/types/vote.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/crypto" - cmtbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/protoio" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtbytes "github.com/KYVENetwork/cometbft/v38/libs/bytes" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) const ( diff --git a/types/vote_set.go b/types/vote_set.go index 6b9c70efed5..bfaea522661 100644 --- a/types/vote_set.go +++ b/types/vote_set.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/libs/bits" - cmtjson "github.com/cometbft/cometbft/libs/json" - cmtsync "github.com/cometbft/cometbft/libs/sync" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/KYVENetwork/cometbft/v38/libs/bits" + cmtjson "github.com/KYVENetwork/cometbft/v38/libs/json" + cmtsync "github.com/KYVENetwork/cometbft/v38/libs/sync" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" ) const ( diff --git a/types/vote_set_test.go b/types/vote_set_test.go index bfd7ac49248..59cd73a9084 100644 --- a/types/vote_set_test.go +++ b/types/vote_set_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - cmtrand "github.com/cometbft/cometbft/libs/rand" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/crypto" + cmtrand "github.com/KYVENetwork/cometbft/v38/libs/rand" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) func TestVoteSet_AddVote_Good(t *testing.T) { diff --git a/types/vote_test.go b/types/vote_test.go index f49368ca8d2..8fec20805e0 100644 --- a/types/vote_test.go +++ b/types/vote_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/cometbft/cometbft/crypto" - "github.com/cometbft/cometbft/crypto/ed25519" - "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/protoio" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" - cmttime "github.com/cometbft/cometbft/types/time" + "github.com/KYVENetwork/cometbft/v38/crypto" + "github.com/KYVENetwork/cometbft/v38/crypto/ed25519" + "github.com/KYVENetwork/cometbft/v38/crypto/tmhash" + "github.com/KYVENetwork/cometbft/v38/libs/protoio" + cmtproto "github.com/KYVENetwork/cometbft/v38/proto/cometbft/v38/types" + cmttime "github.com/KYVENetwork/cometbft/v38/types/time" ) func examplePrevote() *Vote {